Merge pull request #24 from pusherman/feature/update_java_get_ip

Update java's getIPAddress method

Author: pusherman

android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 16

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

@@ -6,17 +6,13 @@
 import android.util.Log;
 
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-
-import java.math.BigInteger;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.nio.ByteOrder;
-import java.util.Map;
+
+import java.net.NetworkInterface;
+import java.util.Enumeration;
 
 public class RNNetworkInfo extends ReactContextBaseJavaModule {
   WifiManager wifi;
@@ -26,7 +22,8 @@ public class RNNetworkInfo extends ReactContextBaseJavaModule {
   public RNNetworkInfo(ReactApplicationContext reactContext) {
     super(reactContext);
 
-    wifi = (WifiManager)reactContext.getSystemService(Context.WIFI_SERVICE);
+    wifi = (WifiManager)reactContext.getApplicationContext()
+            .getSystemService(Context.WIFI_SERVICE);
   }
 
   @Override
@@ -37,47 +34,34 @@ public String getName() {
   @ReactMethod
   public void getSSID(final Callback callback) {
     WifiInfo info = wifi.getConnectionInfo();
-    
+
     // This value should be wrapped in double quotes, so we need to unwrap it.
     String ssid = info.getSSID();
     if (ssid.startsWith("\"") && ssid.endsWith("\"")) {
       ssid = ssid.substring(1, ssid.length() - 1);
     }
-    
+
     callback.invoke(ssid);
   }
 
   @ReactMethod
   public void getIPAddress(final Callback callback) {
-    WifiInfo info = wifi.getConnectionInfo();
-
-    // The following is courtesy of Digital Rounin at
-    //   http://stackoverflow.com/a/18638588 .
+    String ipAddress = null;
 
-    // The endian-ness of `ip` is potentially varying, but we need it to be big-
-    // endian.
-    int ip = info.getIpAddress();
-
-    // Convert little-endian to big-endian if needed.
-    if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) {
-        ip = Integer.reverseBytes(ip);
-    }
-
-    // Now that the value is guaranteed to be big-endian, we can convert it to
-    // an array whose first element is the high byte.
-    byte[] ipByteArray = BigInteger.valueOf(ip).toByteArray();
-
-    String ipAddressString;
     try {
-        // `getByAddress()` wants network byte-order, aka big-endian. 
-        // Good thing we planned ahead!
-        ipAddressString = InetAddress.getByAddress(ipByteArray).getHostAddress();
-    } catch (UnknownHostException ex) {
-        Log.e(TAG, "Unable to determine IP address.");
-        ipAddressString = null;
+      for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+        NetworkInterface intf = en.nextElement();
+        for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
+          InetAddress inetAddress = enumIpAddr.nextElement();
+          if (!inetAddress.isLoopbackAddress()) {
+            ipAddress = inetAddress.getHostAddress();
+          }
+        }
+      }
+    } catch (Exception ex) {
+      Log.e(TAG, ex.toString());
     }
-    
-    callback.invoke(ipAddressString);
-  }
 
+    callback.invoke(ipAddress);
+  }
 }