Merge branch 'iid-migration' of github.com:firebase/firebase-android-sdk into fix_error

Author: ankitaj224

firebase-installations/api.txt

@@ -26,7 +26,7 @@ package com.google.firebase.installations {
 package com.google.firebase.installations.local {
 
   public class IidStore {
-    ctor public IidStore(@NonNull FirebaseApp);
+    ctor public IidStore();
     method @Nullable public String readIid();
   }
 

firebase-installations/src/androidTest/java/com/google/firebase/installations/FirebaseInstallationsInstrumentedTest.java

@@ -226,7 +226,8 @@ public void testGetId_PersistedInstallationOk_BackendOk() throws Exception {
         persistedInstallation.readPersistedInstallationEntryValue();
     assertThat(entryValue).hasFid(TEST_FID_1);
 
-    // Waiting for Task that registers FID on the FIS Servers
+    // getId() returns fid immediately but registers fid asynchronously.  Waiting for half a second
+    // while we mock fid registration. We dont send an actual request to FIS in tests.
     executor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     PersistedInstallationEntry updatedInstallationEntry =

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

@@ -74,7 +74,7 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
         new FirebaseInstallationServiceClient(firebaseApp.getApplicationContext()),
         new PersistedInstallation(firebaseApp),
         new Utils(DefaultClock.getInstance()),
-        new IidStore(firebaseApp));
+        new IidStore());
   }
 
   FirebaseInstallations(
@@ -226,11 +226,9 @@ private final void doRegistration() {
       // New FID needs to be created
       if (persistedInstallationEntry.isNotGenerated()) {
 
-        // Read the existing iid for this firebase installation
-        String fid = iidStore.readIid();
-        if (fid == null) {
-          fid = utils.createRandomFid();
-        }
+        // For a default firebase installation read the existing iid. For other custom firebase
+        // installations create a new fid
+        String fid = readExistingIidOrCreateFid();
         persistFid(fid);
         persistedInstallationEntry = persistedInstallation.readPersistedInstallationEntryValue();
       }
@@ -287,6 +285,19 @@ private final void doRegistration() {
     }
   }
 
+  private String readExistingIidOrCreateFid() {
+    // Check if this firebase app is the default (first initialized) instance
+    if (!firebaseApp.equals(FirebaseApp.getInstance())) {
+      return utils.createRandomFid();
+    }
+    // For a default firebase installation, read the existing iid from shared prefs
+    String fid = iidStore.readIid();
+    if (fid == null) {
+      fid = utils.createRandomFid();
+    }
+    return fid;
+  }
+
   private void persistFid(String fid) throws FirebaseInstallationsException {
     boolean firstUpdateCacheResult =
         persistedInstallation.insertOrUpdatePersistedInstallationEntry(

firebase-installations/src/main/java/com/google/firebase/installations/local/IidStore.java

@@ -31,6 +31,9 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 
+/**
+ * Read existing iid only for default (first initialized) instance of this firebase application.*
+ */
 public class IidStore {
   private static final String IID_SHARED_PREFS_NAME = "com.google.android.gms.appid";
   private static final String STORE_KEY_PUB = "|S||P|";
@@ -39,11 +42,11 @@ public class IidStore {
   @GuardedBy("iidPrefs")
   private final SharedPreferences iidPrefs;
 
-  public IidStore(@NonNull FirebaseApp firebaseApp) {
+  public IidStore() {
     // Different FirebaseApp in the same Android application should have the same application
     // context and same dir path. We only read existing Iids for the default firebase application.
     iidPrefs =
-        firebaseApp
+        FirebaseApp.getInstance()
             .getApplicationContext()
             .getSharedPreferences(IID_SHARED_PREFS_NAME, Context.MODE_PRIVATE);
   }
@@ -57,23 +60,39 @@ public String readIid() {
 
       // If such a version was used by this App-Instance, we can directly read the existing
       // Instance-ID from storage and return it
-      String id = iidPrefs.getString(STORE_KEY_ID, /* defaultValue= */ null);
+      String id = readInstanceIdFromLocalStorage();
 
       if (id != null) {
         return id;
       }
 
       // If this App-Instance did not store the Instance-ID in local storage, we may be able to find
       // its Public-Key in order to calculate the App-Instance's Instance-ID.
+      return readPublicKeyFromLocalStorageAndCalculateInstanceId();
+    }
+  }
+
+  @Nullable
+  private String readInstanceIdFromLocalStorage() {
+    synchronized (iidPrefs) {
+      return iidPrefs.getString(STORE_KEY_ID, /* defaultValue= */ null);
+    }
+  }
+
+  @Nullable
+  private String readPublicKeyFromLocalStorageAndCalculateInstanceId() {
+    synchronized (iidPrefs) {
       String base64PublicKey = iidPrefs.getString(STORE_KEY_PUB, /* defaultValue= */ null);
-      if (base64PublicKey != null) {
-        PublicKey publicKey = parseKey(base64PublicKey);
-        if (publicKey != null) {
-          return getIdFromPublicKey(publicKey);
-        }
+      if (base64PublicKey == null) {
+        return null;
+      }
+
+      PublicKey publicKey = parseKey(base64PublicKey);
+      if (publicKey == null) {
+        return null;
       }
 
-      return null;
+      return getIdFromPublicKey(publicKey);
     }
   }