Merge branch 'master' of https://github.com/mrrfv/open-android-backup

Author: mrrfv

backup.sh

@@ -5,7 +5,7 @@ set -e
 # This is used to download a stable, compatible version of the Android companion app as well as ensure backwards compatibility,
 # so it should match the tag name in GitHub Releases.
 # TODO: load this dynamically, i.e. configure our build system to automatically update the APP_VERSION
-APP_VERSION="v1.2.0"
+APP_VERSION="v1.2.1"
 
 # We use whiptail for showing dialogs.
 # Whiptail is used similarly as dialog, but we can't install it on macOS using Homebrew IIRC.

companion_app/lib/main_screen.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 
 import './services/backup_service.dart';
 import './widgets/progress_widgets.dart';
+import 'services/file_service.dart';
 
 class MainScreen extends StatefulWidget {
   const MainScreen({Key? key}) : super(key: key);
@@ -27,6 +28,8 @@ class _MainScreenState extends State<MainScreen> {
   int contactsAmountFilesystem = 0;
   int contactsImported = 0;
 
+  final FileService fileService = FileService();
+
   // No directory paths needed for main screen - uses hardcoded directories
 
   @override
@@ -78,6 +81,11 @@ class _MainScreenState extends State<MainScreen> {
     });
 
     try {
+      // First check permissions
+      if (!(await fileService.checkStoragePermissions())) {
+        throw Error();
+      }
+
       // Recreate the temp directory if it already exists
       final directory = Directory(exportDir);
       if (await directory.exists()) {

companion_app/lib/services/file_service.dart

@@ -4,7 +4,7 @@ import 'package:device_info_plus/device_info_plus.dart';
 
 class FileService {
   /// Check if we have necessary storage permissions for file operations
-  Future<bool> _checkStoragePermissions() async {
+  Future<bool> checkStoragePermissions() async {
     // Check storage permissions based on Android version
     final androidInfo = await DeviceInfoPlugin().androidInfo;
     if (androidInfo.version.sdkInt <= 29) {
@@ -23,7 +23,7 @@ class FileService {
   /// Verify that we have permissions and the directory is accessible
   Future<bool> verifyDirectoryAccess(String directoryPath) async {
     // First check storage permissions
-    if (!(await _checkStoragePermissions())) {
+    if (!(await checkStoragePermissions())) {
       return false;
     }
 
@@ -94,7 +94,7 @@ class FileService {
   Future<String?> readFile(String filePath) async {
     try {
       // Verify we have storage permissions
-      if (!(await _checkStoragePermissions())) {
+      if (!(await checkStoragePermissions())) {
         // DEBUG: No storage permissions to read file
         return null;
       }

companion_app/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.0+12
+version: 1.2.1+13
 
 environment:
   sdk: ">=2.15.1 <3.0.0"