Missing WPA3 filter and security icon. #267

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Oct 12 08:39:34 EDT 2019
+#Mon Oct 14 11:24:51 EDT 2019
 version_minor=0
-version_build=9
+version_build=10
 version_patch=8
-version_store=49
 version_major=2
+version_store=49

app/src/main/java/com/vrem/wifianalyzer/wifi/model/Security.java

@@ -21,10 +21,13 @@
 import com.vrem.util.EnumUtils;
 import com.vrem.wifianalyzer.R;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -37,29 +40,42 @@ public enum Security {
     WPS(R.drawable.ic_lock_outline),
     WEP(R.drawable.ic_lock_outline),
     WPA(R.drawable.ic_lock),
-    WPA2(R.drawable.ic_lock);
+    WPA2(R.drawable.ic_lock),
+    WPA3(R.drawable.ic_lock, Constants.RSN);
 
     private final int imageResource;
+    private final String additional;
 
     Security(int imageResource) {
+        this(imageResource, null);
+    }
+
+    Security(int imageResource, String additional) {
         this.imageResource = imageResource;
+        this.additional = additional;
     }
 
     @NonNull
-    public static List<Security> findAll(String capabilities) {
-        Set<Security> results = new TreeSet<>();
-        if (capabilities != null) {
-            String[] values = capabilities.toUpperCase(Locale.getDefault())
-                .replace("][", "-").replace("]", "").replace("[", "").split("-");
-            for (String value : values) {
-                try {
-                    results.add(Security.valueOf(value));
-                } catch (Exception e) {
-                    // skip getCapabilities that are not getSecurity
-                }
-            }
+    public static Set<Security> findAll(String capabilities) {
+        if (capabilities == null) {
+            return new TreeSet<>();
         }
-        return new ArrayList<>(results);
+        return new TreeSet<>(
+            CollectionUtils.select(
+                CollectionUtils.collect(parseCapabilities(capabilities), new SecurityTransformer()),
+                PredicateUtils.notNullPredicate()
+            )
+        );
+    }
+
+    private static List<String> parseCapabilities(String capabilities) {
+        return Arrays.asList(capabilities
+            .toUpperCase(Locale.getDefault())
+            .replace("][", "-")
+            .replace("]", "")
+            .replace("[", "")
+            .split("-")
+        );
     }
 
     @NonNull
@@ -73,9 +89,9 @@ public int getImageResource() {
     }
 
     private static class SecurityPredicate implements Predicate<Security> {
-        private final List<Security> securities;
+        private final Set<Security> securities;
 
-        private SecurityPredicate(@NonNull List<Security> securities) {
+        private SecurityPredicate(@NonNull Set<Security> securities) {
             this.securities = securities;
         }
 
@@ -85,4 +101,31 @@ public boolean evaluate(Security security) {
         }
     }
 
+    private static class SecurityAdditionalPredicate implements Predicate<Security> {
+        private final String value;
+
+        private SecurityAdditionalPredicate(@NonNull String value) {
+            this.value = value;
+        }
+
+        @Override
+        public boolean evaluate(Security security) {
+            return value.equals(security.additional);
+        }
+    }
+
+    private static class SecurityTransformer implements Transformer<String, Security> {
+        @Override
+        public Security transform(String input) {
+            try {
+                return Security.valueOf(input);
+            } catch (Exception e) {
+                return IterableUtils.find(EnumUtils.values(Security.class), new SecurityAdditionalPredicate(input));
+            }
+        }
+    }
+
+    private static class Constants {
+        static final String RSN = "RSN";
+    }
 }

app/src/main/res/layout/filter_security.xml

@@ -89,6 +89,15 @@
             android:textColor="@color/selected"
             android:textStyle="bold"/>
 
+        <TextView
+            android:id="@+id/filterSecurityWPA3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/security_wpa3"
+            android:textColor="@color/selected"
+            android:textStyle="bold" />
     </LinearLayout>
 
     <include layout="@layout/separator_line"/>

app/src/main/res/values/strings.xml

@@ -202,6 +202,7 @@
     <string name="security_wep" translatable="false">"WEP"</string>
     <string name="security_wpa" translatable="false">"WPA"</string>
     <string name="security_wpa2" translatable="false">"WPA2"</string>
+    <string name="security_wpa3" translatable="false">"WPA3"</string>
     <!-- security end -->
 
     <!-- filter start -->

app/src/test/java/com/vrem/wifianalyzer/wifi/model/SecurityTest.java

@@ -23,7 +23,8 @@
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -32,7 +33,7 @@ public class SecurityTest {
 
     @Test
     public void testSecurity() {
-        assertEquals(5, Security.values().length);
+        assertEquals(6, Security.values().length);
     }
 
     @Test
@@ -42,12 +43,29 @@ public void testGetImageResource() {
         assertEquals(R.drawable.ic_lock_outline, Security.WEP.getImageResource());
         assertEquals(R.drawable.ic_lock, Security.WPA.getImageResource());
         assertEquals(R.drawable.ic_lock, Security.WPA2.getImageResource());
+        assertEquals(R.drawable.ic_lock, Security.WPA3.getImageResource());
     }
 
     @Test
     public void testFindAll() {
-        List<Security> expected = Arrays.asList(Security.WPS, Security.WEP, Security.WPA, Security.WPA2);
-        assertEquals(expected, Security.findAll("WPA-WPA2-WPA-WEP-WPS-WPA2"));
+        // setup
+        String capabilities = "WPA-WPA2-WPA-WEP-YZX-WPA3-WPS-WPA2";
+        Set<Security> expected = new TreeSet<>(Arrays.asList(Security.WPS, Security.WEP, Security.WPA, Security.WPA2, Security.WPA3));
+        // execute
+        Set<Security> actual = Security.findAll(capabilities);
+        // validate
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testFindAllWithAdditional() {
+        // setup
+        String capabilities = "WPA-WPA2-WPA-WEP-RSN-KPG-WPS-WPA2";
+        Set<Security> expected = new TreeSet<>(Arrays.asList(Security.WPS, Security.WEP, Security.WPA, Security.WPA2, Security.WPA3));
+        // execute
+        Set<Security> actual = Security.findAll(capabilities);
+        // validate
+        assertEquals(expected, actual);
     }
 
     @Test
@@ -58,11 +76,13 @@ public void testFindOne() {
         assertEquals(Security.WEP, Security.findOne(Security.WEP.name()));
         assertEquals(Security.WPA, Security.findOne(Security.WPA.name()));
         assertEquals(Security.WPA2, Security.findOne(Security.WPA2.name()));
+        assertEquals(Security.WPA3, Security.findOne(Security.WPA3.name()));
+        assertEquals(Security.WPA3, Security.findOne("RSN"));
     }
 
     @Test
     public void testOrder() {
-        Security[] expected = {Security.NONE, Security.WPS, Security.WEP, Security.WPA, Security.WPA2};
+        Security[] expected = {Security.NONE, Security.WPS, Security.WEP, Security.WPA, Security.WPA2, Security.WPA3};
         assertArrayEquals(expected, Security.values());
     }
 }