Add Mastodon Redirect support and "Open Link" share target

tuskyapp · Jan 18, 2024 · e8a28bc · e8a28bc
1 parent 5174c00
commit e8a28bc
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 9 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -55,55 +55,77 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
+            android:launchMode="singleTask"
             android:exported="true">
 
-            <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.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
@@ -516,9 +516,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,
@@ -1185,6 +1193,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/components/view/ViewLinkActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/view/ViewLinkActivity.kt
@@ -0,0 +1,25 @@
+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 com.keylesspalace.tusky.di.Injectable
+
+class ViewLinkActivity : BaseActivity(), Injectable {
+    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/di/ActivitiesModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
@@ -41,6 +41,7 @@ import com.keylesspalace.tusky.components.report.ReportActivity
 import com.keylesspalace.tusky.components.scheduled.ScheduledStatusActivity
 import com.keylesspalace.tusky.components.search.SearchActivity
 import com.keylesspalace.tusky.components.trending.TrendingActivity
+import com.keylesspalace.tusky.components.view.ViewLinkActivity
 import com.keylesspalace.tusky.components.viewthread.ViewThreadActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -132,4 +133,7 @@ abstract class ActivitiesModule {
 
     @ContributesAndroidInjector
     abstract fun contributesEditFilterActivity(): EditFilterActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesViewLinkActivity(): ViewLinkActivity
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
@@ -313,6 +313,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/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt b/app/src/main/java/com/keylesspalace/tusky/view/ClickableSpanTextView.kt
@@ -399,10 +399,10 @@ class ClickableSpanTextView @JvmOverloads constructor(
 /**
  * A [Path] that records the contents of all the [addRect] calls it receives.
  *
- * @param rects list to record the received [RectF]
+ * @param recorded list to record the received [RectF]
  */
-private class RectRecordingPath(private val rects: MutableList<RectF>) : Path() {
+private class RectRecordingPath(private val recorded: MutableList<RectF>) : Path() {
     override fun addRect(left: Float, top: Float, right: Float, bottom: Float, dir: Direction) {
-        rects.add(RectF(left, top, right, bottom))
+        recorded.add(RectF(left, top, right, bottom))
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -862,4 +862,6 @@
     <string name="list_reply_policy_list">Members of the list</string>
     <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>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -185,4 +185,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>