From 5861c0ee6a01222582167021fbad76f0d9a3032b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 14 Mar 2022 22:22:12 +0100
Subject: [PATCH] Insight: fix pairing

---
 .../layout/danars_pairing_progress_dialog.xml |  2 +-
 insight/src/main/AndroidManifest.xml          |  2 ++
 .../activities/InsightPairingActivity.java    | 26 +++++++++++++++----
 .../res/layout/activity_insight_alert.xml     |  4 +--
 .../res/layout/activity_insight_pairing.xml   |  6 ++---
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
index 9d586e536c..d8816e1fda 100644
--- a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
+++ b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
@@ -61,7 +61,7 @@
             android:minHeight="3dp" />
 
         <com.google.android.material.button.MaterialButton
-            style="@style/OkCancelButton"
+            style="@style/OkCancelButton.Text"
             android:id="@+id/ok"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/insight/src/main/AndroidManifest.xml b/insight/src/main/AndroidManifest.xml
index 9cb3923c6b..7e05839276 100644
--- a/insight/src/main/AndroidManifest.xml
+++ b/insight/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <application>
         <activity
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
index b720bf0b12..65d8185d26 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
@@ -9,6 +9,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.LayoutInflater;
@@ -20,6 +22,8 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -54,6 +58,8 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
     private RecyclerView deviceList;
     private final DeviceAdapter deviceAdapter = new DeviceAdapter();
 
+    private final int PERMISSION_REQUEST_BLUETOOTH = 30242;
+
     private InsightConnectionService service;
 
     private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -100,9 +106,18 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
         deviceList.setLayoutManager(new LinearLayoutManager(this));
         deviceList.setAdapter(deviceAdapter);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            if (ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_CONNECT") != PackageManager.PERMISSION_GRANTED ||
+                    ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_SCAN") != PackageManager.PERMISSION_GRANTED
+            ) {
+                ActivityCompat.requestPermissions(this, new String[]{"android.permission.BLUETOOTH_SCAN", "android.permission.BLUETOOTH_CONNECT"}, PERMISSION_REQUEST_BLUETOOTH);
+                finish();
+                return;
+            }
+        }
 
         bindService(new Intent(this, InsightConnectionService.class), serviceConnection, BIND_AUTO_CREATE);
-}
+    }
 
     @Override
     protected void onDestroy() {
@@ -110,8 +125,8 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
             service.withdrawConnectionRequest(InsightPairingActivity.this);
             service.unregisterStateCallback(InsightPairingActivity.this);
             service.unregisterExceptionCallback(InsightPairingActivity.this);
+            unbindService(serviceConnection);
         }
-        unbindService(serviceConnection);
         super.onDestroy();
     }
 
@@ -172,7 +187,7 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
 
     private void startBLScan() {
         if (!scanning) {
-            BluetoothAdapter bluetoothAdapter = ((BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+            BluetoothAdapter bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
             if (bluetoothAdapter != null) {
                 if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
                 IntentFilter intentFilter = new IntentFilter();
@@ -188,13 +203,14 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
     private void stopBLScan() {
         if (scanning) {
             unregisterReceiver(broadcastReceiver);
-            BluetoothAdapter bluetoothAdapter = ((BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+            BluetoothAdapter bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
             if (bluetoothAdapter != null) {
                 bluetoothAdapter.cancelDiscovery();
             }
             scanning = false;
         }
     }
+
     @Override
     public void onClick(View v) {
         if (v == exit) finish();
@@ -216,7 +232,7 @@ public class InsightPairingActivity extends NoSplashAppCompatActivity implements
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED))
-                ((BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter().startDiscovery();
+                ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter().startDiscovery();
             else if (action.equals(BluetoothDevice.ACTION_FOUND)) {
                 BluetoothDevice bluetoothDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                 deviceAdapter.addDevice(bluetoothDevice);
diff --git a/insight/src/main/res/layout/activity_insight_alert.xml b/insight/src/main/res/layout/activity_insight_alert.xml
index c94b18a336..aa7ef66665 100644
--- a/insight/src/main/res/layout/activity_insight_alert.xml
+++ b/insight/src/main/res/layout/activity_insight_alert.xml
@@ -51,7 +51,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/mute"
-            style="@style/OkCancelButton"
+            style="@style/OkCancelButton.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="muteClicked"
@@ -59,7 +59,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/confirm"
-            style="@style/OkCancelButton"
+            style="@style/OkCancelButton.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="confirmClicked"
diff --git a/insight/src/main/res/layout/activity_insight_pairing.xml b/insight/src/main/res/layout/activity_insight_pairing.xml
index 196be5c439..0f408a088e 100644
--- a/insight/src/main/res/layout/activity_insight_pairing.xml
+++ b/insight/src/main/res/layout/activity_insight_pairing.xml
@@ -66,14 +66,14 @@
             android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
-                style="@style/OkCancelButton"
+                style="@style/OkCancelButton.Text"
                 android:id="@+id/no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/no" />
 
             <com.google.android.material.button.MaterialButton
-                style="@style/OkCancelButton"
+                style="@style/OkCancelButton.Text"
                 android:id="@+id/yes"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
             android:text="@string/pairing_completed" />
 
         <com.google.android.material.button.MaterialButton
-            style="@style/OkCancelButton"
+            style="@style/OkCancelButton.Text"
             android:id="@+id/exit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"