Skip to content

Commit 8e65eae

Browse files
authored
Merging changes into fis_sdk (#910)
* Fixing FISClient to correctly parse expiration timestamp. (#848) * Updating getAuthToken to return creation timestamp (#884) * Propagating the exceptions to the clients. (#856) * Extract FID from FIS createInstallation response (#888) * Addressing Rayo's comment: Rename PersistedFidEntry to (#899) * Implementing retry once for FIS Client. (#895) * Simplifying FirebaseInstallations class by adding listeners. (#847) * Fixing FISClient to correctly parse expiration timestamp. (#848) * Updating getAuthToken to return creation timestamp (#884) * Propagating the exceptions to the clients. (#856)
1 parent 12ae11d commit 8e65eae

15 files changed

+475
-449
lines changed

firebase-installations/api.txt

Lines changed: 30 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,45 @@ package com.google.firebase.installations {
2525

2626
package com.google.firebase.installations.local {
2727

28-
public class PersistedFid {
29-
ctor public PersistedFid(@NonNull FirebaseApp);
28+
public class PersistedInstallation {
29+
ctor public PersistedInstallation(@NonNull FirebaseApp);
3030
method @NonNull public boolean clear();
31-
method @NonNull public boolean insertOrUpdatePersistedFidEntry(@NonNull com.google.firebase.installations.local.PersistedFidEntry);
32-
method @NonNull public com.google.firebase.installations.local.PersistedFidEntry readPersistedFidEntryValue();
31+
method @NonNull public boolean insertOrUpdatePersistedInstallationEntry(@NonNull com.google.firebase.installations.local.PersistedInstallationEntry);
32+
method @NonNull public com.google.firebase.installations.local.PersistedInstallationEntry readPersistedInstallationEntryValue();
3333
}
3434

35-
public enum PersistedFid.RegistrationStatus {
36-
enum_constant public static final com.google.firebase.installations.local.PersistedFid.RegistrationStatus NOT_GENERATED;
37-
enum_constant public static final com.google.firebase.installations.local.PersistedFid.RegistrationStatus REGISTERED;
38-
enum_constant public static final com.google.firebase.installations.local.PersistedFid.RegistrationStatus REGISTER_ERROR;
39-
enum_constant public static final com.google.firebase.installations.local.PersistedFid.RegistrationStatus UNREGISTERED;
35+
public enum PersistedInstallation.RegistrationStatus {
36+
enum_constant public static final com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus NOT_GENERATED;
37+
enum_constant public static final com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus REGISTERED;
38+
enum_constant public static final com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus REGISTER_ERROR;
39+
enum_constant public static final com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus UNREGISTERED;
4040
}
4141

42-
public abstract class PersistedFidEntry {
43-
ctor public PersistedFidEntry();
44-
method @NonNull public static com.google.firebase.installations.local.PersistedFidEntry.Builder builder();
42+
public abstract class PersistedInstallationEntry {
43+
ctor public PersistedInstallationEntry();
44+
method @NonNull public static com.google.firebase.installations.local.PersistedInstallationEntry.Builder builder();
4545
method @Nullable public abstract String getAuthToken();
4646
method public abstract long getExpiresInSecs();
4747
method @Nullable public abstract String getFirebaseInstallationId();
4848
method @Nullable public abstract String getRefreshToken();
49-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFid.RegistrationStatus getRegistrationStatus();
49+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus getRegistrationStatus();
5050
method public abstract long getTokenCreationEpochInSecs();
5151
method public boolean isErrored();
5252
method public boolean isNotGenerated();
5353
method public boolean isRegistered();
5454
method public boolean isUnregistered();
55-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder toBuilder();
55+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder toBuilder();
5656
}
5757

58-
public abstract static class PersistedFidEntry.Builder {
59-
ctor public PersistedFidEntry.Builder();
60-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry build();
61-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setAuthToken(@Nullable String);
62-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setExpiresInSecs(long);
63-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setFirebaseInstallationId(@NonNull String);
64-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setRefreshToken(@Nullable String);
65-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setRegistrationStatus(@NonNull com.google.firebase.installations.local.PersistedFid.RegistrationStatus);
66-
method @NonNull public abstract com.google.firebase.installations.local.PersistedFidEntry.Builder setTokenCreationEpochInSecs(long);
58+
public abstract static class PersistedInstallationEntry.Builder {
59+
ctor public PersistedInstallationEntry.Builder();
60+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry build();
61+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setAuthToken(@Nullable String);
62+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setExpiresInSecs(long);
63+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setFirebaseInstallationId(@NonNull String);
64+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setRefreshToken(@Nullable String);
65+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setRegistrationStatus(@NonNull com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus);
66+
method @NonNull public abstract com.google.firebase.installations.local.PersistedInstallationEntry.Builder setTokenCreationEpochInSecs(long);
6767
}
6868

6969
}
@@ -72,39 +72,28 @@ package com.google.firebase.installations.remote {
7272

7373
public class FirebaseInstallationServiceClient {
7474
ctor public FirebaseInstallationServiceClient(@NonNull Context);
75-
method @NonNull public com.google.firebase.installations.remote.InstallationResponse createFirebaseInstallation(@NonNull String, @NonNull String, @NonNull String, @NonNull String) throws com.google.firebase.installations.remote.FirebaseInstallationServiceException;
76-
method @NonNull public void deleteFirebaseInstallation(@NonNull String, @NonNull String, @NonNull String, @NonNull String) throws com.google.firebase.installations.remote.FirebaseInstallationServiceException;
77-
method @NonNull public InstallationTokenResult generateAuthToken(@NonNull String, @NonNull String, @NonNull String, @NonNull String) throws com.google.firebase.installations.remote.FirebaseInstallationServiceException;
78-
}
79-
80-
public class FirebaseInstallationServiceException {
81-
ctor public FirebaseInstallationServiceException(@NonNull com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status);
82-
ctor public FirebaseInstallationServiceException(@NonNull String, @NonNull com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status);
83-
ctor public FirebaseInstallationServiceException(@NonNull String, @NonNull com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status, @NonNull Throwable);
84-
method @NonNull public com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status getStatus();
85-
}
86-
87-
public enum FirebaseInstallationServiceException.Status {
88-
enum_constant public static final com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status NETWORK_ERROR;
89-
enum_constant public static final com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status SERVER_ERROR;
90-
enum_constant public static final com.google.firebase.installations.remote.FirebaseInstallationServiceException.Status UNAUTHORIZED;
75+
method @NonNull public com.google.firebase.installations.remote.InstallationResponse createFirebaseInstallation(@NonNull String, @NonNull String, @NonNull String, @NonNull String);
76+
method @NonNull public void deleteFirebaseInstallation(@NonNull String, @NonNull String, @NonNull String, @NonNull String);
77+
method @NonNull public InstallationTokenResult generateAuthToken(@NonNull String, @NonNull String, @NonNull String, @NonNull String);
9178
}
9279

9380
public abstract class InstallationResponse {
9481
ctor public InstallationResponse();
9582
method @NonNull public static com.google.firebase.installations.remote.InstallationResponse.Builder builder();
9683
method @NonNull public abstract InstallationTokenResult getAuthToken();
97-
method @NonNull public abstract String getName();
84+
method @NonNull public abstract String getFid();
9885
method @NonNull public abstract String getRefreshToken();
86+
method @NonNull public abstract String getUri();
9987
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder toBuilder();
10088
}
10189

10290
public abstract static class InstallationResponse.Builder {
10391
ctor public InstallationResponse.Builder();
10492
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse build();
10593
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder setAuthToken(@NonNull InstallationTokenResult);
106-
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder setName(@NonNull String);
94+
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder setFid(@NonNull String);
10795
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder setRefreshToken(@NonNull String);
96+
method @NonNull public abstract com.google.firebase.installations.remote.InstallationResponse.Builder setUri(@NonNull String);
10897
}
10998

11099
}

0 commit comments

Comments
 (0)