From 7ea309de912d63d1027747a1d0ba065aeb82179e Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 8 Aug 2021 12:27:54 +0900
Subject: [PATCH] fixed initialization when handling new intent in existing
 activity

---
 lib/utils/android_file_utils.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/utils/android_file_utils.dart b/lib/utils/android_file_utils.dart
index 7ae61645c..0c57ca95f 100644
--- a/lib/utils/android_file_utils.dart
+++ b/lib/utils/android_file_utils.dart
@@ -14,6 +14,7 @@ class AndroidFileUtils {
   Set<StorageVolume> storageVolumes = {};
   Set<Package> _packages = {};
   List<String> _potentialAppDirs = [];
+  bool _initialized = false;
 
   AChangeNotifier appNameChangeNotifier = AChangeNotifier();
 
@@ -22,6 +23,8 @@ class AndroidFileUtils {
   AndroidFileUtils._private();
 
   Future<void> init() async {
+    if (_initialized) return;
+
     separator = pContext.separator;
     storageVolumes = await storageService.getStorageVolumes();
     primaryStorage = storageVolumes.firstWhereOrNull((volume) => volume.isPrimary)?.path ?? separator;
@@ -32,6 +35,8 @@ class AndroidFileUtils {
     picturesPath = pContext.join(primaryStorage, 'Pictures');
     // from Aves
     videoCapturesPath = pContext.join(dcimPath, 'Video Captures');
+
+    _initialized = true;
   }
 
   Future<void> initAppNames() async {