Merge branch 'develop'

.github/workflows/quality-check.yml

@@ -69,7 +69,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -83,6 +83,6 @@ jobs:
           ./flutterw build apk --profile -t lib/main_play.dart --flavor play
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -75,7 +75,7 @@ jobs:
           AVES_GOOGLE_API_KEY: ${{ secrets.AVES_GOOGLE_API_KEY }}
 
       - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
         with:
           subject-path: 'outputs/*'
 

.github/workflows/scorecards.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
+## <a id="v1.11.18"></a>[v1.11.18] - 2024-11-18
+
+### Changed
+
+- Albums: improved album creation feedback
+- upgraded Flutter to stable v3.24.5
+
+### Fixed
+
+- crash when playing video with DCL restriction enabled
+- cataloguing images with wrong MPF offsets
+- printing multi-page items containing some unprintable pages
+- English (Shavian) locale tags for store listing
+
 ## <a id="v1.11.17"></a>[v1.11.17] - 2024-10-30
 
 ### Added

android/app/build.gradle

@@ -154,12 +154,12 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
     implementation "androidx.appcompat:appcompat:1.7.0"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.6'
+    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
-    implementation 'androidx.work:work-runtime-ktx:2.9.1'
+    implementation 'androidx.work:work-runtime-ktx:2.10.0'
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.commonsware.cwac:document:0.5.0'
@@ -181,7 +181,7 @@ dependencies {
 
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
 
-    kapt 'androidx.annotation:annotation:1.8.2'
+    kapt 'androidx.annotation:annotation:1.9.1'
     ksp "com.github.bumptech.glide:ksp:$glide_version"
 
     compileOnly rootProject.findProject(':streams_channel')

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

@@ -792,7 +792,7 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
 
     private fun hasAppleHdrGainMap(uri: Uri, sizeBytes: Long?): Boolean {
         val mpEntries = MultiPage.getJpegMpfEntries(context, uri, sizeBytes) ?: return false
-        mpEntries.filter { it.type == MpEntry.TYPE_UNDEFINED }.forEach { mpEntry ->
+        mpEntries.filter { it.type == MpEntry.TYPE_UNDEFINED }.forEachIndexed { mpIndex, mpEntry ->
             var dataOffset = mpEntry.dataOffset
             if (dataOffset > 0) {
                 val baseOffset = MultiPage.getJpegMpfBaseOffset(context, uri, sizeBytes)
@@ -802,9 +802,13 @@ class MetadataFetchHandler(private val context: Context) : MethodCallHandler {
             }
             StorageUtils.openInputStream(context, uri)?.let { input ->
                 input.skip(dataOffset)
-                val pageMetadata = Helper.safeRead(input, sizeBytes)
-                if (pageMetadata.getDirectoriesOfType(XmpDirectory::class.java).any { it.xmpMeta.hasHdrGainMap() }) {
-                    return true
+                try {
+                    val pageMetadata = Helper.safeRead(input, sizeBytes)
+                    if (pageMetadata.getDirectoriesOfType(XmpDirectory::class.java).any { it.xmpMeta.hasHdrGainMap() }) {
+                        return true
+                    }
+                } catch (e: Exception) {
+                    Log.w(LOG_TAG, "failed to read metadata by metadata-extractor for uri=$uri mpIndex=$mpIndex mpEntry=$mpEntry", e)
                 }
             }
         }

android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt

@@ -99,9 +99,12 @@ object MimeTypes {
         else -> true
     }
 
-    // as of `ExifInterface` v1.3.1, `isSupportedMimeType` reports
-    // no support for TIFF images, but it can actually open them (maybe other formats too)
-    fun canReadWithExifInterface(mimeType: String, strict: Boolean = true) = ExifInterface.isSupportedMimeType(mimeType) || !strict
+    // as of `ExifInterface` v1.4.0-alpha01, `isSupportedMimeType` reports
+    // no support for AVIF/TIFF images, but it can actually open them (maybe other formats too)
+    fun canReadWithExifInterface(mimeType: String, strict: Boolean = true): Boolean {
+        if (!strict) return true
+        return ExifInterface.isSupportedMimeType(mimeType) || mimeType == AVIF
+    }
 
     // as of latest PixyMeta
     fun canReadWithPixyMeta(mimeType: String) = when (mimeType) {
@@ -143,7 +146,7 @@ object MimeTypes {
         return if (pageId != null && MultiPageImage.isSupported(mimeType)) {
             true
         } else when (mimeType) {
-            DNG, DNG_ADOBE, HEIC, HEIF, PNG, WEBP -> true
+            AVIF, DNG, DNG_ADOBE, HEIC, HEIF, PNG, WEBP -> true
             else -> false
         }
     }

android/app/src/main/res/values-az/strings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves</string>
+    <string name="app_widget_label">Şəkil Çərçivəsi</string>
+    <string name="wallpaper">Divar kağızı</string>
+    <string name="map_shortcut_short_label">Xəritə</string>
+    <string name="search_shortcut_short_label">Axtarış</string>
+    <string name="videos_shortcut_short_label">Videolar</string>
+    <string name="analysis_channel_name">Medianı yoxla</string>
+    <string name="analysis_notification_default_title">Media yoxlanılır</string>
+    <string name="analysis_notification_action_stop">Dayandır</string>
+</resources>

android/app/src/main/res/values-et/strings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves</string>
+    <string name="app_widget_label">Fotoraam</string>
+    <string name="wallpaper">Taustapilt</string>
+    <string name="map_shortcut_short_label">Kaart</string>
+    <string name="search_shortcut_short_label">Otsi</string>
+    <string name="videos_shortcut_short_label">Videod</string>
+    <string name="analysis_channel_name">Meedia tuvastamine</string>
+    <string name="analysis_notification_default_title">Tuvastame meediat</string>
+    <string name="analysis_notification_action_stop">Peata</string>
+</resources>

android/app/src/main/res/values-ru/strings.xml

@@ -8,4 +8,5 @@
     <string name="analysis_channel_name">Сканировать медия</string>
     <string name="analysis_notification_default_title">Сканирование медиа</string>
     <string name="analysis_notification_action_stop">Стоп</string>
+    <string name="map_shortcut_short_label">Карта</string>
 </resources>

android/exifinterface/build.gradle

@@ -26,5 +26,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.8.2'
+    implementation 'androidx.annotation:annotation:1.9.1'
+    implementation 'org.jspecify:jspecify:1.0.0'
 }

android/exifinterface/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
+<manifest />