commit de4df10efe3276145d072b9c629b6521fd0bb8ae
parent 932380034c974a5c4ee1d9f08f4f477d87f05573
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 3 Nov 2025 16:20:27 +0000
Bug 1997741 - Split intent-filter <data> into single-attribute tags. r=android-reviewers,Roger
Use one scheme tag and per-host <data> entries to match Android’s
aggregation semantics and silence lint warnings.
Differential Revision: https://phabricator.services.mozilla.com/D270905
Diffstat:
2 files changed, 23 insertions(+), 274 deletions(-)
diff --git a/mobile/android/fenix/app/lint-baseline.xml b/mobile/android/fenix/app/lint-baseline.xml
@@ -387,237 +387,6 @@
</issue>
<issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="511"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="513"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="515"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="517"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="519"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="521"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="523"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="525"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="527"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="529"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="531"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="533"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="535"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="537"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="539"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="541"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="543"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="545"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="547"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="549"
- column="17"/>
- </issue>
-
- <issue
- id="IntentFilterUniqueDataAttributes"
- message="Consider splitting data tag into multiple tags with individual attributes to avoid confusion"
- errorLine1=" <data android:scheme="${deepLinkScheme}""
- errorLine2=" ^">
- <location
- file="src/main/AndroidManifest.xml"
- line="551"
- column="17"/>
- </issue>
-
- <issue
id="VectorRaster"
message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
errorLine1=" android:width="432dp""
@@ -1075,7 +844,7 @@
errorLine2=" ~~~~~~~~">
<location
file="src/main/AndroidManifest.xml"
- line="754"
+ line="734"
column="10"/>
</issue>
diff --git a/mobile/android/fenix/app/src/main/AndroidManifest.xml b/mobile/android/fenix/app/src/main/AndroidManifest.xml
@@ -508,48 +508,28 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="${deepLinkScheme}"
- android:host="enable_private_browsing"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="home"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="home_collections"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="install_search_widget"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="make_default_browser"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="open"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_accessibility"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_addon_manager"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_delete_browsing_data"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_logins"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_notifications"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_privacy"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_search_engine"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_tracking_protection"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_app_icon"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="share_sheet"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="turn_on_sync"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="urls_bookmarks"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="urls_history"/>
- <data android:scheme="${deepLinkScheme}"
- android:host="settings_private_browsing"/>
+ <data android:scheme="${deepLinkScheme}"/>
+ <data android:host="enable_private_browsing"/>
+ <data android:host="home"/>
+ <data android:host="home_collections"/>
+ <data android:host="install_search_widget"/>
+ <data android:host="make_default_browser"/>
+ <data android:host="open"/>
+ <data android:host="settings"/>
+ <data android:host="settings_accessibility"/>
+ <data android:host="settings_addon_manager"/>
+ <data android:host="settings_delete_browsing_data"/>
+ <data android:host="settings_logins"/>
+ <data android:host="settings_notifications"/>
+ <data android:host="settings_privacy"/>
+ <data android:host="settings_search_engine"/>
+ <data android:host="settings_tracking_protection"/>
+ <data android:host="settings_app_icon"/>
+ <data android:host="share_sheet"/>
+ <data android:host="turn_on_sync"/>
+ <data android:host="urls_bookmarks"/>
+ <data android:host="urls_history"/>
+ <data android:host="settings_private_browsing"/>
</intent-filter>
</activity>
