Remove REFRESH flag

pull/384/head
Alex Baker 10 years ago
parent a063a6d60e
commit 0696e630f6

@ -66,7 +66,6 @@ import com.todoroo.astrid.subtasks.SubtasksUpdater;
import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.timers.TimerPlugin; import com.todoroo.astrid.timers.TimerPlugin;
import com.todoroo.astrid.ui.QuickAddBar; import com.todoroo.astrid.ui.QuickAddBar;
import com.todoroo.astrid.utility.Flags;
import org.tasks.R; import org.tasks.R;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
@ -76,8 +75,6 @@ import org.tasks.injection.Injector;
import org.tasks.notifications.NotificationManager; import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.ActivityPreferences;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject; import javax.inject.Inject;
@ -98,7 +95,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
// --- activities // --- activities
public static final long AUTOSYNC_INTERVAL = 90000L; public static final long AUTOSYNC_INTERVAL = 90000L;
private static final long BACKGROUND_REFRESH_INTERVAL = 120000L;
private static final long WAIT_BEFORE_AUTOSYNC = 2000L; private static final long WAIT_BEFORE_AUTOSYNC = 2000L;
public static final int ACTIVITY_REQUEST_NEW_FILTER = 5; public static final int ACTIVITY_REQUEST_NEW_FILTER = 5;
@ -138,7 +134,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
protected Filter filter; protected Filter filter;
protected QuickAddBar quickAddBar = new QuickAddBar(); protected QuickAddBar quickAddBar = new QuickAddBar();
private Timer backgroundTimer;
protected Bundle extras; protected Bundle extras;
protected boolean isInbox; protected boolean isInbox;
protected boolean isTodayFilter; 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 * ============================================================ lifecycle
@ -424,15 +395,11 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
getActivity().registerReceiver(refreshReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH)); getActivity().registerReceiver(refreshReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH));
if (Flags.checkAndClear(Flags.REFRESH)) {
refresh();
}
setUpBackgroundJobs();
refreshFilterCount(); refreshFilterCount();
initiateAutomaticSync(); initiateAutomaticSync();
refresh();
} }
protected boolean isCurrentTaskListFragment() { protected boolean isCurrentTaskListFragment() {
@ -483,8 +450,6 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
super.onPause(); super.onPause();
AndroidUtilities.tryUnregisterReceiver(getActivity(), refreshReceiver); AndroidUtilities.tryUnregisterReceiver(getActivity(), refreshReceiver);
backgroundTimer.cancel();
} }
/** /**

@ -90,7 +90,6 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, oldDueDate); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, oldDueDate);
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, newDueDate); broadcastIntent.putExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, newDueDate);
context.sendOrderedBroadcast(broadcastIntent, null); context.sendOrderedBroadcast(broadcastIntent, null);
Flags.set(Flags.REFRESH);
} }
} }

@ -9,13 +9,6 @@ public class Flags {
private static int state = 0; 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 * If set, indicates tags changed during task save
*/ */

@ -353,7 +353,6 @@ public class Notifier {
notificationManager.notify(notificationId, notification); notificationManager.notify(notificationId, notification);
AndroidUtilities.sleepDeep(500); AndroidUtilities.sleepDeep(500);
} }
Flags.set(Flags.REFRESH); // Forces a reload when app launches
if (voiceReminder || maxOutVolumeForMultipleRingReminders) { if (voiceReminder || maxOutVolumeForMultipleRingReminders) {
AndroidUtilities.sleepDeep(2000); AndroidUtilities.sleepDeep(2000);
for (int i = 0; i < 50; i++) { for (int i = 0; i < 50; i++) {

@ -34,7 +34,6 @@ public class ImportTaskActivity extends InjectingAppCompatActivity {
xmlImporter.importTasks(ImportTaskActivity.this, filePath, new Runnable() { xmlImporter.importTasks(ImportTaskActivity.this, filePath, new Runnable() {
@Override @Override
public void run() { public void run() {
Flags.set(Flags.REFRESH);
finish(); finish();
} }
}); });

@ -81,7 +81,6 @@ public class RepeatConfirmationReceiver extends InjectingBroadcastReceiver {
task.setHideUntil(hideUntil - (newDueDate - oldDueDate)); task.setHideUntil(hideUntil - (newDueDate - oldDueDate));
} }
taskService.save(task); taskService.save(task);
Flags.set(Flags.REFRESH);
} }
}) })
.show(); .show();

Loading…
Cancel
Save