From 04b053cd375e28f5c2055cf275f89224be5ed0ff Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 11 Aug 2016 17:28:10 -0500 Subject: [PATCH] Move TeslaUnread to main --- .../java/org/tasks/preferences/BasicPreferences.java | 2 +- src/googleplay/java/org/tasks/FlavorSetup.java | 11 ++--------- .../java/org/tasks/injection/BroadcastComponent.java | 3 --- src/main/java/org/tasks/Tasks.java | 9 +++++---- .../org/tasks/injection/BaseBroadcastComponent.java | 5 ++++- .../java/org/tasks/receivers/TeslaUnreadReceiver.java | 0 6 files changed, 12 insertions(+), 18 deletions(-) rename src/{googleplay => main}/java/org/tasks/receivers/TeslaUnreadReceiver.java (100%) diff --git a/src/generic/java/org/tasks/preferences/BasicPreferences.java b/src/generic/java/org/tasks/preferences/BasicPreferences.java index c689e0be9..381d2ab96 100644 --- a/src/generic/java/org/tasks/preferences/BasicPreferences.java +++ b/src/generic/java/org/tasks/preferences/BasicPreferences.java @@ -23,7 +23,7 @@ public class BasicPreferences extends BaseBasicPreferences { }); requires(R.string.settings_general, false, R.string.synchronization); - requires(R.string.get_plugins, false, R.string.p_tesla_unread_enabled, R.string.p_purchased_tasker, R.string.p_purchased_dashclock); + requires(R.string.get_plugins, false, R.string.p_purchased_tasker, R.string.p_purchased_dashclock); requires(R.string.privacy, false, R.string.p_collect_statistics); } diff --git a/src/googleplay/java/org/tasks/FlavorSetup.java b/src/googleplay/java/org/tasks/FlavorSetup.java index 39feca1cc..e0c33ab75 100644 --- a/src/googleplay/java/org/tasks/FlavorSetup.java +++ b/src/googleplay/java/org/tasks/FlavorSetup.java @@ -7,31 +7,25 @@ import org.tasks.billing.InventoryHelper; import org.tasks.billing.PurchaseHelper; import org.tasks.gtasks.PlayServicesAvailability; import org.tasks.gtasks.SyncAdapterHelper; -import org.tasks.preferences.Preferences; -import org.tasks.receivers.TeslaUnreadReceiver; import org.tasks.sync.SyncExecutor; import javax.inject.Inject; public class FlavorSetup { - private final Preferences preferences; private final GtasksPreferenceService gtasksPreferenceService; - private final TeslaUnreadReceiver teslaUnreadReceiver; private final InventoryHelper inventoryHelper; private final SyncAdapterHelper syncAdapterHelper; private final PlayServicesAvailability playServicesAvailability; @Inject - public FlavorSetup(Preferences preferences, GtasksPreferenceService gtasksPreferenceService, + public FlavorSetup(GtasksPreferenceService gtasksPreferenceService, @SuppressWarnings("UnusedParameters") GtasksTaskListUpdater gtasksTaskListUpdater, @SuppressWarnings("UnusedParameters") PurchaseHelper purchaseHelper, @SuppressWarnings("UnusedParameters") SyncExecutor syncExecutor, - TeslaUnreadReceiver teslaUnreadReceiver, InventoryHelper inventoryHelper, + InventoryHelper inventoryHelper, SyncAdapterHelper syncAdapterHelper, PlayServicesAvailability playServicesAvailability) { - this.preferences = preferences; this.gtasksPreferenceService = gtasksPreferenceService; - this.teslaUnreadReceiver = teslaUnreadReceiver; this.inventoryHelper = inventoryHelper; this.syncAdapterHelper = syncAdapterHelper; this.playServicesAvailability = playServicesAvailability; @@ -39,7 +33,6 @@ public class FlavorSetup { public void setup() { inventoryHelper.initialize(); - teslaUnreadReceiver.setEnabled(preferences.getBoolean(R.string.p_tesla_unread_enabled, false)); gtasksPreferenceService.stopOngoing(); // if sync ongoing flag was set, clear it syncAdapterHelper.enableSynchronization(syncAdapterHelper.isEnabled()); playServicesAvailability.refresh(); diff --git a/src/googleplay/java/org/tasks/injection/BroadcastComponent.java b/src/googleplay/java/org/tasks/injection/BroadcastComponent.java index f982abe53..4b9dcb535 100644 --- a/src/googleplay/java/org/tasks/injection/BroadcastComponent.java +++ b/src/googleplay/java/org/tasks/injection/BroadcastComponent.java @@ -2,14 +2,11 @@ package org.tasks.injection; import org.tasks.locale.receiver.FireReceiver; import org.tasks.receivers.GoogleTaskPushReceiver; -import org.tasks.receivers.TeslaUnreadReceiver; import dagger.Subcomponent; @Subcomponent(modules = BroadcastModule.class) public interface BroadcastComponent extends BaseBroadcastComponent { - void inject(TeslaUnreadReceiver teslaUnreadReceiver); - void inject(FireReceiver fireReceiver); void inject(GoogleTaskPushReceiver forceSyncReceiver); diff --git a/src/main/java/org/tasks/Tasks.java b/src/main/java/org/tasks/Tasks.java index fb4e22675..3adecb83c 100644 --- a/src/main/java/org/tasks/Tasks.java +++ b/src/main/java/org/tasks/Tasks.java @@ -3,10 +3,7 @@ package org.tasks; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.TagDataDao; -import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskDao; -import com.todoroo.astrid.dao.TaskListMetadataDao; -import com.todoroo.astrid.dao.UserActivityDao; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagService; @@ -15,6 +12,7 @@ import org.tasks.analytics.Tracker; import org.tasks.injection.ApplicationComponent; import org.tasks.injection.InjectingApplication; import org.tasks.preferences.Preferences; +import org.tasks.receivers.TeslaUnreadReceiver; import org.tasks.themes.ThemeCache; import javax.inject.Inject; @@ -35,15 +33,18 @@ public class Tasks extends InjectingApplication { @Inject FlavorSetup flavorSetup; @Inject BuildSetup buildSetup; @Inject ThemeCache themeCache; + @Inject TeslaUnreadReceiver teslaUnreadReceiver; @Override public void onCreate() { super.onCreate(); + tracker.setTrackingEnabled(preferences.isTrackingEnabled()); + buildSetup.setup(); flavorSetup.setup(); - tracker.setTrackingEnabled(preferences.isTrackingEnabled()); + teslaUnreadReceiver.setEnabled(preferences.getBoolean(R.string.p_tesla_unread_enabled, false)); themeCache.getThemeBase(preferences.getInt(R.string.p_theme, 0)).setDefaultNightMode(); diff --git a/src/main/java/org/tasks/injection/BaseBroadcastComponent.java b/src/main/java/org/tasks/injection/BaseBroadcastComponent.java index 8f75cb438..6be2c4706 100644 --- a/src/main/java/org/tasks/injection/BaseBroadcastComponent.java +++ b/src/main/java/org/tasks/injection/BaseBroadcastComponent.java @@ -6,7 +6,6 @@ import com.todoroo.astrid.gcal.CalendarAlarmReceiver; import com.todoroo.astrid.gcal.GCalTaskCompleteListener; import com.todoroo.astrid.repeats.RepeatTaskCompleteListener; import com.todoroo.astrid.timers.TimerTaskCompleteListener; -import org.tasks.widget.TasksWidget; import org.tasks.receivers.BootCompletedReceiver; import org.tasks.receivers.CompleteTaskReceiver; @@ -15,6 +14,8 @@ import org.tasks.receivers.ListNotificationReceiver; import org.tasks.receivers.MyPackageReplacedReceiver; import org.tasks.receivers.RefreshReceiver; import org.tasks.receivers.TaskNotificationReceiver; +import org.tasks.receivers.TeslaUnreadReceiver; +import org.tasks.widget.TasksWidget; public interface BaseBroadcastComponent { @@ -45,4 +46,6 @@ public interface BaseBroadcastComponent { void inject(BootCompletedReceiver bootCompletedReceiver); void inject(TasksWidget tasksWidget); + + void inject(TeslaUnreadReceiver teslaUnreadReceiver); } diff --git a/src/googleplay/java/org/tasks/receivers/TeslaUnreadReceiver.java b/src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java similarity index 100% rename from src/googleplay/java/org/tasks/receivers/TeslaUnreadReceiver.java rename to src/main/java/org/tasks/receivers/TeslaUnreadReceiver.java