Merge branch 'feature'

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Jun 16 07:46:36 EDT 2018
+#Sat Aug 04 08:23:22 EDT 2018
 version_minor=9
-version_build=0
+version_build=3
 version_patch=2
-version_major=1
 version_store=40
+version_major=1

app/src/main/java/com/vrem/wifianalyzer/settings/ThemeStyle.java

@@ -25,7 +25,8 @@
 
 public enum ThemeStyle {
     DARK(R.style.ThemeDark, R.style.ThemeDarkNoActionBar),
-    LIGHT(R.style.ThemeLight, R.style.ThemeLightNoActionBar);
+    LIGHT(R.style.ThemeLight, R.style.ThemeLightNoActionBar),
+    SYSTEM(R.style.ThemeSystem, R.style.ThemeSystemNoActionBar);
 
     private final int theme;
     private final int themeNoActionBar;

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

@@ -32,7 +32,6 @@
 import org.apache.commons.collections4.IterableUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 class Scanner implements ScannerService {
@@ -56,7 +55,9 @@ class Scanner implements ScannerService {
 
     @Override
     public void update() {
-        performWiFiScan();
+        enableWiFi();
+        scanResults();
+        wiFiData = transformer.transformToWiFiData(cache.getScanResults(), wiFiInfo(), wifiConfiguration());
         IterableUtils.forEach(updateNotifiers, new UpdateClosure());
     }
 
@@ -124,24 +125,43 @@ List<UpdateNotifier> getUpdateNotifiers() {
         return updateNotifiers;
     }
 
-    private void performWiFiScan() {
-        List<ScanResult> scanResults = Collections.emptyList();
-        WifiInfo wifiInfo = null;
-        List<WifiConfiguration> configuredNetworks = null;
+    private void enableWiFi() {
         try {
             if (!wifiManager.isWifiEnabled()) {
                 wifiManager.setWifiEnabled(true);
             }
+        } catch (Exception e) {
+            // critical error: do not die
+        }
+    }
+
+    private void scanResults() {
+        try {
             if (wifiManager.startScan()) {
-                scanResults = wifiManager.getScanResults();
+                List<ScanResult> scanResults = wifiManager.getScanResults();
+                cache.add(scanResults);
             }
-            wifiInfo = wifiManager.getConnectionInfo();
-            configuredNetworks = wifiManager.getConfiguredNetworks();
         } catch (Exception e) {
-            // critical error: set to no results and do not die
+            // 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();
+        } catch (Exception e) {
+            // critical error: do not die
+            return new ArrayList<>();
         }
-        cache.add(scanResults);
-        wiFiData = transformer.transformToWiFiData(cache.getScanResults(), wifiInfo, configuredNetworks);
     }
 
     private class UpdateClosure implements Closure<UpdateNotifier> {

app/src/main/res/raw/contributors.txt

@@ -18,6 +18,7 @@ Marco Santinelli
 Mateus B. Cassiano
 Michael Melo
 Michael Pickard
+Nikolas Rimikis
 Peter Dave Hello
 Silviu Marcu
 Tomasz Wrobel

app/src/main/res/values-de/arrays.xml

@@ -24,24 +24,24 @@
     <string name="navigation_drawer_close">"Navigationsleiste schließen"</string>
     <string name="scanner_message">"Wird gescannt &#8230;"</string>
     <string name="scanner_pause">"Pausieren"</string>
-    <string name="scanner_play">"Wiedergabe"</string>
+    <string name="scanner_play">"Wiedergeben"</string>
 
     <!-- action start -->
     <string name="action_access_points">"Access Points"</string>
     <string name="action_channel_rating">"Kanalbewertung"</string>
     <string name="action_channel_graph">"Kanalübersicht"</string>
     <string name="action_time_graph">"Signalverlauf"</string>
-    <string name="action_export">"Export"</string>
+    <string name="action_export">"Exportieren"</string>
     <string name="action_channel_available">"Verfügbare Kanäle"</string>
     <string name="action_vendors">"Hersteller"</string>
     <string name="action_settings">"Einstellungen"</string>
     <string name="action_about">"Über"</string>
     <!-- action end -->
 
     <string name="no_data">"Keine Daten"</string>
-    <string name="no_data_msg">"Bitte besuchen Sie den Abschnitt zu häufigen Fragen auf unserer Website."</string>
-    <string name="no_data_geo_warning">"Einige Benutzer mit Android 6+ ("Marshmallow") haben berichtet, dass der Standort-Dienst aktiviert sein muss, damit WLAN-Netzerke erkannt werden können. Benutzer unter "Marshmallow" müssen möglicherweise Standortdienste aktivieren, auch wenn WiFiAnalyzer sie nicht benötigt. Dies scheint ein Problem in Android 6+ zu sein."</string>
-    <string name="permission_msg">"As of Android Marshmallow, location permissions are required to perform a WiFi scan. You will be prompted to enable location services/permissions. Since this app does not require internet access, you can be confident that this app cannot transmit your location!"</string>
+    <string name="no_data_msg">"Bitte besuchen Sie den Abschnitt zu häufig gestellten Fragen auf unserer Website."</string>
+    <string name="no_data_geo_warning">"Einige Benutzer mit Android 6+ ("Marshmallow") haben berichtet, dass der Standort-Dienst aktiviert sein muss, damit WLAN-Netzerke erkannt werden können. Benutzer unter "Marshmallow" müssen möglicherweise die Standortdienste aktivieren, auch wenn WiFiAnalyzer sie nicht explizit benötigt. Dies scheint ein Problem in Android 6+ zu sein."</string>
+    <string name="permission_msg">"In Andrroid Marshmallow ist es erforderlich die Standortdienste zu aktivieren, um Wifi scans durchzuführen. Sie werden aufgeforrdert die Standortdienste-Berechtigung zu erteilen. Da die app keine Internetverbindung benötigt können sie sicher sein, dass  die app Ihren Standort zu Übermitteln!"</string>
 
     <string name="export_not_available">"Export nicht verfügbar"</string>
 
@@ -59,19 +59,46 @@
 
     <!-- settings start -->
     <string name="start_menu_title">"Beim Start anzeigen"</string>
+
     <string name="country_code_title">"Land"</string>
+
     <string name="scan_interval_title">"Scan-Intervall"</string>
     <string name="scan_interval_summary">"%d Sekunden zwischen den Scans"</string>
+
     <string name="sort_by_title">"Sortiere Access Points nach"</string>
+    <string name="sort_by_signal_strength">"Signalstärke"</string>
+    <string name="sort_by_channel">"Kanal"</string>
+
     <string name="group_by_title">"Gruppiere Access Points nach"</string>
+    <string name="group_by_none">"Nicht Gruppieren"</string>
+    <string name="group_by_channel">"Kanal"</string>
+
     <string name="connection_view_title">"Verbindungs-Darstellung"</string>
+    <string name="connection_view_complete">"Komplett"</string>
+    <string name="connection_view_compact">"Kompakt"</string>
+    <string name="connection_view_hide">"Verstecken"</string>
+
     <string name="ap_view_title">"Access Point-Darstellung"</string>
+    <string name="ap_view_complete">"Komplett"</string>
+    <string name="ap_view_compact">"Kompakt"</string>
+
     <string name="graph_maximum_y_title">"Maximale Signalstärke in Grafik"</string>
+
     <string name="channel_graph_legend_title">"Anzeige der Legende in Kanalübersicht"</string>
     <string name="time_graph_legend_title">"Anzeige der Legende in Signalverlauf"</string>
+    <string name="graph_legend_left">"Links"</string>
+    <string name="graph_legend_right">"Rechts"</string>
+    <string name="graph_legend_hide">"Verstecken"</string>
+
     <string name="theme_title">"Theme"</string>
+    <string name="theme_dark">"Dunkel"</string>
+    <string name="theme_light">"Hell"</string>
+    <string name="theme_system">"System"</string>
+
     <string name="wifi_off_on_exit_title">"WLAN beim Verlassen deaktivieren"</string>
+
     <string name="keep_screen_on_title">"Bildschirm angeschaltet lassen"</string>
+
     <string name="language_title">"Sprache"</string>
     <!-- settings end -->
 
@@ -97,4 +124,5 @@
     <string name="filter_strength_title">"Signalstärke"</string>
     <string name="filter_security_title">"Sicherheit"</string>
     <!-- filter end -->
+
 </resources>

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

@@ -43,7 +43,7 @@
     <string name="no_data">"Sin datos"</string>
     <string name="no_data_msg">"Por favor, visite frecuentemente preguntas sección en nuestro sitio web."</string>
     <string name="no_data_geo_warning">"Algunos usuarios de Android OS 6 (Marshmallow) han informado de que el servicio de localización debe estar habilitado para ver las redes Wi-Fi. Usuarios de Marshmallow pueden tener que activar el servicio de localización, aunque WiFiAnalyzer no lo requiera explícitamente. Parece ser atribuido a un problema potencial de Android 6 que necesita el servicio de localización para las redes WiFi."</string>
-    <string name="permission_msg">"As of Android Marshmallow, location permissions are required to perform a WiFi scan. You will be prompted to enable location services/permissions. Since this app does not require internet access, you can be confident that this app cannot transmit your location!"</string>
+    <string name="permission_msg">"A partir de Android Marshmallow, se requieren permisos de ubicación para realizar un escaneo WiFi. Se le pedirá que habilite los servicios / permisos de ubicación. Como esta aplicación no requiere acceso a Internet, puede estar seguro de que esta aplicación no puede transmitir su ubicación!"</string>
 
     <string name="export_not_available">"Exportación no disponible"</string>
 
@@ -61,19 +61,46 @@
 
     <!-- settings start -->
     <string name="start_menu_title">"Mostrar al inicio"</string>
+
     <string name="country_code_title">"País"</string>
+
     <string name="scan_interval_title">"Intervalo de exploración"</string>
     <string name="scan_interval_summary">"%d segundos entre exploraciones"</string>
+
     <string name="sort_by_title">"Ordenar Puntos de Acceso por:"</string>
+    <string name="sort_by_signal_strength">"Intensidad de señal"</string>
+    <string name="sort_by_channel">"Canal"</string>
+
     <string name="group_by_title">"Agrupar Puntos de Acceso por:"</string>
+    <string name="group_by_none">"Ninguna"</string>
+    <string name="group_by_channel">"Canal"</string>
+
     <string name="connection_view_title">"Pantalla de conexión"</string>
+    <string name="connection_view_complete">"Completo"</string>
+    <string name="connection_view_compact">"Compacto"</string>
+    <string name="connection_view_hide">"Esconder"</string>
+
     <string name="ap_view_title">"Pantalla de punto de acceso"</string>
+    <string name="ap_view_complete">"Completo"</string>
+    <string name="ap_view_compact">"Compacto"</string>
+
     <string name="graph_maximum_y_title">"Gráfico de intensidad máxima de la señal"</string>
+
     <string name="channel_graph_legend_title">"Leyenda de Visualización de Gráfico de Canales"</string>
     <string name="time_graph_legend_title">"Leyenda de Visualización de Gráfico de Tiempo"</string>
+    <string name="graph_legend_left">"Izquierda"</string>
+    <string name="graph_legend_right">"Derecha"</string>
+    <string name="graph_legend_hide">"Esconder"</string>
+
     <string name="theme_title">"Tema"</string>
+    <string name="theme_dark">"Oscuro"</string>
+    <string name="theme_light">"Claro"</string>
+    <string name="theme_system">"Sistema"</string>
+
     <string name="wifi_off_on_exit_title">"Apagar Wifi al salir"</string>
+
     <string name="keep_screen_on_title">"Mantener pantalla encendida"</string>
+
     <string name="language_title">"Lenguaje"</string>
     <!-- settings end -->
 
@@ -99,4 +126,5 @@
     <string name="filter_strength_title">"Intensidad de señal"</string>
     <string name="filter_security_title">"Seguridad"</string>
     <!-- filter end -->
+
 </resources>