Closes issue mozilla-mobile#8681: Do not retry to update an extension

when an UnRecoverableError happens
Amejia481 · Oct 15, 2020 · cbcd597 · cbcd597
1 parent 05dfb09
commit cbcd597
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/...engine-gecko-nightly/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt b/...engine-gecko-nightly/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
@@ -55,6 +55,8 @@ import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoSession
 import org.mozilla.geckoview.GeckoWebExecutor
+import org.mozilla.geckoview.WebExtension.InstallException
+import org.mozilla.geckoview.WebExtension.InstallException.ErrorCodes.ERROR_NETWORK_FAILURE
 import org.mozilla.geckoview.WebExtensionController
 
 /**
@@ -267,7 +269,13 @@ class GeckoEngine(
             onSuccess(updatedExtension)
             GeckoResult<Void>()
         }, { throwable ->
-            onError(extension.id, throwable)
+
+            val exception = if (throwable is InstallException && throwable.code != ERROR_NETWORK_FAILURE) {
+                WebExtension.UnRecoverableError(throwable)
+            } else {
+                throwable
+            }
+            onError(extension.id, exception)
             GeckoResult<Void>()
         })
     }

diff --git a/...ncept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt b/...ncept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt
@@ -8,6 +8,7 @@ import android.graphics.Bitmap
 import android.net.Uri
 import mozilla.components.concept.engine.EngineSession
 import org.json.JSONObject
+import java.lang.Error
 
 /**
  * Represents a browser extension based on the WebExtension API:
@@ -180,6 +181,13 @@ abstract class WebExtension(
      * available icon to the provided size.
      */
     abstract suspend fun loadIcon(size: Int): Bitmap?
+
+    /**
+     * An error that occur trying to perform an action like installing, removing or updating
+     * an [WebExtension] that is not recoverable.
+     */
+    class UnRecoverableError(throwable: Throwable) : Error(throwable)
+
 }
 
 /**

diff --git a/...nts/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt b/...nts/feature/addons/src/main/java/mozilla/components/feature/addons/update/AddonUpdater.kt
@@ -584,7 +584,7 @@ internal class AddonUpdaterWorker(
                                     "Unable to update extension $extensionId, re-schedule ${status.message}",
                                     status.exception
                             )
-                            Result.retry()
+                            retryIfRecoverable(status.exception)
                         }
                     }
                     saveUpdateAttempt(extensionId, status)
@@ -599,11 +599,19 @@ internal class AddonUpdaterWorker(
                 if (exception.shouldReport()) {
                     GlobalAddonDependencyProvider.onCrash?.invoke(exception)
                 }
-                continuation.resume(Result.retry())
+                continuation.resume(retryIfRecoverable(exception))
             }
         }
     }
 
+    private fun retryIfRecoverable(throwable: Throwable): Result {
+        return if (throwable !is WebExtension.UnRecoverableError) {
+            Result.retry()
+        } else {
+            Result.success()
+        }
+    }
+
     private fun saveUpdateAttempt(extensionId: String, status: AddonUpdater.Status) {
         CoroutineScope((Dispatchers.IO)).launch {
             updateAttemptStorage.saveOrUpdate(AddonUpdater.UpdateAttempt(extensionId, Date(), status))