From 59ca0c8292a7d9efad2cc98c9068f5ffc50c052a Mon Sep 17 00:00:00 2001
From: Prerak Mann <mannprerak2@gmail.com>
Date: Wed, 18 Dec 2019 15:29:03 +0530
Subject: [PATCH] added new method,  askLocationAndExternalStoragePermission

---
 .../NearbyConnectionsPlugin.java                   | 11 ++++++++++-
 lib/nearby_connections.dart                        |  2 +-
 lib/src/{nearby_connections.dart => nearby.dart}   | 14 +++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)
 rename lib/src/{nearby_connections.dart => nearby.dart} (97%)

diff --git a/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java b/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
index d76677c..e3d5f3b 100644
--- a/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
+++ b/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
@@ -75,6 +75,7 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
                 ActivityCompat.requestPermissions(activity,
                         new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
                         0);
+                Log.d("nearby_connections", "askLocationPermission");  
                 result.success(null);
                 break;
             case "checkExternalStoragePermission":
@@ -89,7 +90,15 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
             case "askExternalStoragePermission":
                 ActivityCompat.requestPermissions(activity,
                         new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        0);
+                        1);
+                Log.d("nearby_connections", "askExternalStoragePermission");  
+                result.success(null);
+                break;
+            case "askLocationAndExternalStoragePermission":
+                ActivityCompat.requestPermissions(activity,
+                        new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION,Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                        1);
+                Log.d("nearby_connections", "askExternalStoragePermission");  
                 result.success(null);
                 break;
             case "stopAdvertising":
diff --git a/lib/nearby_connections.dart b/lib/nearby_connections.dart
index 70ba0e2..535fbcb 100644
--- a/lib/nearby_connections.dart
+++ b/lib/nearby_connections.dart
@@ -3,4 +3,4 @@ library nearby_connections;
 
 export 'src/classes.dart';
 export 'src/defs.dart';
-export 'src/nearby_connections.dart';
+export 'src/nearby.dart';
diff --git a/lib/src/nearby_connections.dart b/lib/src/nearby.dart
similarity index 97%
rename from lib/src/nearby_connections.dart
rename to lib/src/nearby.dart
index 22017c0..9ebab6a 100644
--- a/lib/src/nearby_connections.dart
+++ b/lib/src/nearby.dart
@@ -176,6 +176,14 @@ class Nearby {
         'askExternalStoragePermission',
       );
 
+  /// Convinience method
+  ///
+  /// Use this instead of calling both [askLocationPermission()] and [askExternalStoragePermission()]
+  Future<void> askLocationAndExternalStoragePermission() async =>
+      await _channel.invokeMethod(
+        'askLocationAndExternalStoragePermission',
+      );
+
   /// Start Advertising, Discoverers would be able to discover this advertiser.
   ///
   /// [userNickName] and [strategy] should not be null
@@ -342,13 +350,13 @@ class Nearby {
   /// ```dart
   /// String a = "hello";
   /// Uint8List bytes = Uint8List.fromList(a.codeUnits);
-  /// 
+  ///
   /// ```
   /// Convert bytes [Uint8List] to String as follows -
   /// ```dart
   /// String str = String.fromCharCodes(payload.bytes);
   /// ```
-  /// 
+  ///
   Future<void> sendBytesPayload(String endpointId, Uint8List bytes) async {
     assert(endpointId != null);
 
@@ -383,7 +391,7 @@ class Nearby {
   /// Use it to cancel/stop a payload transfer
   Future<void> cancelPayload(int payloadId) async {
     assert(payloadId != null);
-    
+
     return await _channel.invokeMethod(
       'cancelPayload',
       <String, dynamic>{