Use SuccessContinuation instead of creating new ActivityContinuation interface

Author: lfkellogg

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

@@ -39,9 +39,6 @@ interface ActivityConsumer<T> {
     void consume(Activity activity);
   }
 
-  /** A {@link SuccessContinuation} that takes an activity and returns a new {@link Task}. */
-  interface ActivityContinuation<T> extends SuccessContinuation<Activity, T> {}
-
   private static FirebaseAppDistributionLifecycleNotifier instance;
   private final Object lock = new Object();
 
@@ -121,7 +118,7 @@ Task<Void> applyToForegroundActivity(ActivityConsumer consumer) {
    * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
    * will complete with the result of the Task returned by that function.
    */
-  <T> Task<T> applyToForegroundActivityTask(ActivityContinuation<T> continuation) {
+  <T> Task<T> applyToForegroundActivityTask(SuccessContinuation<Activity, T> continuation) {
     return getForegroundActivity()
         .onSuccessTask(
             // Use direct executor to ensure the consumer is called while Activity is in foreground

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifierTest.java

@@ -22,11 +22,11 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
+import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
 import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
-import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityContinuation;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -95,7 +95,7 @@ public void applyToForegroundActivityTask_withCurrentActivity_succeedsAndCallsCo
     // applyToForegroundActivityTask is called
     lifecycleNotifier.onActivityResumed(activity);
 
-    ActivityContinuation<String> continuation = spy(ActivityContinuation.class);
+    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
     when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
     Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
 
@@ -107,7 +107,7 @@ public void applyToForegroundActivityTask_withCurrentActivity_succeedsAndCallsCo
   @Test
   public void applyToForegroundActivityTask_noCurrentActivity_succeedsAndCallsConsumer()
       throws Exception {
-    ActivityContinuation<String> continuation = spy(ActivityContinuation.class);
+    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
     when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
     Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
 
@@ -121,7 +121,7 @@ public void applyToForegroundActivityTask_noCurrentActivity_succeedsAndCallsCons
 
   @Test
   public void applyToForegroundActivityTask_continuationThrows_fails() throws Exception {
-    ActivityContinuation<String> continuation = spy(ActivityContinuation.class);
+    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
     FirebaseAppDistributionException continuationException =
         new FirebaseAppDistributionException(
             "exception in continuation task", Status.AUTHENTICATION_CANCELED);
@@ -137,7 +137,7 @@ public void applyToForegroundActivityTask_continuationThrows_fails() throws Exce
   @Test
   public void applyToForegroundActivityTask_continuationThrowsUnknownException_wrapsException()
       throws Exception {
-    ActivityContinuation<String> continuation = spy(ActivityContinuation.class);
+    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
     RuntimeException continuationException = new RuntimeException("exception in continuation");
     when(continuation.then(activity)).thenThrow(continuationException);
     Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
@@ -151,7 +151,7 @@ public void applyToForegroundActivityTask_continuationThrowsUnknownException_wra
   @Test
   public void applyToForegroundActivityTask_continuationTaskFails_failsWithSameException()
       throws Exception {
-    ActivityContinuation<String> continuation = spy(ActivityContinuation.class);
+    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
     RuntimeException continuationException = new RuntimeException("exception in continuation");
     when(continuation.then(activity)).thenReturn(Tasks.forException(continuationException));
     Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestUtils.java

@@ -19,11 +19,11 @@
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
+import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
 import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
-import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityContinuation;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.mockito.stubbing.Answer;
@@ -69,10 +69,10 @@ static Answer<Task<Void>> applyToForegroundActivityAnswer(Activity activity) {
 
   static <T> Answer<Task<T>> applyToForegroundActivityTaskAnswer(Activity activity) {
     return invocationOnMock -> {
-      ActivityContinuation<T> continuation =
-          (ActivityContinuation<T>) invocationOnMock.getArgument(0);
+      SuccessContinuation<Activity, T> continuation =
+          (SuccessContinuation<Activity, T>) invocationOnMock.getArgument(0);
       if (continuation == null) {
-        return Tasks.forException(new IllegalStateException("ActivityContinuation was null"));
+        return Tasks.forException(new IllegalStateException("Success was null"));
       }
       return continuation.then(activity);
     };