Fix Fiam crash at AbtIntegrationHelper (#4913)

Crash Fix: NullPointerException at AbtIntegrationHelper.setExperimentActive

Author: eldhosembabu

firebase-inappmessaging-display/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+* [fixed] Fixed nullpointer crash when using experiments
+  ([GitHub Issue #4214](//github.com/firebase/firebase-android-sdk/issues/4716))
 
 # 20.3.1
 * [fixed] Fixed nullpointer crash

firebase-inappmessaging/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+* [fixed] Fixed nullpointer crash when using experiments
+  ([GitHub Issue #4214](//github.com/firebase/firebase-android-sdk/issues/4716))
 
 # 20.3.1
 * [fixed] Fixed nullpointer crash

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java

@@ -119,7 +119,8 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
                 new AbtIntegrationHelper(
                     container
                         .get(AbtComponent.class)
-                        .get(FirebaseABTesting.OriginService.INAPP_MESSAGING)))
+                        .get(FirebaseABTesting.OriginService.INAPP_MESSAGING),
+                    container.get(blockingExecutor)))
             .apiClientModule(
                 new ApiClientModule(firebaseApp, firebaseInstallations, universalComponent.clock()))
             .grpcClientModule(new GrpcClientModule(firebaseApp))

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelper.java

@@ -32,12 +32,12 @@
 @FirebaseAppScope
 public class AbtIntegrationHelper {
   private final FirebaseABTesting abTesting;
-
-  @Inject @Blocking @VisibleForTesting Executor executor;
+  @VisibleForTesting Executor executor;
 
   @Inject
-  public AbtIntegrationHelper(FirebaseABTesting abTesting) {
+  public AbtIntegrationHelper(FirebaseABTesting abTesting, @Blocking Executor blockingExecutor) {
     this.abTesting = abTesting;
+    this.executor = blockingExecutor;
   }
 
   /**

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/components/UniversalComponent.java

@@ -72,7 +72,7 @@
       ExecutorsModule.class
     })
 public interface UniversalComponent {
-  ProviderInstaller probiderInstaller();
+  ProviderInstaller providerInstaller();
 
   Channel gRPCChannel();
 

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelperTest.java

@@ -18,6 +18,7 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 
 import com.google.firebase.abt.FirebaseABTesting;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.MessagesProto;
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
@@ -66,7 +67,7 @@ public class AbtIntegrationHelperTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    abtIntegrationHelper = new AbtIntegrationHelper(abTesting);
+    abtIntegrationHelper = new AbtIntegrationHelper(abTesting, TestOnlyExecutors.blocking());
     // make executor immediately execute
     abtIntegrationHelper.executor = Runnable::run;
   }