From 46dfa803449f07e9d9fb6b3b61d74a44dc5a99cf Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Tue, 16 Aug 2022 18:52:26 -0300
Subject: [PATCH] revert unwanted manifest changes

---
 app/src/main/AndroidManifest.xml | 35 +++++++++++++-------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a108090b..6215e4006 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,18 +12,18 @@
         android:name="android.hardware.location.gps"
         android:required="false" />
 
-    <!-- TODO - wait for targetSdkVersion 31
-        &lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt;
-        <uses-permission android:name="android.permission.BLUETOOTH"
-            android:maxSdkVersion="30" />
-        <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
-            android:maxSdkVersion="30" />
+<!-- TODO - wait for targetSdkVersion 31
+    &lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt;
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />
 
-        &lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt;
-        <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-        <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
-            android:usesPermissionFlags="neverForLocation" />
-    -->
+    &lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt;
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
@@ -78,7 +78,7 @@
     <application
         tools:replace="android:icon"
         android:name="com.geeksville.mesh.MeshUtilApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher2"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher2_round"
@@ -118,12 +118,6 @@
             </intent-filter>
         </service>
 
-        <!-- This is a private service which just does direct communication to the radio -->
-        <service
-            android:name="com.geeksville.mesh.service.RadioInterfaceService"
-            android:enabled="true"
-            android:exported="false" />
-
         <!-- zxing for QR Code scanning: lock portrait orientation -->
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
@@ -132,14 +126,13 @@
 
         <activity
             android:name="com.geeksville.mesh.MainActivity"
-            android:label="@string/app_name"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden"
             android:theme="@style/Theme.App.Starting"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
@@ -203,4 +196,4 @@
             android:name=".AppIntroduction"/>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>