Add permission checks for desktop OSs

LeastAuthority · Apr 26, 2022 · 30e8120 · 30e8120
1 parent 7c57c39
commit 30e8120
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 40 deletions.
diff --git a/lib/views/shared/receive.dart b/lib/views/shared/receive.dart
@@ -6,7 +6,6 @@ import 'package:dart_wormhole_gui/views/shared/progress.dart';
 import 'package:dart_wormhole_william/client/client.dart';
 import 'package:dart_wormhole_william/client/native_client.dart';
 import 'package:flutter/material.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:dart_wormhole_gui/views/shared/util.dart';
 import 'package:path_provider/path_provider.dart';
@@ -96,12 +95,12 @@ abstract class ReceiveShared<T extends ReceiveState> extends State<T> {
     return "$prefix.$suffix";
   }
 
-  void defaultErrorHandler(Object error, Object stacktrace) {
+  void defaultErrorHandler(Object error) {
     this.setState(() {
       this.currentState = ReceiveScreenStates.ReceiveError;
       this.error = error.toString();
       this.errorMessage = "Failed to receive file: $error";
-      print("Error receiving file\n$error\n$stacktrace");
+      print("Error receiving file\n$error");
 
       if (error is ClientError) {
         switch (error.errorCode) {
@@ -121,8 +120,8 @@ abstract class ReceiveShared<T extends ReceiveState> extends State<T> {
   }
 
   Future<ReceiveFileResult> receive() async {
-    return await canWriteToFile().then((permissionStatus) async {
-      if (permissionStatus == PermissionStatus.granted) {
+    return await canWriteToDirectory(path!).then((canWrite) async {
+      if (canWrite) {
         late final File tempFile;
         this.setState(() {
           isRequestingConnection = true;
@@ -167,7 +166,10 @@ abstract class ReceiveShared<T extends ReceiveState> extends State<T> {
           return result;
         }, onError: defaultErrorHandler);
       } else {
-        return Future.error(Exception("Permission denied"));
+        final error =
+            Exception("Permission denied. Could not write to ${path!}");
+        defaultErrorHandler(error);
+        return Future.error(error);
       }
     });
   }

diff --git a/lib/views/shared/settings.dart b/lib/views/shared/settings.dart
@@ -42,22 +42,20 @@ abstract class SettingsShared<T extends SettingsState> extends State<T> {
   }
 
   void handleSelectFile() async {
-    await canWriteToFile().then((permissionStatus) async {
-      if (permissionStatus == PermissionStatus.granted) {
-        String? directory = await FilePicker.platform.getDirectoryPath();
-        if (directory == null) {
-          return;
-        }
-        if (await canWriteToDirectory(directory)) {
-          setState(() {
-            prefs?.setString(PATH, directory);
-          });
-        } else {
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-            content: Text(
-                THE_APP_DOES_NOT_HAVE_THE_PREMISSION_TO_STORE_FILES_IN_THE_DIR),
-          ));
-        }
+    String? directory = await FilePicker.platform.getDirectoryPath();
+    if (directory == null) {
+      return;
+    }
+    await canWriteToDirectory(directory).then((canWrite) async {
+      if (canWrite) {
+        setState(() {
+          prefs?.setString(PATH, directory);
+        });
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          content: Text(
+              THE_APP_DOES_NOT_HAVE_THE_PREMISSION_TO_STORE_FILES_IN_THE_DIR),
+        ));
       }
     });
   }

diff --git a/lib/views/shared/util.dart b/lib/views/shared/util.dart
@@ -30,17 +30,6 @@ extension BytesToReadableSize on int {
   }
 }
 
-Future<PermissionStatus> canWriteToFile() async {
-  if (Platform.isAndroid) {
-    return await Permission.storage.request();
-  } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
-    return PermissionStatus.granted;
-  } else {
-    print("Implement write checks for ${Platform()}");
-    return PermissionStatus.permanentlyDenied;
-  }
-}
-
 String nonExistingPathFor(String path) {
   if (File(path).existsSync()) {
     int i = 1;
@@ -65,13 +54,20 @@ String nonExistingPathFor(String path) {
   }
 }
 
-canWriteToDirectory(String directory) async {
-  try {
-    String path = nonExistingPathFor('$directory/test');
-    await File(path).writeAsBytes([]);
-    await File(path).delete();
-    return true;
-  } catch (e) {
+Future<bool> canWriteToDirectory(String directory) async {
+  if (Platform.isAndroid) {
+    return await Permission.storage.request() == PermissionStatus.granted;
+  } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+    try {
+      String path = nonExistingPathFor('$directory/test');
+      File(path).writeAsBytesSync([]);
+      File(path).deleteSync();
+      return true;
+    } catch (e) {
+      return false;
+    }
+  } else {
+    print("Implement write checks for ${Platform()}");
     return false;
   }
 }