android 12 fix

martinohanlon · Jan 2, 2023 · 6480897 · 6480897
1 parent 877c233
commit 6480897
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/clients/android/app/build.gradle b/clients/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.stuffaboutcode.bluedot"
         minSdkVersion 14
         targetSdkVersion 33
-        versionCode 9
-        versionName "2.2.0"
+        versionCode 10
+        versionName "2.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/clients/android/app/release/app-release.apk b/clients/android/app/release/app-release.apk
diff --git a/clients/android/app/release/output-metadata.json b/clients/android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 9,
-      "versionName": "2.2.0",
+      "versionCode": 10,
+      "versionName": "2.2.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/clients/android/app/src/main/AndroidManifest.xml b/clients/android/app/src/main/AndroidManifest.xml
@@ -2,8 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stuffaboutcode.bluedot">
 
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />/>
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30" />/>
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application

diff --git a/clients/android/app/src/main/java/com/stuffaboutcode/bluedot/Devices.java b/clients/android/app/src/main/java/com/stuffaboutcode/bluedot/Devices.java
@@ -1,6 +1,8 @@
 package com.stuffaboutcode.bluedot;
 
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -16,8 +18,11 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+
+import androidx.core.app.ActivityCompat;
 import androidx.preference.PreferenceManager;
 import android.content.SharedPreferences;
+import android.Manifest;
 
 import java.util.Set;
 import java.util.ArrayList;
@@ -34,13 +39,41 @@ public class Devices
     public static String EXTRA_ADDRESS = "device_address";
     public static String EXTRA_NAME = "device_name";
 
+    private static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.BLUETOOTH_CONNECT,
+    };
+    private static String[] PERMISSIONS_LOCATION = {
+            Manifest.permission.BLUETOOTH_CONNECT,
+    };
+
+    private void checkPermissions(){
+        int permission1 = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        int permission2 = ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN);
+        if (permission1 != PackageManager.PERMISSION_GRANTED) {
+            // We don't have permission so prompt the user
+            ActivityCompat.requestPermissions(
+                    this,
+                    PERMISSIONS_STORAGE,
+                    1
+            );
+        } else if (permission2 != PackageManager.PERMISSION_GRANTED){
+            ActivityCompat.requestPermissions(
+                    this,
+                    PERMISSIONS_LOCATION,
+                    1
+            );
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_devices);
 
         devicelist = (ListView)findViewById(R.id.listView);
 
+        checkPermissions();
+
         //if the device has bluetooth
         myBluetooth = BluetoothAdapter.getDefaultAdapter();