Merge pull request #24 from stealthcopter/master

Merging develop changes

Author: stealthcopter

app/build.gradle

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

build.gradle

@@ -27,4 +27,7 @@ subprojects {
   ext.minSdkVer = 10
   ext.targetSdkVer = 24
   ext.supportLibVer = "24.0.0"
+
+  ext.versionName = "0.3.04"
+  ext.versionCode = 12
 }

library/build.gradle

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

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

@@ -8,6 +8,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -81,6 +82,23 @@ public static SubnetDevices fromIPAddress(@NonNull final String ipAddress) {
 
     }
 
+
+    /**
+     * @param ipAddresses - the ipAddresses of devices to be checked
+     *
+     */
+    public static SubnetDevices fromIPList(@NonNull final List<String> ipAddresses) {
+
+        SubnetDevices subnetDevice = new SubnetDevices();
+
+        subnetDevice.addresses = new ArrayList<>();
+
+        subnetDevice.addresses.addAll(ipAddresses);
+
+        return subnetDevice;
+
+    }
+
     /**
      *
      * @param noThreads set the number of threads to work with, note we default to a large number

readme.md

@@ -5,9 +5,9 @@
 
 Disappointed by the lack of good network apis in android / java I developed a collection of handy networking tools for everyday android development.
 
-* Ping
 * Port Scanning
-* Subnet tools (find devices on local network)
+* Subnet Device Finder (discovers devices on local network)
+* Ping
 * Wake-On-Lan
 * & More :)
 

scripts/github-release.sh

@@ -18,7 +18,7 @@ GITHUB_UPLOAD_URL="https://uploads.github.com/repos/stealthcopter/AndroidNetwork
 
 function create_github_release { 
 
-    version=`cat $1/build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
+    version=`cat build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
 
     echo "Uploading release"