etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for Google Suite accounts with external login

This commit is contained in:
jimbo1qaz 2018-09-29 05:03:55 -07:00 committed by Marvin W
parent 725926529a
commit 40974f806d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
View File

@ -85,6 +85,7 @@ public class LoginActivity extends AssistantActivity {
private static final String TAG = "GmsAuthLoginBrowser";
private static final String EMBEDDED_SETUP_URL = "https://accounts.google.com/EmbeddedSetup";
private static final String PROGRAMMATIC_AUTH_URL = "https://accounts.google.com/o/oauth2/programmatic_auth";
private static final String GOOGLE_SUITE_URL = "https://accounts.google.com/signin/continue";
private static final String MAGIC_USER_AGENT = " MinuteMaid";
private static final String COOKIE_OAUTH_TOKEN = "oauth_token";
@ -110,15 +111,27 @@ public class LoginActivity extends AssistantActivity {
@Override
public void onPageFinished(WebView view, String url) {
Log.d(TAG, "pageFinished: " + url);
if ("identifier".equals(Uri.parse(url).getFragment()))
Uri uri = Uri.parse(url);
// Begin login.
// UNUSED: uri=...#identifier never happens. if commented out, webView still appears!
if ("identifier".equals(uri.getFragment()))
runOnUiThread(new Runnable() {
@Override
public void run() {
webView.setVisibility(VISIBLE);
}
});
if ("close".equals(Uri.parse(url).getFragment()))
// Normal login.
if ("close".equals(uri.getFragment()))
closeWeb(false);
// Google Suite login.
if (url.startsWith(GOOGLE_SUITE_URL))
closeWeb(false);
// IDK when this is called.
if (url.startsWith(PROGRAMMATIC_AUTH_URL))
closeWeb(true);
}