Added overloaded method for isWifiConnected

ThanosFisherman · Jul 20, 2020 · 4ab7c6f · 4ab7c6f
1 parent 250c638
commit 4ab7c6f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/sample/src/main/java/com/thanosfisherman/wifiutils/sample/MainActivity.java b/sample/src/main/java/com/thanosfisherman/wifiutils/sample/MainActivity.java
@@ -13,7 +13,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
-import com.thanosfisherman.wifiutils.Logger;
 import com.thanosfisherman.wifiutils.WifiUtils;
 import com.thanosfisherman.wifiutils.wifiConnect.ConnectionErrorCode;
 import com.thanosfisherman.wifiutils.wifiConnect.ConnectionSuccessListener;
@@ -52,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
         final Button buttonCheck = findViewById(R.id.button_check);
         buttonCheck.setOnClickListener(v -> checkWifi());
 
-        WifiUtils.forwardLog((priority, tag, message) ->  {
+        WifiUtils.forwardLog((priority, tag, message) -> {
             String customTag = tag + "_" + MainActivity.class.getSimpleName();
             Log.i(customTag, message);
         });
@@ -93,7 +92,7 @@ private void enableWifi() {
     }
 
     private void checkWifi() {
-        boolean result = WifiUtils.withContext(getApplicationContext()).isWifiConnected(null);
+        boolean result = WifiUtils.withContext(getApplicationContext()).isWifiConnected(SSID);
         Toast.makeText(MainActivity.this, "Wifi Connect State: " + result, Toast.LENGTH_SHORT).show();
     }
 

diff --git a/sample/src/main/java/com/thanosfisherman/wifiutils/sample/MainKotlinActivity.kt b/sample/src/main/java/com/thanosfisherman/wifiutils/sample/MainKotlinActivity.kt
@@ -81,7 +81,7 @@ class MainKotlinActivity : AppCompatActivity() {
     }
 
     private fun check(context: Context) {
-        val result = WifiUtils.withContext(context).isWifiConnected(null)
+        val result = WifiUtils.withContext(context).isWifiConnected(SSID)
         Toast.makeText(context, "Wifi Connect State: $result", Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/wifiutils/src/main/java/com/thanosfisherman/wifiutils/WifiConnectorBuilder.java b/wifiutils/src/main/java/com/thanosfisherman/wifiutils/WifiConnectorBuilder.java
@@ -49,7 +49,8 @@ interface WifiUtilsBuilder {
 
         void cancelAutoConnect();
 
-        boolean isWifiConnected(@Nullable String ssid);
+        boolean isWifiConnected(@NonNull String ssid);
+        boolean isWifiConnected();
     }
 
     interface WifiSuccessListener {

diff --git a/wifiutils/src/main/java/com/thanosfisherman/wifiutils/WifiUtils.java b/wifiutils/src/main/java/com/thanosfisherman/wifiutils/WifiUtils.java
@@ -342,25 +342,31 @@ public void cancelAutoConnect() {
     }
 
     @Override
-    public boolean isWifiConnected(@Nullable String ssid) {
+    public boolean isWifiConnected(@NonNull String ssid) {
         ConnectivityManager connManager = (ConnectivityManager) mContext
                 .getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        final NetworkInfo netInfo = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
         boolean result = false;
 
-        if (mWifi.getState() == NetworkInfo.State.CONNECTED) {
-            if (ssid == null) {
-                result = true;
-            } else {
-                final String quotedSsid = SSIDUtils.convertToQuotedString(ssid);
-                final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-                String tempSSID = wifiInfo.getSSID();
-                result = tempSSID != null && tempSSID.equals(quotedSsid);
-            }
+        if (netInfo.getState() == NetworkInfo.State.CONNECTED) {
+
+            final String quotedSsid = SSIDUtils.convertToQuotedString(ssid);
+            final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+            String tempSSID = wifiInfo.getSSID();
+            result = tempSSID != null && tempSSID.equals(quotedSsid);
         }
         return result;
     }
 
+    @Override
+    public boolean isWifiConnected() {
+        ConnectivityManager connManager = (ConnectivityManager) mContext
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
+        final NetworkInfo netInfo = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+        return netInfo.getState() == NetworkInfo.State.CONNECTED;
+    }
+
     @NonNull
     @Override
     public WifiSuccessListener setTimeout(final long timeOutMillis) {