From 165bb023768427b2072de3204e5d101a714dfe6a Mon Sep 17 00:00:00 2001 From: Ecco Park Date: Tue, 2 Apr 2019 13:23:29 -0700 Subject: [PATCH] Osu-Login: show Sign-up failed message only for sign-up failed. It still shows up even if the OSU procedure is successful. Bug: 129356108 Test: tested with R2 AP for the failure case and success case. Change-Id: I705532c00a3523fd0778499ec9b460dd392c6636 Signed-off-by: Ecco Park --- .../src/com/android/hotspot2/osu/OsuLoginActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/OsuLogin/src/com/android/hotspot2/osu/OsuLoginActivity.java b/packages/OsuLogin/src/com/android/hotspot2/osu/OsuLoginActivity.java index 416894b23a2a1..3a994d741956b 100644 --- a/packages/OsuLogin/src/com/android/hotspot2/osu/OsuLoginActivity.java +++ b/packages/OsuLogin/src/com/android/hotspot2/osu/OsuLoginActivity.java @@ -64,6 +64,7 @@ public class OsuLoginActivity extends Activity { private SwipeRefreshLayout mSwipeRefreshLayout; private ProgressBar mProgressBar; private boolean mForceDisconnect = true; + boolean mRedirectResponseReceived = false; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -142,7 +143,9 @@ public class OsuLoginActivity extends Activity { Log.d(TAG, "Lost for the current Network, close the browser"); } mForceDisconnect = false; // It is already disconnected. - showSignUpFailedToast(); + if (!mRedirectResponseReceived) { + showSignUpFailedToast(); + } if (mNetwork.equals(network)) { finishAndRemoveTask(); } @@ -238,7 +241,6 @@ public class OsuLoginActivity extends Activity { private class OsuWebViewClient extends WebViewClient { boolean mPageError = false; - boolean mRedirectResponseReceived = false; @Override public void onPageStarted(WebView view, String urlString, Bitmap favicon) {