From 3a8763d3ff020e4331102fd92098a544265396a1 Mon Sep 17 00:00:00 2001
From: James Hugman <james@hugman.tv>
Date: Sat, 5 Jun 2021 17:04:40 +0100
Subject: [PATCH] Re-instate catch-all to withExperiment

(cherry picked from commit 5981a9214897f0a6135aba5c885572ae840d0922)
---
 app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt b/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
index 94d42c98c..72fc4eec3 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Nimbus.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ext
 
 import mozilla.components.service.nimbus.NimbusApi
+import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.experiments.nimbus.Variables
 import org.mozilla.fenix.experiments.FeatureId
 
@@ -20,7 +21,7 @@ import org.mozilla.fenix.experiments.FeatureId
  * is passed a `null`.
  */
 fun <T> NimbusApi.withExperiment(featureId: FeatureId, transform: (String?) -> T): T {
-    return transform(getExperimentBranch(featureId.jsonName))
+    return transform(withExperiment(featureId))
 }
 
 /**
@@ -29,7 +30,12 @@ fun <T> NimbusApi.withExperiment(featureId: FeatureId, transform: (String?) -> T
  * Short-hand for ` org.mozilla.experiments.nimbus.NimbusApi.getExperimentBranch`.
  */
 fun NimbusApi.withExperiment(featureId: FeatureId) =
-    getExperimentBranch(featureId.jsonName)
+    try {
+        getExperimentBranch(featureId.jsonName)
+    } catch (e: Throwable) {
+        Logger.error("Failed to getExperimentBranch(${featureId.jsonName})", e)
+        null
+    }
 
 /**
  * Get the variables needed to configure the feature given by `featureId`.