Skip to content

Commit e6df194

Browse files
committed
Inline fetchTokenResultFromProvider.
1 parent de4fdf4 commit e6df194

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -161,23 +161,6 @@ public Task<AppCheckTokenResult> getToken(boolean forceRefresh) {
161161
new FirebaseException("No AppCheckProvider installed.")));
162162
}
163163
// TODO: Cache the in-flight task.
164-
return fetchTokenResultFromProvider();
165-
}
166-
167-
@NonNull
168-
@Override
169-
public Task<AppCheckToken> getAppCheckToken(boolean forceRefresh) {
170-
if (!forceRefresh && hasValidToken()) {
171-
return Tasks.forResult(cachedToken);
172-
}
173-
if (appCheckProvider == null) {
174-
return Tasks.forException(new FirebaseException("No AppCheckProvider installed."));
175-
}
176-
return fetchTokenFromProvider();
177-
}
178-
179-
/** Fetches an {@link AppCheckTokenResult} via the installed {@link AppCheckProvider}. */
180-
Task<AppCheckTokenResult> fetchTokenResultFromProvider() {
181164
return fetchTokenFromProvider()
182165
.continueWithTask(
183166
new Continuation<AppCheckToken, Task<AppCheckTokenResult>>() {
@@ -197,6 +180,18 @@ public Task<AppCheckTokenResult> then(@NonNull Task<AppCheckToken> task) {
197180
});
198181
}
199182

183+
@NonNull
184+
@Override
185+
public Task<AppCheckToken> getAppCheckToken(boolean forceRefresh) {
186+
if (!forceRefresh && hasValidToken()) {
187+
return Tasks.forResult(cachedToken);
188+
}
189+
if (appCheckProvider == null) {
190+
return Tasks.forException(new FirebaseException("No AppCheckProvider installed."));
191+
}
192+
return fetchTokenFromProvider();
193+
}
194+
200195
/** Fetches an {@link AppCheckToken} via the installed {@link AppCheckProvider}. */
201196
Task<AppCheckToken> fetchTokenFromProvider() {
202197
return appCheckProvider

0 commit comments

Comments
 (0)