community-cordova-plugin-wifi 1.0.4 → 1.0.5

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="fixed progress bar in Ping">
+    <list default="true" id="5a269414-5baa-4c38-b2f3-50c21d305b88" name="Changes" comment="isConnectedToTheInternet - Support SDK&gt;29">
       <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/IpInfoUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/android/IpInfoUtils.java" 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" />
@@ -98,7 +99,7 @@
       <workItem from="1722058180072" duration="23000" />
       <workItem from="1722059814051" duration="697000" />
       <workItem from="1722061550247" duration="21000" />
-      <workItem from="1723267322946" duration="2826000" />
+      <workItem from="1723267322946" duration="4719000" />
     </task>
     <task id="LOCAL-00001" summary="update plugin">
       <option name="closed" value="true" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "community-cordova-plugin-wifi",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "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.4">
+        version="1.0.5">
     <name>Cordova Plugin Wifi</name>
     <description></description>
     <license>MIT</license>

package/src/android/IpInfoUtils.java

@@ -18,6 +18,7 @@ import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import android.util.Log;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -123,28 +124,44 @@ public class IpInfoUtils {
         }
     }
 
-    private static void fillLocationInfo(JSONObject ipInfoObject, LocationManager locationManager, CordovaInterface cordova) throws IOException, JSONException {
-        Location location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-        if (location != null) {
-            ipInfoObject.put("latitude", location.getLatitude());
-            ipInfoObject.put("longitude", location.getLongitude());
-            List<Address> addresses = new ArrayList<>();
-            if (isNetworkAvailable(cordova.getActivity())) {
-                Geocoder geocoder = new Geocoder(cordova.getActivity(), Locale.getDefault());
-                addresses = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
-            }
+   private static void fillLocationInfo(JSONObject ipInfoObject, LocationManager locationManager, CordovaInterface cordova) throws JSONException {
+       Log.d(TAG, "fillLocationInfo begin");
+       Location location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+       if (location != null) {
+           Log.d(TAG, "fillLocationInfo location is exists");
+           ipInfoObject.put("latitude", location.getLatitude());
+           ipInfoObject.put("longitude", location.getLongitude());
+           Log.d(TAG, "fillLocationInfo finish lat and long");
+
+           List<Address> addresses = new ArrayList<>();
+           if (isNetworkAvailable(cordova.getActivity())) {
+               try {
+                   Log.d(TAG, "Geocoder begin");
+                   Geocoder geocoder = new Geocoder(cordova.getActivity(), Locale.getDefault());
+                   Log.d(TAG, "Geocoder success");
+                   addresses = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                   Log.d(TAG, "addresses success");
+               } catch (IOException e) {
+                   Log.e(TAG, "Geocoder failed due to network or I/O issues", e);
+               } catch (IllegalArgumentException e) {
+                   Log.e(TAG, "Geocoder failed due to illegal arguments", e);
+               } catch (Exception e) {
+                   Log.e(TAG, "Geocoder failed due to an unexpected error", e);
+               }
+           }
+
+           if (!addresses.isEmpty()) {
+               Address address = addresses.get(0);
+               ipInfoObject.put("city", address.getLocality());
+               ipInfoObject.put("street", address.getThoroughfare());
+               ipInfoObject.put("country", address.getCountryName());
+               ipInfoObject.put("region", address.getSubAdminArea());
+               ipInfoObject.put("zipcode", address.getPostalCode());
+               ipInfoObject.put("state", address.getAdminArea());
+           }
+       }
+   }
 
-            if (!addresses.isEmpty()) {
-                Address address = addresses.get(0);
-                ipInfoObject.put("city", address.getLocality());
-                ipInfoObject.put("street", address.getThoroughfare());
-                ipInfoObject.put("country", address.getCountryName());
-                ipInfoObject.put("region", address.getSubAdminArea());
-                ipInfoObject.put("zipcode", address.getPostalCode());
-                ipInfoObject.put("state", address.getAdminArea());
-            }
-        }
-    }
 
     public static boolean isNetworkAvailable(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);