Merge branch 'develop'

Author: deckerst

.github/workflows/dependency-review.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 

.github/workflows/quality-check.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
@@ -55,7 +55,7 @@ jobs:
             build-mode: manual
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
@@ -72,7 +72,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
           ./flutterw build apk --profile -t lib/main_play.dart --flavor play
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
@@ -83,7 +83,7 @@ jobs:
           subject-path: 'outputs/*'
 
       - name: Create GitHub release
-        uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1.16.0
+        uses: ncipollo/release-action@bcfe5470707e8832e12347755757cec0eb3c22af # v1.18.0
         with:
           artifacts: "outputs/*"
           body: "[Changelog](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ github.ref_name }})"
@@ -101,7 +101,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 

.github/workflows/scorecards.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
@@ -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@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
+## <a id="v1.13.4"></a>[v1.13.4] - 2025-07-09
+
+### Added
+
+- Map: allow setting subdomains, user-agent for custom styles
+
+### Fixed
+
+- showing directories wrongly registered as media in the Media Store
+- apply preferred first day of the week for date picker
+
 ## <a id="v1.13.3"></a>[v1.13.3] - 2025-06-25
 
 ### Added

android/app/build.gradle

@@ -55,7 +55,7 @@ android {
         }
     }
 
-    flavorDimensions = ["store"]
+    flavorDimensions += "store"
 
     productFlavors {
         play {
@@ -93,9 +93,9 @@ android {
             applicationIdSuffix ".profile"
         }
         release {
-            signingConfig signingConfigs.release
-            minifyEnabled true
-            shrinkResources true
+            signingConfig = signingConfigs.release
+            minifyEnabled = true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -178,7 +178,7 @@ dependencies {
     implementation 'com.github.deckerst:pixymeta-android:f4513291b7'
     implementation project(':exifinterface')
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.13.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
 
     kapt 'androidx.annotation:annotation:1.9.1'
     ksp "com.github.bumptech.glide:ksp:$glide_version"

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

@@ -28,34 +28,40 @@ import deckers.thibault.aves.utils.LogUtils
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlin.coroutines.Continuation
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
 
 class AnalysisWorker(context: Context, parameters: WorkerParameters) : CoroutineWorker(context, parameters) {
     private val defaultScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-    private var workCont: Continuation<Any?>? = null
+    private var workCont: CancellableContinuation<Any?>? = null
     private var flutterEngine: FlutterEngine? = null
     private var backgroundChannel: MethodChannel? = null
 
     override suspend fun doWork(): Result {
         Log.i(LOG_TAG, "Start analysis worker $id")
-        defaultScope.launch {
-            // prevent ANR triggered by slow operations in main thread
-            createNotificationChannel()
-            setForeground(createForegroundInfo())
-        }.join()
-        suspendCoroutine { cont ->
-            workCont = cont
-            onStart()
+        createNotificationChannel()
+        val foregroundInfo = createForegroundInfo()
+        if (!isStopped) {
+            setForeground(foregroundInfo)
+            suspendCancellableCoroutine { cont ->
+                workCont = cont
+                cont.invokeOnCancellation {
+                    Log.i(LOG_TAG, "Analysis worker got cancelled")
+                    stopDartAnalysisService()
+                    workCont?.resumeWithException(CancellationException())
+                }
+                onStart()
+            }
+            dispose()
         }
-        dispose()
         return Result.success()
     }
 
@@ -81,17 +87,7 @@ class AnalysisWorker(context: Context, parameters: WorkerParameters) : Coroutine
 
             val preferences = applicationContext.getSharedPreferences(SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE)
             val entryIdStrings = preferences.getStringSet(PREF_ENTRY_IDS_KEY, null)
-
-            runBlocking {
-                FlutterUtils.runOnUiThread {
-                    backgroundChannel?.invokeMethod(
-                        "start", hashMapOf(
-                            "entryIds" to entryIdStrings?.map { Integer.parseUnsignedInt(it) }?.toList(),
-                            "force" to inputData.getBoolean(KEY_FORCE, false),
-                        )
-                    )
-                }
-            }
+            startDartAnalysisService(entryIdStrings)
         } catch (e: Exception) {
             Log.e(LOG_TAG, "failed to initialize worker", e)
             workCont?.resumeWithException(e)
@@ -126,6 +122,27 @@ class AnalysisWorker(context: Context, parameters: WorkerParameters) : Coroutine
         }
     }
 
+    private fun startDartAnalysisService(entryIdStrings: Set<String>?) {
+        runBlocking {
+            FlutterUtils.runOnUiThread {
+                backgroundChannel?.invokeMethod(
+                    "start", hashMapOf(
+                        "entryIds" to entryIdStrings?.map { Integer.parseUnsignedInt(it) }?.toList(),
+                        "force" to inputData.getBoolean(KEY_FORCE, false),
+                    )
+                )
+            }
+        }
+    }
+
+    private fun stopDartAnalysisService() {
+        runBlocking {
+            FlutterUtils.runOnUiThread {
+                backgroundChannel?.invokeMethod("stop", null)
+            }
+        }
+    }
+
     private fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "initialized" -> {
@@ -136,7 +153,7 @@ class AnalysisWorker(context: Context, parameters: WorkerParameters) : Coroutine
             "updateNotification" -> defaultScope.launch { safeSuspend(call, result, ::updateNotification) }
 
             "stop" -> {
-                workCont?.resume(null)
+                workCont?.takeIf { it.isActive }?.resume(null)
                 result.success(null)
             }
 

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

@@ -5,7 +5,6 @@ import android.app.KeyguardManager
 import android.app.SearchManager
 import android.appwidget.AppWidgetManager
 import android.content.ClipData
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -85,10 +84,7 @@ open class MainActivity : FlutterFragmentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(LOG_TAG, "onCreate intent=$intent")
-
-        intent.extras?.takeUnless { it.isEmpty }?.let {
-            Log.i(LOG_TAG, "onCreate intent extras=$it")
-        }
+        logExtras(intent, "onCreate")
 
 //        StrictMode.setThreadPolicy(
 //            StrictMode.ThreadPolicy.Builder()
@@ -105,6 +101,17 @@ open class MainActivity : FlutterFragmentActivity() {
         super.onCreate(savedInstanceState)
     }
 
+    private fun logExtras(intent: Intent?, method: String) {
+        try {
+            intent?.extras?.takeUnless { it.isEmpty }?.let {
+                Log.i(LOG_TAG, "$method intent extras=$it")
+            }
+        } catch (e: Exception) {
+            // accessing extras may fail if their type comes from sending app
+            Log.w(LOG_TAG, "failed to parse extras", e)
+        }
+    }
+
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 
@@ -228,19 +235,15 @@ open class MainActivity : FlutterFragmentActivity() {
 
     override fun onNewIntent(intent: Intent) {
         Log.i(LOG_TAG, "onNewIntent intent=$intent")
-        intent.extras?.takeUnless { it.isEmpty }?.let {
-            Log.i(LOG_TAG, "onNewIntent intent extras=$it")
-        }
+        logExtras(intent, "onNewIntent")
         super.onNewIntent(intent)
         intentStreamHandler.notifyNewIntent(extractIntentData(intent))
     }
 
     @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         Log.i(LOG_TAG, "onActivityResult requestCode=$requestCode resultCode=$resultCode data=$data")
-        data?.extras?.takeUnless { it.isEmpty }?.let {
-            Log.i(LOG_TAG, "onActivityResult intent extras=$it")
-        }
+        logExtras(data, "onActivityResult")
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
             DOCUMENT_TREE_ACCESS_REQUEST -> onDocumentTreeAccessResult(requestCode, resultCode, data)
@@ -332,7 +335,7 @@ open class MainActivity : FlutterFragmentActivity() {
                         INTENT_DATA_KEY_URI to uri.toString(),
                     )
 
-                    val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+                    val keyguardManager = getSystemService(KEYGUARD_SERVICE) as KeyguardManager
                     val isLocked = keyguardManager.isKeyguardLocked
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
                         setShowWhenLocked(isLocked)

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

@@ -14,6 +14,7 @@ import android.provider.MediaStore
 import android.provider.Settings
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.net.toUri
+import androidx.core.text.util.LocalePreferences
 import com.google.android.material.color.DynamicColors
 import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
 import deckers.thibault.aves.model.FieldMap
@@ -36,6 +37,7 @@ class DeviceHandler(private val context: Context) : MethodCallHandler {
             "getCapabilities" -> defaultScope.launch { safe(call, result, ::getCapabilities) }
             "getLocales" -> safe(call, result, ::getLocales)
             "setLocaleConfig" -> safe(call, result, ::setLocaleConfig)
+            "getFirstDayOfWeek" -> safe(call, result, ::getFirstDayOfWeek)
             "getPerformanceClass" -> safe(call, result, ::getPerformanceClass)
             "isLocked" -> safe(call, result, ::isLocked)
             "isSystemFilePickerEnabled" -> safe(call, result, ::isSystemFilePickerEnabled)
@@ -111,6 +113,10 @@ class DeviceHandler(private val context: Context) : MethodCallHandler {
         result.success(true)
     }
 
+    private fun getFirstDayOfWeek(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
+        result.success(LocalePreferences.getFirstDayOfWeek())
+    }
+
     private fun getPerformanceClass(@Suppress("unused_parameter") call: MethodCall, result: MethodChannel.Result) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             val performanceClass = Build.VERSION.MEDIA_PERFORMANCE_CLASS