From 840c512a32fc808edd0f15d535868f8dd79396e4 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 14 Jul 2021 11:04:03 +0200
Subject: [PATCH] Revert "Future-proofed Bluetooth permission request and
 improved broadcast receiver (#2331)"

This reverts commit e510205b61346a0cfc2375fca1fdfc3c3002f6ee.

Fixes #2342
Fixes #2346
---
 app/src/main/AndroidManifest.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2c850db2..7ca290e20 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,10 +8,8 @@
         <uses-permission android:name="android.permission.INTERNET" />
     -->
     <!-- Used for Bluetooth access -->
-    <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" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <!-- Since Android 10 -->
@@ -383,7 +381,8 @@
 
         <receiver
             android:name=".externalevents.BluetoothStateChangeReceiver"
-            android:exported="true">
+            android:exported="true"
+            android:permission="android.permission.BLUETOOTH,android.permission.BLUETOOTH_ADMIN">
             <intent-filter>
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
                 <action android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED" />