Loc-Chain/nearby_connections
3
0
Fork 0
mirror of https://github.com/hackku21/nearby_connections.git synced 2024-10-27 19:14:01 +00:00
Code Issues Projects Releases Wiki Activity

fixed file rename bug

Browse Source
This commit is contained in:
Prerak Mann 2019-08-16 01:50:51 +05:30
parent cd7e9bc63d
commit 598544d7d7
5 changed files with 225 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -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_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_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.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. 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.

29
android/src/main/java/com/pkmnapps/nearby_connections/NearbyConnectionsPlugin.java
View File

@ -62,21 +62,36 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
public void onMethodCall(MethodCall call, final Result result) { public void onMethodCall(MethodCall call, final Result result) {
switch (call.method) { switch (call.method) {
case "checkPermissions": case "checkLocationPermission":
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION)
!= PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION)
!= PackageManager.PERMISSION_GRANTED) { == PackageManager.PERMISSION_GRANTED) {
result.success(false);
} else {
result.success(true); result.success(true);
} else {
result.success(false);
} }
break; break;
case "askPermissions": case "askLocationPermission":
ActivityCompat.requestPermissions(activity, ActivityCompat.requestPermissions(activity,
new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
0); 0);
result.success(null); result.success(null);
break; 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": case "stopAdvertising":
Log.d("nearby_connections", "stopAdvertising"); Log.d("nearby_connections", "stopAdvertising");
Nearby.getConnectionsClient(activity).stopAdvertising(); Nearby.getConnectionsClient(activity).stopAdvertising();
@ -358,7 +373,7 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
assert bytes != null; assert bytes != null;
args.put("bytes", bytes); 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()); args.put("filePath", payload.asFile().asJavaFile().getAbsolutePath());
} }

3
example/android/app/src/main/AndroidManifest.xml
View File

@ -7,6 +7,9 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <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_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_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 <!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method. calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide In most cases you can leave this as-is, but you if you want to provide

333
example/lib/main.dart
View File

@ -33,7 +33,7 @@ class Body extends StatefulWidget {
} }
class _MyBodyState extends State<Body> { 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; final Strategy strategy = Strategy.P2P_STAR;
String cId = "0"; //currently connected device ID String cId = "0"; //currently connected device ID
File tempFile; //stores the file being transferred File tempFile; //stores the file being transferred
@ -42,158 +42,185 @@ class _MyBodyState extends State<Body> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Center( return Center(
child: Column( child: Padding(
children: <Widget>[ padding: const EdgeInsets.all(8.0),
Wrap( child: ListView(
children: <Widget>[ children: <Widget>[
RaisedButton( Text("Permissions",),
child: Text("checkPermission"), Wrap(
onPressed: () async { children: <Widget>[
if (await Nearby().checkPermissions()) { RaisedButton(
Scaffold.of(context).showSnackBar(SnackBar( child: Text("checkLocationPermission"),
content: Text("Location permissions granted :)"))); onPressed: () async {
} else { if (await Nearby().checkLocationPermission()) {
Scaffold.of(context).showSnackBar(SnackBar( Scaffold.of(context).showSnackBar(SnackBar(
content: Text("Location permissions not granted :("))); 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(); RaisedButton(
}, child: Text("askLocationPermission"),
), onPressed: () async {
], await Nearby().askLocationPermission();
), },
Text("User Name: " + userName), ),
Wrap( RaisedButton(
children: <Widget>[ child: Text("checkExternalStoragePermission"),
RaisedButton( onPressed: () async {
child: Text("Start Advertising"), if (await Nearby().checkExternalStoragePermission()) {
onPressed: () async { Scaffold.of(context).showSnackBar(SnackBar(
try { content:
bool a = await Nearby().startAdvertising( Text("External Storage permissions granted :)")));
userName, } else {
strategy, Scaffold.of(context).showSnackBar(SnackBar(
onConnectionInitiated: (id, info) { content: Text(
oci(id, info); "External Storage permissions not granted :(")));
}, }
onConnectionResult: (id, status) { },
showSnackbar(status); ),
}, RaisedButton(
onDisconnected: (id) { child: Text("askExternalStoragePermission"),
showSnackbar("Disconnected: "+id); onPressed: () async {
}, await Nearby().askExternalStoragePermission();
); },
showSnackbar(a); ),
} catch (exception) { ],
showSnackbar(exception); ),
} Divider(),
}, Text("User Name: " + userName),
), Wrap(
RaisedButton( children: <Widget>[
child: Text("Stop Advertising"), RaisedButton(
onPressed: () async { child: Text("Start Advertising"),
await Nearby().stopAdvertising(); onPressed: () async {
}, try {
), bool a = await Nearby().startAdvertising(
], userName,
), strategy,
Wrap( onConnectionInitiated: (id, info) {
children: <Widget>[ oci(id, info);
RaisedButton( },
child: Text("Start Discovery"), onConnectionResult: (id, status) {
onPressed: () async { showSnackbar(status);
try { },
bool a = await Nearby().startDiscovery( onDisconnected: (id) {
userName, showSnackbar("Disconnected: " + id);
strategy, },
onEndpointFound: (id, name, serviceId) { );
print("in callback"); showSnackbar(a);
showModalBottomSheet( } catch (exception) {
context: context, showSnackbar(exception);
builder: (builder) { }
return Center( },
child: Column( ),
children: <Widget>[ RaisedButton(
Text("id: " + id), child: Text("Stop Advertising"),
Text("Name: " + name), onPressed: () async {
Text("ServiceId: " + serviceId), await Nearby().stopAdvertising();
RaisedButton( },
child: Text("Request Connection"), ),
onPressed: () { ],
Navigator.pop(context); ),
Nearby().requestConnection( Wrap(
userName, children: <Widget>[
id, RaisedButton(
onConnectionInitiated: (id, info) { child: Text("Start Discovery"),
oci(id, info); onPressed: () async {
}, try {
onConnectionResult: (id, status) { bool a = await Nearby().startDiscovery(
showSnackbar(status); userName,
}, strategy,
onDisconnected: (id) { onEndpointFound: (id, name, serviceId) {
showSnackbar(id); print("in callback");
}, showModalBottomSheet(
); context: context,
}, builder: (builder) {
), return Center(
], child: Column(
), children: <Widget>[
); Text("id: " + id),
}, Text("Name: " + name),
); Text("ServiceId: " + serviceId),
}, RaisedButton(
onEndpointLost: (id) { child: Text("Request Connection"),
showSnackbar(id); onPressed: () {
}, Navigator.pop(context);
); Nearby().requestConnection(
showSnackbar(a); userName,
} catch (e) { id,
showSnackbar(e); onConnectionInitiated: (id, info) {
} oci(id, info);
}, },
), onConnectionResult: (id, status) {
RaisedButton( showSnackbar(status);
child: Text("Stop Discovery"), },
onPressed: () async { onDisconnected: (id) {
await Nearby().stopDiscovery(); showSnackbar(id);
}, },
), );
], },
), ),
RaisedButton( ],
child: Text("Stop All Endpoints"), ),
onPressed: () async { );
await Nearby().stopAllEndpoints(); },
}, );
), },
RaisedButton( onEndpointLost: (id) {
child: Text("Send Random Bytes Payload"), showSnackbar(id);
onPressed: () async { },
String a = Random().nextInt(100).toString(); );
showSnackbar("Sending $a to $cId"); showSnackbar(a);
Nearby().sendBytesPayload(cId, Uint8List.fromList(a.codeUnits)); } catch (e) {
}, showSnackbar(e);
), }
RaisedButton( },
child: Text("Send File Payload"), ),
onPressed: () async { RaisedButton(
File file = child: Text("Stop Discovery"),
await ImagePicker.pickImage(source: ImageSource.gallery); 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); int payloadId = await Nearby().sendFilePayload(cId, file.path);
showSnackbar("Sending file to $cId"); showSnackbar("Sending file to $cId");
Nearby().sendBytesPayload( Nearby().sendBytesPayload(
cId, cId,
Uint8List.fromList( Uint8List.fromList(
"$payloadId:${file.path.split('/').last}".codeUnits)); "$payloadId:${file.path.split('/').last}".codeUnits));
}, },
), ),
], ],
),
), ),
); );
} }
@ -261,10 +288,8 @@ class _MyBodyState extends State<Body> {
showSnackbar(endid + ": FAILED to transfer file"); showSnackbar(endid + ": FAILED to transfer file");
} else if (payloadTransferUpdate.status == } else if (payloadTransferUpdate.status ==
PayloadStatus.SUCCESS) { PayloadStatus.SUCCESS) {
print( showSnackbar(
"success, total bytes = ${payloadTransferUpdate.totalBytes}"); "success, total bytes = ${payloadTransferUpdate.totalBytes}");
showSnackbar(endid +
": SUCCESS in file transfer (file is un-named in downloads) ");
if (map.containsKey(payloadTransferUpdate.id)) { if (map.containsKey(payloadTransferUpdate.id)) {
//rename the file now //rename the file now

22
lib/src/nearby_connections.dart
View File

@ -149,15 +149,29 @@ class Nearby {
/// ///
/// retruns true/false based on location permissions. /// retruns true/false based on location permissions.
/// Discovery cannot be started with insufficient permission /// Discovery cannot be started with insufficient permission
Future<bool> checkPermissions() async => await _channel.invokeMethod( Future<bool> checkLocationPermission() async => await _channel.invokeMethod(
'checkPermissions', 'checkLocationPermission',
); );
/// Convinience method /// Convinience method
/// ///
/// Asks location permission /// Asks location permission
Future<void> askPermission() async => await _channel.invokeMethod( Future<void> askLocationPermission() async => await _channel.invokeMethod(
'askPermissions', '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 /// Start Advertising