Changes before merge

Author: stealthcopter

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

@@ -201,12 +201,12 @@ private void doPortScan() throws Exception {
 
         // Perform synchronous port scan
         appendResultsText("PortScanning IP: " + ipAddress);
-        ArrayList<Integer> openPorts = PortScan.onAddress(ipAddress).setPort(21).doScan();
+        ArrayList<Integer> openPorts = PortScan.onAddress(ipAddress).setPort(21).setMethodTCP().doScan();
 
         final long startTimeMillis = System.currentTimeMillis();
 
         // Perform an asynchronous port scan
-        PortScan.onAddress(ipAddress).setPortsAll().doScan(new PortScan.PortListener() {
+        PortScan.onAddress(ipAddress).setPortsAll().setMethodTCP().doScan(new PortScan.PortListener() {
             @Override
             public void onResult(int portNo, boolean open) {
                 if (open) appendResultsText("Open: " + portNo);

build.gradle

@@ -26,6 +26,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/src/main/java/com/stealthcopter/networktools/MACTools.java

@@ -18,7 +18,7 @@ private MACTools() {
      *
      * @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();
@@ -29,7 +29,7 @@ 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
      */

library/src/main/java/com/stealthcopter/networktools/traceroute/TraceObj.java

@@ -81,7 +81,7 @@ public void testIsIPv6AddressesStandard() {
     }
 
     @Test
-    @Ignore  // Not working yet, possibly not correct pattern for compression
+    @Ignore  // Recheck this, either test is broken or regex is wrong
     public void testIPv6HexCompressedAddress() {
         for (String address : getIPv6AddressesHexCompresed()) {
             assertTrue(IPTools.isIPv6HexCompressedAddress(address));