diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index b97c14415..633fe3ed7 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -7,10 +7,7 @@ package com.todoroo.astrid.activity; import android.app.Activity; import android.app.AlertDialog; -import android.content.BroadcastReceiver; -import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.support.v4.view.MenuItemCompat; @@ -75,13 +72,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList public static final String OPEN_TASK = "openTask"; //$NON-NLS-1$ - private final BroadcastReceiver refreshReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - refreshTaskList(); - } - }; - /** * @see android.app.Activity#onCreate(Bundle) */ @@ -139,18 +129,9 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList protected void onResume() { super.onResume(); - registerReceiver(refreshReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH)); - getTaskListFragment().setSyncOngoing(gtasksPreferenceService.isOngoing()); } - @Override - protected void onPause() { - super.onPause(); - - unregisterReceiver(refreshReceiver); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { if (isDrawerOpen()) { diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java index 61dc804df..57f679e97 100644 --- a/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -25,7 +25,9 @@ public class SortHelper { public static final int FLAG_SHOW_HIDDEN = 1 << 2; public static final int FLAG_SHOW_DELETED = 1 << 3; public static final int FLAG_DRAG_DROP = 1 << 4; - public static final int FLAG_SHOW_RECENTLY_COMPLETED = 1 << 5; + @SuppressWarnings("UnusedDeclaration") + @Deprecated + private static final int FLAG_SHOW_RECENTLY_COMPLETED = 1 << 5; public static final int SORT_AUTO = 0; public static final int SORT_ALPHA = 1; @@ -55,8 +57,7 @@ public class SortHelper { if((flags & FLAG_SHOW_COMPLETED) > 0) { originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(), Criterion.all.toString()); - } - if ((flags & FLAG_SHOW_RECENTLY_COMPLETED) > 0) { + } else { originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(), Criterion.or(Task.COMPLETION_DATE.lte(0), Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000)).toString()); } diff --git a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 8e5ec4838..b585d6701 100644 --- a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -195,7 +195,6 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac } int flags = preferences.getSortFlags(); - flags |= SortHelper.FLAG_SHOW_RECENTLY_COMPLETED; int sort = preferences.getSortMode(); if(sort == 0) { sort = SortHelper.SORT_WIDGET;