Merge branch 'develop'

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
-## <a id="v1.11.12"></a>[v1.11.12] - 2024-09-16
+## <a id="v1.11.13"></a>[v1.11.13] - 2024-09-17
 
 ### Added
 
@@ -19,6 +19,8 @@ All notable changes to this project will be documented in this file.
 - crash when cataloguing some malformed MP4 files
 - inconsistent launch screen
 
+## <a id="v1.11.12"></a>[v1.11.12] - 2024-09-16 [YANKED AGAIN!]
+
 ## <a id="v1.11.11"></a>[v1.11.11] - 2024-09-16 [YANKED]
 
 ## <a id="v1.11.10"></a>[v1.11.10] - 2024-09-01

android/app/build.gradle

@@ -208,8 +208,8 @@ dependencies {
     // - https://jitpack.io/p/deckerst/mp4parser
     // - https://jitpack.io/p/deckerst/pixymeta-android
     implementation 'com.github.deckerst:Android-TiffBitmapFactory:90c06eebf4'
-    implementation 'com.github.deckerst.mp4parser:isoparser:86d4b6baa1'
+    implementation 'com.github.deckerst.mp4parser:isoparser:d5caf7a3dd'
-    implementation 'com.github.deckerst.mp4parser:muxer:86d4b6baa1'
+    implementation 'com.github.deckerst.mp4parser:muxer:d5caf7a3dd'
     implementation 'com.github.deckerst:pixymeta-android:9ec7097f17'
     implementation project(':exifinterface')
 

android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt

@@ -320,7 +320,9 @@ open class MainActivity : FlutterFragmentActivity() {
 
                     val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as android.app.KeyguardManager
                     val isLocked = keyguardManager.isKeyguardLocked
-                    setShowWhenLocked(isLocked)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                        setShowWhenLocked(isLocked)
+                    }
                     if (isLocked) {
                         // device is locked, so access to content is limited to intent URI by default
                         fields[INTENT_DATA_KEY_SECURE_URIS] = listOf(uri.toString())

android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaStoreHandler.kt

@@ -64,7 +64,7 @@ class MediaStoreHandler(private val context: Context) : MethodCallHandler {
             } catch (e: Exception) {
                 // may yield `IllegalArgumentException: Volume external_primary not found`
                 val volumes = MediaStore.getExternalVolumeNames(context).joinToString(", ")
-                result.error("getGeneration-primary", e.message + " (available volumes are $volumes)", e)
+                result.error("getGeneration-primary", e.message + " (available volumes are [$volumes])", e)
                 return
             }
         } else {

android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt

@@ -50,6 +50,7 @@ internal class FileImageProvider : ImageProvider() {
                 }
             } catch (e: SecurityException) {
                 callback.onFailure(e)
+                return
             }
         }
         entry.fillPreCatalogMetadata(context, safe = false)

android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt

@@ -209,6 +209,7 @@ abstract class ImageProvider {
     ) {
         if (!supportedExportMimeTypes.contains(imageExportMimeType)) {
             callback.onFailure(Exception("unsupported export MIME type=$imageExportMimeType"))
+            return
         }
 
         val targetDirDocFile = StorageUtils.createDirectoryDocIfAbsent(activity, targetDir)
@@ -858,6 +859,7 @@ abstract class ImageProvider {
             }
         } catch (e: NoClassDefFoundError) {
             callback.onFailure(e)
+            return false
         } catch (e: Exception) {
             callback.onFailure(e)
             return false

fastlane/metadata/android/en-US/changelogs/132.txt

@@ -0,0 +1,3 @@
+In v1.11.13:
+- review photos from the lock screen
+Full changelog available on GitHub

fastlane/metadata/android/en-US/changelogs/13201.txt

@@ -0,0 +1,3 @@
+In v1.11.13:
+- review photos from the lock screen
+Full changelog available on GitHub

lib/services/media/media_store_service.dart

@@ -69,7 +69,9 @@ class PlatformMediaStoreService implements MediaStoreService {
     try {
       return await _platform.invokeMethod('getGeneration');
     } on PlatformException catch (e, stack) {
-      await reportService.recordError(e, stack);
+      if (e.code != 'getGeneration-primary') {
+        await reportService.recordError(e, stack);
+      }
     }
     return null;
   }

lib/widget_common.dart

@@ -49,6 +49,8 @@ Future<Map<String, dynamic>> _drawWidget(dynamic args) async {
   final reuseEntry = args['reuseEntry'] as bool;
   final isSystemThemeDark = args['isSystemThemeDark'] as bool;
 
+  await reportService.log('Draw widget with widgetId=$widgetId');
+
   final brightness = isSystemThemeDark ? Brightness.dark : Brightness.light;
   final outline = await settings.getWidgetOutline(widgetId).color(brightness);
 

lib/widgets/dialogs/pick_dialogs/album_pick_page.dart

@@ -8,6 +8,7 @@ import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/vaults/details.dart';
 import 'package:aves/model/vaults/vaults.dart';
+import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/view/view.dart';
@@ -35,6 +36,7 @@ Future<String?> pickAlbum({
 }) async {
   final source = context.read<CollectionSource>();
   if (source.initState != SourceInitializationState.full) {
+    await reportService.log('Complete source initialization to pick album');
     // source may not be fully initialized in view mode
     await source.init();
   }

lib/widgets/home_page.dart

@@ -209,12 +209,14 @@ class _HomePageState extends State<HomePage> {
         final source = context.read<CollectionSource>();
         source.safeMode = safeMode;
         if (source.initState != SourceInitializationState.full) {
+          await reportService.log('Initialize source (init state=${source.initState.name}) to start app with mode=$appMode');
           await source.init(
             loadTopEntriesFirst: settings.homePage == HomePageSetting.collection && settings.homeCustomCollection.isEmpty,
           );
         }
       case AppMode.screenSaver:
         final source = context.read<CollectionSource>();
+        await reportService.log('Initialize source to start screen saver');
         await source.init(
           canAnalyze: false,
         );
@@ -223,6 +225,7 @@ class _HomePageState extends State<HomePage> {
           final directory = _viewerEntry?.directory;
           if (directory != null) {
             unawaited(AnalysisService.registerCallback());
+            await reportService.log('Initialize source to view item in directory $directory');
             final source = context.read<CollectionSource>();
             await source.init(
               directory: directory,

pubspec.yaml

@@ -7,7 +7,7 @@ repository: https://github.com/deckerst/aves
 # - play changelog:   /whatsnew/whatsnew-en-US
 # - izzy changelog:   /fastlane/metadata/android/en-US/changelogs/XXX01.txt
 # - libre changelog:  /fastlane/metadata/android/en-US/changelogs/XXX.txt
-version: 1.11.12+131
+version: 1.11.13+132
 publish_to: none
 
 environment:

whatsnew/whatsnew-en-US

@@ -1,3 +1,3 @@
-In v1.11.12:
+In v1.11.13:
 - review photos from the lock screen
 Full changelog available on GitHub