Merge pull request #8978 from Ebola16/RS

Android: Settings and Emulation activities skip (Tv)MainActivity library rescan
dolphin-emu · Aug 2, 2020 · e33876f · e33876f
2 parents 234eaa0 + a0ab90f
commit e33876f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 2 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -43,6 +43,7 @@
 import org.dolphinemu.dolphinemu.overlay.InputOverlay;
 import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer;
 import org.dolphinemu.dolphinemu.ui.main.MainActivity;
+import org.dolphinemu.dolphinemu.ui.main.TvMainActivity;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
 import org.dolphinemu.dolphinemu.utils.ControllerMappingHelper;
 import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
@@ -278,6 +279,15 @@ protected void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
+    if (TvUtil.isLeanback(getApplicationContext()))
+    {
+      TvMainActivity.skipRescanningLibrary();
+    }
+    else
+    {
+      MainActivity.skipRescanningLibrary();
+    }
+
     if (savedInstanceState == null)
     {
       // Get params we were passed

diff --git a/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java b/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
@@ -20,9 +20,11 @@
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.ui.main.MainActivity;
+import org.dolphinemu.dolphinemu.ui.main.TvMainActivity;
 import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
 import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver;
 import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
+import org.dolphinemu.dolphinemu.utils.TvUtil;
 
 public final class SettingsActivity extends AppCompatActivity implements SettingsActivityView
 {
@@ -46,6 +48,15 @@ protected void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
+    if (TvUtil.isLeanback(getApplicationContext()))
+    {
+      TvMainActivity.skipRescanningLibrary();
+    }
+    else
+    {
+      MainActivity.skipRescanningLibrary();
+    }
+
     setContentView(R.layout.activity_settings);
 
     Intent launcher = getIntent();

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -46,6 +46,7 @@ public final class MainActivity extends AppCompatActivity implements MainView
   private Toolbar mToolbar;
   private TabLayout mTabLayout;
   private FloatingActionButton mFab;
+  private static boolean sShouldRescanLibrary = true;
 
   private MainPresenter mPresenter = new MainPresenter(this, this);
 
@@ -80,7 +81,14 @@ protected void onResume()
   {
     super.onResume();
     mPresenter.addDirIfNeeded(this);
-    GameFileCacheService.startRescan(this);
+    if (sShouldRescanLibrary)
+    {
+      GameFileCacheService.startRescan(this);
+    }
+    else
+    {
+      sShouldRescanLibrary = true;
+    }
   }
 
   @Override
@@ -284,4 +292,9 @@ public void onTabSelected(@NonNull TabLayout.Tab tab)
     showGames();
     GameFileCacheService.startLoad(this);
   }
+
+  public static void skipRescanningLibrary()
+  {
+    sShouldRescanLibrary = false;
+  }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -37,6 +37,8 @@
 
 public final class TvMainActivity extends FragmentActivity implements MainView
 {
+  private static boolean sShouldRescanLibrary = true;
+
   private MainPresenter mPresenter = new MainPresenter(this, this);
 
   private BrowseSupportFragment mBrowseFragment;
@@ -65,7 +67,14 @@ protected void onResume()
   {
     super.onResume();
     mPresenter.addDirIfNeeded(this);
-    GameFileCacheService.startRescan(this);
+    if (sShouldRescanLibrary)
+    {
+      GameFileCacheService.startRescan(this);
+    }
+    else
+    {
+      sShouldRescanLibrary = true;
+    }
   }
 
   @Override
@@ -316,4 +325,9 @@ private ListRow buildSettingsRow()
 
     return new ListRow(header, rowItems);
   }
+
+  public static void skipRescanningLibrary()
+  {
+    sShouldRescanLibrary = false;
+  }
 }