From e02512d75772589347c6d24a95b32ce3b62a6c35 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Wed, 14 Apr 2021 15:56:52 -0400
Subject: [PATCH] Remove requestLegacyExternalStorage flag

---
 app/build.gradle                 | 14 +++++---------
 app/src/main/AndroidManifest.xml |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6ef77b99f..c82f2d66f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,8 +58,7 @@ android {
         def deepLinkSchemeValue = "fenix-dev"
         buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
         manifestPlaceholders = [
-                "deepLinkScheme": deepLinkSchemeValue,
-                "requestLegacyExternalStorage": true
+                "deepLinkScheme": deepLinkSchemeValue
         ]
 
         // Build flag for "Mozilla Online" variants. See `Config.isMozillaOnline`.
@@ -97,8 +96,7 @@ android {
             def deepLinkSchemeValue = "fenix-dev"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
             manifestPlaceholders = [
-                    "deepLinkScheme": deepLinkSchemeValue,
-                    "requestLegacyExternalStorage": false
+                    "deepLinkScheme": deepLinkSchemeValue
             ]
         }
         nightly releaseTemplate >> {
@@ -106,7 +104,7 @@ android {
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
             def deepLinkSchemeValue = "fenix-nightly"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
-            manifestPlaceholders = ["deepLinkScheme": deepLinkSchemeValue, "requestLegacyExternalStorage": false]
+            manifestPlaceholders = ["deepLinkScheme": deepLinkSchemeValue]
         }
         beta releaseTemplate >> {
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
@@ -122,8 +120,7 @@ android {
                     //  - https://issuetracker.google.com/issues/36924841
                     //  - https://issuetracker.google.com/issues/36905922
                     "sharedUserId": "org.mozilla.firefox.sharedID",
-                    "deepLinkScheme": deepLinkSchemeValue,
-                    "requestLegacyExternalStorage": true
+                    "deepLinkScheme": deepLinkSchemeValue
             ]
         }
         release releaseTemplate >> {
@@ -140,8 +137,7 @@ android {
                     //  - https://issuetracker.google.com/issues/36924841
                     //  - https://issuetracker.google.com/issues/36905922
                     "sharedUserId": "org.mozilla.firefox.sharedID",
-                    "deepLinkScheme": deepLinkSchemeValue,
-                    "requestLegacyExternalStorage": true
+                    "deepLinkScheme": deepLinkSchemeValue
             ]
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b13db0148..2b9d15bd9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,7 +27,6 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="${requestLegacyExternalStorage}"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/NormalTheme"