Merge branch 'develop'

.github/workflows/check.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: beta
-          flutter-version: '2.1.0-12.2.pre'
+          flutter-version: '2.2.0-10.1.pre'
 
       - name: Clone the repository.
         uses: actions/checkout@v2

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: beta
-          flutter-version: '2.1.0-12.2.pre'
+          flutter-version: '2.2.0-10.1.pre'
 
       # Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
       # https://issuetracker.google.com/issues/144111441
@@ -50,8 +50,8 @@ jobs:
           echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
           gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
           rm release.keystore.asc
-          flutter build apk --bundle-sksl-path shaders_2.1.0-12.2.pre.sksl.json
-          flutter build appbundle --bundle-sksl-path shaders_2.1.0-12.2.pre.sksl.json
+          flutter build apk --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
+          flutter build appbundle --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
           rm $AVES_STORE_FILE
         env:
           AVES_STORE_FILE: ${{ github.workspace }}/key.jks

CHANGELOG.md

@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v1.4.1] - 2021-04-29
+### Added
+- Motion photo support
+- Viewer: play videos in multi-track HEIC
+- Handle share intent
+
+### Changed
+- Upgraded Flutter to beta v2.2.0-10.1.pre
+
+### Fixed
+- fixed crash when cataloguing large MP4/PSD
+- prevent videos playing in the background when quickly switching entries
+
 ## [v1.4.0] - 2021-04-16
 ### Added
 - Viewer: support for videos with EAC3/FLAC/OPUS audio

android/app/src/main/AndroidManifest.xml

@@ -62,13 +62,22 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
+            </intent-filter>
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
 
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
                 <data android:mimeType="vnd.android.cursor.dir/image" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
             </intent-filter>
             <intent-filter>
                 <action android:name="com.android.camera.action.REVIEW" />
@@ -88,6 +97,7 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
                 <data android:mimeType="vnd.android.cursor.dir/image" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PICK" />
@@ -96,6 +106,7 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
                 <data android:mimeType="vnd.android.cursor.dir/image" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
             </intent-filter>
         </activity>
         <!-- file provider to share files having a file:// URI -->

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.content.pm.ShortcutInfoCompat
@@ -12,6 +13,7 @@ import androidx.core.graphics.drawable.IconCompat
 import app.loup.streams_channel.StreamsChannel
 import deckers.thibault.aves.channel.calls.*
 import deckers.thibault.aves.channel.streams.*
+import deckers.thibault.aves.model.provider.MediaStoreImageProvider
 import deckers.thibault.aves.utils.LogUtils
 import deckers.thibault.aves.utils.PermissionManager
 import io.flutter.embedding.android.FlutterActivity
@@ -33,6 +35,7 @@ class MainActivity : FlutterActivity() {
         MethodChannel(messenger, AppAdapterHandler.CHANNEL).setMethodCallHandler(AppAdapterHandler(this))
         MethodChannel(messenger, AppShortcutHandler.CHANNEL).setMethodCallHandler(AppShortcutHandler(this))
         MethodChannel(messenger, DebugHandler.CHANNEL).setMethodCallHandler(DebugHandler(this))
+        MethodChannel(messenger, EmbeddedDataHandler.CHANNEL).setMethodCallHandler(EmbeddedDataHandler(this))
         MethodChannel(messenger, ImageFileHandler.CHANNEL).setMethodCallHandler(ImageFileHandler(this))
         MethodChannel(messenger, GeocodingHandler.CHANNEL).setMethodCallHandler(GeocodingHandler(this))
         MethodChannel(messenger, MediaStoreHandler.CHANNEL).setMethodCallHandler(MediaStoreHandler(this))
@@ -83,21 +86,29 @@ class MainActivity : FlutterActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == PermissionManager.VOLUME_ACCESS_REQUEST_CODE) {
-            val treeUri = data?.data
-            if (resultCode != RESULT_OK || treeUri == null) {
-                PermissionManager.onPermissionResult(requestCode, null)
-                return
-            }
+        when (requestCode) {
+            VOLUME_ACCESS_REQUEST -> {
+                val treeUri = data?.data
+                if (resultCode != RESULT_OK || treeUri == null) {
+                    PermissionManager.onPermissionResult(requestCode, null)
+                    return
+                }
 
-            // save access permissions across reboots
-            val takeFlags = (data.flags
-                    and (Intent.FLAG_GRANT_READ_URI_PERMISSION
-                    or Intent.FLAG_GRANT_WRITE_URI_PERMISSION))
-            contentResolver.takePersistableUriPermission(treeUri, takeFlags)
+                // save access permissions across reboots
+                val takeFlags = (data.flags
+                        and (Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        or Intent.FLAG_GRANT_WRITE_URI_PERMISSION))
+                contentResolver.takePersistableUriPermission(treeUri, takeFlags)
 
-            // resume pending action
-            PermissionManager.onPermissionResult(requestCode, treeUri)
+                // resume pending action
+                PermissionManager.onPermissionResult(requestCode, treeUri)
+            }
+            DELETE_PERMISSION_REQUEST -> {
+                // delete permission may be requested on Android 10+ only
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    MediaStoreImageProvider.pendingDeleteCompleter?.complete(resultCode == RESULT_OK)
+                }
+            }
         }
     }
 
@@ -111,8 +122,8 @@ class MainActivity : FlutterActivity() {
                     )
                 }
             }
-            Intent.ACTION_VIEW, "com.android.camera.action.REVIEW" -> {
-                intent.data?.let { uri ->
+            Intent.ACTION_VIEW, Intent.ACTION_SEND, "com.android.camera.action.REVIEW" -> {
+                (intent.data ?: (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri))?.let { uri ->
                     return hashMapOf(
                         "action" to "view",
                         "uri" to uri.toString(),
@@ -171,7 +182,9 @@ class MainActivity : FlutterActivity() {
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(MainActivity::class.java)
+        private val LOG_TAG = LogUtils.createTag<MainActivity>()
         const val VIEWER_CHANNEL = "deckers.thibault/aves/viewer"
+        const val VOLUME_ACCESS_REQUEST = 1
+        const val DELETE_PERMISSION_REQUEST = 2
     }
 }

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

@@ -12,6 +12,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DecodeFormat
 import com.bumptech.glide.request.RequestOptions
 import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safesus
 import deckers.thibault.aves.model.FieldMap
 import deckers.thibault.aves.utils.BitmapUtils.getBytes
 import deckers.thibault.aves.utils.LogUtils
@@ -30,7 +31,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "getPackages" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getPackages) }
-            "getAppIcon" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getAppIcon) }
+            "getAppIcon" -> GlobalScope.launch(Dispatchers.IO) { safesus(call, result, ::getAppIcon) }
             "edit" -> {
                 val title = call.argument<String>("title")
                 val uri = call.argument<String>("uri")?.let { Uri.parse(it) }
@@ -109,7 +110,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
         result.success(ArrayList(packages.values))
     }
 
-    private fun getAppIcon(call: MethodCall, result: MethodChannel.Result) {
+    private suspend fun getAppIcon(call: MethodCall, result: MethodChannel.Result) {
         val packageName = call.argument<String>("packageName")
         val sizeDip = call.argument<Double>("sizeDip")
         if (packageName == null || sizeDip == null) {
@@ -254,16 +255,16 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
         return when (uri.scheme?.toLowerCase(Locale.ROOT)) {
             ContentResolver.SCHEME_FILE -> {
                 uri.path?.let { path ->
-                    val applicationId = context.applicationContext.packageName
-                    FileProvider.getUriForFile(context, "$applicationId.fileprovider", File(path))
+                    val authority = "${context.applicationContext.packageName}.fileprovider"
+                    FileProvider.getUriForFile(context, authority, File(path))
                 }
             }
             else -> uri
         }
     }
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(AppAdapterHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<AppAdapterHandler>()
         const val CHANNEL = "deckers.thibault/aves/app"
     }
 }

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

@@ -305,7 +305,7 @@ class DebugHandler(private val context: Context) : MethodCallHandler {
     )
 
     companion object {
-        private val LOG_TAG = LogUtils.createTag(DebugHandler::class.java)
+        private val LOG_TAG = LogUtils.createTag<DebugHandler>()
         const val CHANNEL = "deckers.thibault/aves/debug"
     }
 }