Better permission prompts

Version 1.3
blackboxembedded · Jan 13, 2023 · fe746bb · fe746bb
1 parent bc07ebe
commit fe746bb
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.blackboxembedded.wunderlinqgopro"
         minSdkVersion 23
         targetSdkVersion 32
-        versionCode 3
-        versionName "1.2"
+        versionCode 4
+        versionName "1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,11 +12,15 @@
     <uses-permission
         android:name="android.permission.BLUETOOTH_ADMIN"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="30" />
+
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"/>
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -33,8 +37,7 @@
         <activity
             android:name=".DeviceScanActivity"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:label="@string/app_name">
+            android:launchMode="singleTask">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/app/src/main/java/com/blackboxembedded/wunderlinqgopro/DeviceScanActivity.java b/app/src/main/java/com/blackboxembedded/wunderlinqgopro/DeviceScanActivity.java
@@ -135,17 +135,14 @@ public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3)
             return;
         }
 
+        checkPermissions();
+
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        // Check permissions
-        if (ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSION_REQUEST_FINE_LOCATION);
-        }
-
         // Ensures Bluetooth is enabled on the device.  If Bluetooth is not currently enabled,
         // fire an intent to display a dialog asking the user to grant permission to enable it.
         if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S ||
@@ -464,6 +461,49 @@ public void onDismiss(DialogInterface dialog) {
             }
         }
     }
+
+    //Check Permissions
+    void checkPermissions(){
+        // Check permissions
+        if ((android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S) &&
+                (ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(getString(R.string.location_request_alert_title));
+            builder.setMessage(getString(R.string.location_request_alert_body));
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ActivityCompat.requestPermissions(DeviceScanActivity.this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSION_REQUEST_FINE_LOCATION);
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                }
+            });
+            builder.show();
+        } else if ((android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) &&
+                (ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED)){
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(getString(R.string.bt_request_alert_title));
+            builder.setMessage(getString(R.string.bt_request_alert_body));
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ActivityCompat.requestPermissions(DeviceScanActivity.this, new String[]{Manifest.permission.BLUETOOTH_SCAN}, PERMISSION_REQUEST_BLUETOOTH_SCAN);
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                }
+            });
+            builder.show();
+        }
+    }
+
     //start timer function
     void startTimer() {
         if(!timerRunning) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -11,6 +11,11 @@
     <string name="negative_location_alert_title">Location Request Denied</string>
     <string name="negative_location_alert_body">Location Permissions are required for Bluetooth scanning</string>
 
+    <string name="location_request_alert_title">Location Permission Required</string>
+    <string name="location_request_alert_body">The WunderLINQ GoPro Remote needs access to your location to scan for nearby GoPro Cameras.</string>
+    <string name="bt_request_alert_title">Bluetooth Permission Required</string>
+    <string name="bt_request_alert_body">The WunderLINQ GoPro Remote needs the Bluetooth scanning permission to scan for nearby GoPro Cameras. </string>
+
     <string name="btscan_alert_title">Bluetooth Scan Request</string>
     <string name="btscan_alert_body">Location Permissions are required for Bluetooth scanning</string>
     <string name="negative_btscan_alert_title">Location Request Denied</string>