Restore last selected list

astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java

@@ -225,6 +225,8 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
             Filter newList = getIntent().getParcelableExtra(TOKEN_SWITCH_TO_FILTER);
             getIntent().removeExtra(TOKEN_SWITCH_TO_FILTER);
             onFilterItemClicked(newList);
+        } else {
+            navigationDrawer.restoreLastSelected();
         }
 
         if (getIntent().hasExtra(OPEN_TASK)) {

astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java

@@ -96,9 +96,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
         if (savedInstanceState != null) {
             mCurrentSelectedPosition = savedInstanceState.getInt(TOKEN_LAST_SELECTED);
         }
-
-        // Select either the default item (0) or the last selected item.
-//        selectItem(mCurrentSelectedPosition);
     }
 
     @Override
@@ -440,6 +437,10 @@ public class NavigationDrawerFragment extends InjectingFragment {
                 new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH));
     }
 
+    public void restoreLastSelected() {
+        selectItem(mCurrentSelectedPosition);
+    }
+
     /**
      * Receiver which receives refresh intents
      *