Converted library to pure java implementation for extra portability

Author: stealthcopter

library/build.gradle

@@ -1,27 +1,9 @@
-apply plugin: 'com.android.library'
-
-android {
-  compileSdkVersion compileSdkVer
-  buildToolsVersion buildToolsVer
-
-  defaultConfig {
-    minSdkVersion minSdkVer
-    targetSdkVersion targetSdkVer
-    versionCode versionCode
-    versionName versionName
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
-  }
-}
+apply plugin: 'java'
 
 dependencies {
-  // Should be easy enough to replace with a non-android annotations class if want to make it
-  // a totally java project
-  implementation 'com.android.support:support-annotations:27.1.1'
   testImplementation 'junit:junit:4.12'
   testImplementation 'org.mockito:mockito-core:2.10.0'
 }
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"

library/src/androidTest/java/com/stealthcopter/networktools/ApplicationTest.java

@@ -7,7 +7,7 @@
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
  */
 public class ApplicationTest extends ApplicationTestCase<Application> {
-  public ApplicationTest() {
-    super(Application.class);
-  }
+    public ApplicationTest() {
+        super(Application.class);
+    }
 }

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

@@ -1,7 +1,5 @@
 package com.stealthcopter.networktools;
 
-import android.support.annotation.Nullable;
-
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -32,7 +30,6 @@ private ARPInfo() {
      * @param ip - IP address to search for
      * @return the MAC from the ARP cache or null in format "01:23:45:67:89:ab"
      */
-    @Nullable
     public static String getMACFromIPAddress(String ip) {
         if (ip == null) {
             return null;
@@ -60,7 +57,6 @@ public static String getMACFromIPAddress(String ip) {
      * @param macAddress in format "01:23:45:67:89:ab" to search for
      * @return the IP address found or null in format "192.168.0.1"
      */
-    @Nullable
     public static String getIPAddressFromMAC(String macAddress) {
         if (macAddress == null) {
             return null;

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

@@ -1,7 +1,5 @@
 package com.stealthcopter.networktools;
 
-import android.support.annotation.Nullable;
-
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -56,7 +54,6 @@ public static boolean isIPv6Address(final String address) {
     /**
      * @return The first local IPv4 address, or null
      */
-    @Nullable
     public static InetAddress getLocalIPv4Address() {
         ArrayList<InetAddress> localAddresses = getLocalIPv4Addresses();
         return localAddresses.size() > 0 ? localAddresses.get(0) : null;
@@ -93,7 +90,7 @@ public static ArrayList<InetAddress> getLocalIPv4Addresses() {
 
     /**
      * Check if the provided ip address refers to the localhost
-     *
+     * <p>
      * https://stackoverflow.com/a/2406819/315998
      *
      * @param addr - address to check
@@ -116,7 +113,7 @@ public static boolean isIpAddressLocalhost(InetAddress addr) {
 
     /**
      * Check if the provided ip address refers to the localhost
-     *
+     * <p>
      * https://stackoverflow.com/a/2406819/315998
      *
      * @param addr - address to check

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

@@ -1,7 +1,5 @@
 package com.stealthcopter.networktools;
 
-import android.support.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
 public class MACTools {
@@ -19,9 +17,8 @@ private MACTools() {
      * Validates a provided MAC address
      *
      * @param macAddress - the MAC address to check
-     *
      * @return - true if it is valid MAC address in IEEE802 format (either hyphen or colon seperated)
-     *               eg: "01:23:45:67:89:AB:CD:EF" or "01-23-45-67-89-AB-CD-EF"
+     * eg: "01:23:45:67:89:AB:CD:EF" or "01-23-45-67-89-AB-CD-EF"
      */
     public static boolean isValidMACAddress(final String macAddress) {
         return macAddress != null && PATTERN_MAC.matcher(macAddress).matches();
@@ -33,11 +30,10 @@ public static boolean isValidMACAddress(final String macAddress) {
      *
      * @param macStr - MAC string in IEEE802 format (either hyphen or colon seperated)
      *               eg: "01:23:45:67:89:AB:CD:EF" or "01-23-45-67-89-AB-CD-EF"
-     *
      * @return - MAC formatted in bytes
      * @throws IllegalArgumentException - if mac address is invalid
      */
-    public static byte[] getMacBytes(@NonNull String macStr) throws IllegalArgumentException {
+    public static byte[] getMacBytes(String macStr) throws IllegalArgumentException {
 
         if (macStr == null) throw new IllegalArgumentException("Mac Address cannot be null");
 

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

@@ -1,7 +1,5 @@
 package com.stealthcopter.networktools;
 
-import android.support.annotation.NonNull;
-
 import com.stealthcopter.networktools.ping.PingResult;
 import com.stealthcopter.networktools.ping.PingStats;
 import com.stealthcopter.networktools.ping.PingTools;
@@ -18,9 +16,11 @@ public class Ping {
     private Ping() {
     }
 
-    public interface PingListener{
+    public interface PingListener {
         void onResult(PingResult pingResult);
+
         void onFinished(PingStats pingStats);
+
         void onError(Exception e);
     }
 
@@ -33,59 +33,64 @@ public interface PingListener{
 
     /**
      * Set the address to ping
-     *
+     * <p>
      * Note that a lookup is not performed here so that we do not accidentally perform a network
      * request on the UI thread.
      *
      * @param address - Address to be pinged
      * @return this object to allow chaining
      */
-    public static Ping onAddress(@NonNull String address) {
+    public static Ping onAddress(String address) {
         Ping ping = new Ping();
         ping.setAddressString(address);
         return ping;
     }
 
     /**
      * Set the address to ping
+     *
      * @param ia - Address to be pinged
      * @return this object to allow chaining
      */
-    public static Ping onAddress(@NonNull InetAddress ia) {
+    public static Ping onAddress(InetAddress ia) {
         Ping ping = new Ping();
         ping.setAddress(ia);
         return ping;
     }
 
     /**
      * Set the timeout
+     *
      * @param timeOutMillis - the timeout for each ping in milliseconds
      * @return this object to allow chaining
      */
-    public Ping setTimeOutMillis(int timeOutMillis){
-        if (timeOutMillis<0) throw new IllegalArgumentException("Times cannot be less than 0");
+    public Ping setTimeOutMillis(int timeOutMillis) {
+        if (timeOutMillis < 0) throw new IllegalArgumentException("Times cannot be less than 0");
         this.timeOutMillis = timeOutMillis;
         return this;
     }
 
     /**
      * Set the delay between each ping
+     *
      * @param delayBetweenScansMillis - the timeout for each ping in milliseconds
      * @return this object to allow chaining
      */
-    public Ping setDelayMillis(int delayBetweenScansMillis){
-        if (delayBetweenScansMillis<0) throw new IllegalArgumentException("Delay cannot be less than 0");
+    public Ping setDelayMillis(int delayBetweenScansMillis) {
+        if (delayBetweenScansMillis < 0)
+            throw new IllegalArgumentException("Delay cannot be less than 0");
         this.delayBetweenScansMillis = delayBetweenScansMillis;
         return this;
     }
 
     /**
      * Set number of times to ping the address
+     *
      * @param noTimes - number of times, 0 = continuous
      * @return this object to allow chaining
      */
-    public Ping setTimes(int noTimes){
-        if (noTimes<0) throw new IllegalArgumentException("Times cannot be less than 0");
+    public Ping setTimes(int noTimes) {
+        if (noTimes < 0) throw new IllegalArgumentException("Times cannot be less than 0");
         this.times = noTimes;
         return this;
     }
@@ -96,6 +101,7 @@ private void setAddress(InetAddress address) {
 
     /**
      * Set the address string which will be resolved to an address by resolveAddressString()
+     *
      * @param addressString - String of the address to be pinged
      */
     private void setAddressString(String addressString) {
@@ -108,7 +114,7 @@ private void setAddressString(String addressString) {
      * @throws UnknownHostException - if host cannot be found
      */
     private void resolveAddressString() throws UnknownHostException {
-        if (address == null && addressString !=null){
+        if (address == null && addressString != null) {
             address = InetAddress.getByName(addressString);
         }
     }
@@ -122,9 +128,10 @@ public void cancel() {
 
     /**
      * Perform a synchronous ping and return a result, will ignore number of times.
-     *
+     * <p>
      * Note that this should be performed on a background thread as it will perform a network
      * request
+     *
      * @return - ping result
      */
     public PingResult doPing() throws UnknownHostException {
@@ -135,10 +142,11 @@ public PingResult doPing() throws UnknownHostException {
 
     /**
      * Perform an asynchronous ping
+     *
      * @param pingListener - the listener to fire PingResults to.
      * @return - this so we can cancel if needed
      */
-    public Ping doPing(final PingListener pingListener){
+    public Ping doPing(final PingListener pingListener) {
 
         new Thread(new Runnable() {
             @Override
@@ -151,7 +159,7 @@ public void run() {
                     return;
                 }
 
-                if (address == null){
+                if (address == null) {
                     pingListener.onError(new NullPointerException("Address is null"));
                     return;
                 }
@@ -166,24 +174,23 @@ public void run() {
                 int noPings = times;
 
                 // times == 0 is the case that we can continuous scanning
-                while(noPings>0 || times == 0){
+                while (noPings > 0 || times == 0) {
                     PingResult pingResult = PingTools.doPing(address, timeOutMillis);
 
-                    if (pingListener!=null){
+                    if (pingListener != null) {
                         pingListener.onResult(pingResult);
                     }
 
                     // Update ping stats
                     pingsCompleted++;
 
-                    if (pingResult.hasError()){
+                    if (pingResult.hasError()) {
                         noLostPackets++;
-                    }
-                    else{
+                    } else {
                         float timeTaken = pingResult.getTimeTaken();
                         totalPingTime += timeTaken;
-                        if (maxPingTime == - 1 || timeTaken > maxPingTime) maxPingTime = timeTaken;
-                        if (minPingTime == - 1 || timeTaken < minPingTime) minPingTime = timeTaken;
+                        if (maxPingTime == -1 || timeTaken > maxPingTime) maxPingTime = timeTaken;
+                        if (minPingTime == -1 || timeTaken < minPingTime) minPingTime = timeTaken;
                     }
 
                     noPings--;
@@ -196,7 +203,7 @@ public void run() {
                     }
                 }
 
-                if (pingListener!=null){
+                if (pingListener != null) {
                     pingListener.onFinished(new PingStats(address, pingsCompleted, noLostPackets, totalPingTime, minPingTime, maxPingTime));
                 }
             }