PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VpnSettings: slightly more robust callback context

Browse Source 
Test: runtest -x com/android/settings/vpn2/VpnTests.java
Change-Id: I45fa0509c56211602f6abd55a2f44cdf76f28829
This commit is contained in:
Robin Lee
2016-11-04 15:48:44 +00:00
parent 393857be9c
commit 4f0a0d0a40
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -55,6 +55,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface( private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE)); ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
private Context mContext;
private boolean mUnlocking = false; private boolean mUnlocking = false;
@@ -78,6 +79,12 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
frag.show(parent.getFragmentManager(), TAG_CONFIG_DIALOG); frag.show(parent.getFragmentManager(), TAG_CONFIG_DIALOG);
} }
@Override
public void onAttach(final Context context) {
super.onAttach(context);
mContext = context;
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@@ -86,7 +93,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
if (!KeyStore.getInstance().isUnlocked()) { if (!KeyStore.getInstance().isUnlocked()) {
if (!mUnlocking) { if (!mUnlocking) {
// Let us unlock KeyStore. See you later! // Let us unlock KeyStore. See you later!
Credentials.getInstance().unlock(getActivity()); Credentials.getInstance().unlock(mContext);
} else { } else {
// We already tried, but it is still not working! // We already tried, but it is still not working!
dismiss(); dismiss();
@@ -142,9 +149,9 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
// Possibly throw up a dialog to explain lockdown VPN. // Possibly throw up a dialog to explain lockdown VPN.
final boolean shouldLockdown = dialog.isVpnAlwaysOn(); final boolean shouldLockdown = dialog.isVpnAlwaysOn();
final boolean shouldConnect = shouldLockdown || !dialog.isEditing(); final boolean shouldConnect = shouldLockdown || !dialog.isEditing();
final boolean wasAlwaysOn = VpnUtils.isAlwaysOnOrLegacyLockdownActive(getContext()); final boolean wasAlwaysOn = VpnUtils.isAlwaysOnOrLegacyLockdownActive(mContext);
try { try {
final boolean replace = VpnUtils.isVpnActive(getContext()); final boolean replace = VpnUtils.isVpnActive(mContext);
if (shouldConnect && !isConnected(profile) && if (shouldConnect && !isConnected(profile) &&
ConfirmLockdownFragment.shouldShow(replace, wasAlwaysOn, shouldLockdown)) { ConfirmLockdownFragment.shouldShow(replace, wasAlwaysOn, shouldLockdown)) {
final Bundle opts = new Bundle(); final Bundle opts = new Bundle();
@@ -185,19 +192,19 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
if (isVpnAlwaysOn) { if (isVpnAlwaysOn) {
// Show toast if vpn profile is not valid // Show toast if vpn profile is not valid
if (!profile.isValidLockdownProfile()) { if (!profile.isValidLockdownProfile()) {
Toast.makeText(getContext(), R.string.vpn_lockdown_config_error, Toast.makeText(mContext, R.string.vpn_lockdown_config_error,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
return; return;
} }
final ConnectivityManager conn = ConnectivityManager.from(getActivity()); final ConnectivityManager conn = ConnectivityManager.from(mContext);
conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null, conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
/* lockdownEnabled */ false); /* lockdownEnabled */ false);
VpnUtils.setLockdownVpn(getContext(), profile.key); VpnUtils.setLockdownVpn(mContext, profile.key);
} else { } else {
// update only if lockdown vpn has been changed // update only if lockdown vpn has been changed
if (VpnUtils.isVpnLockdown(profile.key)) { if (VpnUtils.isVpnLockdown(profile.key)) {
VpnUtils.clearLockdownVpn(getContext()); VpnUtils.clearLockdownVpn(mContext);
} }
} }
} }
@@ -219,11 +226,11 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
// Now try to start the VPN - this is not necessary if the profile is set as lockdown, // Now try to start the VPN - this is not necessary if the profile is set as lockdown,
// because just saving the profile in this mode will start a connection. // because just saving the profile in this mode will start a connection.
if (!VpnUtils.isVpnLockdown(profile.key)) { if (!VpnUtils.isVpnLockdown(profile.key)) {
VpnUtils.clearLockdownVpn(getContext()); VpnUtils.clearLockdownVpn(mContext);
try { try {
mService.startLegacyVpn(profile); mService.startLegacyVpn(profile);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show(); Toast.makeText(mContext, R.string.vpn_no_network, Toast.LENGTH_LONG).show();
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to connect", e); Log.e(TAG, "Failed to connect", e);
} }
@@ -241,7 +248,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
if (!isConnected(profile)) { if (!isConnected(profile)) {
return true; return true;
} }
VpnUtils.clearLockdownVpn(getContext()); VpnUtils.clearLockdownVpn(mContext);
return mService.prepareVpn(null, VpnConfig.LEGACY_VPN, UserHandle.myUserId()); return mService.prepareVpn(null, VpnConfig.LEGACY_VPN, UserHandle.myUserId());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to disconnect", e); Log.e(TAG, "Failed to disconnect", e);