Update targetSdk

improv-wifi · Sep 30, 2024 · 535d952 · 535d952
1 parent c652c54
commit 535d952
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
     defaultConfig {
         applicationId "com.wifi.improv.demo"
         minSdk 21
-        targetSdk 30
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/app/src/main/java/com/wifi/improv/demo/MainActivity.kt b/app/src/main/java/com/wifi/improv/demo/MainActivity.kt
@@ -2,6 +2,7 @@ package com.wifi.improv.demo
 
 import android.Manifest
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
@@ -33,27 +34,32 @@ class MainActivity : ComponentActivity() {
     private lateinit var improv: ImprovManager
     private val viewModel: ImprovViewModel by viewModels()
 
-    private val requestPermission = registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
-        if (granted) {
-            Log.i(TAG, "Got location permission!")
+    private val requestPermission = registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { results ->
+        if (results.all { it.value }) {
+            Log.i(TAG, "Got permission!")
             improv.findDevices()
         }
     }
 
     private fun findDevices() {
         // make sure we have permissions!
-        if (ContextCompat.checkSelfPermission(
-                this,
-                Manifest.permission.ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_DENIED
-        ) {
-            requestPermission.launch(Manifest.permission.ACCESS_FINE_LOCATION)
+        val requiredPermissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            arrayOf(Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT)
+        } else {
+            arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
+        }
+        if (requiredPermissions.any { permission ->
+                ContextCompat.checkSelfPermission(
+                    this,
+                    permission
+                ) == PackageManager.PERMISSION_DENIED
+            }) {
+            requestPermission.launch(requiredPermissions)
         } else {
             improv.findDevices()
         }
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         improv = ImprovManager(applicationContext, viewModel)

diff --git a/library/build.gradle b/library/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdk 21
-        targetSdk 30
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <uses-feature
         android:name="android.hardware.bluetooth_le"

diff --git a/library/src/main/java/com/wifi/improv/ImprovManager.kt b/library/src/main/java/com/wifi/improv/ImprovManager.kt
@@ -1,5 +1,6 @@
 package com.wifi.improv
 
+import android.annotation.SuppressLint
 import android.bluetooth.*
 import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanFilter
@@ -11,6 +12,7 @@ import android.util.Log
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue
 
+@SuppressLint("MissingPermission") // Permission checks are expected to be done by the app
 class ImprovManager(
     private val context: Context,
     private val callback: ImprovManagerCallback