fixed the problem that Chai - Chat with AI Friends cannot log in using google
This commit is contained in:
parent
c2ecb9d413
commit
3a053b0186
1 changed files with 7 additions and 0 deletions
|
|
@ -109,7 +109,14 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub {
|
|||
packageName = PackageUtils.getAndCheckCallingPackage(context, packageName, extras.getInt(KEY_CALLER_UID, 0), extras.getInt(KEY_CALLER_PID, 0));
|
||||
boolean notify = extras.getBoolean(KEY_HANDLE_NOTIFICATION, false);
|
||||
|
||||
<<<<<<< HEAD
|
||||
Log.d(TAG, "getToken: account:" + account.name + " scope:" + scope + " extras:" + extras + ", notify: " + notify);
|
||||
=======
|
||||
scope = Objects.equals(AuthConstants.SCOPE_OAUTH2, scope) ? AuthConstants.SCOPE_EM_OP_PRO : scope;
|
||||
|
||||
if (!AuthConstants.SCOPE_GET_ACCOUNT_ID.equals(scope))
|
||||
Log.d(TAG, "getToken: account:" + account.name + " scope:" + scope + " extras:" + extras + ", notify: " + notify);
|
||||
>>>>>>> ac460e96 (fixed the problem that Chai - Chat with AI Friends cannot log in using google)
|
||||
|
||||
scope = Objects.equals(AuthConstants.SCOPE_OAUTH2, scope) ? AuthConstants.SCOPE_EM_OP_PRO : scope;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue