Addressing Rayo's comments.

Author: ankitaj224

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

@@ -67,7 +67,8 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
   private final Object lock = new Object();
   private final ExecutorService backgroundExecutor;
   private final ExecutorService networkExecutor;
-
+  /* FID of this Firebase Installations instance. Cached after successfully registering and
+  persisting the FID locally. NOTE: cachedFid resets if FID is deleted.*/
   private String cachedFid = null;
 
   @GuardedBy("lock")
@@ -217,11 +218,7 @@ String getName() {
   public Task<String> getId() {
     preConditionChecks();
     TaskCompletionSource<String> taskCompletionSource = new TaskCompletionSource<>();
-    if (cachedFid != null) {
-      taskCompletionSource.trySetResult(cachedFid);
-    } else {
-      taskCompletionSource.trySetResult(doGetId());
-    }
+    taskCompletionSource.trySetResult(doGetId());
     return taskCompletionSource.getTask();
   }
 
@@ -290,6 +287,9 @@ private void triggerOnException(PersistedInstallationEntry prefs, Exception exce
   }
 
   private String doGetId() {
+    if (cachedFid != null) {
+      return cachedFid;
+    }
     PersistedInstallationEntry prefs = getPrefsWithGeneratedIdMultiProcessSafe();
     // Execute network calls (CreateInstallations) to the FIS Servers on a separate executor
     // i.e networkExecutor
@@ -343,6 +343,11 @@ private void doNetworkCall(boolean forceRefresh) {
     // Store the prefs to persist the result of the previous step.
     insertOrUpdatePrefs(prefs);
 
+    // Update cachedFID, if FID is successfully REGISTERED and persisted.
+    if (prefs.isRegistered()) {
+      cachedFid = prefs.getFirebaseInstallationId();
+    }
+
     // Let the caller know about the result.
     if (prefs.isErrored()) {
       triggerOnException(prefs, new FirebaseInstallationsException(Status.BAD_CONFIG));
@@ -460,7 +465,6 @@ private PersistedInstallationEntry registerFidWithServer(PersistedInstallationEn
 
     switch (response.getResponseCode()) {
       case OK:
-        cachedFid = response.getFid();
         return prefs.withRegisteredFid(
             response.getFid(),
             response.getRefreshToken(),
@@ -512,6 +516,7 @@ private PersistedInstallationEntry fetchAuthTokenFromServer(
    * storage.
    */
   private Void deleteFirebaseInstallationId() throws FirebaseInstallationsException, IOException {
+    cachedFid = null;
     PersistedInstallationEntry entry = getMultiProcessSafePrefs();
     if (entry.isRegistered()) {
       // Call the FIS servers to delete this Firebase Installation Id.
@@ -527,7 +532,6 @@ private Void deleteFirebaseInstallationId() throws FirebaseInstallationsExceptio
             "Failed to delete a Firebase Installation.", Status.BAD_CONFIG);
       }
     }
-    cachedFid = null;
     insertOrUpdatePrefs(entry.withNoGeneratedFid());
     return null;
   }