summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java/org
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2019-07-18 20:43:23 +1000
committerStenzek <stenzek@gmail.com>2019-07-18 22:35:23 +1000
commit9961e2866a143b5fa7bd21ce5c81c3b98f40db4b (patch)
tree259c32bcbb6c3fc8347eb8262a4ef66c586d8348 /Source/Android/app/src/main/java/org
parent34e6a41d050acb60e844ed825011a76545617a7b (diff)
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.
Diffstat (limited to 'Source/Android/app/src/main/java/org')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java2
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<String> 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