diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2016-12-20 17:45:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 17:45:39 -0600 |
| commit | ca91b6df52a51fbc963b7c409d238d1ce68e7050 (patch) | |
| tree | c2e4c018c620629d3ee0bfaa9a4b53c9978b73eb /Source/Android/app/src/main/java | |
| parent | 7620dd88d360a85d404e7fd32e1aeb0410b9cd5f (diff) | |
| parent | 9bd514ed1cd02cc0b8c8f22affecaae1892da15f (diff) | |
Merge pull request #4521 from JosJuice/tgc
Add TGC disc image compatibility
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java | 3 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java index 057432b8a2..4460a1e155 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java @@ -41,7 +41,8 @@ public class FileListItem implements Comparable<FileListItem> String fileExtension = mPath.substring(extensionStart); // The extensions we care about. - Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".ciso", ".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs")); + Set<String> allowedExtensions = new HashSet<String>(Arrays.asList( + ".ciso", ".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".tgc", ".wad", ".wbfs")); // Check that the file has an extension we care about before trying to read out of it. if (allowedExtensions.contains(fileExtension.toLowerCase())) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java index 44b1c2b9c6..aba310363e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java @@ -150,7 +150,8 @@ public final class GameDatabase extends SQLiteOpenHelper null, null); // Order of folders is irrelevant. - Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs")); + Set<String> allowedExtensions = new HashSet<String>(Arrays.asList( + ".ciso", ".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".tgc", ".wad", ".wbfs")); // Possibly overly defensive, but ensures that moveToNext() does not skip a row. folderCursor.moveToPosition(-1); |