Update scheme and url, add cancellation logic

Author: Rachel Prince

firebase-app-distribution/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="${applicationId}" android:host="authredirect" />
+                <data android:scheme="appdistribution-${applicationId}" android:host="authredirect" />
 
             </intent-filter>
         </activity>

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java

@@ -31,6 +31,8 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.browser.customtabs.CustomTabsIntent;
 import com.google.android.gms.common.internal.Preconditions;
+import com.google.android.gms.tasks.CancellationToken;
+import com.google.android.gms.tasks.CancellationTokenSource;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
@@ -50,6 +52,7 @@ public class FirebaseAppDistribution implements Application.ActivityLifecycleCal
   private Activity currentActivity;
   @VisibleForTesting private boolean currentlySigningIn = false;
   private TaskCompletionSource<Void> signInTaskCompletionSource = null;
+  private CancellationTokenSource signInCancellationSource;
 
   /** Constructor for FirebaseAppDistribution */
   public FirebaseAppDistribution(
@@ -177,9 +180,11 @@ public void onSuccess(String fid) {
         Uri uri =
             Uri.parse(
                 String.format(
-                    "https://appdistribution.firebase.dev/nba/pub/apps/"
-                        + "%s/installations/%s/buildalerts?appName=%s",
-                    firebaseApp.getOptions().getApplicationId(), fid, getApplicationName(context)));
+                    "https://appdistribution.firebase.google.com/pub/apps/%s/installations/%s/buildalerts?appName=%s&packageName=%s",
+                    firebaseApp.getOptions().getApplicationId(),
+                    fid,
+                    getApplicationName(context),
+                    context.getPackageName()));
         openSignInFlowInBrowser(uri);
       }
     };
@@ -225,8 +230,13 @@ public void onClick(DialogInterface dialogInterface, int i) {
   /** Signs in the App Distribution tester. Presents the tester with a Google sign in UI */
   @NonNull
   public Task<Void> signInTester() {
+    if (signInTaskCompletionSource != null && !signInTaskCompletionSource.getTask().isComplete()) {
+      signInCancellationSource.cancel();
+    }
+
+    signInCancellationSource = new CancellationTokenSource();
+    signInTaskCompletionSource = new TaskCompletionSource<>(signInCancellationSource.getToken());
 
-    this.signInTaskCompletionSource = new TaskCompletionSource<>();
     Context context = firebaseApp.getApplicationContext();
     AlertDialog alertDialog = getSignInAlertDialog(context);
     alertDialog.show();
@@ -236,7 +246,7 @@ public Task<Void> signInTester() {
 
   private void setSignInTaskCompletionError(FirebaseAppDistributionException e) {
     if (signInTaskCompletionSource != null && !signInTaskCompletionSource.getTask().isComplete()) {
-      this.signInTaskCompletionSource.setException(e);
+      signInTaskCompletionSource.setException(e);
     }
   }
 

firebase-app-distribution/src/main/res/anim/slide_in_left.xml

@@ -58,11 +58,14 @@ public class FirebaseAppDistributionTest {
 
   public static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
   public static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  public static final String TEST_APP_NAME = "TestApp";
   public static final String TEST_PROJECT_ID = "777777777777";
   public static final String TEST_FID_1 = "cccccccccccccccccccccc";
   public static final String TEST_URL =
       String.format(
-          "https://appdistribution.firebase.dev/nba/pub/apps/%s/installations/%s/buildalerts?appName=com.google.firebase.appdistribution.test",
+          "https://appdistribution.firebase.google.com/pub/apps/%s/installations/%s/buildalerts"
+              + "?appName=com.google.firebase.appdistribution.test"
+              + "&packageName=com.google.firebase.appdistribution.test",
           TEST_APP_ID_1, TEST_FID_1);
 
   private TestActivity activity;