Revert FIS Integration for FIAM (#1405)

This reverts commit 261ad66.
This reverts commit 0fa1043.

This actually doesn't revert those two exactly. This change is meant to be reverted easily to move back to FIS one day when FIS isn't blocking launches.

Author: JasonAHeron

fiamui-app/fiamui-app.gradle

@@ -58,17 +58,8 @@ dependencies {
   implementation project(path: ":firebase-inappmessaging")
   implementation 'com.google.guava:guava:24.1-jre-android'
 
-  implementation('com.google.firebase:firebase-analytics:17.2.3') {
+  implementation('com.google.firebase:firebase-analytics:17.0.0') {
     exclude group: 'com.google.firebase', module: 'firebase-common'
-    exclude group: 'com.google.firebase', module: 'firebase-components'
-    exclude group: 'com.google.firebase', module: 'firebase-installations'
-    exclude group: 'com.google.firebase', module: 'firebase-installations-interop'
-  }
-  implementation('com.google.firebase:firebase-iid:20.1.1') {
-      exclude group: 'com.google.firebase', module: 'firebase-common'
-      exclude group: 'com.google.firebase', module: 'firebase-components'
-      exclude group: 'com.google.firebase', module: 'firebase-installations'
-      exclude group: 'com.google.firebase', module: 'firebase-installations-interop'
   }
 
   implementation "com.android.installreferrer:installreferrer:1.0"

firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

@@ -64,6 +64,10 @@ dependencies {
     implementation project(':firebase-inappmessaging')
     implementation project(':firebase-components')
 
+    implementation('com.google.firebase:firebase-iid:20.0.1') {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+    }
+
     implementation('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
     }

firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java

@@ -75,8 +75,8 @@
  *   <li>send usage metrics to the Firebase backend.
  * </ul>
  *
- * <p>To delete the Instance ID and the data associated with it, see
- * FirebaseInstallationsApi#delete.
+ * <p>To delete the Instance ID and the data associated with it, see {@link
+ * com.google.firebase.iid.FirebaseInstanceId#deleteInstanceId}.
  */
 @Keep
 @FirebaseAppScope

firebase-inappmessaging/firebase-inappmessaging.gradle

@@ -116,8 +116,6 @@ dependencies {
     implementation project(':protolite-well-known-types')
     implementation project(':transport:transport-api')
     implementation project(':firebase-datatransport')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
 
     //To provide @Generated annotations
     compileOnly 'javax.annotation:jsr250-api:1.0'
@@ -130,6 +128,9 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation 'com.google.auto.value:auto-value-annotations:1.6.5'
+    implementation('com.google.firebase:firebase-iid:20.0.1') {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+    }
 
     implementation('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-common'

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java

@@ -44,6 +44,7 @@
 import android.os.Bundle;
 import android.os.Looper;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -52,6 +53,8 @@
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
 import com.google.firebase.events.Subscriber;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
 import com.google.firebase.inappmessaging.CommonTypesProto.Event;
 import com.google.firebase.inappmessaging.CommonTypesProto.Priority;
 import com.google.firebase.inappmessaging.CommonTypesProto.TriggeringCondition;
@@ -69,8 +72,6 @@
 import com.google.firebase.inappmessaging.model.BannerMessage;
 import com.google.firebase.inappmessaging.model.CampaignMetadata;
 import com.google.firebase.inappmessaging.model.InAppMessage;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.installations.InstallationTokenResult;
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto.ThickContent;
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto.VanillaCampaignPayload;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpression;
@@ -112,10 +113,8 @@
 @RunWith(AndroidJUnit4.class)
 public class FirebaseInAppMessagingFlowableTest {
 
-  private static final String PROJECT_NUMBER = "gcm-sender-id";
-  private static final String APP_ID = "app-id";
-  private static final String INSTANCE_ID = "instance-id";
-  private static final String INSTANCE_TOKEN = "token";
+  public static final String PROJECT_NUMBER = "gcm-sender-id";
+  public static final String APP_ID = "app-id";
   private static final long PAST = 1000000;
   private static final long NOW = PAST + 100000;
   private static final long FUTURE = NOW + 1000000;
@@ -168,7 +167,7 @@ public class FirebaseInAppMessagingFlowableTest {
   @Mock
   private MetricsLoggerClient.EngagementMetricsLoggerInterface engagementMetricsLoggerInterface;
 
-  @Mock private FirebaseInstallationsApi firebaseInstallations;
+  @Mock private FirebaseInstanceId instanceId;
   @Mock private TestDeviceHelper testDeviceHelper;
   @Mock private Subscriber firebaseEventSubscriber;
   @Mock private AbtIntegrationHelper abtIntegrationHelper;
@@ -224,16 +223,24 @@ public void setUp() {
     clearProtoDiskCache(InstrumentationRegistry.getTargetContext());
     application =
         spy((Application) InstrumentationRegistry.getTargetContext().getApplicationContext());
-    when(firebaseInstallations.getId()).thenReturn(Tasks.forResult(INSTANCE_ID));
-    when(firebaseInstallations.getToken(false))
+    String id = FirebaseInstanceId.getInstance().getId();
+    when(instanceId.getId()).thenReturn(id);
+    when(instanceId.getInstanceId())
         .thenReturn(
             Tasks.forResult(
-                InstallationTokenResult.builder()
-                    .setToken(INSTANCE_TOKEN)
-                    .setTokenCreationTimestamp(1)
-                    .setTokenExpirationTimestamp(1)
-                    .build()));
-
+                new InstanceIdResult() {
+                  @NonNull
+                  @Override
+                  public String getId() {
+                    return id;
+                  }
+
+                  @NonNull
+                  @Override
+                  public String getToken() {
+                    return "token";
+                  }
+                }));
     when(testDeviceHelper.isAppInstallFresh()).thenReturn(false);
     when(testDeviceHelper.isDeviceInTestMode()).thenReturn(false);
 
@@ -265,7 +272,7 @@ public void setUp() {
             .grpcClientModule(new GrpcClientModule(app))
             .testApiClientModule(
                 new TestApiClientModule(
-                    app, firebaseInstallations, testDeviceHelper, universalComponent.clock()));
+                    app, instanceId, testDeviceHelper, universalComponent.clock()));
     TestAppComponent appComponent = appComponentBuilder.build();
 
     instance = appComponent.providesFirebaseInAppMessaging();
@@ -705,7 +712,7 @@ public void logImpression_writesExpectedLogToEngagementMetrics()
             .setClientTimestampMillis(NOW)
             .setClientApp(
                 ClientAppInfo.newBuilder()
-                    .setFirebaseInstanceId(INSTANCE_ID)
+                    .setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
                     .setGoogleAppId(APP_ID))
             .setEventType(EventType.IMPRESSION_EVENT_TYPE)
             .build();
@@ -735,7 +742,7 @@ public void logAction_writesExpectedLogToEngagementMetrics()
             .setClientTimestampMillis(NOW)
             .setClientApp(
                 ClientAppInfo.newBuilder()
-                    .setFirebaseInstanceId(INSTANCE_ID)
+                    .setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
                     .setGoogleAppId(APP_ID))
             .setEventType(EventType.IMPRESSION_EVENT_TYPE)
             .build();
@@ -766,7 +773,7 @@ public void logRenderError_writesExpectedLogToEngagementMetrics()
             .setClientTimestampMillis(NOW)
             .setClientApp(
                 ClientAppInfo.newBuilder()
-                    .setFirebaseInstanceId(INSTANCE_ID)
+                    .setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
                     .setGoogleAppId(APP_ID))
             .setRenderErrorReason(RenderErrorReason.IMAGE_DISPLAY_ERROR)
             .build();
@@ -797,7 +804,7 @@ public void logDismiss_writesExpectedLogToEngagementMetrics()
             .setClientTimestampMillis(NOW)
             .setClientApp(
                 ClientAppInfo.newBuilder()
-                    .setFirebaseInstanceId(INSTANCE_ID)
+                    .setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
                     .setGoogleAppId(APP_ID))
             .setDismissType(DismissType.AUTO)
             .build();

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java

@@ -17,6 +17,7 @@
 import android.app.Application;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.events.Subscriber;
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.inappmessaging.internal.ApiClient;
 import com.google.firebase.inappmessaging.internal.DataCollectionHelper;
 import com.google.firebase.inappmessaging.internal.GrpcClient;
@@ -25,7 +26,6 @@
 import com.google.firebase.inappmessaging.internal.TestDeviceHelper;
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.internal.time.Clock;
-import com.google.firebase.installations.FirebaseInstallationsApi;
 import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
@@ -36,26 +36,26 @@
 public class TestApiClientModule {
 
   private final FirebaseApp firebaseApp;
-  private final FirebaseInstallationsApi firebaseInstallations;
+  private final FirebaseInstanceId firebaseInstanceId;
   private SharedPreferencesUtils sharedPreferencesUtils;
   private TestDeviceHelper testDeviceHelper;
   private Clock clock;
 
   public TestApiClientModule(
       FirebaseApp firebaseApp,
-      FirebaseInstallationsApi firebaseInstallations,
+      FirebaseInstanceId instanceId,
       TestDeviceHelper testDeviceHelper,
       Clock clock) {
     this.firebaseApp = firebaseApp;
-    this.firebaseInstallations = firebaseInstallations;
+    this.firebaseInstanceId = instanceId;
     this.testDeviceHelper = testDeviceHelper;
     this.sharedPreferencesUtils = new SharedPreferencesUtils(firebaseApp);
     this.clock = clock;
   }
 
   @Provides
-  FirebaseInstallationsApi providesFirebaseInstallations() {
-    return firebaseInstallations;
+  FirebaseInstanceId providesFirebaseInstanceId() {
+    return firebaseInstanceId;
   }
 
   @Provides
@@ -66,7 +66,8 @@ public FirebaseApp providesfirebaseApp() {
 
   @Provides
   DataCollectionHelper providesDataCollectionHelper(Subscriber firebaseEventSubscriber) {
-    return new DataCollectionHelper(firebaseApp, sharedPreferencesUtils, firebaseEventSubscriber);
+    return new DataCollectionHelper(
+        firebaseApp, sharedPreferencesUtils, firebaseInstanceId, firebaseEventSubscriber);
   }
 
   @Provides
@@ -85,7 +86,7 @@ ApiClient providesApiClient(
         grpcClient,
         firebaseApp,
         application,
-        firebaseInstallations,
+        firebaseInstanceId,
         dataCollectionHelper,
         clock,
         providerInstaller);

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java

@@ -16,12 +16,12 @@
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import com.google.firebase.inappmessaging.internal.MetricsLoggerClient;
 import com.google.firebase.inappmessaging.internal.MetricsLoggerClient.EngagementMetricsLoggerInterface;
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.internal.time.Clock;
-import com.google.firebase.installations.FirebaseInstallationsApi;
 import dagger.Module;
 import dagger.Provides;
 
@@ -39,15 +39,15 @@ public TestEngagementMetricsLoggerClientModule(
   @Provides
   @FirebaseAppScope
   public MetricsLoggerClient providesMetricLoggerClient(
-      FirebaseInstallationsApi firebaseInstallations,
+      FirebaseInstanceId firebaseInstanceId,
       AnalyticsConnector analyticsConnector,
       Clock clock,
       DeveloperListenerManager developerListenerManager) {
     return new MetricsLoggerClient(
         engagementMetricsLoggerInterface,
         analyticsConnector,
         firebaseApp,
-        firebaseInstallations,
+        firebaseInstanceId,
         clock,
         developerListenerManager);
   }

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessaging.java

@@ -19,6 +19,7 @@
 import com.google.android.gms.common.annotation.KeepForSdk;
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.inappmessaging.internal.DataCollectionHelper;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import com.google.firebase.inappmessaging.internal.DisplayCallbacksFactory;
@@ -28,7 +29,6 @@
 import com.google.firebase.inappmessaging.internal.injection.qualifiers.ProgrammaticTrigger;
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.model.TriggeredInAppMessage;
-import com.google.firebase.installations.FirebaseInstallationsApi;
 import io.reactivex.disposables.Disposable;
 import java.util.concurrent.Executor;
 import javax.inject.Inject;
@@ -47,7 +47,7 @@
  * </ul>
  *
  * <p>To delete the Instance ID and the data associated with it, see {@link
- * FirebaseInstallationsApi.#delete}.
+ * com.google.firebase.iid.FirebaseInstanceId#deleteInstanceId}.
  */
 @FirebaseAppScope
 public class FirebaseInAppMessaging {
@@ -56,7 +56,6 @@ public class FirebaseInAppMessaging {
   private final DataCollectionHelper dataCollectionHelper;
   private final DisplayCallbacksFactory displayCallbacksFactory;
   private final DeveloperListenerManager developerListenerManager;
-  private final FirebaseInstallationsApi firebaseInstallations;
   private final ProgramaticContextualTriggers programaticContextualTriggers;
 
   private boolean areMessagesSuppressed;
@@ -68,21 +67,18 @@ public class FirebaseInAppMessaging {
       InAppMessageStreamManager inAppMessageStreamManager,
       @ProgrammaticTrigger ProgramaticContextualTriggers programaticContextualTriggers,
       DataCollectionHelper dataCollectionHelper,
-      FirebaseInstallationsApi firebaseInstallations,
       DisplayCallbacksFactory displayCallbacksFactory,
       DeveloperListenerManager developerListenerManager) {
     this.inAppMessageStreamManager = inAppMessageStreamManager;
-    this.firebaseInstallations = firebaseInstallations;
     this.programaticContextualTriggers = programaticContextualTriggers;
     this.dataCollectionHelper = dataCollectionHelper;
     this.areMessagesSuppressed = false;
     this.displayCallbacksFactory = displayCallbacksFactory;
     this.developerListenerManager = developerListenerManager;
 
-    firebaseInstallations
-        .getId()
-        .addOnSuccessListener(
-            id -> Logging.logi("Starting InAppMessaging runtime with Installation ID " + id));
+    Logging.logi(
+        "Starting InAppMessaging runtime with Instance ID "
+            + FirebaseInstanceId.getInstance().getId());
 
     Disposable unused =
         inAppMessageStreamManager
@@ -118,8 +114,9 @@ public boolean isAutomaticDataCollectionEnabled() {
    *
    * <p>When enabled, generates a registration token on app startup if there is no valid one and
    * generates a new token when it is deleted (which prevents {@link
-   * FirebaseInstallationsApi.#delete} from stopping the periodic sending of data). This setting is
-   * persisted across app restarts and overrides the setting specified in your manifest.
+   * com.google.firebase.iid.FirebaseInstanceId#deleteInstanceId} from stopping the periodic sending
+   * of data). This setting is persisted across app restarts and overrides the setting specified in
+   * your manifest.
    *
    * <p>By default, auto-initialization is enabled. If you need to change the default, (for example,
    * because you want to prompt the user before generates/refreshes a registration token on app

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java

@@ -27,6 +27,7 @@
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
 import com.google.firebase.events.Subscriber;
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.inappmessaging.internal.AbtIntegrationHelper;
 import com.google.firebase.inappmessaging.internal.ProgramaticContextualTriggers;
 import com.google.firebase.inappmessaging.internal.injection.components.AppComponent;
@@ -39,7 +40,6 @@
 import com.google.firebase.inappmessaging.internal.injection.modules.ApplicationModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.GrpcClientModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProgrammaticContextualTriggerFlowableModule;
-import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
@@ -57,7 +57,7 @@ public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseInAppMessaging.class)
             .add(Dependency.required(Context.class))
-            .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.required(FirebaseInstanceId.class))
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(AbtComponent.class))
             .add(Dependency.optional(AnalyticsConnector.class))
@@ -71,7 +71,7 @@ public List<Component<?>> getComponents() {
 
   private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer container) {
     FirebaseApp firebaseApp = container.get(FirebaseApp.class);
-    FirebaseInstallationsApi firebaseInstallations = container.get(FirebaseInstallationsApi.class);
+    FirebaseInstanceId firebaseInstanceId = container.get(FirebaseInstanceId.class);
     AnalyticsConnector analyticsConnector = container.get(AnalyticsConnector.class);
     Subscriber firebaseEventsSubscriber = container.get(Subscriber.class);
 
@@ -96,7 +96,7 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
                         .get(AbtComponent.class)
                         .get(FirebaseABTesting.OriginService.INAPP_MESSAGING)))
             .apiClientModule(
-                new ApiClientModule(firebaseApp, firebaseInstallations, universalComponent.clock()))
+                new ApiClientModule(firebaseApp, firebaseInstanceId, universalComponent.clock()))
             .grpcClientModule(new GrpcClientModule(firebaseApp))
             .universalComponent(universalComponent)
             .transportFactory(container.get(TransportFactory.class))