Do I/O (reading the screenshot) on separate thread. (#4347)

* Do I/O (reading the screenshot) on separate thread.
* Use executor
* Make FeedbackSender depend on Blocking executor
* `./gradlew :firebase-appdistribution:googleJavaFormat`

Co-authored-by: Lee Kellogg <[email protected]>

Author: kaibolay

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java

@@ -92,21 +92,37 @@ private void setupView() {
     findViewById(R.id.backButton).setOnClickListener(v -> finish());
     findViewById(R.id.sendButton).setOnClickListener(this::submitFeedback);
 
-    Bitmap screenshot = screenshotUri == null ? null : readScreenshot();
-    if (screenshot != null) {
-      ImageView screenshotImageView = this.findViewById(R.id.screenshotImageView);
-      screenshotImageView.setImageBitmap(screenshot);
-      CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
-      checkBox.setChecked(true);
-      checkBox.setOnClickListener(
-          v -> screenshotImageView.setVisibility(checkBox.isChecked() ? VISIBLE : GONE));
-    } else {
-      LogWrapper.getInstance().e(TAG, "No screenshot available");
-      CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
-      checkBox.setText(R.string.no_screenshot);
-      checkBox.setClickable(false);
-      checkBox.setChecked(false);
-    }
+    setupScreenshot();
+  }
+
+  private void setupScreenshot() {
+    feedbackSender
+        .getBlockingExecutor()
+        .execute(
+            () -> {
+              // do I/O on separate thread in order to not block the UI
+              Bitmap screenshot = screenshotUri == null ? null : readScreenshot();
+              if (screenshot != null) {
+                runOnUiThread(
+                    () -> {
+                      ImageView imageView = findViewById(R.id.screenshotImageView);
+                      imageView.setImageBitmap(screenshot);
+                      CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
+                      checkBox.setChecked(true);
+                      checkBox.setOnClickListener(
+                          v -> imageView.setVisibility(checkBox.isChecked() ? VISIBLE : GONE));
+                    });
+              } else {
+                LogWrapper.getInstance().e(TAG, "No screenshot available");
+                runOnUiThread(
+                    () -> {
+                      CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
+                      checkBox.setText(R.string.no_screenshot);
+                      checkBox.setClickable(false);
+                      checkBox.setChecked(false);
+                    });
+              }
+            });
   }
 
   @Nullable

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackSender.java

@@ -19,14 +19,17 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import java.util.concurrent.Executor;
 
 /** Sends tester feedback to the Tester API. */
 class FeedbackSender {
-
   private final FirebaseAppDistributionTesterApiClient testerApiClient;
+  private final Executor blockingExecutor;
 
-  FeedbackSender(FirebaseAppDistributionTesterApiClient testerApiClient) {
+  FeedbackSender(
+      FirebaseAppDistributionTesterApiClient testerApiClient, Executor blockingExecutor) {
     this.testerApiClient = testerApiClient;
+    this.blockingExecutor = blockingExecutor;
   }
 
   /** Get an instance of FeedbackSender. */
@@ -42,6 +45,12 @@ Task<Void> sendFeedback(String releaseName, String feedbackText, @Nullable Uri s
         .onSuccessTask(testerApiClient::commitFeedback);
   }
 
+  // TODO(kbolay): Remove this hack to make the executor available in FeedbackAction and use a more
+  //     sophisticated dependency injection solution.
+  Executor getBlockingExecutor() {
+    return blockingExecutor;
+  }
+
   private Task<String> attachScreenshot(String feedbackName, @Nullable Uri screenshotUri) {
     if (screenshotUri == null) {
       return Tasks.forResult(feedbackName);

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java

@@ -62,22 +62,28 @@ public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
         Component.builder(FeedbackSender.class)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
+            .add(Dependency.required(blockingExecutor))
             .factory(c -> buildFeedbackSender(c, c.get(blockingExecutor)))
             .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
-  private FeedbackSender buildFeedbackSender(ComponentContainer container, Executor blockingExecutor) {
+  private FeedbackSender buildFeedbackSender(
+      ComponentContainer container, Executor blockingExecutor) {
     FirebaseApp firebaseApp = container.get(FirebaseApp.class);
     Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider =
         container.getProvider(FirebaseInstallationsApi.class);
     FirebaseAppDistributionTesterApiClient testerApiClient =
         new FirebaseAppDistributionTesterApiClient(
-            firebaseApp, firebaseInstallationsApiProvider, new TesterApiHttpClient(firebaseApp), blockingExecutor);
-    return new FeedbackSender(testerApiClient);
+            firebaseApp,
+            firebaseInstallationsApiProvider,
+            new TesterApiHttpClient(firebaseApp),
+            blockingExecutor);
+    return new FeedbackSender(testerApiClient, blockingExecutor);
   }
 
-  private FirebaseAppDistribution buildFirebaseAppDistribution(ComponentContainer container, Executor blockingExecutor) {
+  private FirebaseAppDistribution buildFirebaseAppDistribution(
+      ComponentContainer container, Executor blockingExecutor) {
     FirebaseApp firebaseApp = container.get(FirebaseApp.class);
     Context context = firebaseApp.getApplicationContext();
     Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider =

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FeedbackSenderTest.java

@@ -25,6 +25,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.util.concurrent.Executors;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,7 +48,7 @@ public class FeedbackSenderTest {
   @Before
   public void setup() {
     MockitoAnnotations.initMocks(this);
-    feedbackSender = new FeedbackSender(mockTesterApiClient);
+    feedbackSender = new FeedbackSender(mockTesterApiClient, Executors.newSingleThreadExecutor());
   }
 
   @Test

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClientTest.java

@@ -35,8 +35,8 @@
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
-import java.util.concurrent.Executors;
 import java.io.FileNotFoundException;
+import java.util.concurrent.Executors;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;