fix tests

Author: kaibolay

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

@@ -374,18 +374,20 @@ private void doStartFeedback(CharSequence infoText, @Nullable Uri screenshotUri)
         .signInTester()
         .addOnFailureListener(
             taskExecutor,
-            e ->
-                LogWrapper.getInstance()
-                    .e("Failed to sign in tester. Could not collect feedback.", e))
+            e -> {
+              feedbackInProgress.set(false);
+              LogWrapper.getInstance()
+                  .e("Failed to sign in tester. Could not collect feedback.", e);
+            })
         .onSuccessTask(
             taskExecutor,
             unused ->
                 releaseIdentifier
                     .identifyRelease()
                     .addOnFailureListener(
                         e -> {
-                          LogWrapper.getInstance().e("Failed to identify release", e);
                           feedbackInProgress.set(false);
+                          LogWrapper.getInstance().e("Failed to identify release", e);
                           Toast.makeText(
                                   firebaseApp.getApplicationContext(),
                                   R.string.feedback_unidentified_release,
@@ -398,9 +400,9 @@ private void doStartFeedback(CharSequence infoText, @Nullable Uri screenshotUri)
                             launchFeedbackActivity(releaseName, infoText, screenshotUri)
                                 .addOnFailureListener(
                                     e -> {
+                                      feedbackInProgress.set(false);
                                       LogWrapper.getInstance()
                                           .e("Failed to launch feedback flow", e);
-                                      feedbackInProgress.set(false);
                                       Toast.makeText(
                                               firebaseApp.getApplicationContext(),
                                               R.string.feedback_launch_failed,

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

@@ -758,7 +758,7 @@ public void startFeedback_signInTesterFails_logsAndSetsInProgressToFalse()
     TestUtils.awaitAsyncOperations(taskExecutor);
 
     assertThat(firebaseAppDistribution.isFeedbackInProgress()).isFalse();
-    assertLoggedError("Failed to launch feedback flow", exception);
+    assertLoggedError("Failed to sign in tester", exception);
   }
 
   @Test
@@ -772,7 +772,7 @@ public void startFeedback_cantIdentifyRelease_logsAndSetsInProgressToFalse()
     TestUtils.awaitAsyncOperations(taskExecutor);
 
     assertThat(firebaseAppDistribution.isFeedbackInProgress()).isFalse();
-    assertLoggedError("Failed to launch feedback flow", exception);
+    assertLoggedError("Failed to identify release", exception);
   }
 
   private static void assertLoggedError(String partialMessage, Throwable e) {