Add Mastodon Redirect support and "Open Link" share target

tuskyapp · May 12, 2024 · dcb87a4 · dcb87a4
1 parent 45d36a6
commit dcb87a4
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -40,56 +40,62 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
+            android:launchMode="singleTask"
             android:exported="true"
             android:theme="@style/SplashTheme">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
+
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="text/plain" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="image/*" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="image/*" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/action_compose">
                 <action android:name="android.intent.action.SEND" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <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.app.shortcuts"
@@ -98,6 +104,21 @@
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
+        </activity>
+        <activity
+            android:name=".components.view.ViewLinkActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@style/NullTheme">
+
+            <intent-filter android:label="@string/open_link">
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
         </activity>
         <activity
             android:name=".components.compose.ComposeActivity"

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -531,9 +531,17 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
             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 =
             intent.getParcelableExtraCompat<ComposeActivity.ComposeOptions>(COMPOSE_OPTIONS)
@@ -1201,6 +1209,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
 
     override fun getActionButton() = binding.composeButton
 
+    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 {
         const val OPEN_WITH_EXPLODE_ANIMATION = "explode"
 

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/view/ViewLinkActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/view/ViewLinkActivity.kt
@@ -0,0 +1,26 @@
+package com.keylesspalace.tusky.components.view
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import com.keylesspalace.tusky.BaseActivity
+import com.keylesspalace.tusky.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class ViewLinkActivity : BaseActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (intent?.action == Intent.ACTION_SEND) {
+            val link = intent.getStringExtra(Intent.EXTRA_TEXT)
+
+            val launchIntent = Intent(this, MainActivity::class.java)
+            launchIntent.action = "dev.zwander.mastodonredirect.intent.action.OPEN_FEDI_LINK"
+            launchIntent.data = link?.let { Uri.parse(it) }
+
+            startActivity(launchIntent)
+            finish()
+        }
+    }
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
@@ -311,6 +311,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) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -853,5 +853,7 @@
     <string name="list_reply_policy_followed">Any followed user</string>
     <string name="list_reply_policy_label">Show replies to</string>
 
+    <string name="open_link">Open Link</string>
+
     <string name="unknown_notification_type">Unknown notification type</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -177,4 +177,17 @@
         <item name="android:layout_marginLeft">20dp</item>
         <item name="android:layout_marginRight">20dp</item>
     </style>
+
+    <style name="NullTheme" parent="Theme.Material3.DynamicColors.DayNight">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
+        <item name="android:windowNoDisplay">true</item>
+        <item name="android:windowActionBar">false</item>
+    </style>
 </resources>