Addressing ciaran's comment on satisfying immediate getId response.

Author: ankitaj224

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

@@ -189,7 +189,7 @@ private void triggerOnStateReached(PersistedFidEntry persistedFidEntry) {
       Iterator<StateListener> it = listeners.iterator();
       while (it.hasNext()) {
         StateListener l = it.next();
-        boolean doneListening = l.onStateReached(persistedFidEntry);
+        boolean doneListening = l.onStateReached(persistedFidEntry, shouldRefreshAuthToken);
         if (doneListening) {
           it.remove();
         }
@@ -208,18 +208,16 @@ private final void doRegistration() {
         persistedFidEntry = persistedFid.readPersistedFidEntryValue();
       }
 
-      // Always notify the GetIdListeners. For GetAuthTokenListeners, only notify if force
-      // refreshing auth token is not required.
-      synchronized (lock) {
-        if (!shouldRefreshAuthToken) {
-          triggerOnStateReached(persistedFidEntry);
-        }
-      }
+      triggerOnStateReached(persistedFidEntry);
 
       // FID needs to be registered
       if (persistedFidEntry.isUnregistered()) {
         registerAndSaveFid(persistedFidEntry);
         persistedFidEntry = persistedFid.readPersistedFidEntryValue();
+        // Newly registered Fid will have valid auth token. No refresh required.
+        synchronized (lock) {
+          shouldRefreshAuthToken = false;
+        }
       }
 
       // Don't notify the listeners at this point; we might as well make ure the auth token is up
@@ -235,10 +233,10 @@ private final void doRegistration() {
       // Refresh Auth token if needed
       if (needRefresh) {
         fetchAuthTokenFromServer(persistedFidEntry);
+        persistedFidEntry = persistedFid.readPersistedFidEntryValue();
         synchronized (lock) {
           shouldRefreshAuthToken = false;
         }
-        persistedFidEntry = persistedFid.readPersistedFidEntryValue();
       }
 
       triggerOnStateReached(persistedFidEntry);

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

@@ -28,9 +28,12 @@ public GetAuthTokenListener(
   }
 
   @Override
-  public boolean onStateReached(PersistedFidEntry persistedFidEntry) {
+  public boolean onStateReached(
+      PersistedFidEntry persistedFidEntry, boolean shouldRefreshAuthToken) {
     // AuthTokenListener state is reached when FID is registered and has a valid auth token
-    if (persistedFidEntry.isRegistered() && !utils.isAuthTokenExpired(persistedFidEntry)) {
+    if (persistedFidEntry.isRegistered()
+        && !utils.isAuthTokenExpired(persistedFidEntry)
+        && !shouldRefreshAuthToken) {
       resultTaskCompletionSource.setResult(
           InstallationTokenResult.builder()
               .setToken(persistedFidEntry.getAuthToken())

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

@@ -25,7 +25,7 @@ public GetIdListener(TaskCompletionSource<String> taskCompletionSource) {
   }
 
   @Override
-  public boolean onStateReached(PersistedFidEntry persistedFidEntry) {
+  public boolean onStateReached(PersistedFidEntry persistedFidEntry, boolean unused) {
     if (persistedFidEntry.isUnregistered() || persistedFidEntry.isRegistered()) {
       taskCompletionSource.setResult(persistedFidEntry.getFirebaseInstallationId());
       return true;

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

@@ -17,5 +17,5 @@
 import com.google.firebase.installations.local.PersistedFidEntry;
 
 interface StateListener {
-  boolean onStateReached(PersistedFidEntry persistedFidEntry);
+  boolean onStateReached(PersistedFidEntry persistedFidEntry, boolean shouldRefreshAuthToken);
 }