From 137553653470e075cb938fc12f9aaafa16fad6cc Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Sat, 13 Jul 2019 15:30:10 +0200
Subject: [PATCH] fix android intent-filter. fix spurious maple warning

---
 core/hw/maple/maple_cfg.cpp                   |  3 +
 core/hw/maple/maple_devs.cpp                  |  6 +-
 .../reicast/src/dreamcast/AndroidManifest.xml | 51 ++++++++++++++
 .../reicast/src/naomi/AndroidManifest.xml     | 69 -------------------
 .../src/naomi/res/values/donottranslate.xml   | 14 ----
 5 files changed, 57 insertions(+), 86 deletions(-)
 delete mode 100644 shell/android-studio/reicast/src/naomi/AndroidManifest.xml
 delete mode 100644 shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml

diff --git a/core/hw/maple/maple_cfg.cpp b/core/hw/maple/maple_cfg.cpp
index 4816ff018..210b0b8a1 100644
--- a/core/hw/maple/maple_cfg.cpp
+++ b/core/hw/maple/maple_cfg.cpp
@@ -217,6 +217,9 @@ void mcfg_CreateDevices()
 				mcfg_Create((MapleDeviceType)settings.input.maple_expansion_devices[bus][0], bus, 0);
 			break;
 
+		case MDT_None:
+			break;
+
 		default:
 			WARN_LOG(MAPLE, "Invalid device type %d for port %d", settings.input.maple_devices[bus], bus);
 			break;
diff --git a/core/hw/maple/maple_devs.cpp b/core/hw/maple/maple_devs.cpp
index 213f994f3..5d8128f9b 100755
--- a/core/hw/maple/maple_devs.cpp
+++ b/core/hw/maple/maple_devs.cpp
@@ -371,7 +371,7 @@ struct maple_sega_twinstick: maple_sega_controller
 		return 0x80;
 	}
 
-	virtual const char *get_device_name()
+	virtual const char *get_device_name() override
 	{
 		return maple_sega_twinstick_name;
 	}
@@ -396,7 +396,7 @@ struct maple_ascii_stick: maple_sega_controller
 		return kcode | 0xF800;
 	}
 
-	virtual MapleDeviceType get_device_type()
+	virtual MapleDeviceType get_device_type() override
 	{
 		return MDT_AsciiStick;
 	}
@@ -405,7 +405,7 @@ struct maple_ascii_stick: maple_sega_controller
 		return 0x80;
 	}
 
-	virtual const char *get_device_name()
+	virtual const char *get_device_name() override
 	{
 		return maple_ascii_stick_name;
 	}
diff --git a/shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml b/shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml
index d0a0cfb3b..017147011 100644
--- a/shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml
+++ b/shell/android-studio/reicast/src/dreamcast/AndroidManifest.xml
@@ -53,6 +53,57 @@
 					android:mimeType="*/*"
 					android:pathPattern=".*\\.cue"
 					android:scheme="file" />
+
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.LST"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.lst"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.BIN"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.bin"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.DAT"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.dat"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.ZIP"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.zip"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.7Z"
+					android:scheme="file" />
+				<data
+					android:host="*"
+					android:mimeType="*/*"
+					android:pathPattern=".*\\.7z"
+					android:scheme="file" />
 			</intent-filter>
 		</activity-alias>
 	</application>
diff --git a/shell/android-studio/reicast/src/naomi/AndroidManifest.xml b/shell/android-studio/reicast/src/naomi/AndroidManifest.xml
deleted file mode 100644
index a1a4c24b2..000000000
--- a/shell/android-studio/reicast/src/naomi/AndroidManifest.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:name="com.reicast.emulator.Emulator">
-
-        <activity
-            android:name="com.reicast.emulator.NativeGLActivity"/>
-        <activity-alias
-            android:name="com.reicast.emulator.MainActivity"
-            android:targetActivity="com.reicast.emulator.NativeGLActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.LST"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.lst"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.BIN"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.bin"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.DAT"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.dat"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.ZIP"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.zip"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.7Z"
-                    android:scheme="file" />
-                <data
-                    android:host="*"
-                    android:mimeType="*/*"
-                    android:pathPattern=".*\\.7z"
-                    android:scheme="file" />
-            </intent-filter>
-        </activity-alias>
-    </application>
-</manifest>
diff --git a/shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml b/shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml
deleted file mode 100644
index 5baf4c3f8..000000000
--- a/shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <string name="app_name" translatable="false">Flycast Naomi</string>
-    <string name="flavor" translatable="false">naomi</string>
-
-    <string-array name="images">
-        <item>bin</item>
-        <item>dat</item>
-        <item>lst</item>
-        <item>zip</item>
-        <item>7z</item>
-    </string-array>
-
-</resources>
\ No newline at end of file