archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename SyncAdapterHelper to GtaskSyncAdapterHelper

Browse Source
pull/645/head
Alex Baker 6 years ago
parent 1277948bf9
commit 195ed35058
13 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File

12
app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
Unescape Escape View File

@ -9,7 +9,7 @@ import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
import org.tasks.data.GoogleTaskList; import org.tasks.data.GoogleTaskList;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import java.util.List; import java.util.List;
@ -27,17 +27,17 @@ import static java.util.Collections.emptyList;
public class GtasksFilterExposer { public class GtasksFilterExposer {
private final GtasksListService gtasksListService; private final GtasksListService gtasksListService;
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject @Inject
public GtasksFilterExposer(GtasksListService gtasksListService, SyncAdapterHelper syncAdapterHelper) { public GtasksFilterExposer(GtasksListService gtasksListService, GtaskSyncAdapterHelper gtaskSyncAdapterHelper) {
this.gtasksListService = gtasksListService; this.gtasksListService = gtasksListService;
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
} }
public List<Filter> getFilters() { public List<Filter> getFilters() {
// if we aren't logged in (or we are logged in to astrid.com), don't expose features // if we aren't logged in (or we are logged in to astrid.com), don't expose features
if(!syncAdapterHelper.isEnabled()) { if(!gtaskSyncAdapterHelper.isEnabled()) {
return emptyList(); return emptyList();
} }
@ -49,7 +49,7 @@ public class GtasksFilterExposer {
} }
public Filter getFilter(long id) { public Filter getFilter(long id) {
if (syncAdapterHelper.isEnabled()) { if (gtaskSyncAdapterHelper.isEnabled()) {
GoogleTaskList list = gtasksListService.getList(id); GoogleTaskList list = gtasksListService.getList(id);
if (list != null) { if (list != null) {
return filterFromList(list); return filterFromList(list);

18
app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java
Unescape Escape View File

@ -18,8 +18,8 @@ import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.data.GoogleTaskDao; import org.tasks.data.GoogleTaskDao;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.gtasks.PlayServicesAvailability; import org.tasks.gtasks.PlayServicesAvailability;
import org.tasks.gtasks.SyncAdapterHelper;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingPreferenceActivity; import org.tasks.injection.InjectingPreferenceActivity;
import org.tasks.preferences.ActivityPermissionRequestor; import org.tasks.preferences.ActivityPermissionRequestor;
@ -36,7 +36,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
@Inject GtasksPreferenceService gtasksPreferenceService; @Inject GtasksPreferenceService gtasksPreferenceService;
@Inject ActivityPermissionRequestor permissionRequestor; @Inject ActivityPermissionRequestor permissionRequestor;
@Inject Tracker tracker; @Inject Tracker tracker;
@Inject SyncAdapterHelper syncAdapterHelper; @Inject GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject PlayServicesAvailability playServicesAvailability; @Inject PlayServicesAvailability playServicesAvailability;
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@Inject GoogleTaskDao googleTaskDao; @Inject GoogleTaskDao googleTaskDao;
@ -48,7 +48,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
addPreferencesFromResource(R.xml.preferences_gtasks); addPreferencesFromResource(R.xml.preferences_gtasks);
final CheckBoxPreference gtaskPreference = (CheckBoxPreference) findPreference(getString(R.string.sync_gtasks)); final CheckBoxPreference gtaskPreference = (CheckBoxPreference) findPreference(getString(R.string.sync_gtasks));
gtaskPreference.setChecked(syncAdapterHelper.isEnabled()); gtaskPreference.setChecked(gtaskSyncAdapterHelper.isEnabled());
gtaskPreference.setOnPreferenceChangeListener((preference, newValue) -> { gtaskPreference.setOnPreferenceChangeListener((preference, newValue) -> {
if ((boolean) newValue) { if ((boolean) newValue) {
if (!playServicesAvailability.refreshAndCheck()) { if (!playServicesAvailability.refreshAndCheck()) {
@ -58,7 +58,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
} }
return false; return false;
} else { } else {
syncAdapterHelper.enableSynchronization(false); gtaskSyncAdapterHelper.enableSynchronization(false);
tracker.reportEvent(Tracking.Events.GTASK_DISABLED); tracker.reportEvent(Tracking.Events.GTASK_DISABLED);
gtasksPreferenceService.stopOngoing(); gtasksPreferenceService.stopOngoing();
return true; return true;
@ -70,7 +70,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
gtasksPreferenceService.getLastSyncDate()))); gtasksPreferenceService.getLastSyncDate())));
} }
findPreference(getString(R.string.gtask_background_sync)).setOnPreferenceChangeListener((preference, o) -> { findPreference(getString(R.string.gtask_background_sync)).setOnPreferenceChangeListener((preference, o) -> {
syncAdapterHelper.enableSynchronization((Boolean) o); gtaskSyncAdapterHelper.enableSynchronization((Boolean) o);
return true; return true;
}); });
findPreference(getString(R.string.sync_SPr_forget_key)).setOnPreferenceClickListener(preference -> { findPreference(getString(R.string.sync_SPr_forget_key)).setOnPreferenceClickListener(preference -> {
@ -79,7 +79,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
gtasksPreferenceService.clearLastSyncDate(); gtasksPreferenceService.clearLastSyncDate();
gtasksPreferenceService.setUserName(null); gtasksPreferenceService.setUserName(null);
googleTaskDao.deleteAll(); googleTaskDao.deleteAll();
syncAdapterHelper.enableSynchronization(false); gtaskSyncAdapterHelper.enableSynchronization(false);
tracker.reportEvent(Tracking.Events.GTASK_LOGOUT); tracker.reportEvent(Tracking.Events.GTASK_LOGOUT);
gtaskPreference.setChecked(false); gtaskPreference.setChecked(false);
}) })
@ -98,8 +98,8 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
super.onPostResume(); super.onPostResume();
CheckBoxPreference backgroundSync = (CheckBoxPreference) findPreference(getString(R.string.gtask_background_sync)); CheckBoxPreference backgroundSync = (CheckBoxPreference) findPreference(getString(R.string.gtask_background_sync));
backgroundSync.setChecked(syncAdapterHelper.isSyncEnabled()); backgroundSync.setChecked(gtaskSyncAdapterHelper.isSyncEnabled());
if (syncAdapterHelper.isMasterSyncEnabled()) { if (gtaskSyncAdapterHelper.isMasterSyncEnabled()) {
backgroundSync.setSummary(null); backgroundSync.setSummary(null);
} else { } else {
backgroundSync.setSummary(R.string.master_sync_warning); backgroundSync.setSummary(R.string.master_sync_warning);
@ -111,7 +111,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
if (requestCode == REQUEST_LOGIN) { if (requestCode == REQUEST_LOGIN) {
boolean enabled = resultCode == RESULT_OK; boolean enabled = resultCode == RESULT_OK;
if (enabled) { if (enabled) {
syncAdapterHelper.enableSynchronization(true); gtaskSyncAdapterHelper.enableSynchronization(true);
tracker.reportEvent(Tracking.Events.GTASK_ENABLED); tracker.reportEvent(Tracking.Events.GTASK_ENABLED);
} }
((CheckBoxPreference) findPreference(getString(R.string.sync_gtasks))).setChecked(enabled); ((CheckBoxPreference) findPreference(getString(R.string.sync_gtasks))).setChecked(enabled);

10
app/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
Unescape Escape View File

@ -19,7 +19,7 @@ import com.todoroo.astrid.gtasks.api.MoveRequest;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
import org.tasks.data.GoogleTask; import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskDao; import org.tasks.data.GoogleTaskDao;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.injection.ApplicationScope; import org.tasks.injection.ApplicationScope;
import java.io.IOException; import java.io.IOException;
@ -40,7 +40,7 @@ public class GtasksSyncService {
private final GtasksPreferenceService gtasksPreferenceService; private final GtasksPreferenceService gtasksPreferenceService;
private final GtasksInvoker gtasksInvoker; private final GtasksInvoker gtasksInvoker;
private final LinkedBlockingQueue<SyncOnSaveOperation> operationQueue = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue<SyncOnSaveOperation> operationQueue = new LinkedBlockingQueue<>();
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
private final Tracker tracker; private final Tracker tracker;
private final GoogleTaskDao googleTaskDao; private final GoogleTaskDao googleTaskDao;
@ -48,12 +48,12 @@ public class GtasksSyncService {
public GtasksSyncService(TaskDao taskDao, public GtasksSyncService(TaskDao taskDao,
GtasksPreferenceService gtasksPreferenceService, GtasksPreferenceService gtasksPreferenceService,
GtasksInvoker gtasksInvoker, GtasksInvoker gtasksInvoker,
SyncAdapterHelper syncAdapterHelper, Tracker tracker, GtaskSyncAdapterHelper gtaskSyncAdapterHelper, Tracker tracker,
GoogleTaskDao googleTaskDao) { GoogleTaskDao googleTaskDao) {
this.taskDao = taskDao; this.taskDao = taskDao;
this.gtasksPreferenceService = gtasksPreferenceService; this.gtasksPreferenceService = gtasksPreferenceService;
this.gtasksInvoker = gtasksInvoker; this.gtasksInvoker = gtasksInvoker;
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
this.tracker = tracker; this.tracker = tracker;
this.googleTaskDao = googleTaskDao; this.googleTaskDao = googleTaskDao;
new OperationPushThread(operationQueue).start(); new OperationPushThread(operationQueue).start();
@ -134,7 +134,7 @@ public class GtasksSyncService {
{ {
return; return;
} }
if (!syncAdapterHelper.isEnabled()) { if (!gtaskSyncAdapterHelper.isEnabled()) {
return; return;
} }

10
app/src/googleplay/java/com/todoroo/astrid/service/SyncV2Service.java
Unescape Escape View File

@ -9,7 +9,7 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncResultCallback;
import org.tasks.data.GoogleTaskList; import org.tasks.data.GoogleTaskList;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.sync.SyncExecutor; import org.tasks.sync.SyncExecutor;
import javax.inject.Inject; import javax.inject.Inject;
@ -28,18 +28,18 @@ public class SyncV2Service {
* for responding to sync requests through this new API. * for responding to sync requests through this new API.
*/ */
private final SyncExecutor syncExecutor; private final SyncExecutor syncExecutor;
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
private final GtasksSyncService gtasksSyncService; private final GtasksSyncService gtasksSyncService;
@Inject @Inject
public SyncV2Service(SyncExecutor syncExecutor, SyncAdapterHelper syncAdapterHelper, GtasksSyncService gtasksSyncService) { public SyncV2Service(SyncExecutor syncExecutor, GtaskSyncAdapterHelper gtaskSyncAdapterHelper, GtasksSyncService gtasksSyncService) {
this.syncExecutor = syncExecutor; this.syncExecutor = syncExecutor;
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
this.gtasksSyncService = gtasksSyncService; this.gtasksSyncService = gtasksSyncService;
} }
public void clearCompleted(final GoogleTaskList list, final SyncResultCallback callback) { public void clearCompleted(final GoogleTaskList list, final SyncResultCallback callback) {
if (syncAdapterHelper.isEnabled()) { if (gtaskSyncAdapterHelper.isEnabled()) {
syncExecutor.execute(callback, () -> { syncExecutor.execute(callback, () -> {
callback.started(); callback.started();
try { try {

10
app/src/googleplay/java/org/tasks/FlavorSetup.java
Unescape Escape View File

@ -4,7 +4,7 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
import org.tasks.billing.InventoryHelper; import org.tasks.billing.InventoryHelper;
import org.tasks.gtasks.PlayServicesAvailability; import org.tasks.gtasks.PlayServicesAvailability;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import javax.inject.Inject; import javax.inject.Inject;
@ -12,22 +12,22 @@ public class FlavorSetup {
private final GtasksPreferenceService gtasksPreferenceService; private final GtasksPreferenceService gtasksPreferenceService;
private final InventoryHelper inventoryHelper; private final InventoryHelper inventoryHelper;
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
private final PlayServicesAvailability playServicesAvailability; private final PlayServicesAvailability playServicesAvailability;
@Inject @Inject
public FlavorSetup(GtasksPreferenceService gtasksPreferenceService, InventoryHelper inventoryHelper, public FlavorSetup(GtasksPreferenceService gtasksPreferenceService, InventoryHelper inventoryHelper,
SyncAdapterHelper syncAdapterHelper, PlayServicesAvailability playServicesAvailability) { GtaskSyncAdapterHelper gtaskSyncAdapterHelper, PlayServicesAvailability playServicesAvailability) {
this.gtasksPreferenceService = gtasksPreferenceService; this.gtasksPreferenceService = gtasksPreferenceService;
this.inventoryHelper = inventoryHelper; this.inventoryHelper = inventoryHelper;
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
this.playServicesAvailability = playServicesAvailability; this.playServicesAvailability = playServicesAvailability;
} }
public void setup() { public void setup() {
inventoryHelper.initialize(); inventoryHelper.initialize();
gtasksPreferenceService.stopOngoing(); // if sync ongoing flag was set, clear it gtasksPreferenceService.stopOngoing(); // if sync ongoing flag was set, clear it
syncAdapterHelper.enableSynchronization(syncAdapterHelper.isEnabled()); gtaskSyncAdapterHelper.enableSynchronization(gtaskSyncAdapterHelper.isEnabled());
playServicesAvailability.refresh(); playServicesAvailability.refresh();
} }
} }

4
app/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java → app/src/googleplay/java/org/tasks/gtasks/GtaskSyncAdapterHelper.java
Unescape Escape View File

@ -19,7 +19,7 @@ import javax.inject.Inject;
import timber.log.Timber; import timber.log.Timber;
public class SyncAdapterHelper { public class GtaskSyncAdapterHelper {
private static final String AUTHORITY = "org.tasks"; private static final String AUTHORITY = "org.tasks";
@ -30,7 +30,7 @@ public class SyncAdapterHelper {
private final Tracker tracker; private final Tracker tracker;
@Inject @Inject
public SyncAdapterHelper(AccountManager accountManager, Preferences preferences, public GtaskSyncAdapterHelper(AccountManager accountManager, Preferences preferences,
GtasksPreferenceService gtasksPreferenceService, GtasksPreferenceService gtasksPreferenceService,
PlayServicesAvailability playServicesAvailability, Tracker tracker) { PlayServicesAvailability playServicesAvailability, Tracker tracker) {
this.accountManager = accountManager; this.accountManager = accountManager;

12
app/src/googleplay/java/org/tasks/receivers/GoogleTaskPusher.java
Unescape Escape View File

@ -4,21 +4,21 @@ import com.google.common.base.Strings;
import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import javax.inject.Inject; import javax.inject.Inject;
public class GoogleTaskPusher { public class GoogleTaskPusher {
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject @Inject
public GoogleTaskPusher(SyncAdapterHelper syncAdapterHelper) { public GoogleTaskPusher(GtaskSyncAdapterHelper gtaskSyncAdapterHelper) {
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
} }
void push(Task task, Task original) { void push(Task task, Task original) {
if(!syncAdapterHelper.isEnabled()) { if(!gtaskSyncAdapterHelper.isEnabled()) {
return; return;
} }
@ -35,7 +35,7 @@ public class GoogleTaskPusher {
!task.getCompletionDate().equals(original.getCompletionDate()) || !task.getCompletionDate().equals(original.getCompletionDate()) ||
!task.getDeletionDate().equals(original.getDeletionDate()) || !task.getDeletionDate().equals(original.getDeletionDate()) ||
task.checkAndClearTransitory(SyncFlags.FORCE_SYNC)) { task.checkAndClearTransitory(SyncFlags.FORCE_SYNC)) {
syncAdapterHelper.requestSynchronization(); gtaskSyncAdapterHelper.requestSynchronization();
} }
} }
} }

6
app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -48,7 +48,7 @@ import org.tasks.data.TagDataDao;
import org.tasks.dialogs.SortDialog; import org.tasks.dialogs.SortDialog;
import org.tasks.fragments.CommentBarFragment; import org.tasks.fragments.CommentBarFragment;
import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.gtasks.RemoteListSelectionHandler;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.intents.TaskIntents; import org.tasks.intents.TaskIntents;
@ -97,7 +97,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
@Inject TagDataDao tagDataDao; @Inject TagDataDao tagDataDao;
@Inject Theme theme; @Inject Theme theme;
@Inject ThemeCache themeCache; @Inject ThemeCache themeCache;
@Inject SyncAdapterHelper syncAdapterHelper; @Inject GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject Tracker tracker; @Inject Tracker tracker;
@Inject TaskCreator taskCreator; @Inject TaskCreator taskCreator;
@Inject TaskDao taskDao; @Inject TaskDao taskDao;
@ -274,7 +274,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
localBroadcastManager.registerRepeatReceiver(repeatConfirmationReceiver); localBroadcastManager.registerRepeatReceiver(repeatConfirmationReceiver);
syncAdapterHelper.checkPlayServices(getTaskListFragment()); gtaskSyncAdapterHelper.checkPlayServices(getTaskListFragment());
} }
public void restart() { public void restart() {

8
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -50,7 +50,7 @@ import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.dialogs.SortDialog; import org.tasks.dialogs.SortDialog;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.injection.ForActivity; import org.tasks.injection.ForActivity;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.injection.InjectingFragment; import org.tasks.injection.InjectingFragment;
@ -97,7 +97,7 @@ public class TaskListFragment extends InjectingFragment implements
// --- instance variables // --- instance variables
@Inject SyncAdapterHelper syncAdapterHelper; @Inject GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject TaskDeleter taskDeleter; @Inject TaskDeleter taskDeleter;
@Inject TaskDuplicator taskDuplicator; @Inject TaskDuplicator taskDuplicator;
@Inject @ForActivity Context context; @Inject @ForActivity Context context;
@ -135,7 +135,7 @@ public class TaskListFragment extends InjectingFragment implements
@Override @Override
public void onRefresh() { public void onRefresh() {
if (!syncAdapterHelper.initiateManualSync()) { if (!gtaskSyncAdapterHelper.initiateManualSync()) {
refresh(); refresh();
} }
} }
@ -477,7 +477,7 @@ public class TaskListFragment extends InjectingFragment implements
for (Task task : tasks) { for (Task task : tasks) {
onTaskCreated(task.getUuid()); onTaskCreated(task.getUuid());
} }
syncAdapterHelper.requestSynchronization(); gtaskSyncAdapterHelper.requestSynchronization();
} }
public void onTaskCreated(String uuid) { public void onTaskCreated(String uuid) {

6
app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java
Unescape Escape View File

@ -21,8 +21,8 @@ import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.calendars.AndroidCalendar; import org.tasks.calendars.AndroidCalendar;
import org.tasks.calendars.CalendarProvider; import org.tasks.calendars.CalendarProvider;
import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.gtasks.RemoteListSelectionHandler;
import org.tasks.gtasks.SyncAdapterHelper;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingPreferenceActivity; import org.tasks.injection.InjectingPreferenceActivity;
import org.tasks.preferences.ActivityPermissionRequestor; import org.tasks.preferences.ActivityPermissionRequestor;
@ -46,7 +46,7 @@ public class DefaultsPreferences extends InjectingPreferenceActivity implements
@Inject ActivityPermissionRequestor permissionRequester; @Inject ActivityPermissionRequestor permissionRequester;
@Inject Tracker tracker; @Inject Tracker tracker;
@Inject GtasksPreferenceService gtasksPreferenceService; @Inject GtasksPreferenceService gtasksPreferenceService;
@Inject SyncAdapterHelper syncAdapterHelper; @Inject GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject DefaultFilterProvider defaultFilterProvider; @Inject DefaultFilterProvider defaultFilterProvider;
private Preference defaultCalendarPref; private Preference defaultCalendarPref;
@ -69,7 +69,7 @@ public class DefaultsPreferences extends InjectingPreferenceActivity implements
? getString(R.string.dont_add_to_calendar) ? getString(R.string.dont_add_to_calendar)
: defaultCalendarName); : defaultCalendarName);
if (syncAdapterHelper.isEnabled()) { if (gtaskSyncAdapterHelper.isEnabled()) {
findPreference(R.string.p_default_remote_list).setOnPreferenceClickListener(preference -> { findPreference(R.string.p_default_remote_list).setOnPreferenceClickListener(preference -> {
newRemoteListNativePicker(defaultFilterProvider.getDefaultRemoteList()) newRemoteListNativePicker(defaultFilterProvider.getDefaultRemoteList())
.show(getFragmentManager(), FRAG_TAG_REMOTE_LIST_SELECTION); .show(getFragmentManager(), FRAG_TAG_REMOTE_LIST_SELECTION);

10
app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
Unescape Escape View File

@ -21,7 +21,7 @@ import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskList; import org.tasks.data.GoogleTaskList;
import org.tasks.data.Tag; import org.tasks.data.Tag;
import org.tasks.data.TagData; import org.tasks.data.TagData;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import java.util.HashMap; import java.util.HashMap;
@ -47,15 +47,15 @@ public class FilterCriteriaProvider {
private final TagService tagService; private final TagService tagService;
private final GtasksListService gtasksListService; private final GtasksListService gtasksListService;
private final Resources r; private final Resources r;
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
@Inject @Inject
public FilterCriteriaProvider(@ForApplication Context context, TagService tagService, public FilterCriteriaProvider(@ForApplication Context context, TagService tagService,
GtasksListService gtasksListService, SyncAdapterHelper syncAdapterHelper) { GtasksListService gtasksListService, GtaskSyncAdapterHelper gtaskSyncAdapterHelper) {
this.context = context; this.context = context;
this.tagService = tagService; this.tagService = tagService;
this.gtasksListService = gtasksListService; this.gtasksListService = gtasksListService;
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
r = context.getResources(); r = context.getResources();
} }
@ -68,7 +68,7 @@ public class FilterCriteriaProvider {
result.add(getDueDateFilter()); result.add(getDueDateFilter());
result.add(getImportanceFilter()); result.add(getImportanceFilter());
result.add(getTaskTitleContainsFilter()); result.add(getTaskTitleContainsFilter());
if (syncAdapterHelper.isEnabled()) { if (gtaskSyncAdapterHelper.isEnabled()) {
result.add(getGtasksFilterCriteria()); result.add(getGtasksFilterCriteria());
} }

10
app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
Unescape Escape View File

@ -16,7 +16,7 @@ import com.todoroo.astrid.ui.ReminderControlSet;
import org.tasks.BuildConfig; import org.tasks.BuildConfig;
import org.tasks.R; import org.tasks.R;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.ui.CalendarControlSet; import org.tasks.ui.CalendarControlSet;
import org.tasks.ui.DeadlineControlSet; import org.tasks.ui.DeadlineControlSet;
@ -72,11 +72,11 @@ public class TaskEditControlSetFragmentManager {
private final Map<String, Integer> controlSetFragments = new LinkedHashMap<>(); private final Map<String, Integer> controlSetFragments = new LinkedHashMap<>();
private final List<String> displayOrder; private final List<String> displayOrder;
private final SyncAdapterHelper syncAdapterHelper; private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper;
private int numRows; private int numRows;
public TaskEditControlSetFragmentManager(Activity activity, Preferences preferences, SyncAdapterHelper syncAdapterHelper) { public TaskEditControlSetFragmentManager(Activity activity, Preferences preferences, GtaskSyncAdapterHelper gtaskSyncAdapterHelper) {
this.syncAdapterHelper = syncAdapterHelper; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper;
displayOrder = BeastModePreferences.constructOrderedControlList(preferences, activity); displayOrder = BeastModePreferences.constructOrderedControlList(preferences, activity);
displayOrder.add(0, activity.getString(EditTitleControlSet.TAG)); displayOrder.add(0, activity.getString(EditTitleControlSet.TAG));
displayOrder.add(1, activity.getString(CommentBarFragment.TAG)); displayOrder.add(1, activity.getString(CommentBarFragment.TAG));
@ -151,7 +151,7 @@ public class TaskEditControlSetFragmentManager {
case CommentBarFragment.TAG: case CommentBarFragment.TAG:
return new CommentBarFragment(); return new CommentBarFragment();
case RemoteListFragment.TAG: case RemoteListFragment.TAG:
return syncAdapterHelper.isEnabled() return gtaskSyncAdapterHelper.isEnabled()
? new RemoteListFragment() ? new RemoteListFragment()
: null; : null;
default: default:

6
app/src/main/java/org/tasks/injection/ActivityModule.java
Unescape Escape View File

@ -5,7 +5,7 @@ import android.content.Context;
import org.tasks.R; import org.tasks.R;
import org.tasks.fragments.TaskEditControlSetFragmentManager; import org.tasks.fragments.TaskEditControlSetFragmentManager;
import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.themes.ThemeAccent; import org.tasks.themes.ThemeAccent;
import org.tasks.themes.ThemeBase; import org.tasks.themes.ThemeBase;
@ -55,7 +55,7 @@ public class ActivityModule {
@Provides @Provides
@ActivityScope @ActivityScope
public TaskEditControlSetFragmentManager getTaskEditControlSetFragmentManager(Preferences preferences, SyncAdapterHelper syncAdapterHelper) { public TaskEditControlSetFragmentManager getTaskEditControlSetFragmentManager(Preferences preferences, GtaskSyncAdapterHelper gtaskSyncAdapterHelper) {
return new TaskEditControlSetFragmentManager(activity, preferences, syncAdapterHelper); return new TaskEditControlSetFragmentManager(activity, preferences, gtaskSyncAdapterHelper);
} }
} }

Write Preview
Loading…
Cancel
Save