From 620a025c1bfdad254616d223c83cfa232988d0b7 Mon Sep 17 00:00:00 2001 From: Ramswaroop Ghanshyam Somani Date: Fri, 19 Feb 2016 17:03:25 -0800 Subject: Make CaptivePortalLoginActivity compatible with setupwizard. Cyanogenmod setupwizard sends a token to validate when the result is sent. Handle this token. Issue-id: CYNGNOS-2048 Change-Id: I7b76e0df32288bf2efd60c495d6e726065353435 --- .../com/android/captiveportallogin/CaptivePortalLoginActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages/CaptivePortalLogin') diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index ed95bff..ed9c111 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -76,6 +76,7 @@ public class CaptivePortalLoginActivity extends Activity { private ConnectivityManager mCm; private boolean mLaunchBrowser = false; private MyWebViewClient mWebViewClient; + private String mResponseToken; @Override protected void onCreate(Bundle savedInstanceState) { @@ -92,6 +93,7 @@ public class CaptivePortalLoginActivity extends Activity { setResult(Activity.RESULT_CANCELED); done(Result.WANTED_AS_IS); } + mResponseToken = getIntent().getStringExtra(Intent.EXTRA_TEXT); mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK); mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL); @@ -196,7 +198,9 @@ public class CaptivePortalLoginActivity extends Activity { mCaptivePortal.useNetwork(); break; } - setResult(Activity.RESULT_OK); + Intent intent = new Intent(); + intent.putExtra(Intent.EXTRA_TEXT, mResponseToken); + setResult(Activity.RESULT_OK, intent); finish(); } -- cgit v1.1