Reading iid store only for default firebase app

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/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

@@ -39,11 +39,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);
   }