Merge pull request #9590 from JosJuice/android-recreate-main

Android: Fix recreating main activity
dolphin-emu · Mar 16, 2021 · 064a006 · 064a006
2 parents 13f7932 + fcb19a2
commit 064a006
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java b/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
@@ -40,7 +40,11 @@ public PlatformPagerAdapter(FragmentManager fm, Context context,
   @Override
   public Fragment getItem(int position)
   {
-    return PlatformGamesFragment.newInstance(Platform.fromPosition(position), mOnRefreshListener);
+    Platform platform = Platform.fromPosition(position);
+
+    PlatformGamesFragment fragment = PlatformGamesFragment.newInstance(platform);
+    fragment.setOnRefreshListener(mOnRefreshListener);
+    return fragment;
   }
 
   @Override

diff --git a/...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesFragment.java b/...ndroid/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesFragment.java
@@ -26,10 +26,9 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam
   private SwipeRefreshLayout mSwipeRefresh;
   private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener;
 
-  public static PlatformGamesFragment newInstance(Platform platform,
-          SwipeRefreshLayout.OnRefreshListener onRefreshListener)
+  public static PlatformGamesFragment newInstance(Platform platform)
   {
-    PlatformGamesFragment fragment = new PlatformGamesFragment(onRefreshListener);
+    PlatformGamesFragment fragment = new PlatformGamesFragment();
 
     Bundle args = new Bundle();
     args.putSerializable(ARG_PLATFORM, platform);
@@ -38,11 +37,6 @@ public static PlatformGamesFragment newInstance(Platform platform,
     return fragment;
   }
 
-  public PlatformGamesFragment(SwipeRefreshLayout.OnRefreshListener onRefreshListener)
-  {
-    mOnRefreshListener = onRefreshListener;
-  }
-
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
@@ -110,6 +104,14 @@ public void refetchMetadata()
     mAdapter.refetchMetadata();
   }
 
+  public void setOnRefreshListener(@Nullable SwipeRefreshLayout.OnRefreshListener listener)
+  {
+    mOnRefreshListener = listener;
+
+    if (mSwipeRefresh != null)
+      mSwipeRefresh.setOnRefreshListener(listener);
+  }
+
   public void setRefreshing(boolean refreshing)
   {
     mSwipeRefresh.setRefreshing(refreshing);