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

Initial work for programmatic auth, might fix #28

This commit is contained in:
mar-v-in 2015-10-06 18:41:06 +02:00
parent b92c4d2417
commit fcda44b257
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ public class LoginActivity extends AssistantActivity {
private static final String TAG = "GmsAuthLoginBrowser"; private static final String TAG = "GmsAuthLoginBrowser";
private static final String EMBEDDED_SETUP_URL = "https://accounts.google.com/EmbeddedSetup"; 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 MAGIC_USER_AGENT = " MinuteMaid"; private static final String MAGIC_USER_AGENT = " MinuteMaid";
private static final String COOKIE_OAUTH_TOKEN = "oauth_token"; private static final String COOKIE_OAUTH_TOKEN = "oauth_token";
@ -99,7 +100,9 @@ public class LoginActivity extends AssistantActivity {
public void onPageFinished(WebView view, String url) { public void onPageFinished(WebView view, String url) {
Log.d(TAG, "pageFinished: " + url); Log.d(TAG, "pageFinished: " + url);
if ("close".equals(Uri.parse(url).getFragment())) if ("close".equals(Uri.parse(url).getFragment()))
closeWeb(); closeWeb(false);
if (url.startsWith(PROGRAMMATIC_AUTH_URL))
closeWeb(true);
} }
}); });
if (getIntent().hasExtra(EXTRA_TOKEN)) { if (getIntent().hasExtra(EXTRA_TOKEN)) {
@ -202,7 +205,7 @@ public class LoginActivity extends AssistantActivity {
webView.loadUrl(buildUrl(tmpl, Utils.getLocale(this))); webView.loadUrl(buildUrl(tmpl, Utils.getLocale(this)));
} }
private void closeWeb() { private void closeWeb(boolean programmaticAuth) {
setMessage(R.string.auth_finalize); setMessage(R.string.auth_finalize);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
@ -210,7 +213,7 @@ public class LoginActivity extends AssistantActivity {
webView.setVisibility(INVISIBLE); webView.setVisibility(INVISIBLE);
} }
}); });
String cookies = CookieManager.getInstance().getCookie(EMBEDDED_SETUP_URL); String cookies = CookieManager.getInstance().getCookie(programmaticAuth ? PROGRAMMATIC_AUTH_URL : EMBEDDED_SETUP_URL);
String[] temp = cookies.split(";"); String[] temp = cookies.split(";");
for (String ar1 : temp) { for (String ar1 : temp) {
if (ar1.trim().startsWith(COOKIE_OAUTH_TOKEN + "=")) { if (ar1.trim().startsWith(COOKIE_OAUTH_TOKEN + "=")) {