diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java index cae351fec..35d7ae84d 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java @@ -74,7 +74,7 @@ public class GtasksInvoker { execute(service.tasks().update(listId, task.getId(), task)); } - public Task moveGtask(String listId, String taskId, String parentId, String previousId) + Task moveGtask(String listId, String taskId, String parentId, String previousId) throws IOException { return execute( service.tasks().move(listId, taskId).setParent(parentId).setPrevious(previousId)); @@ -92,10 +92,6 @@ public class GtasksInvoker { return execute(service.tasklists().insert(new TaskList().setTitle(title))); } - public void clearCompleted(String listId) throws IOException { - execute(service.tasks().clear(listId)); - } - public void deleteGtask(String listId, String taskId) throws IOException { try { execute(service.tasks().delete(listId, taskId)); diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index 652206223..1ef7ea0bb 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java @@ -6,8 +6,6 @@ package com.todoroo.astrid.gtasks.sync; -import static com.todoroo.andlib.utility.AndroidUtilities.assertNotMainThread; - import android.content.Context; import android.text.TextUtils; import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException; @@ -32,7 +30,6 @@ import org.tasks.data.GoogleTaskListDao; import org.tasks.gtasks.GtaskSyncAdapterHelper; import org.tasks.injection.ApplicationScope; import org.tasks.injection.ForApplication; -import org.tasks.jobs.WorkManager; import org.tasks.preferences.Preferences; import timber.log.Timber; @@ -47,7 +44,6 @@ public class GtasksSyncService { private final GtaskSyncAdapterHelper gtaskSyncAdapterHelper; private final Tracker tracker; private final GoogleTaskDao googleTaskDao; - private final WorkManager workManager; @Inject public GtasksSyncService( @@ -57,26 +53,16 @@ public class GtasksSyncService { GtaskSyncAdapterHelper gtaskSyncAdapterHelper, Tracker tracker, GoogleTaskDao googleTaskDao, - GoogleTaskListDao googleTaskListDao, - WorkManager workManager) { + GoogleTaskListDao googleTaskListDao) { this.context = context; this.taskDao = taskDao; this.preferences = preferences; this.gtaskSyncAdapterHelper = gtaskSyncAdapterHelper; this.tracker = tracker; this.googleTaskDao = googleTaskDao; - this.workManager = workManager; new OperationPushThread(operationQueue).start(); } - public void clearCompleted(GoogleTaskList googleTaskList) throws IOException { - assertNotMainThread(); - - GtasksInvoker invoker = new GtasksInvoker(context, googleTaskList.getAccount()); - invoker.clearCompleted(googleTaskList.getRemoteId()); - workManager.syncNow(); - } - public void triggerMoveForMetadata(GoogleTaskList googleTaskList, GoogleTask googleTask) { if (googleTask == null) { return; diff --git a/app/src/main/java/org/tasks/analytics/Tracking.java b/app/src/main/java/org/tasks/analytics/Tracking.java index b5ab21967..883f13af4 100644 --- a/app/src/main/java/org/tasks/analytics/Tracking.java +++ b/app/src/main/java/org/tasks/analytics/Tracking.java @@ -22,8 +22,6 @@ public class Tracking { GTASK_DELETE_LIST( R.string.tracking_category_google_tasks, R.string.tracking_action_delete_list), GTASK_SET_COLOR(R.string.tracking_category_google_tasks, R.string.p_theme_color), - GTASK_CLEAR_COMPLETED( - R.string.tracking_category_google_tasks, R.string.tracking_action_clear_completed), MULTISELECT_DELETE( R.string.tracking_category_event, R.string.tracking_event_multiselect_delete), MULTISELECT_CLONE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone), diff --git a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java index 30b9124d6..bada84f5d 100644 --- a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java +++ b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java @@ -11,13 +11,9 @@ import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.gtasks.sync.GtasksSyncService; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; import javax.inject.Inject; import org.tasks.R; import org.tasks.activities.GoogleTaskListSettingsActivity; -import org.tasks.analytics.Tracking; import org.tasks.data.GoogleTaskList; import org.tasks.injection.FragmentComponent; @@ -85,16 +81,6 @@ public class GtasksListFragment extends TaskListFragment { } } - @Override - protected void clearCompleted() { - tracker.reportEvent(Tracking.Events.GTASK_CLEAR_COMPLETED); - setSyncOngoing(true); - disposables.add(Completable.fromAction(() -> gtasksSyncService.clearCompleted(list)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(() -> preferences.isSyncOngoing())); - } - @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState);