Remove another global callback object (#6316)

1 files changed, 15 insertions, 15 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 15edec1ce..ac4570fc5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -76,7 +76,6 @@ public class MainActivity extends CastEnabledActivity {
     public static final String PREF_NAME = "MainActivityPrefs";
     public static final String PREF_IS_FIRST_LAUNCH = "prefMainActivityIsFirstLaunch";
 
-    public static final String EXTRA_FRAGMENT_ARGS = "fragment_args";
     public static final String EXTRA_FEED_ID = "fragment_feed_id";
     public static final String EXTRA_REFRESH_ON_START = "refresh_on_start";
     public static final String EXTRA_STARTED_FROM_SEARCH = "started_from_search";
@@ -516,21 +515,12 @@ public class MainActivity extends CastEnabledActivity {
     }
 
     private void handleNavIntent() {
+        Log.d(TAG, "handleNavIntent()");
         Intent intent = getIntent();
-        if (intent.hasExtra(EXTRA_FEED_ID) || intent.hasExtra(MainActivityStarter.EXTRA_FRAGMENT_TAG)
-                || intent.hasExtra(EXTRA_REFRESH_ON_START)) {
-            Log.d(TAG, "handleNavIntent()");
-            String tag = intent.getStringExtra(MainActivityStarter.EXTRA_FRAGMENT_TAG);
-            Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
-            boolean refreshOnStart = intent.getBooleanExtra(EXTRA_REFRESH_ON_START, false);
-            if (refreshOnStart) {
-                AutoUpdateManager.runImmediate(this);
-            }
-
+        if (intent.hasExtra(EXTRA_FEED_ID)) {
             long feedId = intent.getLongExtra(EXTRA_FEED_ID, 0);
-            if (tag != null) {
-                loadFragment(tag, args);
-            } else if (feedId > 0) {
+            Bundle args = intent.getBundleExtra(MainActivityStarter.EXTRA_FRAGMENT_ARGS);
+            if (feedId > 0) {
                 boolean startedFromSearch = intent.getBooleanExtra(EXTRA_STARTED_FROM_SEARCH, false);
                 boolean addToBackStack = intent.getBooleanExtra(EXTRA_ADD_TO_BACK_STACK, false);
                 if (startedFromSearch || addToBackStack) {
@@ -540,6 +530,13 @@ public class MainActivity extends CastEnabledActivity {
                 }
             }
             sheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+        } else if (intent.hasExtra(MainActivityStarter.EXTRA_FRAGMENT_TAG)) {
+            String tag = intent.getStringExtra(MainActivityStarter.EXTRA_FRAGMENT_TAG);
+            Bundle args = intent.getBundleExtra(MainActivityStarter.EXTRA_FRAGMENT_ARGS);
+            if (tag != null) {
+                loadFragment(tag, args);
+            }
+            sheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
         } else if (intent.getBooleanExtra(MainActivityStarter.EXTRA_OPEN_PLAYER, false)) {
             sheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             bottomSheetCallback.onSlide(null, 1.0f);
@@ -547,9 +544,12 @@ public class MainActivity extends CastEnabledActivity {
             handleDeeplink(intent.getData());
         }
 
-        if (intent.hasExtra(MainActivityStarter.EXTRA_OPEN_DRAWER) && drawerLayout != null) {
+        if (intent.getBooleanExtra(MainActivityStarter.EXTRA_OPEN_DRAWER, false) && drawerLayout != null) {
             drawerLayout.open();
         }
+        if (intent.getBooleanExtra(EXTRA_REFRESH_ON_START, false)) {
+            AutoUpdateManager.runImmediate(this);
+        }
         // to avoid handling the intent twice when the configuration changes
         setIntent(new Intent(MainActivity.this, MainActivity.class));
     }