mirror of
https://github.com/hackku21/nearby_connections.git
synced 2024-10-27 19:14:01 +00:00
fixed file rename bug
This commit is contained in:
parent
cd7e9bc63d
commit
598544d7d7
@ -31,6 +31,7 @@ Add these to AndroidManifest.xml
|
|||||||
|
|
||||||
<!-- 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.
|
||||||
|
|
||||||
|
@ -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());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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,14 +42,17 @@ class _MyBodyState extends State<Body> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Center(
|
return Center(
|
||||||
child: Column(
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
child: ListView(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
Text("Permissions",),
|
||||||
Wrap(
|
Wrap(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
RaisedButton(
|
RaisedButton(
|
||||||
child: Text("checkPermission"),
|
child: Text("checkLocationPermission"),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
if (await Nearby().checkPermissions()) {
|
if (await Nearby().checkLocationPermission()) {
|
||||||
Scaffold.of(context).showSnackBar(SnackBar(
|
Scaffold.of(context).showSnackBar(SnackBar(
|
||||||
content: Text("Location permissions granted :)")));
|
content: Text("Location permissions granted :)")));
|
||||||
} else {
|
} else {
|
||||||
@ -59,13 +62,34 @@ class _MyBodyState extends State<Body> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
RaisedButton(
|
RaisedButton(
|
||||||
child: Text("askPermission"),
|
child: Text("askLocationPermission"),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
await Nearby().askPermission();
|
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),
|
Text("User Name: " + userName),
|
||||||
Wrap(
|
Wrap(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
@ -169,6 +193,8 @@ class _MyBodyState extends State<Body> {
|
|||||||
await Nearby().stopAllEndpoints();
|
await Nearby().stopAllEndpoints();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
Divider(),
|
||||||
|
Text("Sending Data",),
|
||||||
RaisedButton(
|
RaisedButton(
|
||||||
child: Text("Send Random Bytes Payload"),
|
child: Text("Send Random Bytes Payload"),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
@ -195,6 +221,7 @@ class _MyBodyState extends State<Body> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user