From d2cce891d7d648220f25688c8fd8995d2e417b32 Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Sun, 17 Jun 2018 17:39:59 +0100
Subject: [PATCH 1/7] Updated CI scripts

---
 app/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4adf6ba..05c5390 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,9 @@ apply plugin: 'com.github.triplet.play'
 
 play {
   track = 'beta'
-  serviceAccountEmail ANDROID_NETWORK_TOOLS_SERVICE_ACCOUNT
+  if (project.hasProperty("ANDROID_NETWORK_TOOLS_SERVICE_ACCOUNT")) {
+    serviceAccountEmail ANDROID_NETWORK_TOOLS_SERVICE_ACCOUNT
+  }
   pk12File = file('../key.p12')
 }
 

From 751447535d704afe23defb1f95186bf25d5d14a0 Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Mon, 18 Jun 2018 09:23:38 +0100
Subject: [PATCH 2/7] Added javadoc

---
 library/build.gradle                          |  9 +++++++++
 .../stealthcopter/networktools/ARPInfo.java   |  4 ++--
 .../com/stealthcopter/networktools/Ping.java  |  1 +
 .../stealthcopter/networktools/PortScan.java  |  2 +-
 .../networktools/SubnetDevices.java           | 20 ++++++++++++++++---
 .../stealthcopter/networktools/WakeOnLan.java | 11 ++++++++++
 .../networktools/ping/PingNative.java         | 12 ++++++-----
 .../networktools/ping/PingTools.java          |  4 ++--
 .../portscanning/PortScanTCP.java             |  8 ++++++++
 .../portscanning/PortScanUDP.java             |  9 +++++++++
 scripts/github-release.sh                     |  6 +++---
 11 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 6715221..a884fc6 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,5 +8,14 @@ dependencies {
   testImplementation 'org.mockito:mockito-core:2.10.0'
 }
 
+task javadocJar(type: Jar) {
+    classifier = 'javadoc'
+    from javadoc
+}
+
+artifacts {
+    archives javadocJar
+}
+
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
\ No newline at end of file
diff --git a/library/src/main/java/com/stealthcopter/networktools/ARPInfo.java b/library/src/main/java/com/stealthcopter/networktools/ARPInfo.java
index 46d4878..2c07a99 100644
--- a/library/src/main/java/com/stealthcopter/networktools/ARPInfo.java
+++ b/library/src/main/java/com/stealthcopter/networktools/ARPInfo.java
@@ -8,10 +8,10 @@
 
 /**
  * Created by mat on 09/12/15.
- * <p/>
+ *
  * Looks at the file at /proc/net/arp to fromIPAddress ip/mac addresses from the cache
  * We assume that the file has this structure:
- * <p/>
+ *
  * IP address       HW type     Flags       HW address            Mask     Device
  * 192.168.18.11    0x1         0x2         00:04:20:06:55:1a     *        eth0
  * 192.168.18.36    0x1         0x2         00:22:43:ab:2a:5b     *        eth0
diff --git a/library/src/main/java/com/stealthcopter/networktools/Ping.java b/library/src/main/java/com/stealthcopter/networktools/Ping.java
index 89ff301..6a43fc8 100644
--- a/library/src/main/java/com/stealthcopter/networktools/Ping.java
+++ b/library/src/main/java/com/stealthcopter/networktools/Ping.java
@@ -141,6 +141,7 @@ public void cancel() {
      * request
      *
      * @return - ping result
+     * @throws UnknownHostException - if the host cannot be resolved
      */
     public PingResult doPing() throws UnknownHostException {
         cancelled = false;
diff --git a/library/src/main/java/com/stealthcopter/networktools/PortScan.java b/library/src/main/java/com/stealthcopter/networktools/PortScan.java
index e47de2e..ef9f0bc 100644
--- a/library/src/main/java/com/stealthcopter/networktools/PortScan.java
+++ b/library/src/main/java/com/stealthcopter/networktools/PortScan.java
@@ -54,7 +54,7 @@ public interface PortListener {
      * @param address - Address to be pinged
      * @return this object to allow chaining
      * @throws UnknownHostException - if no IP address for the
-     *                              <code>host</code> could be found, or if a scope_id was specified
+     *                              {@code host} could be found, or if a scope_id was specified
      *                              for a global IPv6 address.
      */
     public static PortScan onAddress(String address) throws UnknownHostException {
diff --git a/library/src/main/java/com/stealthcopter/networktools/SubnetDevices.java b/library/src/main/java/com/stealthcopter/networktools/SubnetDevices.java
index 65dc7d3..f42b9ee 100644
--- a/library/src/main/java/com/stealthcopter/networktools/SubnetDevices.java
+++ b/library/src/main/java/com/stealthcopter/networktools/SubnetDevices.java
@@ -34,6 +34,8 @@ public interface OnSubnetDeviceFound {
 
     /**
      * Find devices on the subnet working from the local device ip address
+     *
+     * @return - this for chaining
      */
     public static SubnetDevices fromLocalAddress() {
         InetAddress ipv4 = IPTools.getLocalIPv4Address();
@@ -47,6 +49,8 @@ public static SubnetDevices fromLocalAddress() {
 
     /**
      * @param inetAddress - an ip address in the subnet
+     *
+     * @return - this for chaining
      */
     public static SubnetDevices fromIPAddress(InetAddress inetAddress) {
         return fromIPAddress(inetAddress.getHostAddress());
@@ -55,6 +59,8 @@ public static SubnetDevices fromIPAddress(InetAddress inetAddress) {
     /**
      * @param ipAddress - the ipAddress string of any device in the subnet i.e. "192.168.0.1"
      *                  the final part will be ignored
+     *
+     * @return - this for chaining
      */
     public static SubnetDevices fromIPAddress(final String ipAddress) {
 
@@ -84,6 +90,8 @@ public static SubnetDevices fromIPAddress(final String ipAddress) {
 
     /**
      * @param ipAddresses - the ipAddresses of devices to be checked
+     *
+     * @return - this for chaining
      */
     public static SubnetDevices fromIPList(final List<String> ipAddresses) {
 
@@ -100,8 +108,10 @@ public static SubnetDevices fromIPList(final List<String> ipAddresses) {
     /**
      * @param noThreads set the number of threads to work with, note we default to a large number
      *                  as these requests are network heavy not cpu heavy.
-     * @return self
-     * @throws IllegalAccessException
+     *
+     * @throws IllegalArgumentException - if invalid number of threads requested
+     *
+     * @return - this for chaining
      */
     public SubnetDevices setNoThreads(int noThreads) throws IllegalArgumentException {
         if (noThreads < 1) throw new IllegalArgumentException("Cannot have less than 1 thread");
@@ -112,9 +122,13 @@ public SubnetDevices setNoThreads(int noThreads) throws IllegalArgumentException
     /**
      * Sets the timeout for each address we try to ping
      *
+     * @param timeOutMillis - timeout in milliseconds for each ping
+     *
      * @return this object to allow chaining
+     *
+     * @throws IllegalArgumentException - if timeout is less than zero
      */
-    public SubnetDevices setTimeOutMillis(int timeOutMillis) {
+    public SubnetDevices setTimeOutMillis(int timeOutMillis) throws IllegalArgumentException {
         if (timeOutMillis < 0) throw new IllegalArgumentException("Timeout cannot be less than 0");
         this.timeOutMillis = timeOutMillis;
         return this;
diff --git a/library/src/main/java/com/stealthcopter/networktools/WakeOnLan.java b/library/src/main/java/com/stealthcopter/networktools/WakeOnLan.java
index d7ad69f..53adb5f 100644
--- a/library/src/main/java/com/stealthcopter/networktools/WakeOnLan.java
+++ b/library/src/main/java/com/stealthcopter/networktools/WakeOnLan.java
@@ -141,6 +141,8 @@ public void wake() throws IOException {
     /**
      * Asynchronous call of the wake method. This will be performed on the background thread
      * and optionally fire a listener when complete, or when an error occurs
+     *
+     * @param wakeOnLanListener - listener to call on result
      */
     public void wake(final WakeOnLanListener wakeOnLanListener) {
 
@@ -165,6 +167,9 @@ public void run() {
      *
      * @param ipStr  - IP String to send to
      * @param macStr - MAC address to wake up
+     *
+     * @throws IllegalArgumentException - invalid ip or mac
+     * @throws IOException - error sending packet
      */
     public static void sendWakeOnLan(String ipStr, String macStr) throws IllegalArgumentException, IOException {
         sendWakeOnLan(ipStr, macStr, DEFAULT_PORT, DEFAULT_TIMEOUT_MILLIS, DEFAULT_NO_PACKETS);
@@ -178,6 +183,9 @@ public static void sendWakeOnLan(String ipStr, String macStr) throws IllegalArgu
      * @param port          - port to send packet to
      * @param timeoutMillis - timeout (millis)
      * @param packets       - number of packets to send
+     *
+     * @throws IllegalArgumentException - invalid ip or mac
+     * @throws IOException - error sending packet
      */
     public static void sendWakeOnLan(final String ipStr, final String macStr, final int port, final int timeoutMillis, final int packets) throws IllegalArgumentException, IOException {
         if (ipStr == null) throw new IllegalArgumentException("Address cannot be null");
@@ -193,6 +201,9 @@ public static void sendWakeOnLan(final String ipStr, final String macStr, final
      * @param port          - port to send packet to
      * @param timeoutMillis - timeout (millis)
      * @param packets       - number of packets to send
+     *
+     * @throws IllegalArgumentException - invalid ip or mac
+     * @throws IOException - error sending packet
      */
     public static void sendWakeOnLan(final InetAddress address, final String macStr, final int port, final int timeoutMillis, final int packets) throws IllegalArgumentException, IOException {
         if (address == null) throw new IllegalArgumentException("Address cannot be null");
diff --git a/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java b/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
index 7ed1430..cc6bfbd 100644
--- a/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
+++ b/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
@@ -86,13 +86,15 @@ public static PingResult ping(InetAddress host, int timeOutMillis) throws IOExce
      * # activity_ping 321321.
      * activity_ping: unknown host 321321.
      *
-     * 1. Check if output contains 0% packet loss : Branch to success -> Get stats
-     * 2. Check if output contains 100% packet loss : Branch to fail -> No stats
-     * 3. Check if output contains 25% packet loss : Branch to partial success -> Get stats
+     * 1. Check if output contains 0% packet loss : Branch to success - Get stats
+     * 2. Check if output contains 100% packet loss : Branch to fail - No stats
+     * 3. Check if output contains 25% packet loss : Branch to partial success - Get stats
      * 4. Check if output contains "unknown host"
      *
-     * @param pingResult
-     * @param s
+     * @param pingResult - the current ping result
+     * @param s - result from ping command
+     *
+     * @return The ping result
      */
     public static PingResult getPingStats(PingResult pingResult, String s) {
         String pingError;
diff --git a/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java b/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
index b327289..bf5f937 100644
--- a/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
+++ b/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
@@ -45,8 +45,8 @@ public static PingResult doPing(InetAddress ia, int timeOutMillis) {
      * @param ia            - address to ping
      * @param timeOutMillis - timeout in millisecdonds
      * @return - the ping results
-     * @throws IOException
-     * @throws InterruptedException
+     * @throws IOException - IO error running ping command
+     * @throws InterruptedException - thread interupt
      */
     public static PingResult doNativePing(InetAddress ia, int timeOutMillis) throws IOException, InterruptedException {
         return PingNative.ping(ia, timeOutMillis);
diff --git a/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanTCP.java b/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanTCP.java
index c2537d5..34050b8 100644
--- a/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanTCP.java
+++ b/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanTCP.java
@@ -14,6 +14,14 @@ public class PortScanTCP {
     private PortScanTCP() {
     }
 
+    /**
+     * Check if a port is open with TCP
+     *
+     * @param ia            - address to scan
+     * @param portNo        - port to scan
+     * @param timeoutMillis - timeout
+     * @return - true if port is open, false if not or unknown
+     */
     public static boolean scanAddress(InetAddress ia, int portNo, int timeoutMillis) {
 
         Socket s = null;
diff --git a/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanUDP.java b/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanUDP.java
index efd1939..fd58e56 100644
--- a/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanUDP.java
+++ b/library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanUDP.java
@@ -14,6 +14,15 @@ public class PortScanUDP {
     private PortScanUDP() {
     }
 
+    /**
+     * Check if a port is open with UDP, note that this isn't reliable
+     * as UDP will does not send ACKs
+     *
+     * @param ia            - address to scan
+     * @param portNo        - port to scan
+     * @param timeoutMillis - timeout
+     * @return - true if port is open, false if not or unknown
+     */
     public static boolean scanAddress(InetAddress ia, int portNo, int timeoutMillis) {
 
         try {
diff --git a/scripts/github-release.sh b/scripts/github-release.sh
index 90ddc51..e1ec1f5 100755
--- a/scripts/github-release.sh
+++ b/scripts/github-release.sh
@@ -16,7 +16,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=$2
     
     echo "Uploading release"
     
@@ -33,7 +33,7 @@ function create_github_release {
     echo "Found id $id"
     
     # Upload apk file
-    GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/release/AndroidNetworkTools.apk"
+    GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/release/AndroidNetworkTools-release.apk"
     GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
     curl -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"$GITHUB_RELEASE_FILE_PATH" $GITHUB_UPLOAD_URL$id/assets?name=$GITHUB_RELASE_FILENAME
 
@@ -57,7 +57,7 @@ function create_github_release {
 
 if [[ $GIT_TAG != *"undefined"* ]]; then
     echo "Creating github release for tag $GIT_TAG"
-    if create_github_release $GITHUB_RELEASE_MODULE; then
+    if create_github_release $GITHUB_RELEASE_MODULE $GIT_TAG; then
         webhook $GITHUB_RELEASE_MODULE "$GITHUB_RELEASE_NAME" "Created github release for tag $TAG"
     else
         webhook $GITHUB_RELEASE_MODULE "$GITHUB_RELEASE_NAME" "Failed to create github release for tag $TAG :("

From 0ad0eb449d97286741b609b9839cd541a88b472d Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Mon, 18 Jun 2018 09:26:00 +0100
Subject: [PATCH 3/7] Added sources

---
 library/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/build.gradle b/library/build.gradle
index a884fc6..e3cfdfd 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,12 +8,18 @@ dependencies {
   testImplementation 'org.mockito:mockito-core:2.10.0'
 }
 
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
     from javadoc
 }
 
 artifacts {
+    archives sourcesJar
     archives javadocJar
 }
 

From c3b3a196037f2e4de478b8d51e11ee7d5d8cdbba Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Wed, 20 Jun 2018 09:56:44 +0100
Subject: [PATCH 4/7] Updated CI scripts #PLAY_BETA

---
 .circleci/key.p12.enc  | Bin 2496 -> 2496 bytes
 .gitignore             |   1 +
 scripts/upload-apks.sh |   4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/key.p12.enc b/.circleci/key.p12.enc
index be3d8cf1641028b746665d6bd066cb3c6d055824..ed07f353d5cfa8ce429404f7bd776548894313e4 100644
GIT binary patch
literal 2496
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
KXttUu&`fP(%F*ut

literal 2496
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
KM3Z1FcehMmz1@HS

diff --git a/.gitignore b/.gitignore
index f88df09..255e0fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /captures
 TODO
 key.p12
+/keystore
diff --git a/scripts/upload-apks.sh b/scripts/upload-apks.sh
index 085e4d6..8a6ebb6 100755
--- a/scripts/upload-apks.sh
+++ b/scripts/upload-apks.sh
@@ -22,7 +22,7 @@ function upload_to_beta {
 function upload_to_google_play {
     echo "Uploading $1 to Google Play"
     
-    if ./gradlew :$1:publishApkRegularRelease ; then
+    if ./gradlew :$1:publishApkRelease ; then
         webhook $1 "$APP_RELEASE_NAME" "Uploading to Google Play Succeeded"
     else
         webhook $1 "$APP_RELEASE_NAME" "Uploading to Google Play FAILED :("
@@ -39,7 +39,7 @@ function upload_to_google_play {
 # Print the git commit message
 echo "Git commit message: ${GIT_COMMIT_DESC}"
 
-if [[ $GIT_COMMIT_DESC == *"#DEPLOY"* ]]; then
+if [[ $GIT_COMMIT_DESC == *"#PLAY_BETA"* ]]; then
     upload_to_google_play "app"  
 else
     echo "Not publishing to Google Play as deploy not found in commit message"

From bbb18e17510da1130df9bbeeef8ed062b22e5d9d Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Wed, 20 Jun 2018 10:00:27 +0100
Subject: [PATCH 5/7] Fixed version numbers #PLAY_BETA

---
 app/build.gradle | 4 ++--
 build.gradle     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 05c5390..0da3309 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode versionName
-    versionName versionCode
+    versionCode appVersionName
+    versionName appVersionCode
     archivesBaseName = "AndroidNetworkTools"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
diff --git a/build.gradle b/build.gradle
index 92d1190..90c9eb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,6 @@ subprojects {
   ext.targetSdkVer = 27
   ext.supportLibVer = "27.1.1"
 
-  ext.versionName = "0.4.0"
-  ext.versionCode = 14
+  ext.appVersionName = "0.4.0"
+  ext.appVersionCode = 14
 }

From 4ab200349fd5222881dd5f65e6b172d7fbd829e8 Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Wed, 20 Jun 2018 10:05:15 +0100
Subject: [PATCH 6/7] Fixed code/name switch #PLAY_BETA

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0da3309..11a38af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode appVersionName
-    versionName appVersionCode
+    versionName appVersionName
+    versionCode appVersionCode
     archivesBaseName = "AndroidNetworkTools"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }

From 90d766b1382aefede7d05c5580807ef0cddcb0e9 Mon Sep 17 00:00:00 2001
From: Matthew Rollings <matthewrollings@gmail.com>
Date: Thu, 21 Jun 2018 16:21:15 +0100
Subject: [PATCH 7/7] Added null check

---
 .../com/stealthcopter/networktools/ping/PingNative.java     | 6 ++++++
 .../java/com/stealthcopter/networktools/ping/PingTools.java | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java b/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
index cc6bfbd..4870a35 100644
--- a/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
+++ b/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
@@ -18,6 +18,12 @@ private PingNative() {
 
     public static PingResult ping(InetAddress host, int timeOutMillis) throws IOException, InterruptedException {
         PingResult pingResult = new PingResult(host);
+
+        if (host == null) {
+            pingResult.isReachable = false;
+            return pingResult;
+        }
+
         StringBuilder echo = new StringBuilder();
         Runtime runtime = Runtime.getRuntime();
 
diff --git a/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java b/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
index bf5f937..b72ab8c 100644
--- a/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
+++ b/library/src/main/java/com/stealthcopter/networktools/ping/PingTools.java
@@ -63,6 +63,12 @@ public static PingResult doNativePing(InetAddress ia, int timeOutMillis) throws
      */
     public static PingResult doJavaPing(InetAddress ia, int timeOutMillis) {
         PingResult pingResult = new PingResult(ia);
+
+        if (ia == null) {
+            pingResult.isReachable = false;
+            return pingResult;
+        }
+
         try {
             long startTime = System.nanoTime();
             final boolean reached = ia.isReachable(timeOutMillis);