Merge branch 'develop'

deckerst · Sep 16, 2024 · 4688ba0 · 4688ba0
2 parents 50416ad + f2275d5
commit 4688ba0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/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.11"></a>[v1.11.11] - 2024-09-16
+## <a id="v1.11.12"></a>[v1.11.12] - 2024-09-16
 
 ### 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.11"></a>[v1.11.11] - 2024-09-16 [YANKED]
+
 ## <a id="v1.11.10"></a>[v1.11.10] - 2024-09-01
 
 ### Added

diff --git a/README.md b/README.md
@@ -124,4 +124,4 @@ To run the app:
 ```
 
 [Version badge]: https://img.shields.io/github/v/release/deckerst/aves?include_prereleases&sort=semver
-[Build badge]: https://img.shields.io/github/actions/workflow/status/deckerst/aves/check.yml?branch=develop
+[Build badge]: https://img.shields.io/github/actions/workflow/status/deckerst/aves/quality-check.yml?branch=develop
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -119,7 +119,6 @@
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:showWhenLocked="true"
         android:supportsRtl="true"
         tools:targetApi="tiramisu">
         <activity
@@ -128,7 +127,6 @@
             android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
-            android:showWhenLocked="true"
             android:supportsPictureInPicture="true"
             android:theme="@style/NormalTheme"
             android:windowSoftInputMode="adjustResize">

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -320,6 +320,7 @@ open class MainActivity : FlutterFragmentActivity() {
 
                     val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as android.app.KeyguardManager
                     val isLocked = keyguardManager.isKeyguardLocked
+                    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())

diff --git a/fastlane/metadata/android/en-US/changelogs/131.txt b/fastlane/metadata/android/en-US/changelogs/131.txt
@@ -0,0 +1,3 @@
+In v1.11.12:
+- review photos from the lock screen
+Full changelog available on GitHub
diff --git a/fastlane/metadata/android/en-US/changelogs/13101.txt b/fastlane/metadata/android/en-US/changelogs/13101.txt
@@ -0,0 +1,3 @@
+In v1.11.12:
+- review photos from the lock screen
+Full changelog available on GitHub
diff --git a/pubspec.yaml b/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.11+130
+version: 1.11.12+131
 publish_to: none
 
 environment:

diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
@@ -1,3 +1,3 @@
-In v1.11.11:
+In v1.11.12:
 - review photos from the lock screen
 Full changelog available on GitHub