Fix restoring filters in right drawer after screen rotation

aalaaiaanaa · Apr 23, 2023 · 577cb59 · 577cb59
1 parent 3b8800c
commit 577cb59
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/src/main/java/com/gh4a/activities/IssueListActivity.java b/app/src/main/java/com/gh4a/activities/IssueListActivity.java
@@ -129,20 +129,21 @@ public static Intent makeIntent(Context context, String repoOwner, String repoNa
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mUserLogin = Gh4Application.get().getAuthLogin();
-
+        // We're restoring instance state before calling super.onCreate() because some of the fields
+        // are used to populate the right navigation drawer, which is done in BaseActivity.onCreate()
         if (savedInstanceState != null) {
             mSearchQuery = savedInstanceState.getString(STATE_KEY_SEARCH_QUERY);
             mSearchMode = savedInstanceState.getBoolean(STATE_KEY_SEARCH_MODE);
             mSearchIsExpanded = savedInstanceState.getBoolean(STATE_KEY_SEARCH_IS_EXPANDED);
+            mSelectedMilestone = savedInstanceState.getString(STATE_KEY_SELECTED_MILESTONE);
             mSelectedLabel = savedInstanceState.getString(STATE_KEY_SELECTED_LABEL);
             mSelectedAssignee = savedInstanceState.getString(STATE_KEY_SELECTED_ASSIGNEE);
-            mSelectedParticipatingStatus =
-                    savedInstanceState.getInt(STATE_KEY_PARTICIPATING_STATUS);
+            mSelectedParticipatingStatus = savedInstanceState.getInt(STATE_KEY_PARTICIPATING_STATUS);
         }
 
+        super.onCreate(savedInstanceState);
+        mUserLogin = Gh4Application.get().getAuthLogin();
+
         if (!mIsPullRequest && Gh4Application.get().isAuthorized()) {
             CoordinatorLayout rootLayout = getRootLayout();
             mCreateFab = (FloatingActionButton) getLayoutInflater().inflate(