Remove InjectingBroadcastReceiver

pull/1716/head
Alex Baker 3 years ago
parent c0b89a63a5
commit a7ada4d11d

@ -2,6 +2,7 @@ package com.todoroo.astrid.gcal;
import static com.google.common.collect.Iterables.any; import static com.google.common.collect.Iterables.any;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -15,13 +16,12 @@ import org.tasks.calendars.AndroidCalendarEvent;
import org.tasks.calendars.AndroidCalendarEventAttendee; import org.tasks.calendars.AndroidCalendarEventAttendee;
import org.tasks.calendars.CalendarEventProvider; import org.tasks.calendars.CalendarEventProvider;
import org.tasks.gtasks.GoogleAccountManager; import org.tasks.gtasks.GoogleAccountManager;
import org.tasks.injection.InjectingBroadcastReceiver;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.scheduling.CalendarNotificationIntentService; import org.tasks.scheduling.CalendarNotificationIntentService;
import timber.log.Timber; import timber.log.Timber;
@AndroidEntryPoint @AndroidEntryPoint
public class CalendarAlarmReceiver extends InjectingBroadcastReceiver { public class CalendarAlarmReceiver extends BroadcastReceiver {
public static final int REQUEST_CODE_CAL_REMINDER = 100; public static final int REQUEST_CODE_CAL_REMINDER = 100;
public static final String BROADCAST_CALENDAR_REMINDER = public static final String BROADCAST_CALENDAR_REMINDER =
@ -33,8 +33,6 @@ public class CalendarAlarmReceiver extends InjectingBroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
super.onReceive(context, intent);
if (!preferences.getBoolean(R.string.p_calendar_reminders, true)) { if (!preferences.getBoolean(R.string.p_calendar_reminders, true)) {
return; return;
} }

@ -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) {}
}

@ -1,20 +1,19 @@
package org.tasks.notifications package org.tasks.notifications
import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.injection.InjectingBroadcastReceiver
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class NotificationClearedReceiver : InjectingBroadcastReceiver() { class NotificationClearedReceiver : BroadcastReceiver() {
@Inject lateinit var notificationManager: NotificationManager @Inject lateinit var notificationManager: NotificationManager
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
super.onReceive(context, intent)
val notificationId = intent.getLongExtra(NotificationManager.EXTRA_NOTIFICATION_ID, -1L) val notificationId = intent.getLongExtra(NotificationManager.EXTRA_NOTIFICATION_ID, -1L)
Timber.d("cleared $notificationId") Timber.d("cleared $notificationId")
GlobalScope.launch { GlobalScope.launch {

@ -1,21 +1,20 @@
package org.tasks.receivers package org.tasks.receivers
import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import com.todoroo.astrid.service.TaskCompleter import com.todoroo.astrid.service.TaskCompleter
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.injection.InjectingBroadcastReceiver
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class CompleteTaskReceiver : InjectingBroadcastReceiver() { class CompleteTaskReceiver : BroadcastReceiver() {
@Inject lateinit var taskCompleter: TaskCompleter @Inject lateinit var taskCompleter: TaskCompleter
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
super.onReceive(context, intent)
val taskId = intent.getLongExtra(TASK_ID, 0) val taskId = intent.getLongExtra(TASK_ID, 0)
Timber.i("Completing %s", taskId) Timber.i("Completing %s", taskId)
GlobalScope.launch { GlobalScope.launch {

Loading…
Cancel
Save