redirect to Location Setting when off

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Aug 24 14:32:20 EDT 2019
+#Sat Aug 24 16:38:39 EDT 2019
 version_minor=0
-version_build=17
+version_build=18
 version_patch=7
-version_major=2
 version_store=48
+version_major=2

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

@@ -18,7 +18,9 @@
 
 package com.vrem.wifianalyzer;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
+import android.os.Build;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -30,6 +32,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
+import static android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS;
 import static android.provider.Settings.Panel.ACTION_WIFI;
 
 public class ActivityUtils {
@@ -70,12 +73,19 @@ static Toolbar setupToolbar() {
         return toolbar;
     }
 
+    @TargetApi(Build.VERSION_CODES.Q)
     public static void startWiFiSettings() {
         MainActivity mainActivity = MainContext.INSTANCE.getMainActivity();
         Intent intent = IntentUtils.makeIntent(ACTION_WIFI);
         mainActivity.startActivityForResult(intent, 0);
     }
 
+    static void startLocationSettings() {
+        MainActivity mainActivity = MainContext.INSTANCE.getMainActivity();
+        Intent intent = IntentUtils.makeIntent(ACTION_LOCATION_SOURCE_SETTINGS);
+        mainActivity.startActivity(intent);
+    }
+
     static class WiFiBandToggle implements View.OnClickListener {
         private final MainActivity mainActivity;
 

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

@@ -200,7 +200,12 @@ protected void onPause() {
     @Override
     protected void onResume() {
         super.onResume();
-        MainContext.INSTANCE.getScannerService().resume();
+        if (permissionService.isPermissionGranted()) {
+            if (!permissionService.isSystemEnabled()) {
+                ActivityUtils.startLocationSettings();
+            }
+            MainContext.INSTANCE.getScannerService().resume();
+        }
         updateActionBar();
     }
 
@@ -279,4 +284,8 @@ void setNavigationMenuController(NavigationMenuController navigationMenuControll
     void setDrawerNavigation(DrawerNavigation drawerNavigation) {
         this.drawerNavigation = drawerNavigation;
     }
+
+    void setPermissionService(PermissionService permissionService) {
+        this.permissionService = permissionService;
+    }
 }

app/src/main/java/com/vrem/wifianalyzer/wifi/accesspoint/ConnectionView.java

@@ -27,7 +27,6 @@
 import com.vrem.wifianalyzer.MainActivity;
 import com.vrem.wifianalyzer.MainContext;
 import com.vrem.wifianalyzer.R;
-import com.vrem.wifianalyzer.permission.PermissionService;
 import com.vrem.wifianalyzer.wifi.model.WiFiConnection;
 import com.vrem.wifianalyzer.wifi.model.WiFiData;
 import com.vrem.wifianalyzer.wifi.model.WiFiDetail;
@@ -73,8 +72,7 @@ private void displayNoData(@NonNull WiFiData wiFiData) {
     }
 
     private int getNoLocationVisibility(int visibility) {
-        PermissionService permissionService = mainActivity.getPermissionService();
-        return permissionService.isEnabled() ? View.GONE : visibility;
+        return mainActivity.getPermissionService().isEnabled() ? View.GONE : visibility;
     }
 
     private boolean noData(@NonNull WiFiData wiFiData) {

app/src/test/java/com/vrem/wifianalyzer/ActivityUtilsTest.java

@@ -181,4 +181,17 @@ public void testStartWiFiSettings() {
         verifyStatic(IntentUtils.class);
         IntentUtils.makeIntent(android.provider.Settings.Panel.ACTION_WIFI);
     }
+
+    @Test
+    public void testStartLocationSettings() {
+        // setup
+        when(IntentUtils.makeIntent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)).thenReturn(intent);
+        // execute
+        ActivityUtils.startLocationSettings();
+        // validate
+        verify(mainActivity).startActivity(intent);
+        verifyStatic(IntentUtils.class);
+        IntentUtils.makeIntent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+    }
+
 }

app/src/test/java/com/vrem/wifianalyzer/MainActivityTest.java

@@ -27,6 +27,7 @@
 import com.vrem.wifianalyzer.navigation.NavigationMenu;
 import com.vrem.wifianalyzer.navigation.NavigationMenuController;
 import com.vrem.wifianalyzer.navigation.options.OptionMenu;
+import com.vrem.wifianalyzer.permission.PermissionService;
 import com.vrem.wifianalyzer.settings.Settings;
 import com.vrem.wifianalyzer.wifi.scanner.ScannerService;
 
@@ -43,9 +44,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 import static org.robolectric.annotation.LooperMode.Mode.PAUSED;
 
 @RunWith(AndroidJUnit4.class)
@@ -83,10 +84,14 @@ public void testOnPauseWillPauseScanner() {
     @Test
     public void testOnResumeCallsOptionMenuResume() {
         // setup
+        PermissionService permissionService = mock(PermissionService.class);
+        fixture.setPermissionService(permissionService);
         ScannerService scannerService = MainContextHelper.INSTANCE.getScannerService();
+        when(permissionService.isPermissionGranted()).thenReturn(true);
         // execute
         fixture.onResume();
         // validate
+        verify(permissionService).isPermissionGranted();
         verify(scannerService).resume();
     }