diff --git a/app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java index 28364e798..832b27385 100644 --- a/app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java +++ b/app/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java @@ -2,6 +2,7 @@ package com.todoroo.astrid.gcal; import static com.google.common.collect.Iterables.any; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -15,13 +16,12 @@ import org.tasks.calendars.AndroidCalendarEvent; import org.tasks.calendars.AndroidCalendarEventAttendee; import org.tasks.calendars.CalendarEventProvider; import org.tasks.gtasks.GoogleAccountManager; -import org.tasks.injection.InjectingBroadcastReceiver; import org.tasks.preferences.Preferences; import org.tasks.scheduling.CalendarNotificationIntentService; import timber.log.Timber; @AndroidEntryPoint -public class CalendarAlarmReceiver extends InjectingBroadcastReceiver { +public class CalendarAlarmReceiver extends BroadcastReceiver { public static final int REQUEST_CODE_CAL_REMINDER = 100; public static final String BROADCAST_CALENDAR_REMINDER = @@ -33,8 +33,6 @@ public class CalendarAlarmReceiver extends InjectingBroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - if (!preferences.getBoolean(R.string.p_calendar_reminders, true)) { return; } diff --git a/app/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.kt b/app/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.kt deleted file mode 100644 index fd445fb76..000000000 --- a/app/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.tasks.injection - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent - -// https://github.com/google/dagger/issues/1918 -abstract class InjectingBroadcastReceiver : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) {} -} diff --git a/app/src/main/java/org/tasks/notifications/NotificationClearedReceiver.kt b/app/src/main/java/org/tasks/notifications/NotificationClearedReceiver.kt index 471014613..5d038f9fe 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationClearedReceiver.kt +++ b/app/src/main/java/org/tasks/notifications/NotificationClearedReceiver.kt @@ -1,20 +1,19 @@ package org.tasks.notifications +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import org.tasks.injection.InjectingBroadcastReceiver import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint -class NotificationClearedReceiver : InjectingBroadcastReceiver() { +class NotificationClearedReceiver : BroadcastReceiver() { @Inject lateinit var notificationManager: NotificationManager override fun onReceive(context: Context, intent: Intent) { - super.onReceive(context, intent) val notificationId = intent.getLongExtra(NotificationManager.EXTRA_NOTIFICATION_ID, -1L) Timber.d("cleared $notificationId") GlobalScope.launch { diff --git a/app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.kt b/app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.kt index 73fd867f6..d13e87d19 100644 --- a/app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.kt +++ b/app/src/main/java/org/tasks/receivers/CompleteTaskReceiver.kt @@ -1,21 +1,20 @@ package org.tasks.receivers +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.todoroo.astrid.service.TaskCompleter import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import org.tasks.injection.InjectingBroadcastReceiver import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint -class CompleteTaskReceiver : InjectingBroadcastReceiver() { +class CompleteTaskReceiver : BroadcastReceiver() { @Inject lateinit var taskCompleter: TaskCompleter override fun onReceive(context: Context, intent: Intent) { - super.onReceive(context, intent) val taskId = intent.getLongExtra(TASK_ID, 0) Timber.i("Completing %s", taskId) GlobalScope.launch {