From 2cd12cced60cdbae134f21835e83ddcd37b011d3 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sat, 5 Mar 2016 21:44:58 +0100 Subject: [PATCH] Hotfix for Google Login server changes --- .../java/org/microg/gms/auth/login/LoginActivity.java | 7 +++++++ proguard.flags | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index 45204966..03302c7f 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -100,6 +100,13 @@ 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())) + runOnUiThread(new Runnable() { + @Override + public void run() { + webView.setVisibility(VISIBLE); + } + }); if ("close".equals(Uri.parse(url).getFragment())) closeWeb(false); if (url.startsWith(PROGRAMMATIC_AUTH_URL)) diff --git a/proguard.flags b/proguard.flags index 9c6d08fd..add05b04 100644 --- a/proguard.flags +++ b/proguard.flags @@ -22,7 +22,13 @@ -keep public class com.google.android.gms.plus.plusone.PlusOneButtonCreatorImpl -keepclassmembers class com.google.android.gms.common.security.ProviderInstallerImpl { - public *; + public *; +} + +# Keep AutoSafeParcelables +-keep public class * extends org.microg.safeparcel.AutoSafeParcelable +-keepclassmembers public class * extends org.microg.safeparcel.AutoSafeParcelable { + @org.microg.safeparcel.SafeParceled *; } # Keep library info