Merge branch 'feature'

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,25 @@
+#
+# WiFiAnalyzer
+# Copyright (C) 2019  VREM Software Development <[email protected]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+
 #Build Properties
-#Sat Jun 29 11:42:08 EDT 2019
+#Mon Jul 08 19:27:35 EDT 2019
 version_minor=0
-version_build=0
+version_build=7
 version_patch=5
-version_store=46
 version_major=2
+version_store=46

app/src/main/AndroidManifest.xml

@@ -55,7 +55,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="com.vrem.wifianalyzer.MAINACTIVITY"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>

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

@@ -19,7 +19,6 @@
 package com.vrem.wifianalyzer;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Configuration;
@@ -40,6 +39,7 @@
 import com.vrem.wifianalyzer.navigation.NavigationMenuControl;
 import com.vrem.wifianalyzer.navigation.NavigationMenuController;
 import com.vrem.wifianalyzer.navigation.options.OptionMenu;
+import com.vrem.wifianalyzer.permission.ApplicationPermission;
 import com.vrem.wifianalyzer.settings.Repository;
 import com.vrem.wifianalyzer.settings.Settings;
 import com.vrem.wifianalyzer.wifi.accesspoint.ConnectionView;
@@ -56,7 +56,7 @@ public class MainActivity extends AppCompatActivity implements NavigationMenuCon
     private NavigationMenu navigationMenu;
     private OptionMenu optionMenu;
     private String currentCountryCode;
-    private PermissionChecker permissionChecker;
+    private ApplicationPermission applicationPermission;
 
     @Override
     protected void attachBaseContext(Context newBase) {
@@ -92,16 +92,15 @@ protected void onCreate(Bundle savedInstanceState) {
         drawerNavigation = new DrawerNavigation(this, toolbar);
 
         navigationMenu = settings.getSelectedMenu();
-        NavigationMenuController navigationMenuController = new NavigationMenuController(this);
+        navigationMenuController = new NavigationMenuController(this);
         navigationMenuController.setCurrentNavigationMenu(navigationMenu);
-        setNavigationMenuController(navigationMenuController);
         onNavigationItemSelected(getCurrentMenuItem());
 
         ConnectionView connectionView = new ConnectionView(this);
         mainContext.getScannerService().register(connectionView);
 
-        permissionChecker = new PermissionChecker(this);
-        permissionChecker.check();
+        applicationPermission = new ApplicationPermission(this);
+        applicationPermission.check();
     }
 
     @Override
@@ -118,7 +117,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (!permissionChecker.isGranted(requestCode, grantResults)) {
+        if (!applicationPermission.isGranted(requestCode, grantResults)) {
             finish();
         }
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -145,7 +144,8 @@ private boolean isLargeScreen() {
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         MainContext mainContext = MainContext.INSTANCE;
         if (mainReload.shouldReload(mainContext.getSettings())) {
-            reloadActivity();
+            MainContext.INSTANCE.getScannerService().stop();
+            recreate();
         } else {
             ActivityUtils.keepScreenOn(this);
             setWiFiChannelPairs(mainContext);
@@ -158,14 +158,6 @@ public void update() {
         updateActionBar();
     }
 
-    private void reloadActivity() {
-        finish();
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP |
-            Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-    }
-
     @Override
     public void onBackPressed() {
         if (!closeDrawer()) {
@@ -180,13 +172,9 @@ public void onBackPressed() {
 
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
-        try {
-            closeDrawer();
-            NavigationMenu navigationMenu = EnumUtils.find(NavigationMenu.class, menuItem.getItemId(), NavigationMenu.ACCESS_POINTS);
-            navigationMenu.activateNavigationMenu(this, menuItem);
-        } catch (Exception e) {
-            reloadActivity();
-        }
+        closeDrawer();
+        NavigationMenu currentNavigationMenu = EnumUtils.find(NavigationMenu.class, menuItem.getItemId(), NavigationMenu.ACCESS_POINTS);
+        currentNavigationMenu.activateNavigationMenu(this, menuItem);
         return true;
     }
 
@@ -208,13 +196,9 @@ protected void onPause() {
 
     @Override
     protected void onResume() {
-        try {
-            super.onResume();
-            MainContext.INSTANCE.getScannerService().resume();
-            updateActionBar();
-        } catch (Exception e) {
-            reloadActivity();
-        }
+        super.onResume();
+        MainContext.INSTANCE.getScannerService().resume();
+        updateActionBar();
     }
 
     @Override

app/src/main/java/com/vrem/wifianalyzer/PermissionChecker.java renamed to app/src/main/java/com/vrem/wifianalyzer/permission/ApplicationPermission.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package com.vrem.wifianalyzer;
+package com.vrem.wifianalyzer.permission;
 
 import android.Manifest;
 import android.app.Activity;
@@ -25,23 +25,23 @@
 
 import com.vrem.util.BuildUtils;
 
-class PermissionChecker {
+public class ApplicationPermission {
     static final String[] PERMISSIONS = {Manifest.permission.ACCESS_COARSE_LOCATION};
     static final int REQUEST_CODE = 0x123450;
 
     private final Activity activity;
     private final PermissionDialog permissionDialog;
 
-    PermissionChecker(@NonNull Activity activity) {
+    public ApplicationPermission(@NonNull Activity activity) {
         this(activity, new PermissionDialog(activity));
     }
 
-    PermissionChecker(@NonNull Activity activity, @NonNull PermissionDialog permissionDialog) {
+    ApplicationPermission(@NonNull Activity activity, @NonNull PermissionDialog permissionDialog) {
         this.activity = activity;
         this.permissionDialog = permissionDialog;
     }
 
-    void check() {
+    public void check() {
         if (isGranted()) {
             return;
         }
@@ -51,11 +51,11 @@ void check() {
         permissionDialog.show();
     }
 
-    boolean isGranted(int requestCode, @NonNull int[] grantResults) {
+    public boolean isGranted(int requestCode, @NonNull int[] grantResults) {
         return requestCode == REQUEST_CODE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
     }
 
-    private boolean isGranted() {
+    boolean isGranted() {
         return isGranted(Manifest.permission.ACCESS_COARSE_LOCATION) || isGranted(Manifest.permission.ACCESS_FINE_LOCATION);
     }
 

app/src/main/java/com/vrem/wifianalyzer/PermissionDialog.java renamed to app/src/main/java/com/vrem/wifianalyzer/permission/PermissionDialog.java

@@ -1,6 +1,6 @@
 /*
  * WiFiAnalyzer
- * Copyright (C) 2018  VREM Software Development <[email protected]>
+ * Copyright (C) 2019  VREM Software Development <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package com.vrem.wifianalyzer;
+package com.vrem.wifianalyzer.permission;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -26,6 +26,7 @@
 import android.view.View;
 
 import com.vrem.util.BuildUtils;
+import com.vrem.wifianalyzer.R;
 
 class PermissionDialog {
     private final Activity activity;
@@ -58,7 +59,7 @@ static class OkClick implements OnClickListener {
         public void onClick(DialogInterface dialog, int which) {
             dialog.dismiss();
             if (BuildUtils.isMinVersionM()) {
-                activity.requestPermissions(PermissionChecker.PERMISSIONS, PermissionChecker.REQUEST_CODE);
+                activity.requestPermissions(ApplicationPermission.PERMISSIONS, ApplicationPermission.REQUEST_CODE);
             }
         }
     }

app/src/main/java/com/vrem/wifianalyzer/permission/RequirementPermission.java

@@ -0,0 +1,50 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2019  VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer.permission;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+
+import com.vrem.util.BuildUtils;
+
+public class RequirementPermission {
+    private SystemPermission systemPermission;
+    private ApplicationPermission applicationPermission;
+
+    public RequirementPermission(@NonNull Activity activity) {
+        this.applicationPermission = new ApplicationPermission(activity);
+        this.systemPermission = new SystemPermission(activity);
+    }
+
+    public boolean isEnabled() {
+        if (BuildUtils.isMinVersionM()) {
+            return systemPermission.isEnabled() && applicationPermission.isGranted();
+        } else {
+            return true;
+        }
+    }
+
+    void setSystemPermission(SystemPermission systemPermission) {
+        this.systemPermission = systemPermission;
+    }
+
+    void setApplicationPermission(ApplicationPermission applicationPermission) {
+        this.applicationPermission = applicationPermission;
+    }
+}

app/src/main/java/com/vrem/wifianalyzer/permission/SystemPermission.java

@@ -0,0 +1,79 @@
+/*
+ * WiFiAnalyzer
+ * Copyright (C) 2019  VREM Software Development <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.vrem.wifianalyzer.permission;
+
+import android.app.Activity;
+import android.content.Context;
+import android.location.LocationManager;
+import android.support.annotation.NonNull;
+
+import com.vrem.util.BuildUtils;
+
+public class SystemPermission {
+    private final Activity activity;
+
+    public SystemPermission(@NonNull Activity activity) {
+        this.activity = activity;
+    }
+
+    public boolean isEnabled() {
+        if (BuildUtils.isMinVersionM()) {
+            return isProviderEnabled();
+        } else {
+            return true;
+        }
+    }
+
+    private boolean isProviderEnabled() {
+        try {
+            LocationManager locationManager = (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
+            return isLocationEnabled(locationManager) || isNetworkProviderEnabled(locationManager) || isGPSProviderEnabled(locationManager);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private boolean isGPSProviderEnabled(@NonNull LocationManager locationManager) {
+        try {
+            return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private boolean isNetworkProviderEnabled(@NonNull LocationManager locationManager) {
+        try {
+            return locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private boolean isLocationEnabled(@NonNull LocationManager locationManager) {
+        if (BuildUtils.isMinVersionP()) {
+            try {
+                return locationManager.isLocationEnabled();
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+}

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

@@ -69,6 +69,10 @@ public int getScanSpeed() {
         return scanSpeed;
     }
 
+    public boolean isWiFiThrottleDisabled() {
+        return repository.getBoolean(R.string.wifi_throttle_disabled_key, repository.getResourceBoolean(R.bool.wifi_throttle_disabled_default));
+    }
+
     public int getGraphMaximumY() {
         int defaultValue = repository.getStringAsInteger(R.string.graph_maximum_y_default, GRAPH_Y_DEFAULT);
         int result = repository.getStringAsInteger(R.string.graph_maximum_y_key, defaultValue);

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

@@ -21,13 +21,15 @@
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
 
+import com.vrem.util.BuildUtils;
 import com.vrem.wifianalyzer.R;
 
 public class SettingsFragment extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(Bundle bundle, String rootKey) {
         addPreferencesFromResource(R.xml.settings);
+        findPreference(getString(R.string.experimental_key)).setVisible(BuildUtils.isMinVersionP());
     }
 
 }