ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8978 from Ebola16/RS 

Android: Settings and Emulation activities skip (Tv)MainActivity library rescan
This commit is contained in:
JosJuice 2020-08-02 22:05:38 +02:00 committed by GitHub
parent 234eaa0ff9 a0ab90f4c6
commit e33876fbe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -43,6 +43,7 @@ import org.dolphinemu.dolphinemu.services.GameFileCacheService;
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 @@ public final class EmulationActivity extends AppCompatActivity
{
super.onCreate(savedInstanceState);
if (TvUtil.isLeanback(getApplicationContext()))
{
TvMainActivity.skipRescanningLibrary();
}
else
{
MainActivity.skipRescanningLibrary();
}
if (savedInstanceState == null)
{
// Get params we were passed

11
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
View File

@ -20,9 +20,11 @@ import android.widget.Toast;
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 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
{
super.onCreate(savedInstanceState);
if (TvUtil.isLeanback(getApplicationContext()))
{
TvMainActivity.skipRescanningLibrary();
}
else
{
MainActivity.skipRescanningLibrary();
}
setContentView(R.layout.activity_settings);
Intent launcher = getIntent();

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
View File

@ -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 @@ public final class MainActivity extends AppCompatActivity implements MainView
{
super.onResume();
mPresenter.addDirIfNeeded(this);
GameFileCacheService.startRescan(this);
if (sShouldRescanLibrary)
{
GameFileCacheService.startRescan(this);
}
else
{
sShouldRescanLibrary = true;
}
}
@Override
@ -284,4 +292,9 @@ public final class MainActivity extends AppCompatActivity implements MainView
showGames();
GameFileCacheService.startLoad(this);
}
public static void skipRescanningLibrary()
{
sShouldRescanLibrary = false;
}
}

16
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
View File

@ -37,6 +37,8 @@ import java.util.Collection;
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 @@ public final class TvMainActivity extends FragmentActivity implements MainView
{
super.onResume();
mPresenter.addDirIfNeeded(this);
GameFileCacheService.startRescan(this);
if (sShouldRescanLibrary)
{
GameFileCacheService.startRescan(this);
}
else
{
sShouldRescanLibrary = true;
}
}
@Override
@ -316,4 +325,9 @@ public final class TvMainActivity extends FragmentActivity implements MainView
return new ListRow(header, rowItems);
}
public static void skipRescanningLibrary()
{
sShouldRescanLibrary = false;
}
}