Merge pull request #5666 from Joehuu/fix-android-external-links

Fix external links not working on Android
ppy · Mar 6, 2023 · eac684a · eac684a
2 parents 32a7ef0 + bcf883e
commit eac684a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/SampleGame.Android/AndroidManifest.xml b/SampleGame.Android/AndroidManifest.xml
@@ -2,4 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="SampleGame.Android" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application />
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<category android:name="android.intent.category.BROWSABLE" />
+			<data android:scheme="https" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<category android:name="android.intent.category.BROWSABLE" />
+			<data android:scheme="mailto" />
+		</intent>
+	</queries>
 </manifest>
diff --git a/osu.Framework.Tests.Android/AndroidManifest.xml b/osu.Framework.Tests.Android/AndroidManifest.xml
@@ -2,4 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="osu.Framework.Tests.Android" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:label="osu!framework test" />
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<category android:name="android.intent.category.BROWSABLE" />
+			<data android:scheme="https" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<category android:name="android.intent.category.BROWSABLE" />
+			<data android:scheme="mailto" />
+		</intent>
+	</queries>
 </manifest>
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs b/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs
@@ -34,6 +34,12 @@ public TestSceneExternalLinks()
                         Text = "Open osu! site",
                     },
                     new BasicButton
+                    {
+                        Action = () => host.OpenUrlExternally("mailto:contact@ppy.sh"),
+                        Size = new Vector2(150, 30),
+                        Text = "Mail to contact email",
+                    },
+                    new BasicButton
                     {
                         Action = () => host.OpenUrlExternally("this is a bad link that shouldn't crash the app"),
                         Size = new Vector2(150, 30),