Dev

.gitignore

@@ -54,4 +54,5 @@ app.*.map.json
 android/.kotlin/
 devtools_options.yaml
 rust/target
-rust_dependencies/target
+rust_dependencies/target
+fastlane/repo/status/running.json

CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 0.2.26
+
+- New: Import images from the gallery
+- Improved: Media files are now stored in the dedicated "twonly" album
+- Improved: UI components adapt to native styling (iOS/Android)
+- Fix: Migration issue that resulted in a corrupted backup mechanism 
+- Fix: Database issues causing messages to be lost or the database to be corrupted
+- Fix: Permission view did not disappear after they were granted
+
 ## 0.2.23
 
-- Improves: Smaller UI changes
+- Improved: Smaller UI changes
 - Fix: Some messages were not marked as opened.
 
 ## 0.2.20

android/.gitignore

@@ -9,5 +9,7 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/to/reference-keystore
 key.properties
+key.github.properties
+key.properties.backup
 **/*.keystore
 **/*.jks

android/app/src/main/kotlin/eu/twonly/MainActivity.kt

@@ -10,11 +10,32 @@ import android.content.Context
 import io.crates.keyring.Keyring
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import android.os.Bundle
+import android.net.Uri
+import java.io.InputStream
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
+import io.flutter.plugin.common.MethodChannel
 
 class MainActivity : FlutterFragmentActivity() {
+    private val CHANNEL = "eu.twonly/photo_picker"
+    private var pendingResult: MethodChannel.Result? = null
+
+    private lateinit var pickMultipleMedia: ActivityResultLauncher<PickVisualMediaRequest>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+
+        pickMultipleMedia = registerForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { uris ->
+            if (uris.isNotEmpty()) {
+                val uriStrings = uris.map { it.toString() }
+                pendingResult?.success(uriStrings)
+            } else {
+                pendingResult?.success(emptyList<String>())
+            }
+            pendingResult = null
+        }
+
         super.onCreate(savedInstanceState)
     }
 
@@ -35,7 +56,36 @@ class MainActivity : FlutterFragmentActivity() {
 
         Keyring.initializeNdkContext(applicationContext)
 
-        MediaStoreChannel.configure(flutterEngine, applicationContext)
         VideoCompressionChannel.configure(flutterEngine, applicationContext)
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
+            when (call.method) {
+                "pickImages" -> {
+                    pendingResult = result
+                    pickMultipleMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+                }
+                "getUriBytes" -> {
+                    val uriString = call.argument<String>("uri")
+                    if (uriString != null) {
+                        try {
+                            val uri = Uri.parse(uriString)
+                            val inputStream: InputStream? = contentResolver.openInputStream(uri)
+                            if (inputStream != null) {
+                                val bytes = inputStream.readBytes()
+                                inputStream.close()
+                                result.success(bytes)
+                            } else {
+                                result.error("UNAVAILABLE", "Could not open InputStream", null)
+                            }
+                        } catch (e: Exception) {
+                            result.error("ERROR", e.message, null)
+                        }
+                    } else {
+                        result.error("INVALID_ARGUMENT", "URI string is null", null)
+                    }
+                }
+                else -> result.notImplemented()
+            }
+        }
     }
 }

android/key.github.properties.example

@@ -0,0 +1,8 @@
+# Example signing credentials configuration for GitHub Releases.
+# Copy this file to 'key.github.properties' and fill in your actual credentials.
+# Do not commit the actual 'key.github.properties' file to version control.
+
+storePassword=YOUR_GITHUB_RELEASE_STORE_PASSWORD
+keyPassword=YOUR_GITHUB_RELEASE_KEY_PASSWORD
+keyAlias=github-releases-signature
+storeFile=/absolute/path/to/your/github-release-keystore.jks