From 9961e2866a143b5fa7bd21ce5c81c3b98f40db4b Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 18 Jul 2019 20:43:23 +1000 Subject: [PATCH] Android: Support opening .dff files This is also shared by the disc change code, but changing discs to a .dol doesn't make sense either. --- .../org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 2 +- .../dolphinemu/fragments/CustomFilePickerFragment.java | 2 +- 2 files changed, 2 insertions(+), 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 index 259767ff86..518a7bc38c 100644 --- 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 @@ -216,7 +216,7 @@ public final class EmulationActivity extends AppCompatActivity else { // Display the path to the file as the game title in the menu. - launcher.putExtra(EXTRA_SELECTED_TITLE, filePaths); + launcher.putExtra(EXTRA_SELECTED_TITLE, filePaths[0]); // Use 00000000 as the game ID. This should match the Desktop version behavior. // TODO: This should really be pulled from the Core. diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java index 8197dfc955..58cfcb9121 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java @@ -19,7 +19,7 @@ import java.util.Set; public class CustomFilePickerFragment extends FilePickerFragment { private static final Set extensions = new HashSet<>(Arrays.asList( - "gcm", "tgc", "iso", "ciso", "gcz", "wbfs", "wad", "dol", "elf")); + "gcm", "tgc", "iso", "ciso", "gcz", "wbfs", "wad", "dol", "elf", "dff")); @NonNull @Override