manifest permissions update

mannprerak2 · Apr 30, 2024 · c8dff59 · c8dff59
1 parent e22d4de
commit c8dff59
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 18 deletions.
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,10 +1,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.pkmnapps.nearby_connections">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <!-- Required for Nearby Connections -->
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <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:minSdkVersion="29"
+    android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:minSdkVersion="31"
+    android:name="android.permission.BLUETOOTH_ADVERTISE" />
+  <uses-permission android:minSdkVersion="31"
+    android:name="android.permission.BLUETOOTH_CONNECT" />
+  <uses-permission android:minSdkVersion="31"
+    android:name="android.permission.BLUETOOTH_SCAN" />
+  <uses-permission android:minSdkVersion="32"
+    android:name="android.permission.NEARBY_WIFI_DEVICES" />
 
-    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-</manifest>
+</manifest>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Required for Nearby Connections -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <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:minSdkVersion="29"
+        android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:minSdkVersion="31"
+        android:name="android.permission.BLUETOOTH_ADVERTISE" />
+    <uses-permission android:minSdkVersion="31"
+        android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:minSdkVersion="31"
+        android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:minSdkVersion="32"
+        android:name="android.permission.NEARBY_WIFI_DEVICES" />
+    <!-- Optional: only required for FILE payloads -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+
     <application
         android:label="nearby_connections_example"
         android:name="${applicationName}"
@@ -16,12 +38,12 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -37,8 +59,8 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+            <data android:mimeType="text/plain" />
         </intent>
     </queries>
-</manifest>
+</manifest>
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -61,7 +61,7 @@ class _MyBodyState extends State<Body> {
                 ElevatedButton(
                   child: const Text("checkLocationPermission (<= Android 12)"),
                   onPressed: () async {
-                    if (await Permission.location.isGranted) {
+                    if (await Permission.locationWhenInUse.isGranted) {
                       showSnackbar("Location permissions granted :)");
                     } else {
                       showSnackbar("Location permissions not granted :(");
@@ -71,7 +71,9 @@ class _MyBodyState extends State<Body> {
                 ElevatedButton(
                   child: const Text("askLocationPermission"),
                   onPressed: () async {
-                    if (await Permission.location.request().isGranted) {
+                    if (await Permission.locationWhenInUse
+                        .request()
+                        .isGranted) {
                       showSnackbar("Location permissions granted :)");
                     } else {
                       showSnackbar("Location permissions not granted :(");
@@ -113,8 +115,8 @@ class _MyBodyState extends State<Body> {
                 ),
                 ElevatedButton(
                   child: const Text("askBluetoothPermission (Android 12+)"),
-                  onPressed: () {
-                    [
+                  onPressed: () async {
+                    await [
                       Permission.bluetooth,
                       Permission.bluetoothAdvertise,
                       Permission.bluetoothConnect,