Fixed stupid merge commit issue

Author: stealthcopter

app/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
 
     // This is so we can publish straight to Google Play
-    classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
+    classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
   }
 }
 
@@ -17,8 +17,8 @@ apply plugin: 'spoon'
 apply plugin: 'com.github.triplet.play'
 
 play {
-  track = 'alpha'
-  serviceAccountEmail = 'androidnetworktoolspublisher@api-6650335122940819061-609121.iam.gserviceaccount.com'
+  track = 'beta'
+  serviceAccountEmail ANDROID_NETWORK_TOOLS_SERVICE_ACCOUNT
   pk12File = file('../key.p12')
 }
 
@@ -30,8 +30,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 13
-    versionName "0.3.08"
+    versionCode versionName
+    versionName versionCode
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 
@@ -57,13 +57,6 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
-
-//  productFlavors {
-//    regular {  }
-//    // Add a CI only flavor that has extra permissions needed for CI to perform
-//    ci {  }
-//  }
-
 }
 
 // Spoon used for CI / Testing

app/src/androidTest/java/com/stealthcotper/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);
+    }
 }

build.gradle

@@ -30,6 +30,6 @@ subprojects {
   ext.targetSdkVer = 27
   ext.supportLibVer = "27.1.1"
 
-  ext.versionName = "0.3.08"
-  ext.versionCode = 13
+  ext.versionName = "0.4.0"
+  ext.versionCode = 14
 }

library/build.gradle

@@ -1,25 +1,12 @@
-apply plugin: 'com.android.library'
+apply plugin: 'java'
+apply plugin: 'maven'
 
-android {
-  compileSdkVersion compileSdkVer
-  buildToolsVersion buildToolsVer
-
-  defaultConfig {
-    minSdkVersion minSdkVer
-    targetSdkVersion targetSdkVer
-    versionCode 13
-    versionName "0.3.08"
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
-  }
-}
+group = 'com.github.stealthcopter'
 
 dependencies {
   testImplementation 'junit:junit:4.12'
   testImplementation 'org.mockito:mockito-core:2.10.0'
-  provided 'com.android.support:appcompat-v7:27.1.1'
 }
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"

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" or "01-23-45-67-89-AB"
      */
     public static boolean isValidMACAddress(final String macAddress) {
         return macAddress != null && PATTERN_MAC.matcher(macAddress).matches();
@@ -32,12 +29,11 @@ public static boolean isValidMACAddress(final String macAddress) {
      * Convert a MAC string to bytes
      *
      * @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"
-     *
+     *               eg: "01:23:45:67:89:AB" or "01-23-45-67-89-AB"
      * @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");
 
@@ -56,4 +52,4 @@ public static byte[] getMacBytes(@NonNull String macStr) throws IllegalArgumentE
         return bytes;
     }
 
-}
+}

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;
@@ -14,11 +12,21 @@
  */
 public class Ping {
 
+    // Only try ping using the java method
+    public static final int PING_JAVA = 0;
+
+    // Only try ping using the native method (will only work if native ping binary is found)
+    public static final int PING_NATIVE = 1;
+
+    // Use a hybrid ping that will attempt to use native binary but fallback to using java method
+    // if it's not found.
+    public static final int PING_HYBRID = 2;
+
     // This class is not to be instantiated
     private Ping() {
     }
 
-    public interface PingListener{
+    public interface PingListener {
         void onResult(PingResult pingResult);
         void onFinished(PingStats pingStats);
         void onError(Exception e);
@@ -40,52 +48,57 @@ public interface PingListener{
      * @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 +109,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 +122,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);
         }
     }
@@ -125,6 +139,7 @@ public void cancel() {
      *
      * 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 +150,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 +167,7 @@ public void run() {
                     return;
                 }
 
-                if (address == null){
+                if (address == null) {
                     pingListener.onError(new NullPointerException("Address is null"));
                     return;
                 }
@@ -166,24 +182,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,12 +211,12 @@ public void run() {
                     }
                 }
 
-                if (pingListener!=null){
+                if (pingListener != null) {
                     pingListener.onFinished(new PingStats(address, pingsCompleted, noLostPackets, totalPingTime, minPingTime, maxPingTime));
                 }
             }
         }).start();
         return this;
     }
 
-}
+}