Merge branch 'feature'

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -25,18 +25,20 @@ dependencies {
     // Compile Build Dependencies
     implementation fileTree(include: ["*.jar"], dir: "libs")
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.media:media:1.0.1'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.collection:collection:1.1.0'
+    implementation 'androidx.media:media:1.1.0'
     implementation 'org.apache.commons:commons-lang3:3.9'
     implementation 'org.apache.commons:commons-collections4:4.4'
     implementation 'com.jjoe64:graphview:4.2.2'
     // Unit Test Dependencies
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.2'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.2'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.4'
+    testImplementation 'org.powermock:powermock-api-mockito2:2.0.4'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation 'androidx.test.ext:junit:1.1.1'
     // Android Test Dependencies
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/java/com/vrem/util/LocaleUtils.java

@@ -38,7 +38,6 @@
 
 public class LocaleUtils {
     static final Locale SPANISH = new Locale("es");
-    static final Locale POLISH = new Locale("pl");
     static final Locale PORTUGUESE = new Locale("pt");
     static final Locale RUSSIAN = new Locale("ru");
     private static final String SEPARATOR = "_";
@@ -157,11 +156,11 @@ private static class SyncAvoid {
                 SPANISH,
                 Locale.FRENCH,
                 Locale.ITALIAN,
-                POLISH,
                 PORTUGUESE,
                 RUSSIAN,
                 Locale.SIMPLIFIED_CHINESE,
-                Locale.TRADITIONAL_CHINESE, DEFAULT)));
+                Locale.TRADITIONAL_CHINESE,
+                DEFAULT)));
         }
 
         private static class CountryClosure implements Closure<Locale> {

app/src/main/java/com/vrem/wifianalyzer/MainContext.java

@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.view.LayoutInflater;
 
@@ -107,7 +106,6 @@ void setFilterAdapter(FilterAdapter filterAdapter) {
 
     void initialize(@NonNull MainActivity mainActivity, boolean largeScreen) {
         Context applicationContext = mainActivity.getApplicationContext();
-        WifiManager wifiManager = (WifiManager) applicationContext.getSystemService(Context.WIFI_SERVICE);
         Handler handler = new Handler();
         Repository repository = new Repository(applicationContext);
         Settings currentSettings = SettingsFactory.make(repository);
@@ -117,7 +115,7 @@ void initialize(@NonNull MainActivity mainActivity, boolean largeScreen) {
         setConfiguration(currentConfiguration);
         setSettings(currentSettings);
         setVendorService(VendorServiceFactory.makeVendorService(mainActivity.getResources()));
-        setScannerService(ScannerServiceFactory.makeScannerService(wifiManager, handler, currentSettings));
+        setScannerService(ScannerServiceFactory.makeScannerService(mainActivity, handler, currentSettings));
         setFilterAdapter(new FilterAdapter(currentSettings));
     }
 

app/src/main/java/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.java

@@ -91,7 +91,7 @@ public GraphView getGraphView() {
     private int getNumX() {
         int channelFirst = wiFiChannelPair.first.getChannel() - WiFiChannels.CHANNEL_OFFSET;
         int channelLast = wiFiChannelPair.second.getChannel() + WiFiChannels.CHANNEL_OFFSET;
-        return Math.min(GraphConstants.NUM_X_CHANNEL, channelLast - channelFirst + 1);
+        return channelLast - channelFirst + 1;
     }
 
     @NonNull

app/src/main/java/com/vrem/wifianalyzer/wifi/filter/SecurityFilter.java

@@ -38,6 +38,7 @@ class SecurityFilter extends EnumFilter<Security, SecurityAdapter> {
         ids.put(Security.WEP, R.id.filterSecurityWEP);
         ids.put(Security.WPA, R.id.filterSecurityWPA);
         ids.put(Security.WPA2, R.id.filterSecurityWPA2);
+        ids.put(Security.WPA3, R.id.filterSecurityWPA3);
     }
 
     SecurityFilter(@NonNull SecurityAdapter securityAdapter, @NonNull Dialog dialog) {

app/src/main/java/com/vrem/wifianalyzer/wifi/graphutils/GraphConstants.java

@@ -27,8 +27,6 @@ public class GraphConstants {
     public static final int MIN_Y = -100;
     public static final int MIN_Y_OFFSET = -1;
     public static final int MIN_Y_HALF = MIN_Y / 2;
-    public static final int NUM_X_CHANNEL = 18;
-    public static final int NUM_X_TIME = 21;
     public static final int MAX_NOTSEEN_COUNT = 20;
     public static final int THICKNESS_INVISIBLE = 0;
     public static final int THICKNESS_REGULAR = 5;

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/java/com/vrem/wifianalyzer/wifi/model/WiFiDetail.java

@@ -31,7 +31,7 @@
 
 public class WiFiDetail implements Comparable<WiFiDetail> {
     public static final WiFiDetail EMPTY = new WiFiDetail(StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, WiFiSignal.EMPTY);
-    private static final String SSID_EMPTY = "***";
+    private static final String SSID_EMPTY = "*hidden*";
 
     private final List<WiFiDetail> children;
     private final String SSID;

app/src/main/java/com/vrem/wifianalyzer/wifi/scanner/PeriodicScan.java

@@ -25,8 +25,8 @@
 import androidx.annotation.NonNull;
 
 class PeriodicScan implements Runnable {
-    static final int DELAY_INITIAL = 1;
-    static final int DELAY_INTERVAL = 1000;
+    static final long DELAY_INITIAL = 1L;
+    static final long DELAY_INTERVAL = 1000L;
 
     private final ScannerService scanner;
     private final Handler handler;
@@ -49,7 +49,7 @@ void start() {
         nextRun(DELAY_INITIAL);
     }
 
-    private void nextRun(int delayInitial) {
+    private void nextRun(long delayInitial) {
         stop();
         handler.postDelayed(this, delayInitial);
         running = true;

app/src/main/java/com/vrem/wifianalyzer/wifi/scanner/Scanner.java

@@ -18,15 +18,10 @@
 
 package com.vrem.wifianalyzer.wifi.scanner;
 
-import android.annotation.TargetApi;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Handler;
 
-import com.vrem.util.BuildUtils;
-import com.vrem.wifianalyzer.ActivityUtils;
 import com.vrem.wifianalyzer.settings.Settings;
 import com.vrem.wifianalyzer.wifi.model.WiFiData;
 
@@ -40,16 +35,16 @@
 
 class Scanner implements ScannerService {
     private final List<UpdateNotifier> updateNotifiers;
-    private final WifiManager wifiManager;
     private final Settings settings;
     private Transformer transformer;
     private WiFiData wiFiData;
+    private WiFiManagerWrapper wiFiManagerWrapper;
     private Cache cache;
     private PeriodicScan periodicScan;
 
-    Scanner(@NonNull WifiManager wifiManager, @NonNull Handler handler, @NonNull Settings settings) {
+    Scanner(@NonNull WiFiManagerWrapper wiFiManagerWrapper, @NonNull Handler handler, @NonNull Settings settings) {
         this.updateNotifiers = new ArrayList<>();
-        this.wifiManager = wifiManager;
+        this.wiFiManagerWrapper = wiFiManagerWrapper;
         this.settings = settings;
         this.wiFiData = WiFiData.EMPTY;
         this.setTransformer(new Transformer());
@@ -59,7 +54,7 @@ class Scanner implements ScannerService {
 
     @Override
     public void update() {
-        enableWiFi();
+        wiFiManagerWrapper.enableWiFi();
         scanResults();
         wiFiData = transformer.transformToWiFiData(cache.getScanResults(), cache.getWifiInfo());
         IterableUtils.forEach(updateNotifiers, new UpdateClosure());
@@ -98,22 +93,11 @@ public void resume() {
 
     @Override
     public void stop() {
-        if (!BuildUtils.isMinVersionQ()) {
-            try {
-                if (settings.isWiFiOffOnExit()) {
-                    disableWiFiLegacy();
-                }
-            } catch (Exception e) {
-                // critical error: do not die
-            }
+        if (settings.isWiFiOffOnExit()) {
+            wiFiManagerWrapper.disableWiFi();
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private void disableWiFiLegacy() {
-        wifiManager.setWifiEnabled(false);
-    }
-
     @NonNull
     PeriodicScan getPeriodicScan() {
         return periodicScan;
@@ -136,38 +120,12 @@ List<UpdateNotifier> getUpdateNotifiers() {
         return updateNotifiers;
     }
 
-    private void enableWiFi() {
-        try {
-            if (!wifiManager.isWifiEnabled()) {
-                if (BuildUtils.isMinVersionQ()) {
-                    enableWiFiAndroidQ();
-                } else {
-                    enableWiFiLegacy();
-                }
-            }
-        } catch (Exception e) {
-            // critical error: do not die
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.Q)
-    private void enableWiFiAndroidQ() {
-        ActivityUtils.startWiFiSettings();
-    }
-
-    @SuppressWarnings("deprecation")
-    private void enableWiFiLegacy() {
-        wifiManager.setWifiEnabled(true);
-    }
-
     private void scanResults() {
         try {
-            if (wifiManager.startScan()) {
-                List<ScanResult> scanResults = wifiManager.getScanResults();
-                WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-                if (scanResults != null) {
-                    cache.add(scanResults, wifiInfo);
-                }
+            if (wiFiManagerWrapper.startScan()) {
+                List<ScanResult> scanResults = wiFiManagerWrapper.scanResults();
+                WifiInfo wifiInfo = wiFiManagerWrapper.wiFiInfo();
+                cache.add(scanResults, wifiInfo);
             }
         } catch (Exception e) {
             // critical error: do not die