Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmsdk: Fix non-triggered ON_DISCONNECT + cleanups

Browse Source 
* the WifiInfo object may be null if there is no active connection
which should trigger an ON_DISCONNECT
* by using the already existing "getActiveSSID"-method there is no
need to cleanup UTF-8 encoded SSIDs

Change-Id: I69e4db55753ca1e02afde59b186dae822adf7b63
This commit is contained in:
Martin Herndl
2016-10-31 11:06:09 +01:00
parent 97054244ce
commit c7ecd4d8fa
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
View File

@@ -107,26 +107,15 @@ public class ProfileTriggerHelper extends BroadcastReceiver {
String action = intent.getAction();
if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
Bundle extras = intent.getExtras();
WifiInfo wifiInfo = extras.getParcelable(WifiManager.EXTRA_WIFI_INFO);
if (wifiInfo != null) {
String ssid = wifiInfo.getSSID();
if (ssid != null) {
// SSID will be surrounded by double quotation marks if it can be decoded
// as UTF-8
if (ssid.startsWith("\"") && ssid.endsWith("\"")) {
ssid = ssid.substring(1, ssid.length()-1);
}
if (TextUtils.equals(ssid, WifiSsid.NONE)) {
checkTriggers(Profile.TriggerType.WIFI, mLastConnectedSSID,
Profile.TriggerState.ON_DISCONNECT);
mLastConnectedSSID = WifiSsid.NONE;
} else if (!TextUtils.equals(mLastConnectedSSID, ssid)) {
mLastConnectedSSID = ssid;
checkTriggers(Profile.TriggerType.WIFI, mLastConnectedSSID,
Profile.TriggerState.ON_CONNECT);
}
}
String ssid = getActiveSSID();
if (ssid == null || TextUtils.equals(ssid, WifiSsid.NONE)) {
checkTriggers(Profile.TriggerType.WIFI, mLastConnectedSSID,
Profile.TriggerState.ON_DISCONNECT);
mLastConnectedSSID = WifiSsid.NONE;
} else if (!TextUtils.equals(mLastConnectedSSID, ssid)) {
mLastConnectedSSID = ssid;
checkTriggers(Profile.TriggerType.WIFI, mLastConnectedSSID,
Profile.TriggerState.ON_CONNECT);
}
} else if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)
|| action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {