fix

Author: vkryachko

firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java

@@ -22,7 +22,6 @@
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
@@ -94,7 +93,8 @@ public void testToken() throws InterruptedException, ExecutionException {
               HttpsCallableContext context = new HttpsCallableContext("token", null, null);
               return Tasks.forResult(context);
             },
-            TestOnlyExecutors.lite());
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("tokenTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -116,7 +116,8 @@ public void testInstanceId() throws InterruptedException, ExecutionException {
               HttpsCallableContext context = new HttpsCallableContext(null, "iid", null);
               return Tasks.forResult(context);
             },
-            TestOnlyExecutors.lite());
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("instanceIdTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -138,7 +139,8 @@ public void testAppCheck() throws InterruptedException, ExecutionException {
               HttpsCallableContext context = new HttpsCallableContext(null, null, "appCheck");
               return Tasks.forResult(context);
             },
-            TestOnlyExecutors.lite());
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("appCheckTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java

@@ -15,7 +15,6 @@
 package com.google.firebase.functions;
 
 import android.content.Context;
-import android.os.Handler;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,6 +27,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.io.IOException;
@@ -94,7 +94,8 @@ public class FirebaseFunctions {
       String projectId,
       String regionOrCustomDomain,
       ContextProvider contextProvider,
-      @Lightweight Executor executor) {
+      @Lightweight Executor executor,
+      @UiThread Executor uiExecutor) {
     this.app = app;
     this.executor = executor;
     this.client = new OkHttpClient();
@@ -118,15 +119,16 @@ public class FirebaseFunctions {
       this.customDomain = regionOrCustomDomain;
     }
 
-    maybeInstallProviders(context);
+    maybeInstallProviders(context, uiExecutor);
   }
 
   /**
    * Runs ProviderInstaller.installIfNeededAsync once per application instance.
    *
    * @param context The application context.
+   * @param uiExecutor
    */
-  private static void maybeInstallProviders(Context context) {
+  private static void maybeInstallProviders(Context context, Executor uiExecutor) {
     // Make sure this only runs once.
     synchronized (providerInstalled) {
       if (providerInstallStarted) {
@@ -137,7 +139,7 @@ private static void maybeInstallProviders(Context context) {
 
     // Package installIfNeededAsync into a Runnable so it can be run on the main thread.
     // installIfNeededAsync checks to make sure it is on the main thread, and throws otherwise.
-    Runnable runnable =
+    uiExecutor.execute(
         () ->
             ProviderInstaller.installIfNeededAsync(
                 context,
@@ -152,10 +154,7 @@ public void onProviderInstallFailed(int i, android.content.Intent intent) {
                     Log.d("FirebaseFunctions", "Failed to update ssl context");
                     providerInstalled.setResult(null);
                   }
-                });
-
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(runnable);
+                }));
   }
 
   /**

firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java

@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import androidx.annotation.GuardedBy;
+import androidx.annotation.UiThread;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.concurrent.Lightweight;
 import java.util.HashMap;
@@ -35,17 +36,20 @@ class FunctionsMultiResourceComponent {
   private final Context applicationContext;
   private final ContextProvider contextProvider;
   private final FirebaseApp app;
-  private final Executor executor;
+  private final Executor liteExecutor;
+  private final Executor uiExecutor;
 
   FunctionsMultiResourceComponent(
       Context applicationContext,
       ContextProvider contextProvider,
       FirebaseApp app,
-      @Lightweight Executor executor) {
+      @Lightweight Executor liteExecutor,
+      @UiThread Executor uiExecutor) {
     this.applicationContext = applicationContext;
     this.contextProvider = contextProvider;
     this.app = app;
-    this.executor = executor;
+    this.liteExecutor = liteExecutor;
+    this.uiExecutor = uiExecutor;
   }
 
   synchronized FirebaseFunctions get(String regionOrCustomDomain) {
@@ -55,7 +59,13 @@ synchronized FirebaseFunctions get(String regionOrCustomDomain) {
     if (functions == null) {
       functions =
           new FirebaseFunctions(
-              app, applicationContext, projectId, regionOrCustomDomain, contextProvider, executor);
+              app,
+              applicationContext,
+              projectId,
+              regionOrCustomDomain,
+              contextProvider,
+              liteExecutor,
+              uiExecutor);
       instances.put(regionOrCustomDomain, functions);
     }
     return functions;

firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java

@@ -18,6 +18,7 @@
 import androidx.annotation.Keep;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
@@ -42,11 +43,14 @@ public class FunctionsRegistrar implements ComponentRegistrar {
   @Override
   public List<Component<?>> getComponents() {
     Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+    Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
     return Arrays.asList(
         Component.builder(ContextProvider.class)
             .add(Dependency.optionalProvider(InternalAuthProvider.class))
             .add(Dependency.requiredProvider(FirebaseInstanceIdInternal.class))
             .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(uiExecutor))
             .factory(
                 c ->
                     new FirebaseContextProvider(
@@ -66,7 +70,8 @@ public List<Component<?>> getComponents() {
                         c.get(Context.class),
                         c.get(ContextProvider.class),
                         c.get(FirebaseApp.class),
-                        c.get(liteExecutor)))
+                        c.get(liteExecutor),
+                        c.get(uiExecutor)))
             .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }