Add Mastodon Redirect support

tuskyapp · Dec 26, 2023 · f1941db · f1941db
1 parent d2cb74b
commit f1941db
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -55,6 +55,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
+            android:launchMode="singleTask"
             android:exported="true">
 
             <intent-filter>
@@ -100,6 +101,12 @@
                 <data android:mimeType="audio/*" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="dev.zwander.mastodonredirect.intent.action.OPEN_FEDI_LINK" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="androidx.sharetarget.ChooserTargetServiceCompat" />

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -499,9 +499,17 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             if (redirectUrl != null) {
                 viewUrl(redirectUrl, PostLookupFallbackBehavior.DISPLAY_ERROR)
             }
+
+            handleMastodonRedirectIntent(intent)
         }
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        handleMastodonRedirectIntent(intent)
+    }
+
     private fun forwardToComposeActivity(intent: Intent) {
         val composeOptions = IntentCompat.getParcelableExtra(intent, COMPOSE_OPTIONS, ComposeActivity.ComposeOptions::class.java)
 
@@ -1139,6 +1147,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
     override fun androidInjector() = androidInjector
 
+    private fun handleMastodonRedirectIntent(intent: Intent?) {
+        if (intent?.action == "dev.zwander.mastodonredirect.intent.action.OPEN_FEDI_LINK") {
+            intent.dataString?.let { url ->
+                viewUrl(url, PostLookupFallbackBehavior.OPEN_IN_BROWSER)
+            }
+        }
+    }
+
     companion object {
         private const val TAG = "MainActivity" // logging tag
         private const val DRAWER_ITEM_ADD_ACCOUNT: Long = -13

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
@@ -281,6 +281,10 @@ fun Context.openLink(url: String) {
  */
 private fun openLinkInBrowser(uri: Uri?, context: Context) {
     val intent = Intent(Intent.ACTION_VIEW, uri)
+
+    // Makes sure the Intent opens in the browser instead of something like Mastodon Redirect.
+    intent.selector = Intent(Intent.ACTION_VIEW, Uri.parse("https://"))
+
     try {
         context.startActivity(intent)
     } catch (e: ActivityNotFoundException) {