tor-browser

commit 07cdd1f846509ce0e5abf0abe0c1d9a47f392ec0
parent 19024aa4d11a7e0f8180802db35305ecfff94236
Author: Alex Catarineu <acat@torproject.org>
Date:   Thu,  1 Oct 2020 18:31:11 +0200

[android] Modify Addon support

android-components#40011: Hide option for disallowing addons in private mode

android-components#40016: Allow inheriting from AddonCollectionProvider

This will allow implementing our own AddonsProvider in fenix.

Diffstat:
M
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt
 | 
1
+
M
mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt
 | 
4
++--
M
mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml
 | 
1
+

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt
@@ -556,6 +556,7 @@ class AddonManager(
         val installedAddon = Addon.newFromWebExtension(ext, installedState)
 
         addonUpdater.registerForFutureUpdates(installedAddon.id)
+        setAddonAllowedInPrivateBrowsing(installedAddon, true)
         completePendingAddonAction(pendingAction)
         onSuccess(installedAddon)
     }
diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt
@@ -66,7 +66,7 @@ internal const val PAGE_SIZE = 50
  * is being used by default
  * @property ioDispatcher Coroutine dispatcher for IO operations.
  */
-class AMOAddonsProvider(
+open class AMOAddonsProvider(
     private val context: Context,
     private val client: Client,
     private val serverURL: String = DEFAULT_SERVER_URL,
@@ -245,7 +245,7 @@ class AMOAddonsProvider(
     }
 
     @VisibleForTesting
-    internal fun writeToDiskCache(collectionResponse: String, language: String?) {
+    open fun writeToDiskCache(collectionResponse: String, language: String?) {
         synchronized(diskCacheLock) {
             getCacheFile(context, language, useFallbackFile = false).writeString { collectionResponse }
         }
diff --git a/mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml b/mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml
@@ -70,6 +70,7 @@
                 app:drawableStartCompat="@drawable/mozac_ic_permissions" />
 
         <androidx.appcompat.widget.SwitchCompat
+            android:visibility="gone"
             android:id="@+id/allow_in_private_browsing_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"