Merge branch 'fix-ble-scan'

JW · JW · commit 3fd0ab9d50dd · 2022-03-16T02:53:50.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,28 +1,25 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "cc.calliope.mini"
         minSdkVersion 18
-        targetSdkVersion 27
-        versionCode 8
-        versionName "1.0.2"
+        targetSdkVersion 30
+        versionCode 11
+        versionName "1.1.1"
         resConfigs "de", "en"
         vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
         debug {
             minifyEnabled false
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             minifyEnabled true
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk
diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "cc.calliope.mini",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 11,
+      "versionName": "1.1.1",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/debug/output.json b/app/debug/output.json
diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "cc.calliope.mini",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 11,
+      "versionName": "1.1.1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -31,9 +31,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="cc.calliope.mini">
 
+
+    <!-- Request legacy Bluetooth permissions on older devices. -->
+<!--    <uses-permission android:name="android.permission.BLUETOOTH"-->
+<!--        android:maxSdkVersion="30" />-->
+<!--    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"-->
+<!--        android:maxSdkVersion="30" />-->
+
+    <!-- Needed only if your app looks for Bluetooth devices.
+         If your app doesn't use Bluetooth scan results to derive physical
+         location information, you can strongly assert that your app
+         doesn't derive physical location. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+
+    <!-- Needed only if your app communicates with already-paired Bluetooth
+         devices. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
+    <!-- Needed only if your app uses Bluetooth scan results to derive physical location. -->
+<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"-->
+<!--        android:maxSdkVersion="32" />-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
diff --git a/app/src/main/java/cc/calliope/mini/ScannerActivity.java b/app/src/main/java/cc/calliope/mini/ScannerActivity.java
@@ -36,6 +36,7 @@
 import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
@@ -61,7 +62,10 @@
 import cc.calliope.mini.viewmodels.ScannerViewModel;
 
 public class ScannerActivity extends AppCompatActivity implements DevicesAdapter.OnItemClickListener {
-	private static final int REQUEST_ACCESS_COARSE_LOCATION = 1022; // random number
+	private static final int REQUEST_ACCESS_FINE_LOCATION = 1022; // random number
+	private static final int REQUEST_ACCESS_BLUETOOTH_SCAN = 1023; // random number
+
+
 
 	private ScannerViewModel mScannerViewModel;
 	private AnimationDrawable pairAnimation;
@@ -152,13 +156,13 @@ public void onItemClick(final ExtendedBluetoothDevice device) {
 //		} catch (Exception e) {
 //			Log.e("PAIRING", e.getMessage());
 //		}
-//	}
+
 
 	@Override
 	public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
 		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 		switch (requestCode) {
-			case REQUEST_ACCESS_COARSE_LOCATION:
+			case REQUEST_ACCESS_FINE_LOCATION:
 				mScannerViewModel.refresh();
 				break;
 		}
@@ -176,10 +180,27 @@ public void onEnableBluetoothClicked() {
 		startActivity(enableIntent);
 	}
 
+	private static final String[] BLE_PERMISSIONS = new String[]{
+			Manifest.permission.ACCESS_COARSE_LOCATION,
+			Manifest.permission.ACCESS_FINE_LOCATION
+	};
+
+	private static final String[] ANDROID_12_BLE_PERMISSIONS = new String[]{
+			Manifest.permission.BLUETOOTH_SCAN,
+			Manifest.permission.BLUETOOTH_CONNECT,
+			Manifest.permission.ACCESS_FINE_LOCATION
+	};
+
 	@OnClick(R.id.action_grant_location_permission)
 	public void onGrantLocationPermissionClicked() {
 		Utils.markLocationPermissionRequested(this);
-		ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, REQUEST_ACCESS_COARSE_LOCATION);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			Log.i("PERMISSIONS", "12");
+			ActivityCompat.requestPermissions(this, ANDROID_12_BLE_PERMISSIONS, REQUEST_ACCESS_BLUETOOTH_SCAN);
+		} else {
+			Log.i("PERMISSIONS", "LEGACY");
+			ActivityCompat.requestPermissions(this, BLE_PERMISSIONS, REQUEST_ACCESS_FINE_LOCATION);
+		}
 	}
 
 	@OnClick(R.id.action_permission_settings)
@@ -193,8 +214,13 @@ public void onPermissionSettingsClicked() {
 	 * Start scanning for Bluetooth devices or displays a message based on the scanner state.
 	 */
 	private void startScan(final ScannerLiveData state) {
+		Log.v("Scan Permission: ", Utils.isBluetoothScanPermissionsGranted(this)+"");
+		Log.v("Location Permission: ", Utils.isLocationPermissionsGranted(this)+"");
+		Log.v("Version", Build.VERSION.SDK_INT+"");
 		// First, check the Location permission. This is required on Marshmallow onwards in order to scan for Bluetooth LE devices.
-		if (Utils.isLocationPermissionsGranted(this)) {
+		if (Utils.isLocationPermissionsGranted(this)
+		&& (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || Utils.isBluetoothScanPermissionsGranted(this))
+		) {
 			mNoLocationPermissionView.setVisibility(View.GONE);
 
 			// Bluetooth must be enabled
diff --git a/app/src/main/java/cc/calliope/mini/utils/Utils.java b/app/src/main/java/cc/calliope/mini/utils/Utils.java
@@ -64,6 +64,16 @@ public static boolean isLocationPermissionsGranted(final Context context) {
 		return ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
 	}
 
+
+	/**
+	 * Checks for required permissions.
+	 *
+	 * @return true if permissions are already granted, false otherwise.
+	 */
+	public static boolean isBluetoothScanPermissionsGranted(final Context context) {
+		return ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED;
+	}
+
 	/**
 	 * Returns true if location permission has been requested at least twice and
 	 * user denied it, and checked 'Don't ask again'.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/dfuLibrary/build.gradle b/dfuLibrary/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 18
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Mon Feb 25 13:12:06 CET 2019
+#Wed Mar 16 01:19:30 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
-distributionSha256Sum=36bf7ff499223d5139f005822130ccca784c91591b514677fd376eed966c907e
+zipStoreBase=GRADLE_USER_HOME
+distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.3.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:7.1.2'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`