ADHOC
/
replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: Modify intent for CaptivePortalLogin 

Issue-id: CYNGNOS-2048

Change-Id: I6e9b0ab56c59013aa1bf4d47de2a222c938d53b2
This commit is contained in:
cretin45 2016-02-26 12:15:00 -08:00
parent 01e57cdf28
commit ca63326151
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
View File

@ -19,11 +19,11 @@ package com.cyanogenmod.setupwizard.setup;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityOptions; import android.app.ActivityOptions;
import android.app.FragmentManager; import android.app.FragmentManager;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.CaptivePortal;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Uri; import android.net.ICaptivePortal;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.provider.Settings; import android.provider.Settings;
@ -64,15 +64,18 @@ public class WifiSetupPage extends SetupPage {
public void run() { public void run() {
if (mIsCaptivePortal) { if (mIsCaptivePortal) {
try { try {
int netId = ConnectivityManager.from(mContext)
.getNetworkForType(ConnectivityManager.TYPE_WIFI).netId;
mResponseToken = String.valueOf(new Random().nextLong()); mResponseToken = String.valueOf(new Random().nextLong());
Intent intent = new Intent(); final Intent intent = new Intent(
intent.setData(Uri.fromParts("netid", Integer.toString(netId), ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN);
mResponseToken)); intent.putExtra(Intent.EXTRA_TEXT, mResponseToken);
intent.setComponent(new ComponentName("com.android.captiveportallogin", intent.putExtra(ConnectivityManager.EXTRA_NETWORK,
"com.android.captiveportallogin.CaptivePortalLoginActivity")); ConnectivityManager.from(mContext)
intent.putExtra(Intent.EXTRA_TEXT, String.valueOf(netId)); .getNetworkForType(ConnectivityManager.TYPE_WIFI));
intent.putExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL,
new CaptivePortal(new ICaptivePortal.Stub() {
@Override
public void appResponse(int response) {}
}));
intent.putExtra("status_bar_color", intent.putExtra("status_bar_color",
mContext.getResources().getColor(R.color.primary_dark)); mContext.getResources().getColor(R.color.primary_dark));
intent.putExtra("action_bar_color", mContext.getResources().getColor( intent.putExtra("action_bar_color", mContext.getResources().getColor(