community-cordova-plugin-wifi 1.0.2 → 1.0.4

package/.idea/workspace.xml

@@ -4,10 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5a269414-5baa-4c38-b2f3-50c21d305b88" name="Changes" comment="update plugin">
+    <list default="true" id="5a269414-5baa-4c38-b2f3-50c21d305b88" name="Changes" comment="fixed progress bar in Ping">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/plugin.xml" beforeDir="false" afterPath="$PROJECT_DIR$/plugin.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/android/WifiPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/android/WifiPlugin.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,7 +92,13 @@
       <workItem from="1709102390279" duration="5116000" />
       <workItem from="1709959064513" duration="9732000" />
       <workItem from="1710582743464" duration="1835000" />
-      <workItem from="1710593259268" duration="300000" />
+      <workItem from="1710593259268" duration="1509000" />
+      <workItem from="1711186960914" duration="287000" />
+      <workItem from="1720760722451" duration="1035000" />
+      <workItem from="1722058180072" duration="23000" />
+      <workItem from="1722059814051" duration="697000" />
+      <workItem from="1722061550247" duration="21000" />
+      <workItem from="1723267322946" duration="2826000" />
     </task>
     <task id="LOCAL-00001" summary="update plugin">
       <option name="closed" value="true" />
@@ -157,7 +164,15 @@
       <option name="project" value="LOCAL" />
       <updated>1710593285324</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="fixed progress bar in Ping">
+      <option name="closed" value="true" />
+      <created>1711187013726</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1711187013726</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -176,6 +191,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="update plugin" />
-    <option name="LAST_COMMIT_MESSAGE" value="update plugin" />
+    <MESSAGE value="fixed progress bar in Ping" />
+    <option name="LAST_COMMIT_MESSAGE" value="fixed progress bar in Ping" />
   </component>
 </project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "community-cordova-plugin-wifi",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "types": "./types/index.d.ts",
   "readme": "README.md",
   "repository": "EYALIN/community-cordova-plugin-wifi/tree/master",

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         id="community-cordova-plugin-wifi"
-        version="1.0.2">
+        version="1.0.4">
     <name>Cordova Plugin Wifi</name>
     <description></description>
     <license>MIT</license>

package/src/android/PingTask.java

@@ -20,10 +20,10 @@ public class PingTask {
                 String line;
                 String fullResponse = "";
                 while ((line = reader.readLine()) != null) {
+                    int progress = (int) (((double) linesRead / count) * 100);
                     linesRead++;
                     JSONObject progressUpdate = new JSONObject();
                       // Ensure progress does not exceed 100
-                                    int progress = (int) (((double) linesRead / count) * 100);
                                     progress = Math.min(progress, 100); // Cap progress at 100
                     progressUpdate.put("line", line);
                     if (fullResponse != null && !fullResponse.isEmpty()) {

package/src/android/WifiPlugin.java

@@ -22,6 +22,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.util.Log;
+
 import java.util.List;
 
 public class WifiPlugin extends CordovaPlugin {
@@ -116,14 +118,60 @@ public class WifiPlugin extends CordovaPlugin {
     }
 
     private void isConnectedToInternet(CallbackContext callbackContext) {
-        ConnectivityManager connectivityManager = (ConnectivityManager) cordova.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (connectivityManager != null) {
-            NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
-            boolean isConnected = activeNetworkInfo != null && activeNetworkInfo.isConnected();
-            callbackContext.success(isConnected ? 1 : 0);
-        } else {
-            callbackContext.error("ConnectivityManager is null");
-        }
+       ConnectivityManager connectivityManager = (ConnectivityManager) cordova.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+       if (connectivityManager != null) {
+           if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+              Network network = connectivityManager.getActiveNetwork();
+                     if (network != null) {
+                         NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(network);
+                         if (networkCapabilities != null) {
+                             boolean isConnected = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                                                   networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) &&
+                                                   networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) &&
+                                                   networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
+
+                             if (isConnected) {
+                                 boolean isWiFi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
+                                 boolean isCellular = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+                                 boolean isVPN = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN);
+
+                                 // You can now use these flags to determine the type of connection
+                                 if (isWiFi) {
+                                     // Connected via WiFi
+                Log.d(TAG, "Connected via WiFi");
+                                     callbackContext.success(1); // or handle accordingly
+                                 } else if (isCellular) {
+                                     // Connected via Cellular
+                Log.d(TAG, "Connected via Cellular");
+                                     callbackContext.success(1); // or handle accordingly
+                                 } else if (isVPN) {
+                                     // Connected via VPN
+                Log.d(TAG, "Connected via VPN");
+                                     callbackContext.success(1); // or handle accordingly
+                                 } else {
+                                     // Unknown or unsupported transport
+                Log.d(TAG, "Connected via Unknown or unsupported transport");
+                                     callbackContext.success(1); // or handle accordingly
+                                 }
+                             } else {
+                                 callbackContext.success(0); // No internet connection
+                             }
+                         } else {
+                             callbackContext.success(0); // No internet connection
+                         }
+                     } else {
+                         callbackContext.success(0); // No network connection
+                     }
+           } else {
+               // For devices with SDK < 23, you can still use the deprecated method
+               NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+               boolean isConnected = activeNetworkInfo != null && activeNetworkInfo.isConnected();
+               callbackContext.success(isConnected ? 1 : 0);
+           }
+       } else {
+                Log.e(TAG, "ConnectivityManager is null");
+                callbackContext.success(0);
+       }
     }
 
     private void canConnectToInternet(CallbackContext callbackContext) {