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

Add WiFi toggle prompts - settings

Browse Source 
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
This commit is contained in:
Svetoslav Ganov
2016-07-26 18:26:45 -07:00
parent 9e5c105806
commit 871078e91b
3 changed files with 319 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AndroidManifest.xml
View File

@@ -2793,6 +2793,17 @@
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
<activity android:name=".wifi.RequestToggleWiFiActivity"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:excludeFromRecents="true"
android:permission="android.permission.CHANGE_WIFI_STATE">
<intent-filter>
<action android:name="android.net.wifi.action.REQUEST_ENABLE" />
<action android:name="android.net.wifi.action.REQUEST_DISABLE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".wifi.WifiDialogActivity" <activity android:name=".wifi.WifiDialogActivity"
android:label="" android:label=""
android:theme="@style/Transparent" android:theme="@style/Transparent"

5
res/values/strings.xml
View File

@@ -1496,6 +1496,11 @@
<!-- Link speed on Wifi Status screen --> <!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string> <string name="link_speed">%1$d Mbps</string>
<!-- This string asks the user whether or not to allow an app to enable WiFi. [CHAR LIMIT=NONE] -->
<string name="wifi_ask_enable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn WiFi ON for this device.</string>
<!-- This string asks the user whether or not to allow an app to disable WiFi. [CHAR LIMIT=NONE] -->
<string name="wifi_ask_disable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn WiFi OFF for this device.</string>
<!-- NFC settings --> <!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC --> <!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string> <string name="nfc_quick_toggle_title">NFC</string>

303
src/com/android/settings/wifi/RequestToggleWiFiActivity.java Normal file
View File

@@ -0,0 +1,303 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import com.android.internal.app.AlertActivity;
import com.android.settings.R;
/**
* This activity handles requests to toggle WiFi by collecting user
* consent and waiting until the state change is completed.
*/
public class RequestToggleWiFiActivity extends AlertActivity
implements DialogInterface.OnClickListener {
private static final String LOG_TAG = "RequestToggleWiFiActivity";
private static final long TOGGLE_TIMEOUT_MILLIS = 10000; // 10 sec
private static final int STATE_UNKNOWN = -1;
private static final int STATE_ENABLE = 1;
private static final int STATE_ENABLING = 2;
private static final int STATE_DISABLE = 3;
private static final int STATE_DISABLING = 4;
private final StateChangeReceiver mReceiver = new StateChangeReceiver();
private final Runnable mTimeoutCommand = () -> {
if (!isFinishing() && !isDestroyed()) {
finish();
}
};
private @NonNull WifiManager mWiFiManager;
private @NonNull CharSequence mAppLabel;
private int mState = STATE_UNKNOWN;
private int mLastUpdateState = STATE_UNKNOWN;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mWiFiManager = getSystemService(WifiManager.class);
setResult(Activity.RESULT_CANCELED);
String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
if (TextUtils.isEmpty(packageName)) {
finish();
return;
}
try {
ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
packageName, 0);
mAppLabel = applicationInfo.loadSafeLabel(getPackageManager());
} catch (PackageManager.NameNotFoundException e) {
Log.e(LOG_TAG, "Couldn't find app with package name " + packageName);
finish();
return;
}
String action = getIntent().getAction();
switch (action) {
case WifiManager.ACTION_REQUEST_ENABLE: {
mState = STATE_ENABLE;
} break;
case WifiManager.ACTION_REQUEST_DISABLE: {
mState = STATE_DISABLE;
} break;
default: {
finish();
}
}
}
@Override
public void onClick(DialogInterface dialog, int which) {
if (which != DialogInterface.BUTTON_POSITIVE) {
return;
}
switch (mState) {
case STATE_ENABLE: {
mWiFiManager.setWifiEnabled(true);
mState = STATE_ENABLING;
scheduleToggleTimeout();
updateUi();
} break;
case STATE_DISABLE: {
mWiFiManager.setWifiEnabled(false);
mState = STATE_DISABLING;
scheduleToggleTimeout();
updateUi();
} break;
}
}
@Override
protected void onStart() {
super.onStart();
mReceiver.register();
final int wifiState = mWiFiManager.getWifiState();
switch (mState) {
case STATE_ENABLE: {
switch (wifiState) {
case WifiManager.WIFI_STATE_ENABLED: {
setResult(RESULT_OK);
finish();
} return;
case WifiManager.WIFI_STATE_ENABLING: {
mState = STATE_ENABLING;
scheduleToggleTimeout();
} break;
}
} break;
case STATE_DISABLE: {
switch (wifiState) {
case WifiManager.WIFI_STATE_DISABLED: {
setResult(RESULT_OK);
finish();
}
return;
case WifiManager.WIFI_STATE_ENABLING: {
mState = STATE_DISABLING;
scheduleToggleTimeout();
}
break;
}
} break;
case STATE_ENABLING: {
switch (wifiState) {
case WifiManager.WIFI_STATE_ENABLED: {
setResult(RESULT_OK);
finish();
} return;
case WifiManager.WIFI_STATE_ENABLING: {
scheduleToggleTimeout();
} break;
case WifiManager.WIFI_STATE_DISABLED:
case WifiManager.WIFI_STATE_DISABLING: {
mState = STATE_ENABLE;
} break;
}
} break;
case STATE_DISABLING: {
switch (wifiState) {
case WifiManager.WIFI_STATE_DISABLED: {
setResult(RESULT_OK);
finish();
} return;
case WifiManager.WIFI_STATE_DISABLING: {
scheduleToggleTimeout();
} break;
case WifiManager.WIFI_STATE_ENABLED:
case WifiManager.WIFI_STATE_ENABLING: {
mState = STATE_DISABLE;
} break;
}
} break;
}
updateUi();
}
@Override
protected void onStop() {
mReceiver.unregister();
unscheduleToggleTimeout();
super.onStop();
}
private void updateUi() {
if (mLastUpdateState == mState) {
return;
}
mLastUpdateState = mState;
switch (mState) {
case STATE_ENABLE: {
mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
mAlertParams.mPositiveButtonListener = this;
mAlertParams.mMessage = getString(R.string.wifi_ask_enable, mAppLabel);
} break;
case STATE_ENABLING: {
// Params set button text only if non-null, but we want a null
// button text to hide the button, so reset the controller directly.
mAlert.setButton(DialogInterface.BUTTON_POSITIVE, null, null, null);
mAlertParams.mPositiveButtonText = null;
mAlertParams.mPositiveButtonListener = null;
mAlertParams.mMessage = getString(R.string.wifi_starting);
} break;
case STATE_DISABLE: {
mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
mAlertParams.mPositiveButtonListener = this;
mAlertParams.mMessage = getString(R.string.wifi_ask_disable, mAppLabel);
} break;
case STATE_DISABLING: {
// Params set button text only if non-null, but we want a null
// button text to hide the button, so reset the controller directly.
mAlert.setButton(DialogInterface.BUTTON_POSITIVE, null, null, null);
mAlertParams.mPositiveButtonText = null;
mAlertParams.mPositiveButtonListener = null;
mAlertParams.mMessage = getString(R.string.wifi_stopping);
} break;
}
setupAlert();
}
@Override
public void dismiss() {
// Clicking on the dialog buttons dismisses the dialog and finishes
// the activity but we want to finish after the WiFi state changed.
}
private void scheduleToggleTimeout() {
getWindow().getDecorView().postDelayed(mTimeoutCommand, TOGGLE_TIMEOUT_MILLIS);
}
private void unscheduleToggleTimeout() {
getWindow().getDecorView().removeCallbacks(mTimeoutCommand);
}
private final class StateChangeReceiver extends BroadcastReceiver {
private final IntentFilter mFilter = new IntentFilter(
WifiManager.WIFI_STATE_CHANGED_ACTION);
public void register() {
registerReceiver(this, mFilter);
}
public void unregister() {
unregisterReceiver(this);
}
public void onReceive(Context context, Intent intent) {
Activity activity = RequestToggleWiFiActivity.this;
if (activity.isFinishing() || activity.isDestroyed()) {
return;
}
final int currentState = mWiFiManager.getWifiState();
switch (currentState) {
case WifiManager.WIFI_STATE_ENABLED:
case WifiManager.WIFI_STATE_DISABLED: {
if (mState == STATE_ENABLING || mState == STATE_DISABLING) {
RequestToggleWiFiActivity.this.setResult(Activity.RESULT_OK);
finish();
}
} break;
case WifiManager.ERROR: {
Toast.makeText(activity, R.string.wifi_error, Toast.LENGTH_SHORT).show();
finish();
} break;
}
}
}
}