From 3139415172ec4056101a99106ae85e47e86efd93 Mon Sep 17 00:00:00 2001 From: mvp76 Date: Mon, 13 Mar 2017 09:14:43 +0100 Subject: [PATCH] Get WIFI_SERVICE using application context to avoid leaks. Linting complains about this issue. --- .../main/java/org/fdroid/fdroid/net/WifiStateChangeService.java | 2 +- .../main/java/org/fdroid/fdroid/views/ManageReposActivity.java | 2 +- .../java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java index d56d39cc9..43a34177f 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -62,7 +62,7 @@ public class WifiStateChangeService extends IntentService { } Utils.debugLog(TAG, "WiFi change service started, clearing info about wifi state until we have figured it out again."); NetworkInfo ni = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); - wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); int wifiState = wifiManager.getWifiState(); if (ni == null || ni.isConnected()) { Utils.debugLog(TAG, "ni == " + ni + " wifiState == " + printWifiState(wifiState)); diff --git a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java index 121766c03..d9db24604 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -672,7 +672,7 @@ public class ManageReposActivity extends AppCompatActivity implements LoaderMana private void checkIfNewRepoOnSameWifi(NewRepoConfig newRepo) { // if this is a local repo, check we're on the same wifi if (!TextUtils.isEmpty(newRepo.getBssid())) { - WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); String bssid = wifiInfo.getBSSID(); if (TextUtils.isEmpty(bssid)) { /* not all devices have wifi */ diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index c047b6685..9e2c92a82 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -254,7 +254,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { } private void promptToSetupWifiAP() { - WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); WifiApControl ap = WifiApControl.getInstance(this); wifiManager.setWifiEnabled(false); if (!ap.enable()) {