Added subnet device scanning, updated build versions and readme.

Author: stealthcopter

app/build.gradle

@@ -30,8 +30,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 9
-    versionName "0.1.14"
+    versionCode 10
+    versionName "0.3.0"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 

app/src/main/java/com/stealthcotper/networktools/MainActivity.java

@@ -21,7 +21,7 @@
 import com.stealthcopter.networktools.WakeOnLan;
 import com.stealthcopter.networktools.ping.PingResult;
 import com.stealthcopter.networktools.ping.PingStats;
-import com.stealthcopter.networktools.subnet.SubnetInfo;
+import com.stealthcopter.networktools.subnet.Device;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -225,12 +225,12 @@ private void findSubnetDevices() {
 
         SubnetDevices.fromLocalAddress().findDevices(new SubnetDevices.OnSubnetDeviceFound() {
             @Override
-            public void onDeviceFound(SubnetInfo subnetInfo) {
-                appendResultsText("Device: " + subnetInfo.ip+" "+subnetInfo.hostname);
+            public void onDeviceFound(Device device) {
+                appendResultsText("Device: " + device.ip+" "+ device.hostname);
             }
 
             @Override
-            public void onFinished(ArrayList<SubnetInfo> devicesFound) {
+            public void onFinished(ArrayList<Device> devicesFound) {
                 float timeTaken =  (System.currentTimeMillis() - startTimeMillis)/1000.0f;
                 appendResultsText("Finished "+timeTaken+" s");
             }

library/build.gradle

@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 7
-    versionName "0.2.34"
+    versionCode 10
+    versionName "0.3.0"
   }
   buildTypes {
     release {

library/src/main/java/com/stealthcopter/networktools/SubnetDevices.java

@@ -3,7 +3,7 @@
 import android.support.annotation.NonNull;
 
 import com.stealthcopter.networktools.ping.PingResult;
-import com.stealthcopter.networktools.subnet.SubnetInfo;
+import com.stealthcopter.networktools.subnet.Device;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -19,16 +19,16 @@ public class SubnetDevices {
     private int noThreads = 255;
 
     private ArrayList<String> addresses;
-    private ArrayList<SubnetInfo> devicesFound;
+    private ArrayList<Device> devicesFound;
     private OnSubnetDeviceFound listener;
 
     // This class is not to be instantiated
     private SubnetDevices() {
     }
 
     public interface OnSubnetDeviceFound {
-        void onDeviceFound(SubnetInfo subnetInfo);
-        void onFinished(ArrayList<SubnetInfo> devicesFound);
+        void onDeviceFound(Device device);
+        void onFinished(ArrayList<Device> devicesFound);
     }
 
     /**
@@ -118,9 +118,9 @@ public void findDevices(final OnSubnetDeviceFound listener) {
         this.listener.onFinished(devicesFound);
     }
 
-    private synchronized void subnetDeviceFound(SubnetInfo subnetInfo){
-        devicesFound.add(subnetInfo);
-        listener.onDeviceFound(subnetInfo);
+    private synchronized void subnetDeviceFound(Device device){
+        devicesFound.add(device);
+        listener.onDeviceFound(device);
     }
 
     public class SubnetDeviceFinderRunnable implements Runnable {
@@ -136,10 +136,10 @@ public void run() {
                 InetAddress ia = InetAddress.getByName(address);
                 PingResult pingResult = Ping.onAddress(ia).doPing();
                 if (pingResult.isReachable) {
-                    SubnetInfo subnetInfo = new SubnetInfo(ia);
-                    subnetInfo.mac = ARPInfo.getMACFromIPAddress(ia.getHostAddress());
-                    subnetInfo.time = pingResult.timeTaken;
-                    subnetDeviceFound(subnetInfo);
+                    Device device = new Device(ia);
+                    device.mac = ARPInfo.getMACFromIPAddress(ia.getHostAddress());
+                    device.time = pingResult.timeTaken;
+                    subnetDeviceFound(device);
                 }
             } catch (UnknownHostException e) {
                 e.printStackTrace();

library/src/main/java/com/stealthcopter/networktools/subnet/SubnetInfo.java renamed to library/src/main/java/com/stealthcopter/networktools/subnet/Device.java

@@ -2,33 +2,22 @@
 
 import java.net.InetAddress;
 
-/**
- * Class: PortInfo
- * <p/>
- * <p/>
- * <p/>
- * Project: com.stealthcopter.portdroid portdroid
- * Created Date: 19/02/14 02:30
- *
- * @author <a href="mailto:[email protected]">Matthew Rollings</a>
- *         Copyright (c) 2014 Intohand Ltd. All rights reserved.
- */
-public class SubnetInfo {
+public class Device {
     public String ip = "";
     public String hostname = "";
     public String mac = "";
 
 
     public float time = 0;
 
-    public SubnetInfo(InetAddress ip) {
+    public Device(InetAddress ip) {
         this.ip = ip.getHostAddress();
         this.hostname = ip.getCanonicalHostName();
     }
 
     @Override
     public String toString() {
-        return "SubnetInfo{" +
+        return "Device{" +
                 "ip='" + ip + '\'' +
                 ", hostname='" + hostname + '\'' +
                 ", mac='" + mac + '\'' +

readme.md

@@ -39,7 +39,7 @@ then add a library dependency. **Remember** to check for latest release [here](h
 
 ```groovy
     dependencies {
-        compile 'com.github.stealthcopter:AndroidNetworkTools:0.2.1'
+        compile 'com.github.stealthcopter:AndroidNetworkTools:0.3.0'
     }
 ```
 
@@ -49,6 +49,49 @@ Requires internet permission (obviously...)
   <uses-permission android:name="android.permission.INTERNET" />
 ```
 
+### Port Scanning
+
+A simple java based TCP port scanner, fast and easy to use.
+
+```java
+    // Synchronously
+    ArrayList<Integer> openPorts = PortScan.onAddress("192.168.0.1").setPort(21).doScan();
+
+    // Asynchronously
+    PortScan.onAddress("192.168.0.1").setTimeOutMillis(1000).setPortsAll().doScan(new PortScan.PortListener() {
+      @Override
+      public void onResult(int portNo, boolean open) {
+        if (open) // Stub: found open port
+      }
+
+      @Override
+      public void onFinished(ArrayList<Integer> openPorts) {
+        // Stub: Finished scanning
+      }
+    });
+
+```
+
+### Subnet Devices
+
+Finds devices that respond to ping that are on the same subnet as the current device.
+
+```
+    // Asynchronously
+    SubnetDevices.fromLocalAddress().findDevices(new SubnetDevices.OnSubnetDeviceFound() {
+        @Override
+        public void onDeviceFound(Device device) {
+            // Stub: Found subnet device
+        }
+
+        @Override
+        public void onFinished(ArrayList<Device> devicesFound) {
+            // Stub: Finished scanning
+        }
+    });
+
+```
+
 ### Ping
 
 Uses the native ping binary if available on the device (some devices come without it) and falls back to a TCP request on port 7 (echo request) if not.
@@ -68,28 +111,7 @@ Uses the native ping binary if available on the device (some devices come withou
 
 Note: If we do have to fall back to using TCP port 7 (the java way) to detect devices we will find significantly less than with the native ping binary. If this is an issue you could consider adding a ping binary to your application or device so that it is always available.
 
-### Port Scanning
-
-A simple java based TCP port scanner, fast and easy to use. 
-
-```java
-    // Synchronously 
-    ArrayList<Integer> openPorts = PortScan.onAddress("192.168.0.1").setPort(21).doScan();
-    
-    // Asynchronously
-    PortScan.onAddress("192.168.0.1").setTimeOutMillis(1000).setPortsAll().doScan(new PortScan.PortListener() {
-      @Override
-      public void onResult(int portNo, boolean open) {
-        if (open) // Stub: found open port
-      }
-
-      @Override
-      public void onFinished(ArrayList<Integer> openPorts) {
-	// Stub: finished scanning
-      }
-    });
 
-```
 Note: If you want a more advanced portscanner you should consider compiling nmap into your project and using that instead.
 
 ### Wake-On-Lan