Merge pull request #113 from Smeat/android10

Fix connection on android 10
voroshkov · May 4, 2020 · 2142355 · 2142355
2 parents d8abb07 + 44af585
commit 2142355
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...ChorusRFLaptimer/app/src/main/java/app/andrey_voroshkov/chorus_laptimer/MainActivity.java b/...ChorusRFLaptimer/app/src/main/java/app/andrey_voroshkov/chorus_laptimer/MainActivity.java
@@ -284,8 +284,12 @@ private boolean checkIsWifiOnAndConnected() {
         WifiManager wifiMgr = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
         if (!wifiMgr.isWifiEnabled()) return false;  // Wi-Fi adapter is OFF
 
-        WifiInfo wifiInfo = wifiMgr.getConnectionInfo();
-        return wifiInfo.getNetworkId() != -1; // if true, then connected to an access point
+        ConnectivityManager cm =
+            (ConnectivityManager)getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        // Deprecated in Android 10, but should still be fine
+        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+        boolean isConnected = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+        return isConnected;
     }
 
     private String getGatewayIP() {