From ea830156b73a6224022b89cd8edc2dba5087ac9d Mon Sep 17 00:00:00 2001
From: Steven Laver <steven.laver@solana.com>
Date: Tue, 22 Oct 2024 13:31:33 -0700
Subject: [PATCH 1/3] Specify both priority and order for SeedVaultSimulator
 <intent-filter>s

---
 .../src/main/AndroidManifest.xml              | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/SeedVaultSimulator/src/main/AndroidManifest.xml b/SeedVaultSimulator/src/main/AndroidManifest.xml
index 74a648e..3b91e25 100644
--- a/SeedVaultSimulator/src/main/AndroidManifest.xml
+++ b/SeedVaultSimulator/src/main/AndroidManifest.xml
@@ -54,38 +54,45 @@
             android:parentActivityName=".ui.seeds.SeedsActivity"
             android:theme="@style/Theme.SeedVaultImpl.NoActionBar" />
 
-        <!-- NOTE: intent-filter order set below that of the privileged alias in case an app holds
-             both permissions. Apps normally should hold only one of the two permissions, but the
+        <!-- NOTE: Priority set to 100 (which only functions if this app is installed as a
+             privileged app) to ensure that non-privileged apps cannot handle Seed Vault implicit
+             intents. Order set below that of the privileged alias in case an app holds both
+             permissions. Apps normally should hold only one of the two permissions, but the
              Seed Vault should gracefully handle the case where an app is granted both. -->
         <activity-alias
             android:name=".seedDetailsGenericAlias"
             android:exported="true"
             android:permission="com.solanamobile.seedvault.ACCESS_SEED_VAULT"
             android:targetActivity=".ui.seeddetail.SeedDetailActivity">
-            <intent-filter android:order="-100">
+            <intent-filter android:priority="100" android:order="-100">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_CREATE_SEED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:order="-100">
+            <intent-filter android:priority="100" android:order="-100">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_IMPORT_SEED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity-alias>
 
+        <!-- NOTE: Priority set to 100 (which only functions if this app is installed as a
+             privileged app) to ensure that non-privileged apps cannot handle Seed Vault implicit
+             intents. Order set above that of the non-privileged alias in case an app holds both
+             permissions. Apps normally should hold only one of the two permissions, but the
+             Seed Vault should gracefully handle the case where an app is granted both. -->
         <activity-alias
             android:name=".seedDetailsPrivilegedAlias"
             android:exported="true"
             android:permission="com.solanamobile.seedvault.ACCESS_SEED_VAULT_PRIVILEGED"
             android:targetActivity=".ui.seeddetail.SeedDetailActivity">
-            <intent-filter>
+            <intent-filter android:priority="100" android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_CREATE_SEED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="100" android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_IMPORT_SEED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="100">
+            <intent-filter android:priority="100" android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SEED_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -97,6 +104,10 @@
             android:noHistory="true"
             android:theme="@style/Theme.SeedVaultImpl.Transparent" />
 
+        <!-- NOTE: Order set below that of the privileged alias in case an app holds both
+             permissions. Apps normally should hold only one of the two permissions, but the
+             Seed Vault should gracefully handle the case where an app is granted both. These
+             intents are always explicit, so no elevated priority is required. -->
         <activity-alias
             android:name=".authActivityGenericAlias"
             android:exported="true"
@@ -120,24 +131,28 @@
             </intent-filter>
         </activity-alias>
 
+        <!-- NOTE: Order set above that of the non-privileged alias in case an app holds both
+             permissions. Apps normally should hold only one of the two permissions, but the
+             Seed Vault should gracefully handle the case where an app is granted both. These
+             intents are always explicit, so no elevated priority is required. -->
         <activity-alias
             android:name=".authActivityPrivilegedAlias"
             android:exported="true"
             android:permission="com.solanamobile.seedvault.ACCESS_SEED_VAULT_PRIVILEGED"
             android:targetActivity=".ui.AuthorizeActivity">
-            <intent-filter>
+            <intent-filter android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_AUTHORIZE_SEED_ACCESS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SIGN_TRANSACTION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SIGN_MESSAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:order="0">
                 <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_GET_PUBLIC_KEY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>

From 426cd44da64222521efce6f9b1d1aa7d46e9910b Mon Sep 17 00:00:00 2001
From: Steven Laver <steven.laver@solana.com>
Date: Tue, 22 Oct 2024 13:54:06 -0700
Subject: [PATCH 2/3] Declare low-priority <intent-filter>s for CTS test app

---
 cts/src/main/AndroidManifest.xml              | 37 ++++++++++++++++++-
 .../seedvault/cts/UnhandledIntentActivity.kt  | 16 ++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 cts/src/main/java/com/solanamobile/seedvault/cts/UnhandledIntentActivity.kt

diff --git a/cts/src/main/AndroidManifest.xml b/cts/src/main/AndroidManifest.xml
index ff4203e..88a2461 100644
--- a/cts/src/main/AndroidManifest.xml
+++ b/cts/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
             android:theme="@style/Theme.WalletAPISDK">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -36,6 +35,42 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+
+        <!-- This activity exists to catch unhandled Intents and ensure that they return immediately
+             with RESULT_CANCELED. Any proper implementation of Seed Vault will have higher priority
+             handling of these, and so these should never be used. -->
+        <activity
+            android:name=".UnhandledIntentActivity"
+            android:exported="true">
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_AUTHORIZE_SEED_ACCESS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SIGN_TRANSACTION" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SIGN_MESSAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_GET_PUBLIC_KEY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_CREATE_SEED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_IMPORT_SEED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-100">
+                <action android:name="com.solanamobile.seedvault.wallet.v1.ACTION_SEED_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/cts/src/main/java/com/solanamobile/seedvault/cts/UnhandledIntentActivity.kt b/cts/src/main/java/com/solanamobile/seedvault/cts/UnhandledIntentActivity.kt
new file mode 100644
index 0000000..4706f38
--- /dev/null
+++ b/cts/src/main/java/com/solanamobile/seedvault/cts/UnhandledIntentActivity.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2024 Solana Mobile Inc.
+ */
+
+package com.solanamobile.seedvault.cts
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+
+class UnhandledIntentActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setResult(RESULT_CANCELED)
+        finish()
+    }
+}
\ No newline at end of file

From 74414849410329bffe5923d6dffdd6d071a92068 Mon Sep 17 00:00:00 2001
From: Steven Laver <steven.laver@solana.com>
Date: Tue, 22 Oct 2024 13:54:52 -0700
Subject: [PATCH 3/3] Do not run 'csss' test case on Saga

---
 .../solanamobile/seedvault/cts/data/tests/TestCorpusProvider.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cts/src/main/java/com/solanamobile/seedvault/cts/data/tests/TestCorpusProvider.kt b/cts/src/main/java/com/solanamobile/seedvault/cts/data/tests/TestCorpusProvider.kt
index 1bcec26..bd06f4f 100644
--- a/cts/src/main/java/com/solanamobile/seedvault/cts/data/tests/TestCorpusProvider.kt
+++ b/cts/src/main/java/com/solanamobile/seedvault/cts/data/tests/TestCorpusProvider.kt
@@ -78,7 +78,7 @@ internal object TestCorpusProvider {
             signatureRequestsExceedLimitTestCase,
             denySignTransactionTestCase,
             incorrectPinSignTransactionFailureTestCase,
-            cannotShowSeedSettingsTestCase.takeIf { isGenericBuild },
+            cannotShowSeedSettingsTestCase.takeIf { isGenericBuild && !isSaga },
             showSeedSettingsTestCase.takeIf { !isGenericBuild },
             deauthorizeSeed12TestCase.takeIf { isGenericBuild },
             hasUnauthorizedSeedsContentProviderTestCase.takeIf { isGenericBuild },