sync connection and scan

Author: VREMSoftwareDevelopment

app/build.properties

@@ -17,9 +17,9 @@
 #
 
 #Build Properties
-#Sat Jun 15 09:06:49 EDT 2019
+#Sat Jun 15 11:08:13 EDT 2019
 version_minor=0
-version_build=10
+version_build=11
 version_patch=4
-version_store=45
 version_major=2
+version_store=45

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

@@ -19,6 +19,7 @@
 package com.vrem.wifianalyzer.wifi.scanner;
 
 import android.net.wifi.ScanResult;
+import android.net.wifi.WifiInfo;
 import android.support.annotation.NonNull;
 
 import com.vrem.wifianalyzer.MainContext;
@@ -38,6 +39,7 @@ class Cache {
 
     private static final int ADJUST = 10;
     private final Deque<List<ScanResult>> cachedScanResults = new ArrayDeque<>();
+    private WifiInfo cachedWifiInfo = null;
 
     @NonNull
     List<CacheResult> getScanResults() {
@@ -62,6 +64,10 @@ List<CacheResult> getScanResults() {
         return results;
     }
 
+    WifiInfo getWifiInfo() {
+        return cachedWifiInfo;
+    }
+
     @NonNull
     private CacheResult getCacheResult(@NonNull ScanResult current, int level, int count) {
         CacheResult cacheResult;
@@ -81,12 +87,13 @@ private List<ScanResult> combineCache() {
         return scanResults;
     }
 
-    void add(@NonNull List<ScanResult> scanResults) {
+    void add(@NonNull List<ScanResult> scanResults, WifiInfo wifiInfo) {
         int cacheSize = getCacheSize();
         while (cachedScanResults.size() >= cacheSize) {
             cachedScanResults.pollLast();
         }
         cachedScanResults.addFirst(scanResults);
+        cachedWifiInfo = wifiInfo;
     }
 
     @NonNull

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

@@ -57,7 +57,7 @@ class Scanner implements ScannerService {
     public void update() {
         enableWiFi();
         scanResults();
-        wiFiData = transformer.transformToWiFiData(cache.getScanResults(), wiFiInfo(), wifiConfiguration());
+        wiFiData = transformer.transformToWiFiData(cache.getScanResults(), cache.getWifiInfo(), wifiConfiguration());
         IterableUtils.forEach(updateNotifiers, new UpdateClosure());
     }
 
@@ -135,29 +135,20 @@ private void enableWiFi() {
         }
     }
 
-    @SuppressWarnings("deprecation")
     private void scanResults() {
         try {
             if (wifiManager.startScan()) {
                 List<ScanResult> scanResults = wifiManager.getScanResults();
+                WifiInfo wifiInfo = wifiManager.getConnectionInfo();
                 if (scanResults != null) {
-                    cache.add(scanResults);
+                    cache.add(scanResults, wifiInfo);
                 }
             }
         } catch (Exception e) {
             // critical error: do not die
         }
     }
 
-    private WifiInfo wiFiInfo() {
-        try {
-            return wifiManager.getConnectionInfo();
-        } catch (Exception e) {
-            // critical error: do not die
-            return null;
-        }
-    }
-
     private List<WifiConfiguration> wifiConfiguration() {
         try {
             return wifiManager.getConfiguredNetworks();

app/src/test/java/com/vrem/wifianalyzer/wifi/scanner/CacheTest.java

@@ -19,6 +19,7 @@
 package com.vrem.wifianalyzer.wifi.scanner;
 
 import android.net.wifi.ScanResult;
+import android.net.wifi.WifiInfo;
 
 import com.vrem.wifianalyzer.Configuration;
 import com.vrem.wifianalyzer.MainContextHelper;
@@ -44,6 +45,8 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class CacheTest {
+    @Mock
+    private WifiInfo wifiInfo;
     @Mock
     private ScanResult scanResult1;
     @Mock
@@ -82,7 +85,7 @@ public void testAddWithSizeAvailable() {
         // setup
         List<ScanResult> scanResults = Collections.emptyList();
         // execute
-        fixture.add(scanResults);
+        fixture.add(scanResults, wifiInfo);
         // validate
         assertEquals(scanResults, fixture.getFirst());
     }
@@ -96,7 +99,7 @@ public void testAddCompliesToMaxCacheSizeWithSizeAvailable() {
         for (int i = 0; i < cacheSize; i++) {
             List<ScanResult> scanResults = Collections.emptyList();
             expected.add(scanResults);
-            fixture.add(scanResults);
+            fixture.add(scanResults, wifiInfo);
         }
         // validate
         assertEquals(cacheSize, expected.size());
@@ -144,9 +147,10 @@ public void testAdd() {
         when(configuration.isSizeAvailable()).thenReturn(false);
         List<ScanResult> scanResults = Collections.emptyList();
         // execute
-        fixture.add(scanResults);
+        fixture.add(scanResults, wifiInfo);
         // validate
         assertEquals(scanResults, fixture.getFirst());
+        assertEquals(wifiInfo, fixture.getWifiInfo());
     }
 
     @Test
@@ -159,7 +163,7 @@ public void testAddCompliesToMaxCacheSize() {
         for (int i = 0; i < cacheSize; i++) {
             List<ScanResult> scanResults = Collections.emptyList();
             expected.add(scanResults);
-            fixture.add(scanResults);
+            fixture.add(scanResults, wifiInfo);
         }
         // validate
         assertEquals(cacheSize, expected.size());
@@ -210,9 +214,9 @@ private void withScanResults() {
         scanResult6.BSSID = "BBSID3";
         scanResult6.level = 10;
 
-        fixture.add(Arrays.asList(scanResult1, scanResult4));
-        fixture.add(Arrays.asList(scanResult2, scanResult5));
-        fixture.add(Arrays.asList(scanResult3, scanResult6));
+        fixture.add(Arrays.asList(scanResult1, scanResult4), wifiInfo);
+        fixture.add(Arrays.asList(scanResult2, scanResult5), wifiInfo);
+        fixture.add(Arrays.asList(scanResult3, scanResult6), wifiInfo);
     }
 
 }

app/src/test/java/com/vrem/wifianalyzer/wifi/scanner/ScannerTest.java

@@ -125,7 +125,7 @@ public void testUpdateWithWiFiData() {
         // validate
         assertEquals(wiFiData, fixture.getWiFiData());
         verifyCache();
-        verifyTransfomer();
+        verifyTransformer();
         verifyWiFiManager();
         verify(updateNotifier1).update(wiFiData);
         verify(updateNotifier2).update(wiFiData);
@@ -178,15 +178,17 @@ public void testStopDoesNotTurnsOffWiFi() {
 
     private void withCache() {
         when(cache.getScanResults()).thenReturn(cacheResults);
+        when(cache.getWifiInfo()).thenReturn(wifiInfo);
     }
 
     private void withTransformer() {
         when(transformer.transformToWiFiData(cacheResults, wifiInfo, configuredNetworks)).thenReturn(wiFiData);
     }
 
     private void verifyCache() {
-        verify(cache).add(scanResults);
+        verify(cache).add(scanResults, wifiInfo);
         verify(cache).getScanResults();
+        verify(cache).getWifiInfo();
     }
 
     private void verifyWiFiManager() {
@@ -210,17 +212,15 @@ private void withWiFiManager() {
         withWiFiManagerStartScan();
     }
 
-    @SuppressWarnings("deprecation")
     private void verifyWiFiManagerStartScan() {
         verify(wifiManager).startScan();
     }
 
-    @SuppressWarnings("deprecation")
     private void withWiFiManagerStartScan() {
         when(wifiManager.startScan()).thenReturn(true);
     }
 
-    private void verifyTransfomer() {
+    private void verifyTransformer() {
         verify(transformer).transformToWiFiData(cacheResults, wifiInfo, configuredNetworks);
     }