Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47d14fb9 authored by Ramswaroop Ghanshyam Somani's avatar Ramswaroop Ghanshyam Somani Committed by Ed Carrigan
Browse files

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
(cherry picked from commit 620a025c)
parent d9c0692a

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -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();

    }