From be5c271b0ec413d369cb8cebf54adf2fafb55d32 Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 31 Dec 2012 20:48:52 +0100 Subject: [PATCH] Don't show save files in ROM browser. --- android/phoenix/res/xml/prefs.xml | 1 + .../org/retroarch/browser/DirectoryActivity.java | 14 ++++++++++++-- .../src/org/retroarch/browser/ModuleActivity.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml index 3463220066..cd854a121c 100644 --- a/android/phoenix/res/xml/prefs.xml +++ b/android/phoenix/res/xml/prefs.xml @@ -21,6 +21,7 @@ android:key="video_force_aspect" android:summary="Let game decide aspect ratio" android:title="Force aspect correction" /> + diff --git a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java index 4e8f55f962..a36f5eeb87 100644 --- a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java +++ b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java @@ -200,8 +200,18 @@ public class DirectoryActivity extends Activity implements final File[] files = listedDirectory.listFiles(); if (files != null) { for (File file : files) { - adapter.add(new FileWrapper(file, false, - file.isDirectory() || true)); + String path = file.getName(); + + boolean isRomFile = !path.endsWith(".srm") + && !path.endsWith(".state") + && !path.contains(".state.auto") + && !path.endsWith(".rtc"); + + // Don't list save files in ROM list. + if (isRomFile) { + adapter.add(new FileWrapper(file, false, + file.isDirectory() || true)); + } } } diff --git a/android/phoenix/src/org/retroarch/browser/ModuleActivity.java b/android/phoenix/src/org/retroarch/browser/ModuleActivity.java index 3570d6365e..4726eee29a 100644 --- a/android/phoenix/src/org/retroarch/browser/ModuleActivity.java +++ b/android/phoenix/src/org/retroarch/browser/ModuleActivity.java @@ -132,7 +132,7 @@ public class ModuleActivity extends Activity implements } private void updateConfigFile() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext()); config.setBoolean("video_force_aspect", prefs.getBoolean("video_force_aspect", true)); config.setBoolean("audio_rate_control", prefs.getBoolean("audio_rate_control", true)); config.setBoolean("audio_enable", prefs.getBoolean("audio_enable", true));