etc/VancedMicroG
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedMicroG synced 2024-11-14 15:05:06 +00:00
Code Issues Projects Releases Wiki Activity

Auth: Do not try to get token for non-existing accounts

Browse source
This commit is contained in:
Marvin W 2020-12-05 10:03:22 +01:00
parent 5e39818a20
commit eaef4bc151
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
View file

@ -124,6 +124,13 @@ public class AuthManager {
getAccountManager().setUserData(getAccount(), key, value);
}
public boolean accountExists() {
for (Account refAccount : getAccountManager().getAccountsByType(accountType)) {
if (refAccount.name.equalsIgnoreCase(accountName)) return true;
}
return false;
}
public String peekAuthToken() {
Log.d(TAG, "peekAuthToken: " + buildTokenKey());
return getAccountManager().peekAuthToken(getAccount(), buildTokenKey());

4
play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
View file

@ -93,6 +93,10 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub {
Bundle result = new Bundle();
result.putString(KEY_ACCOUNT_NAME, accountName);
result.putString(KEY_ACCOUNT_TYPE, authManager.getAccountType());
if (!authManager.accountExists()) {
result.putString(KEY_ERROR, "NetworkError");
return result;
}
try {
AuthResponse res = authManager.requestAuth(false);
if (res.auth != null) {