From b753d52b93d8e7c6774c8e8abfb41c6675d1bead Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Mon, 2 Mar 2020 10:30:32 -0800
Subject: [PATCH] don't incorrectly ask for CAMERA permission

---
 app/src/main/AndroidManifest.xml                         | 3 +++
 app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15421f1e..70757f77 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,9 @@
     <!-- Needed to open our bluetooth connection to our paired device (after reboot) -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+    <!-- the xing library will try to bring this permission in but we don't want it -->
+    <uses-permission android:name="android.permission.CAMERA" tools:node="remove" />
+
     <uses-feature
         android:name="android.hardware.bluetooth_le"
         android:required="true" />
diff --git a/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt b/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt
index 6274f386..22baa576 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt
@@ -57,7 +57,7 @@ data class BTScanEntry(val name: String, val macAddress: String, val bonded: Boo
 
 @Composable
 fun BTScanScreen() {
-    val context = ambient(ContextAmbient)
+    val context = ContextAmbient.current
 
     /// Note: may be null on platforms without a bluetooth driver (ie. the emulator)
     val bluetoothAdapter =