Skip to content

Commit 77754bb

Browse files
committed
Fixing the sdk version and addressing comments from #1099.
1 parent ce65aa2 commit 77754bb

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=17.1.1
1+
version=17.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=17.1.1
1+
version=17.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private PersistedInstallationEntry registerFidWithServer(PersistedInstallationEn
353353
// Note: Default value of instanceIdMigrationAuth: null
354354
String iidToken = null;
355355

356-
if (prefs.getFirebaseInstallationId().equals(iidStore.readIid())) {
356+
if (prefs.getFirebaseInstallationId().length() == 11) {
357357
// For a default firebase installation, read the stored star scoped iid token. This token
358358
// will be used for authenticating Instance-ID when migrating to FIS.
359359
iidToken = iidStore.readToken();

firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import static android.content.ContentValues.TAG;
1818
import static com.google.android.gms.common.internal.Preconditions.checkArgument;
19+
import static com.google.firebase.installations.BuildConfig.VERSION_NAME;
1920

2021
import android.content.Context;
2122
import android.content.pm.PackageManager;
@@ -176,7 +177,7 @@ private static JSONObject buildCreateFirebaseInstallationRequestBody(String fid,
176177
firebaseInstallationData.put("fid", fid);
177178
firebaseInstallationData.put("appId", appId);
178179
firebaseInstallationData.put("authVersion", FIREBASE_INSTALLATION_AUTH_VERSION);
179-
firebaseInstallationData.put("sdkVersion", "a:1.0.0");
180+
firebaseInstallationData.put("sdkVersion", "a:" + VERSION_NAME);
180181
return firebaseInstallationData;
181182
}
182183

firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class FirebaseInstallationsTest {
9090

9191
public static final String TEST_INSTANCE_ID_1 = "ccccccccccc";
9292

93-
public static final String TEST_INSTANCE_ID_TOKEN_1 = "iid.token";
93+
public static final String TEST_INSTANCE_ID_TOKEN_1 = "iid:token";
9494

9595
public static final InstallationResponse TEST_INSTALLATION_RESPONSE =
9696
InstallationResponse.builder()

0 commit comments

Comments
 (0)