From 0696e630f60f490db0657185c5787162b08e8959 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 1 Feb 2016 11:59:04 -0600 Subject: [PATCH] Remove REFRESH flag --- .../astrid/activity/TaskListFragment.java | 39 +------------------ .../repeats/RepeatTaskCompleteListener.java | 1 - .../com/todoroo/astrid/utility/Flags.java | 7 ---- src/main/java/org/tasks/Notifier.java | 1 - .../tasks/activities/ImportTaskActivity.java | 1 - .../receivers/RepeatConfirmationReceiver.java | 1 - 6 files changed, 2 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 2fc29f7d5..01687ecd7 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -66,7 +66,6 @@ import com.todoroo.astrid.subtasks.SubtasksUpdater; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.timers.TimerPlugin; import com.todoroo.astrid.ui.QuickAddBar; -import com.todoroo.astrid.utility.Flags; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; @@ -76,8 +75,6 @@ import org.tasks.injection.Injector; import org.tasks.notifications.NotificationManager; import org.tasks.preferences.ActivityPreferences; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; @@ -98,7 +95,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr // --- activities public static final long AUTOSYNC_INTERVAL = 90000L; - private static final long BACKGROUND_REFRESH_INTERVAL = 120000L; private static final long WAIT_BEFORE_AUTOSYNC = 2000L; public static final int ACTIVITY_REQUEST_NEW_FILTER = 5; @@ -138,7 +134,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr protected Filter filter; protected QuickAddBar quickAddBar = new QuickAddBar(); - private Timer backgroundTimer; protected Bundle extras; protected boolean isInbox; protected boolean isTodayFilter; @@ -388,30 +383,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr }); } - private void setUpBackgroundJobs() { - backgroundTimer = new Timer(); - - // start a thread to refresh periodically - backgroundTimer.scheduleAtFixedRate(new TimerTask() { - @Override - public void run() { - // refresh if conditions match - Flags.checkAndClear(Flags.REFRESH); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - try { - refresh(); - } catch (IllegalStateException e) { - // view may have been destroyed - Timber.e(e, e.getMessage()); - } - } - }); - } - }, BACKGROUND_REFRESH_INTERVAL, BACKGROUND_REFRESH_INTERVAL); - } - /* * ====================================================================== * ============================================================ lifecycle @@ -424,15 +395,11 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr getActivity().registerReceiver(refreshReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH)); - if (Flags.checkAndClear(Flags.REFRESH)) { - refresh(); - } - - setUpBackgroundJobs(); - refreshFilterCount(); initiateAutomaticSync(); + + refresh(); } protected boolean isCurrentTaskListFragment() { @@ -483,8 +450,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr super.onPause(); AndroidUtilities.tryUnregisterReceiver(getActivity(), refreshReceiver); - - backgroundTimer.cancel(); } /** diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java index 1d1f30366..f64058c22 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java @@ -90,7 +90,6 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver { broadcastIntent.putExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, oldDueDate); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, newDueDate); context.sendOrderedBroadcast(broadcastIntent, null); - Flags.set(Flags.REFRESH); } } diff --git a/src/main/java/com/todoroo/astrid/utility/Flags.java b/src/main/java/com/todoroo/astrid/utility/Flags.java index 122402183..0042f725e 100644 --- a/src/main/java/com/todoroo/astrid/utility/Flags.java +++ b/src/main/java/com/todoroo/astrid/utility/Flags.java @@ -9,13 +9,6 @@ public class Flags { private static int state = 0; - /** - * Whether to refresh the task list when displaying it. If you are - * writing a background service, send a BROADCAST_EVENT_REFRESH - * instead, as this is only checked periodically and when loading task list. - */ - public static final int REFRESH = 1; - /** * If set, indicates tags changed during task save */ diff --git a/src/main/java/org/tasks/Notifier.java b/src/main/java/org/tasks/Notifier.java index 8142c4526..fd1770685 100644 --- a/src/main/java/org/tasks/Notifier.java +++ b/src/main/java/org/tasks/Notifier.java @@ -353,7 +353,6 @@ public class Notifier { notificationManager.notify(notificationId, notification); AndroidUtilities.sleepDeep(500); } - Flags.set(Flags.REFRESH); // Forces a reload when app launches if (voiceReminder || maxOutVolumeForMultipleRingReminders) { AndroidUtilities.sleepDeep(2000); for (int i = 0; i < 50; i++) { diff --git a/src/main/java/org/tasks/activities/ImportTaskActivity.java b/src/main/java/org/tasks/activities/ImportTaskActivity.java index e946b693b..d27b8b1ac 100644 --- a/src/main/java/org/tasks/activities/ImportTaskActivity.java +++ b/src/main/java/org/tasks/activities/ImportTaskActivity.java @@ -34,7 +34,6 @@ public class ImportTaskActivity extends InjectingAppCompatActivity { xmlImporter.importTasks(ImportTaskActivity.this, filePath, new Runnable() { @Override public void run() { - Flags.set(Flags.REFRESH); finish(); } }); diff --git a/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java b/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java index 8ffc75831..5a096448c 100644 --- a/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java +++ b/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java @@ -81,7 +81,6 @@ public class RepeatConfirmationReceiver extends InjectingBroadcastReceiver { task.setHideUntil(hideUntil - (newDueDate - oldDueDate)); } taskService.save(task); - Flags.set(Flags.REFRESH); } }) .show();