Merge remote-tracking branch 'origin/main' into feat-backup-optin

app/src/main/AndroidManifest.xml

@@ -70,25 +70,20 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <!-- Captures the Microsoft OAuth redirect for Outlook sign-in. AppAuth registers the
-             Gmail scheme via ${appAuthRedirectScheme}; this adds the Outlook scheme. The redirect
-             URI org.libremail.outlook://oauth2redirect must be registered as a public-client
-             (mobile/desktop) redirect in the Azure app registration.
-             AppAuth's RedirectUriReceiverActivity extends AppCompatActivity, so it needs an
-             AppCompat theme; without this it inherits the app's Theme.Material shell and crashes
-             ("You need to use a Theme.AppCompat theme") when the redirect launches it. We reuse the
-             translucent theme AppAuth itself applies to AuthorizationManagementActivity. -->
+        <!-- Captures the Microsoft OAuth redirect for Outlook sign-in. AppAuth's bundled manifest
+             already declares RedirectUriReceiverActivity with an intent-filter for
+             ${appAuthRedirectScheme}, which build.gradle.kts sets to the Outlook scheme
+             (org.libremail.outlook); the redirect URI org.libremail.outlook://oauth2redirect must
+             be registered as a public-client (mobile/desktop) redirect in the Azure app
+             registration. We only merge a theme onto that activity here: AppAuth declares no theme
+             and RedirectUriReceiverActivity extends AppCompatActivity, so without an AppCompat theme
+             it inherits the app's Theme.Material shell and crashes ("You need to use a Theme.AppCompat
+             theme") when the redirect launches it. We reuse the translucent theme AppAuth itself
+             applies to AuthorizationManagementActivity. -->
         <activity
             android:name="net.openid.appauth.RedirectUriReceiverActivity"
             android:exported="true"
             android:theme="@style/Theme.AppCompat.Translucent.NoTitleBar"
-            tools:node="merge">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="org.libremail.outlook" />
-            </intent-filter>
-        </activity>
+            tools:node="merge" />
     </application>
 </manifest>