(feature) updates getIPV4Address to return wifi IP if exists, cellular if not

* [FEATURE] getWIFIIPV4Address

* Updated NetworkInfo.js & README

* Updated with getWIFIIPV4Address

* Fixed conversion to String in Android

* Updated for new API

* (task) code cleanup

Author: Rapsssito

NetworkInfo.js

@@ -21,6 +21,11 @@ const NetworkInfo = {
   },
 
   async getIPV4Address() {
+    const wifiIP = await RNNetworkInfo.getWIFIIPV4Address();
+    if (wifiIP && wifiIP !== '0.0.0.0') {
+      return wifiIP;
+    }
+    
     return await RNNetworkInfo.getIPV4Address();
   },
 

README.md

@@ -31,7 +31,7 @@ import { NetworkInfo } from "react-native-network-info";
 // Get Local IP
 const ipAddress = await NetworkInfo.getIPAddress();
 
-// Get IPv4 IP
+// Get IPv4 IP (priority: WiFi first, cellular second)
 const ipv4Address = await NetworkInfo.getIPV4Address();
 
 // Get Broadcast

android/src/main/java/com/pusherman/networkinfo/RNNetworkInfo.java

@@ -161,6 +161,27 @@ public void run() {
         }).start();
     }
 
+    /**
+        Gets the device's WiFi interface IP address
+        @return device's WiFi IP if connected to WiFi, else '0.0.0.0'
+     */
+    @ReactMethod
+    public void getWIFIIPV4Address(final Promise promise) throws Exception {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    WifiInfo info = wifi.getConnectionInfo();
+                    int ipAddress = info.getIpAddress();
+		            String stringip = String.format("%d.%d.%d.%d", (ipAddress & 0xff), (ipAddress >> 8 & 0xff),
+                                                (ipAddress >> 16 & 0xff), (ipAddress >> 24 & 0xff));
+		            promise.resolve(stringip);
+                }catch (Exception e) {
+                    promise.resolve(null);
+                }
+            }
+        }).start();
+    }
+
     @ReactMethod
     public void getSubnet(final Promise promise) throws Exception {
         new Thread(new Runnable() {

ios/RNNetworkInfo.m

@@ -186,6 +186,31 @@ @implementation RNNetworkInfo
     }
 }
 
+/**
+    Gets the device's WiFi interface IP address
+    @return device's WiFi IP if connected to WiFi, else '0.0.0.0'
+*/
+RCT_EXPORT_METHOD(getWIFIIPV4Address:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    @try{
+        NSArray *searchArray = @[ IOS_WIFI @"/" IP_ADDR_IPv4 ];
+        NSDictionary *addresses = [self getAllIPAddresses];
+        NSLog(@"addresses: %@", addresses);
+
+        __block NSString *address;
+        [searchArray enumerateObjectsUsingBlock:^(NSString *key, NSUInteger idx, BOOL *stop)
+         {
+             address = addresses[key];
+             if(address) *stop = YES;
+         } ];
+        NSString *addressToReturn = address ? address : @"0.0.0.0";
+        resolve(addressToReturn);
+    }@catch (NSException *exception) {
+        resolve(NULL);
+    }
+}
+
 RCT_EXPORT_METHOD(getSubnet:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {