From 598544d7d7be79438528bf5a1794a2153be0b711 Mon Sep 17 00:00:00 2001
From: Prerak Mann <mannprerak2@gmail.com>
Date: Fri, 16 Aug 2019 01:50:51 +0530
Subject: [PATCH] fixed file rename bug

---
 README.md                                     |   3 +-
 .../NearbyConnectionsPlugin.java              |  29 +-
 .../android/app/src/main/AndroidManifest.xml  |   3 +
 example/lib/main.dart                         | 335 ++++++++++--------
 lib/src/nearby_connections.dart               |  22 +-
 5 files changed, 225 insertions(+), 167 deletions(-)

diff --git a/README.md b/README.md
index 16cfc18..c3c79fb 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,9 @@ Add these to AndroidManifest.xml
 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-<!-- Optional: only required for FILE payloads -->
+<!-- Optional: only required for FILE payloads-->
 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 ```
 Since ACCESS_FINE_LOCATION and READ_EXTERNAL_STORAGE is considered to be dangerous system permissions, in addition to adding them to your manifest, you must request these permissions at runtime.
 
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 ac830d4..b473614 100644
--- a/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
+++ b/android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
@@ -62,21 +62,36 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
     public void onMethodCall(MethodCall call, final Result result) {
 
         switch (call.method) {
-            case "checkPermissions":
+            case "checkLocationPermission":
                 if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)
-                        != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION)
-                        != PackageManager.PERMISSION_GRANTED) {
-                    result.success(false);
-                } else {
+                        == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION)
+                        == PackageManager.PERMISSION_GRANTED) {
                     result.success(true);
+                } else {
+                    result.success(false);
                 }
                 break;
-            case "askPermissions":
+            case "askLocationPermission":
                 ActivityCompat.requestPermissions(activity,
                         new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
                         0);
                 result.success(null);
                 break;
+            case "checkExternalStoragePermission":
+                if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE)
+                        == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                        == PackageManager.PERMISSION_GRANTED) {
+                    result.success(true);
+                } else {
+                    result.success(false);
+                }
+                break;
+            case "askExternalStoragePermission":
+                ActivityCompat.requestPermissions(activity,
+                        new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                        0);
+                result.success(null);
+                break;
             case "stopAdvertising":
                 Log.d("nearby_connections", "stopAdvertising");
                 Nearby.getConnectionsClient(activity).stopAdvertising();
@@ -358,7 +373,7 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
                 assert bytes != null;
                 args.put("bytes", bytes);
             }
-            else if (payload.getType() == Payload.Type.BYTES) {
+            else if (payload.getType() == Payload.Type.FILE) {
                 args.put("filePath", payload.asFile().asJavaFile().getAbsolutePath());
             }
 
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index da157b9..d175df9 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,9 @@
 <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 5b81e65..80de29b 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -33,7 +33,7 @@ class Body extends StatefulWidget {
 }
 
 class _MyBodyState extends State<Body> {
-  final String userName = Random().nextInt(1000).toString();
+  final String userName = Random().nextInt(10000).toString();
   final Strategy strategy = Strategy.P2P_STAR;
   String cId = "0"; //currently connected device ID
   File tempFile; //stores the file being transferred
@@ -42,158 +42,185 @@ class _MyBodyState extends State<Body> {
   @override
   Widget build(BuildContext context) {
     return Center(
-      child: Column(
-        children: <Widget>[
-          Wrap(
-            children: <Widget>[
-              RaisedButton(
-                child: Text("checkPermission"),
-                onPressed: () async {
-                  if (await Nearby().checkPermissions()) {
-                    Scaffold.of(context).showSnackBar(SnackBar(
-                        content: Text("Location permissions granted :)")));
-                  } else {
-                    Scaffold.of(context).showSnackBar(SnackBar(
-                        content: Text("Location permissions not granted :(")));
-                  }
-                },
-              ),
-              RaisedButton(
-                child: Text("askPermission"),
-                onPressed: () async {
-                  await Nearby().askPermission();
-                },
-              ),
-            ],
-          ),
-          Text("User Name: " + userName),
-          Wrap(
-            children: <Widget>[
-              RaisedButton(
-                child: Text("Start Advertising"),
-                onPressed: () async {
-                  try {
-                    bool a = await Nearby().startAdvertising(
-                      userName,
-                      strategy,
-                      onConnectionInitiated: (id, info) {
-                        oci(id, info);
-                      },
-                      onConnectionResult: (id, status) {
-                        showSnackbar(status);
-                      },
-                      onDisconnected: (id) {
-                        showSnackbar("Disconnected: "+id);
-                      },
-                    );
-                    showSnackbar(a);
-                  } catch (exception) {
-                    showSnackbar(exception);
-                  }
-                },
-              ),
-              RaisedButton(
-                child: Text("Stop Advertising"),
-                onPressed: () async {
-                  await Nearby().stopAdvertising();
-                },
-              ),
-            ],
-          ),
-          Wrap(
-            children: <Widget>[
-              RaisedButton(
-                child: Text("Start Discovery"),
-                onPressed: () async {
-                  try {
-                    bool a = await Nearby().startDiscovery(
-                      userName,
-                      strategy,
-                      onEndpointFound: (id, name, serviceId) {
-                        print("in callback");
-                        showModalBottomSheet(
-                          context: context,
-                          builder: (builder) {
-                            return Center(
-                              child: Column(
-                                children: <Widget>[
-                                  Text("id: " + id),
-                                  Text("Name: " + name),
-                                  Text("ServiceId: " + serviceId),
-                                  RaisedButton(
-                                    child: Text("Request Connection"),
-                                    onPressed: () {
-                                      Navigator.pop(context);
-                                      Nearby().requestConnection(
-                                        userName,
-                                        id,
-                                        onConnectionInitiated: (id, info) {
-                                          oci(id, info);
-                                        },
-                                        onConnectionResult: (id, status) {
-                                          showSnackbar(status);
-                                        },
-                                        onDisconnected: (id) {
-                                          showSnackbar(id);
-                                        },
-                                      );
-                                    },
-                                  ),
-                                ],
-                              ),
-                            );
-                          },
-                        );
-                      },
-                      onEndpointLost: (id) {
-                        showSnackbar(id);
-                      },
-                    );
-                    showSnackbar(a);
-                  } catch (e) {
-                    showSnackbar(e);
-                  }
-                },
-              ),
-              RaisedButton(
-                child: Text("Stop Discovery"),
-                onPressed: () async {
-                  await Nearby().stopDiscovery();
-                },
-              ),
-            ],
-          ),
-          RaisedButton(
-            child: Text("Stop All Endpoints"),
-            onPressed: () async {
-              await Nearby().stopAllEndpoints();
-            },
-          ),
-          RaisedButton(
-            child: Text("Send Random Bytes Payload"),
-            onPressed: () async {
-              String a = Random().nextInt(100).toString();
-              showSnackbar("Sending $a to $cId");
-              Nearby().sendBytesPayload(cId, Uint8List.fromList(a.codeUnits));
-            },
-          ),
-          RaisedButton(
-            child: Text("Send File Payload"),
-            onPressed: () async {
-              File file =
-                  await ImagePicker.pickImage(source: ImageSource.gallery);
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: ListView(
+          children: <Widget>[
+            Text("Permissions",),
+            Wrap(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("checkLocationPermission"),
+                  onPressed: () async {
+                    if (await Nearby().checkLocationPermission()) {
+                      Scaffold.of(context).showSnackBar(SnackBar(
+                          content: Text("Location permissions granted :)")));
+                    } else {
+                      Scaffold.of(context).showSnackBar(SnackBar(
+                          content: Text("Location permissions not granted :(")));
+                    }
+                  },
+                ),
+                RaisedButton(
+                  child: Text("askLocationPermission"),
+                  onPressed: () async {
+                    await Nearby().askLocationPermission();
+                  },
+                ),
+                RaisedButton(
+                  child: Text("checkExternalStoragePermission"),
+                  onPressed: () async {
+                    if (await Nearby().checkExternalStoragePermission()) {
+                      Scaffold.of(context).showSnackBar(SnackBar(
+                          content:
+                              Text("External Storage permissions granted :)")));
+                    } else {
+                      Scaffold.of(context).showSnackBar(SnackBar(
+                          content: Text(
+                              "External Storage permissions not granted :(")));
+                    }
+                  },
+                ),
+                RaisedButton(
+                  child: Text("askExternalStoragePermission"),
+                  onPressed: () async {
+                    await Nearby().askExternalStoragePermission();
+                  },
+                ),
+              ],
+            ),
+            Divider(),
+            Text("User Name: " + userName),
+            Wrap(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("Start Advertising"),
+                  onPressed: () async {
+                    try {
+                      bool a = await Nearby().startAdvertising(
+                        userName,
+                        strategy,
+                        onConnectionInitiated: (id, info) {
+                          oci(id, info);
+                        },
+                        onConnectionResult: (id, status) {
+                          showSnackbar(status);
+                        },
+                        onDisconnected: (id) {
+                          showSnackbar("Disconnected: " + id);
+                        },
+                      );
+                      showSnackbar(a);
+                    } catch (exception) {
+                      showSnackbar(exception);
+                    }
+                  },
+                ),
+                RaisedButton(
+                  child: Text("Stop Advertising"),
+                  onPressed: () async {
+                    await Nearby().stopAdvertising();
+                  },
+                ),
+              ],
+            ),
+            Wrap(
+              children: <Widget>[
+                RaisedButton(
+                  child: Text("Start Discovery"),
+                  onPressed: () async {
+                    try {
+                      bool a = await Nearby().startDiscovery(
+                        userName,
+                        strategy,
+                        onEndpointFound: (id, name, serviceId) {
+                          print("in callback");
+                          showModalBottomSheet(
+                            context: context,
+                            builder: (builder) {
+                              return Center(
+                                child: Column(
+                                  children: <Widget>[
+                                    Text("id: " + id),
+                                    Text("Name: " + name),
+                                    Text("ServiceId: " + serviceId),
+                                    RaisedButton(
+                                      child: Text("Request Connection"),
+                                      onPressed: () {
+                                        Navigator.pop(context);
+                                        Nearby().requestConnection(
+                                          userName,
+                                          id,
+                                          onConnectionInitiated: (id, info) {
+                                            oci(id, info);
+                                          },
+                                          onConnectionResult: (id, status) {
+                                            showSnackbar(status);
+                                          },
+                                          onDisconnected: (id) {
+                                            showSnackbar(id);
+                                          },
+                                        );
+                                      },
+                                    ),
+                                  ],
+                                ),
+                              );
+                            },
+                          );
+                        },
+                        onEndpointLost: (id) {
+                          showSnackbar(id);
+                        },
+                      );
+                      showSnackbar(a);
+                    } catch (e) {
+                      showSnackbar(e);
+                    }
+                  },
+                ),
+                RaisedButton(
+                  child: Text("Stop Discovery"),
+                  onPressed: () async {
+                    await Nearby().stopDiscovery();
+                  },
+                ),
+              ],
+            ),
+            RaisedButton(
+              child: Text("Stop All Endpoints"),
+              onPressed: () async {
+                await Nearby().stopAllEndpoints();
+              },
+            ),
+            Divider(),
+            Text("Sending Data",),
+            RaisedButton(
+              child: Text("Send Random Bytes Payload"),
+              onPressed: () async {
+                String a = Random().nextInt(100).toString();
+                showSnackbar("Sending $a to $cId");
+                Nearby().sendBytesPayload(cId, Uint8List.fromList(a.codeUnits));
+              },
+            ),
+            RaisedButton(
+              child: Text("Send File Payload"),
+              onPressed: () async {
+                File file =
+                    await ImagePicker.pickImage(source: ImageSource.gallery);
 
-              if (file == null) return;
+                if (file == null) return;
 
-              int payloadId = await Nearby().sendFilePayload(cId, file.path);
-              showSnackbar("Sending file to $cId");
-              Nearby().sendBytesPayload(
-                  cId,
-                  Uint8List.fromList(
-                      "$payloadId:${file.path.split('/').last}".codeUnits));
-            },
-          ),
-        ],
+                int payloadId = await Nearby().sendFilePayload(cId, file.path);
+                showSnackbar("Sending file to $cId");
+                Nearby().sendBytesPayload(
+                    cId,
+                    Uint8List.fromList(
+                        "$payloadId:${file.path.split('/').last}".codeUnits));
+              },
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -261,11 +288,9 @@ class _MyBodyState extends State<Body> {
                         showSnackbar(endid + ": FAILED to transfer file");
                       } else if (payloadTransferUpdate.status ==
                           PayloadStatus.SUCCESS) {
-                        print(
+                        showSnackbar(
                             "success, total bytes = ${payloadTransferUpdate.totalBytes}");
-                        showSnackbar(endid +
-                            ": SUCCESS in file transfer (file is un-named in downloads) ");
-
+                        
                         if (map.containsKey(payloadTransferUpdate.id)) {
                           //rename the file now
                           String name = map[payloadTransferUpdate.id];
diff --git a/lib/src/nearby_connections.dart b/lib/src/nearby_connections.dart
index 695c65b..d2674f6 100644
--- a/lib/src/nearby_connections.dart
+++ b/lib/src/nearby_connections.dart
@@ -149,15 +149,29 @@ class Nearby {
   ///
   /// retruns true/false based on location permissions.
   /// Discovery cannot be started with insufficient permission
-  Future<bool> checkPermissions() async => await _channel.invokeMethod(
-        'checkPermissions',
+  Future<bool> checkLocationPermission() async => await _channel.invokeMethod(
+        'checkLocationPermission',
       );
 
   /// Convinience method
   ///
   /// Asks location permission
-  Future<void> askPermission() async => await _channel.invokeMethod(
-        'askPermissions',
+  Future<void> askLocationPermission() async => await _channel.invokeMethod(
+        'askLocationPermission',
+      );
+  
+  /// Convinience method
+  ///
+  /// retruns true/false based on external storage permissions.
+  Future<bool> checkExternalStoragePermission() async => await _channel.invokeMethod(
+        'checkExternalStoragePermission',
+      );
+
+  /// Convinience method
+  ///
+  /// Asks external storage permission, required for file
+  Future<void> askExternalStoragePermission() async => await _channel.invokeMethod(
+        'askExternalStoragePermission',
       );
 
   /// Start Advertising