diff --git a/lib/utils/android_file_utils.dart b/lib/utils/android_file_utils.dart index a11e37d9b..a81e03bb8 100644 --- a/lib/utils/android_file_utils.dart +++ b/lib/utils/android_file_utils.dart @@ -8,7 +8,8 @@ import 'package:flutter/widgets.dart'; final AndroidFileUtils androidFileUtils = AndroidFileUtils._private(); class AndroidFileUtils { - late final String separator, primaryStorage, dcimPath, downloadPath, moviesPath, picturesPath, videoCapturesPath; + late final String separator, primaryStorage, dcimPath, downloadPath, moviesPath, picturesPath, avesVideoCapturesPath; + late final Set videoCapturesPaths; Set storageVolumes = {}; Set _packages = {}; List _potentialAppDirs = []; @@ -31,8 +32,13 @@ class AndroidFileUtils { downloadPath = pContext.join(primaryStorage, 'Download'); moviesPath = pContext.join(primaryStorage, 'Movies'); picturesPath = pContext.join(primaryStorage, 'Pictures'); - // from Aves - videoCapturesPath = pContext.join(dcimPath, 'Video Captures'); + avesVideoCapturesPath = pContext.join(dcimPath, 'Videocaptures'); + videoCapturesPaths = { + // from Samsung + pContext.join(dcimPath, 'Video Captures'), + // from Aves + avesVideoCapturesPath, + }; _initialized = true; } @@ -58,7 +64,7 @@ class AndroidFileUtils { bool isScreenRecordingsPath(String path) => (path.startsWith(dcimPath) || path.startsWith(moviesPath)) && (path.endsWith('${separator}Screen recordings') || path.endsWith('${separator}ScreenRecords')); - bool isVideoCapturesPath(String path) => path == videoCapturesPath; + bool isVideoCapturesPath(String path) => videoCapturesPaths.contains(path); bool isDownloadPath(String path) => path == downloadPath; diff --git a/lib/widgets/viewer/video_action_delegate.dart b/lib/widgets/viewer/video_action_delegate.dart index 494cfc7c7..b81ff5549 100644 --- a/lib/widgets/viewer/video_action_delegate.dart +++ b/lib/widgets/viewer/video_action_delegate.dart @@ -72,7 +72,7 @@ class VideoActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix final positionMillis = controller.currentPosition; final bytes = await controller.captureFrame(); - final destinationAlbum = androidFileUtils.videoCapturesPath; + final destinationAlbum = androidFileUtils.avesVideoCapturesPath; if (!await checkStoragePermissionForAlbums(context, {destinationAlbum})) return; if (!await checkFreeSpace(context, bytes.length, destinationAlbum)) return;