Fix errors after rebase on fad/next (#4477)

* Fix unit test after rebase on fad/next

* Guard reference to previousActivity with lock

* Supress lint error about explicit executor in continuation

Author: lfkellogg

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

@@ -17,6 +17,7 @@
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
@@ -144,6 +145,8 @@ private Bitmap readScreenshot() {
     return bitmap;
   }
 
+  // TODO(b/261014422): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   public void submitFeedback(View view) {
     setSubmittingStateEnabled(true);
     if (releaseName == null) {

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

@@ -14,6 +14,7 @@
 
 package com.google.firebase.appdistribution.impl;
 
+import android.annotation.SuppressLint;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
@@ -37,6 +38,8 @@ static FeedbackSender getInstance() {
     return FirebaseApp.getInstance().get(FeedbackSender.class);
   }
 
+  // TODO(b/261014422): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   /** Send feedback text and optionally a screenshot to the Tester API for the given release. */
   Task<Void> sendFeedback(String releaseName, String feedbackText, @Nullable Uri screenshotUri) {
     return testerApiClient

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

@@ -372,6 +372,8 @@ public void cancelFeedbackNotification() {
     notificationsManager.cancelFeedbackNotification();
   }
 
+  // TODO(b/261014422): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   private void doStartFeedback(CharSequence infoText, @Nullable Uri screenshotUri) {
     testerSignInManager
         .signInTester()

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

@@ -242,8 +242,10 @@ <A extends Activity> Task<Activity> getForegroundActivity(@Nullable Class<A> cla
           new OnActivityResumedListener() {
             @Override
             public void onResumed(Activity activity) {
-              task.setResult(
-                  getActivityWithIgnoredClass(activity, previousActivity, classToIgnore));
+              synchronized (lock) {
+                task.setResult(
+                    getActivityWithIgnoredClass(activity, previousActivity, classToIgnore));
+              }
               removeOnActivityResumedListener(this);
             }
           });

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

@@ -72,6 +72,8 @@ class ScreenshotTaker {
    * @return a {@link Task} that will complete with the file URI in app-level storage where the
    *     screenshot was written, or null if no activity could be found to screenshot.
    */
+  // TODO(b/261014422): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   Task<Uri> takeScreenshot() {
     return deleteScreenshot()
         .onSuccessTask(unused -> captureScreenshot())

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

@@ -95,7 +95,7 @@ public void showAppUpdateNotification_withSuccess() {
     Notification notification =
         shadowOf(notificationManager).getNotification(APP_UPDATE.tag, APP_UPDATE.id);
     assertThat(shadowOf(notification).getProgress()).isEqualTo(100);
-    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download completed");
+    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download complete");
   }
 
   @Test