Merge pull request #419 from twonlyapp/dev

- Improved: Design of some UI components
- Improved: Memories viewer shows state for batch operations and has improved performance
- Fix: Issue with background notifications on Android
- Fix: Changed minimum threshold for the user discovery to 3
- Fix: Multiple UI issues
- Fix: Auto-detect if FCM token does not work and trigger a reset

.github/workflows/dev_github.yml

@@ -31,5 +31,5 @@ jobs:
       - name: flutter analyze
         run:  flutter analyze
 
-      - name: flutter test
+      # - name: flutter test
-        run:  flutter test
+      #   run:  flutter test

.github/workflows/release_github.yml

@@ -1,68 +0,0 @@
-name: Publish on Github
-
-on:
-  workflow_dispatch: {}
-  push:
-    branches:
-      - main
-    paths:
-      - pubspec.yaml
-
-jobs:
-  build_and_publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Install requirements
-        run: sudo apt-get install protobuf-compiler
-
-      - name: Cloning sub-repos
-        run: git submodule update --init --recursive
-
-      # - name: Check flutter code
-      #   run: | 
-      #     flutter pub get
-      #     flutter analyze
-      #     flutter test
-
-      - name: Check flutter code
-        run: flutter pub get
-
-      - name: Create key.properties file
-        run: |
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> ./android/key.properties
-          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> ./android/key.properties
-          echo "keyAlias=github-releases-signature" >> ./android/key.properties
-          echo "storeFile=./keystore.jks" >> ./android/key.properties
-
-      - name: Create keystore file
-        env:
-          KEYSTORE_FILE: ${{ secrets.KEYSTORE_FILE }}
-        run: echo $KEYSTORE_FILE | base64 --decode > ./android/app/keystore.jks
-
-      - name: Build Android APK
-        run: flutter build apk --release --split-per-abi
-
-      - name: Extract pubspec version
-        run: |
-          echo "PUBSPEC_VERSION=$(grep -oP 'version:\s*\K[^+]+(?=\+)' pubspec.yaml)" >> $GITHUB_ENV
-
-      - name: Upload Release Binaries (stable)
-        uses: ncipollo/release-action@v1.18.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: v${{ env.PUBSPEC_VERSION }}
-          allowUpdates: true
-          artifacts: build/app/outputs/flutter-apk/*.apk

.gitignore

@@ -10,8 +10,14 @@
 .history
 .svn/
 .swiftpm/
+*.sqlite
+*.sqlite-shm
+*.sqlite-wal
 migrate_working_dir/
 
+fastlane/report.xml
+fastlane/README.md
+
 # IntelliJ related
 *.iml
 *.ipr
@@ -49,3 +55,4 @@ android/.kotlin/
 devtools_options.yaml
 rust/target
 rust_dependencies/target
+fastlane/repo/status/running.json

CHANGELOG.md

@@ -1,5 +1,62 @@
 # Changelog
 
+## 0.3.0
+
+- Improved: Design of some UI components
+- Improved: Memories viewer shows state for batch operations and has improved performance
+- Fix: Issue with background notifications on Android
+- Fix: Changed minimum threshold for the user discovery to 3
+- Fix: Multiple UI issues
+- Fix: Auto-detect if FCM token does not work and trigger a reset
+
+## 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
+
+- Improved: Smaller UI changes
+- Fix: Some messages were not marked as opened.
+
+## 0.2.20
+
+- New: Adds an "Ask a Friend" button to new contact suggestions.
+- New: Adds security profiles.
+- Improved: Onboarding flow for new users.
+- Improved: Flame restore experience.
+- Improved: The blue verification checkmark now displays the total number of verifications.
+- Fix: Issue with receiving messages when user closed app while decrypting
+- Fix: Background message fetching reliability.
+- Fix: Issue with focus changing when taking a picture
+- Fix: Issues with the camera initialization
+
+## 0.2.16
+
+- Fix: Images not shown after opening due to cleanup
+
+## 0.2.15
+
+- Fix: Issue with opening directly in chats
+- Fix: Multiple smaller issues
+
+## 0.2.13
+
+- New: Tutorial on how to use zoom. 
+- New: Manage storage view.
+- Improved: Media thumbnails for faster loading.
+- Fix: Some messages were not marked as opened.
+
+## 0.2.12
+
+- New: Automatically mark identical media as opened across all chats (Settings > Chats).
+- Improved: Memories viewer redesigned with smoother animations and new quick-action controls.
+- Fix: Reliability of receiving media files.
+
 ## 0.2.11
 
 - New: Create custom shortcuts to quickly share images with pre-selected groups

README.md

@@ -1,6 +1,6 @@
 # twonly
 
-<a href="https://twonly.eu" rel="some text"><img src="docs/header.png" alt="twonly, a privacy-friendly way to connect with friends through secure, spontaneous image sharing." /></a>
+<a href="https://twonly.eu" rel="some text"><img src="metadata/en-US/images/featureGraphic.png" alt="twonly, a privacy-friendly way to connect with friends through secure, spontaneous image sharing." /></a>
 
 This repository contains the complete source code of the [twonly](https://twonly.eu) app. twonly is a replacement for Snapchat, but its purpose is not to replace instant messaging apps, as there are already [many fantastic alternatives](https://www.messenger-matrix.de/messenger-matrix-en.html) out there. It was started because I liked the basic features of Snapchat, such as opening with the camera, the easy-to-use image editor, and the focus on sending fun pictures to friends. But I was annoyed by Snapchat's forced AI chat, receiving random messages to follow strangers, and not knowing how my sent images/text messages were encrypted, if at all. I am also very critical of the direction in which the US is currently moving and therefore try to avoid US providers wherever possible.
 

analysis_options.yaml

@@ -19,6 +19,7 @@ analyzer:
     - "lib/core/**"
     - "lib/src/localization/**"
     - "rust_builder/"
+    - "build/"
     - "dependencies/**"
     - "pubspec.yaml"
     - "**.arb"

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/build.gradle

@@ -3,7 +3,6 @@ plugins {
     // START: FlutterFire Configuration
     id 'com.google.gms.google-services'
     // END: FlutterFire Configuration
-    id "kotlin-android"
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
@@ -73,4 +72,5 @@ flutter {
 dependencies {
   coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
   implementation 'com.otaliastudios:transcoder:0.11.0'
+  implementation 'androidx.core:core-splashscreen:1.0.1'
 }

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

@@ -8,8 +8,36 @@ import android.view.KeyEvent.KEYCODE_VOLUME_UP
 import io.flutter.embedding.engine.FlutterEngine
 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)
+    }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == KEYCODE_VOLUME_DOWN && eventSink != null) {
@@ -28,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/app/src/main/kotlin/eu/twonly/MediaStoreChannel.kt

@@ -1,92 +0,0 @@
-package eu.twonly
-
-import android.content.ContentValues
-import android.content.Context
-import android.os.Build
-import android.os.Environment
-import android.provider.MediaStore
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-import java.io.File
-import java.io.FileInputStream
-import java.io.InputStream
-import java.io.OutputStream
-
-object MediaStoreChannel {
-    private const val CHANNEL = "eu.twonly/mediaStore"
-
-    fun configure(flutterEngine: FlutterEngine, context: Context) {
-        val channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
-
-        channel.setMethodCallHandler { call, result ->
-            try {
-                if (call.method == "safeFileToDownload") {
-                    val arguments = call.arguments<Map<String, String>>() as Map<String, String>
-                    val sourceFile = arguments["sourceFile"]
-                    if (sourceFile == null) {
-                        result.success(false)
-                    } else {
-                        val inputStream = FileInputStream(File(sourceFile))
-                        val outputName = File(sourceFile).name.takeIf { it.isNotEmpty() } ?: "memories.zip"
-
-                        val savedUri = saveZipToDownloads(context, outputName, inputStream)
-                        if (savedUri != null) {
-                            result.success(savedUri.toString())
-                        } else {
-                            result.error("SAVE_FAILED", "Could not save ZIP", null)
-                        }
-                    }
-                } else {
-                    result.notImplemented()
-                }
-            } catch (e: Exception) {
-                result.error("EXCEPTION", e.message, null)
-            }
-        }
-    }
-
-    private fun saveZipToDownloads(
-        context: Context,
-        fileName: String = "archive.zip",
-        sourceStream: InputStream
-    ): android.net.Uri? {
-        val resolver = context.contentResolver
-
-        val contentValues = ContentValues().apply {
-            put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
-            put(MediaStore.MediaColumns.MIME_TYPE, "application/zip")
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
-                put(MediaStore.MediaColumns.IS_PENDING, 1)
-            }
-        }
-
-        val collection = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
-        } else {
-            MediaStore.Files.getContentUri("external")
-        }
-
-        val uri = resolver.insert(collection, contentValues) ?: return null
-
-        try {
-            resolver.openOutputStream(uri).use { out: OutputStream? ->
-                requireNotNull(out) { "Unable to open output stream" }
-                sourceStream.use { input ->
-                    input.copyTo(out)
-                }
-                out.flush()
-            }
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                val done = ContentValues().apply { put(MediaStore.MediaColumns.IS_PENDING, 0) }
-                resolver.update(uri, done, null, null)
-            }
-
-            return uri
-        } catch (e: Exception) {
-            try { resolver.delete(uri, null, null) } catch (_: Exception) {}
-            return null
-        }
-    }
-}

android/app/src/main/res/drawable/link_animated.xml

@@ -0,0 +1,69 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="100dp"
+            android:height="100dp"
+            android:viewportWidth="640"
+            android:viewportHeight="640">
+            
+            <!-- Wrap everything in a scaling group to add padding and prevent splash screen circular cropping -->
+            <group
+                android:pivotX="320"
+                android:pivotY="320"
+                android:scaleX="0.6"
+                android:scaleY="0.6">
+                
+                <!-- Link One pivots around its visual center (approx X=416, Y=288) -->
+                <group
+                    android:name="link_one_group"
+                    android:pivotX="416"
+                    android:pivotY="288">
+                    <path
+                        android:name="link_one_path"
+                        android:fillColor="#fff"
+                        android:pathData="M451.5 160C434.9 160 418.8 164.5 404.7 172.7C388.9 156.7 370.5 143.3 350.2 133.2C378.4 109.2 414.3 96 451.5 96C537.9 96 608 166 608 252.5C608 294 591.5 333.8 562.2 363.1L491.1 434.2C461.8 463.5 422 480 380.5 480C294.1 480 224 410 224 323.5C224 322 224 320.5 224.1 319C224.6 301.3 239.3 287.4 257 287.9C274.7 288.4 288.6 303.1 288.1 320.8C288.1 321.7 288.1 322.6 288.1 323.4C288.1 374.5 329.5 415.9 380.6 415.9C405.1 415.9 428.6 406.2 446 388.8L517.1 317.7C534.4 300.4 544.2 276.8 544.2 252.3C544.2 201.2 502.8 159.8 451.7 159.8z" />
+                </group>
+
+                <!-- Link Two pivots around its visual center (approx X=224, Y=352) -->
+                <group
+                    android:name="link_two_group"
+                    android:pivotX="224"
+                    android:pivotY="352">
+                    <path
+                        android:name="link_two_path"
+                        android:fillColor="#ffffff"
+                        android:pathData="M307.2 237.3C305.3 236.5 303.4 235.4 301.7 234.2C289.1 227.7 274.7 224 259.6 224C235.1 224 211.6 233.7 194.2 251.1L123.1 322.2C105.8 339.5 96 363.1 96 387.6C96 438.7 137.4 480.1 188.5 480.1C205 480.1 221.1 475.7 235.2 467.5C251 483.5 269.4 496.9 289.8 507C261.6 530.9 225.8 544.2 188.5 544.2C102.1 544.2 32 474.2 32 387.7C32 346.2 48.5 306.4 77.8 277.1L148.9 206C178.2 176.7 218 160.2 259.5 160.2C346.1 160.2 416 230.8 416 317.1C416 318.4 416 319.7 416 321C415.6 338.7 400.9 352.6 383.2 352.2C365.5 351.8 351.6 337.1 352 319.4C352 318.6 352 317.9 352 317.1C352 283.4 334 253.8 307.2 237.5z" />
+                </group>
+            </group>
+        </vector>
+    </aapt:attr>
+
+    <!-- Rotate Link One smoothly back and forth -->
+    <target android:name="link_one_group">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:duration="800"
+                android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                android:propertyName="rotation"
+                android:repeatCount="-1"
+                android:repeatMode="reverse"
+                android:valueFrom="-3"
+                android:valueTo="3" />
+        </aapt:attr>
+    </target>
+
+    <!-- Rotate Link Two smoothly in the opposite direction to create the opening/closing effect -->
+    <target android:name="link_two_group">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:duration="800"
+                android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+                android:propertyName="rotation"
+                android:repeatCount="-1"
+                android:repeatMode="reverse"
+                android:valueFrom="3"
+                android:valueTo="-3" />
+        </aapt:attr>
+    </target>
+</animated-vector>

android/app/src/main/res/values-night/styles.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.SplashScreen">
-        <!-- Show a splash screen on the activity. Automatically removed when
+        <!-- Configure the Androidx Splash Screen API parameters -->
-             the Flutter engine draws its first frame -->
+        <item name="windowSplashScreenBackground">#FF57CC99</item>
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/link_animated</item>
+        <item name="windowSplashScreenAnimationDuration">800</item>
+        <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values/styles.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.SplashScreen">
-        <!-- Show a splash screen on the activity. Automatically removed when
+        <!-- Configure the Androidx Splash Screen API parameters -->
-             the Flutter engine draws its first frame -->
+        <item name="windowSplashScreenBackground">#FF57CC99</item>
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/link_animated</item>
-        <!-- Set the background color to the primary color so the white logo is visible -->
+        <item name="windowSplashScreenAnimationDuration">800</item>
-        <item name="android:colorBackground">#FF57CC99</item>
+        <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/gradle.properties

@@ -1,3 +1,7 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip

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

android/settings.gradle

@@ -18,11 +18,11 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.9.1' apply false
+    id "com.android.application" version '8.11.1' apply false
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.3.15" apply false
     // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
 }
 
 include ":app"

assets/icons/verification_badge_numeric/verified_badge_1.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#57CC99" class="bi bi-patch-check-fill" viewBox="0 0 16 16">
+  <path d="M10.067.87a2.89 2.89 0 0 0-4.134 0l-.622.638-.89-.011a2.89 2.89 0 0 0-2.924 2.924l.01.89-.636.622a2.89 2.89 0 0 0 0 4.134l.637.622-.011.89a2.89 2.89 0 0 0 2.924 2.924l.89-.01.622.636a2.89 2.89 0 0 0 4.134 0l.622-.637.89.011a2.89 2.89 0 0 0 2.924-2.924l-.01-.89.636-.622a2.89 2.89 0 0 0 0-4.134l-.637-.622.011-.89a2.89 2.89 0 0 0-2.924-2.924l-.89.01zM8.107 4.000L9.339 4.000L9.339 12.000L7.832 12.000L7.832 6.246L7.817 6.232L7.339 6.638L6.948 6.899L6.455 7.159L5.861 7.391L5.861 6.014L6.165 5.899L6.499 5.725L6.861 5.493L7.296 5.159L7.643 4.812L7.832 4.565L8.049 4.174L8.107 4.000Z"/>
+</svg>

assets/icons/verification_badge_numeric/verified_badge_2.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#57CC99" class="bi bi-patch-check-fill" viewBox="0 0 16 16">
+  <path d="M10.067.87a2.89 2.89 0 0 0-4.134 0l-.622.638-.89-.011a2.89 2.89 0 0 0-2.924 2.924l.01.89-.636.622a2.89 2.89 0 0 0 0 4.134l.637.622-.011.89a2.89 2.89 0 0 0 2.924 2.924l.89-.01.622.636a2.89 2.89 0 0 0 4.134 0l.622-.637.89.011a2.89 2.89 0 0 0 2.924-2.924l-.01-.89.636-.622a2.89 2.89 0 0 0 0-4.134l-.637-.622.011-.89a2.89 2.89 0 0 0-2.924-2.924l-.89.01zM7.899 4.000L8.391 4.000L8.768 4.043L9.029 4.101L9.362 4.217L9.623 4.348L9.942 4.580L10.145 4.783L10.304 4.986L10.406 5.145L10.551 5.464L10.652 5.899L10.667 6.406L10.594 6.884L10.478 7.246L10.290 7.638L10.043 8.029L9.812 8.333L9.507 8.667L8.406 9.696L7.928 10.174L7.754 10.391L7.638 10.580L10.667 10.594L10.667 12.000L5.333 12.000L5.391 11.609L5.522 11.159L5.710 10.725L6.000 10.246L6.232 9.942L6.638 9.478L7.464 8.652L8.072 8.087L8.594 7.551L8.870 7.203L9.029 6.899L9.087 6.739L9.145 6.449L9.145 6.174L9.101 5.928L8.986 5.667L8.768 5.435L8.652 5.362L8.522 5.304L8.246 5.246L7.971 5.246L7.783 5.275L7.652 5.319L7.406 5.464L7.232 5.652L7.101 5.913L7.029 6.203L7.000 6.493L5.493 6.348L5.565 5.870L5.725 5.362L5.957 4.942L6.275 4.594L6.638 4.348L6.942 4.203L7.377 4.072L7.899 4.000Z"/>
+</svg>

assets/icons/verification_badge_numeric/verified_badge_3.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#57CC99" class="bi bi-patch-check-fill" viewBox="0 0 16 16">
+  <path d="M10.067.87a2.89 2.89 0 0 0-4.134 0l-.622.638-.89-.011a2.89 2.89 0 0 0-2.924 2.924l.01.89-.636.622a2.89 2.89 0 0 0 0 4.134l.637.622-.011.89a2.89 2.89 0 0 0 2.924 2.924l.89-.01.622.636a2.89 2.89 0 0 0 4.134 0l.622-.637.89.011a2.89 2.89 0 0 0 2.924-2.924l-.01-.89.636-.622a2.89 2.89 0 0 0 0-4.134l-.637-.622.011-.89a2.89 2.89 0 0 0-2.924-2.924l-.89.01zM7.730 4.000L8.142 4.000L8.555 4.057L8.854 4.142L9.224 4.313L9.523 4.527L9.794 4.797L10.064 5.196L10.206 5.580L10.249 5.851L10.235 6.263L10.149 6.591L10.007 6.875L9.836 7.103L9.566 7.359L9.125 7.644L9.409 7.730L9.708 7.872L9.950 8.043L10.164 8.256L10.335 8.498L10.477 8.797L10.548 9.039L10.591 9.338L10.577 9.836L10.448 10.377L10.249 10.776L10.093 11.004L9.893 11.231L9.523 11.544L9.125 11.772L8.911 11.858L8.598 11.943L8.171 12.000L7.587 11.986L7.146 11.900L6.733 11.744L6.320 11.488L5.950 11.132L5.680 10.733L5.509 10.320L5.409 9.865L5.409 9.808L6.847 9.637L6.861 9.765L6.947 10.064L7.004 10.192L7.160 10.420L7.416 10.633L7.630 10.733L7.843 10.776L8.171 10.762L8.327 10.719L8.498 10.633L8.797 10.363L8.968 10.064L9.039 9.822L9.068 9.609L9.053 9.167L8.954 8.826L8.769 8.541L8.512 8.327L8.214 8.214L7.872 8.199L7.331 8.299L7.488 7.132L7.929 7.089L8.256 6.975L8.384 6.890L8.569 6.705L8.683 6.505L8.754 6.221L8.754 5.979L8.698 5.737L8.598 5.552L8.427 5.381L8.242 5.281L8.000 5.224L7.772 5.224L7.445 5.324L7.317 5.409L7.132 5.594L7.032 5.751L6.947 5.964L6.890 6.278L5.523 6.036L5.623 5.623L5.794 5.181L5.950 4.911L6.235 4.584L6.591 4.327L6.961 4.157L7.302 4.057L7.730 4.000Z"/>
+</svg>

dependencies

@@ -1 +1 @@
-Subproject commit e0c6a9617a20a8d6bc1ad4c6b9c2e229feb5f37a
+Subproject commit 72d9bd6320bca1f1d29c6e61c3821fed326c0abe

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file(ENV["GOOGLE_PLAY_JSON_KEY_PATH"] || "../../local_data/accesskeys/upload_track_releases_google_play.json")
+package_name("eu.twonly") # Your application ID

fastlane/Fastfile

@@ -0,0 +1,149 @@
+default_platform(:android)
+
+platform :android do
+  desc "Submit a new App Bundle to the Google Play Internal Track"
+  lane :internal do
+    # This lane assumes that `flutter build appbundle` has already been run from the flutter root.
+    upload_to_play_store(
+      track: 'internal',
+      aab: 'build/app/outputs/bundle/release/app-release.aab',
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true
+    )
+  end
+
+  desc "Build the application locally and upload it as a new GitHub release"
+  lane :release_github do
+    # Read pubspec.yaml to get the version
+    pubspec_path = File.expand_path("../pubspec.yaml", __dir__)
+    unless File.exist?(pubspec_path)
+      UI.user_error!("Could not find pubspec.yaml at #{pubspec_path}")
+    end
+    
+    pubspec_content = File.read(pubspec_path)
+    version_match = pubspec_content.match(/^version:\s*([^+]+)/)
+    unless version_match
+      UI.user_error!("Could not extract version from pubspec.yaml")
+    end
+    
+    version = version_match[1].strip
+    tag_name = "v#{version}"
+    UI.message("Extracted version: #{version} (tag: #{tag_name})")
+
+    # Load release notes from CHANGELOG.md
+    changelog_path = File.expand_path("../CHANGELOG.md", __dir__)
+    release_notes = "Small bug fixes."
+    if File.exist?(changelog_path)
+      changelog_content = File.read(changelog_path)
+      escaped_version = Regexp.escape(version)
+      pattern = /##\s*\[?#{escaped_version}\]?(.*?)(?=##\s*|\z)/m
+      match = changelog_content.match(pattern)
+      if match
+        release_notes = match[1].strip
+        UI.message("Loaded release notes from CHANGELOG.md:\n#{release_notes}")
+      else
+        UI.important("Could not find release notes for version #{version} in CHANGELOG.md. Using default description.")
+      end
+    else
+      UI.important("CHANGELOG.md not found at #{changelog_path}. Using default description.")
+    end
+
+    # Handle key.properties swapping if key.github.properties exists
+    key_properties_path = File.expand_path("../android/key.properties", __dir__)
+    github_properties_path = File.expand_path("../android/key.github.properties", __dir__)
+    backup_properties_path = File.expand_path("../android/key.properties.backup", __dir__)
+
+    swapped_properties = false
+    if File.exist?(github_properties_path)
+      UI.message("Found key.github.properties. Swapping in for the build...")
+      if File.exist?(key_properties_path)
+        FileUtils.cp(key_properties_path, backup_properties_path)
+      end
+      FileUtils.cp(github_properties_path, key_properties_path)
+      swapped_properties = true
+    else
+      UI.message("No key.github.properties found. Building with default key.properties...")
+    end
+
+    begin
+      # Build the Android application
+      UI.message("Building Android APK...")
+      Dir.chdir(File.expand_path("..", __dir__)) do
+        sh("flutter build apk --release --split-per-abi")
+      end
+    ensure
+      # Restore original key.properties if swapped
+      if swapped_properties
+        UI.message("Restoring original key.properties...")
+        if File.exist?(backup_properties_path)
+          FileUtils.cp(backup_properties_path, key_properties_path)
+          FileUtils.rm(backup_properties_path)
+        else
+          FileUtils.rm_f(key_properties_path)
+        end
+      end
+    end
+
+    # Find built APKs
+    apk_glob = File.expand_path("../build/app/outputs/flutter-apk/*-release.apk", __dir__)
+    apks = Dir.glob(apk_glob)
+    
+    if apks.empty?
+      UI.user_error!("No release APKs found matching #{apk_glob}")
+    end
+    
+    UI.message("Found APKs to upload: #{apks.join(', ')}")
+
+    # Retrieve GitHub Token (fall back to gh auth token)
+    github_token = ENV["GITHUB_TOKEN"]
+    if github_token.nil? || github_token.empty?
+      UI.message("GITHUB_TOKEN env variable not set. Retrieving token via GitHub CLI (gh auth token)...")
+      begin
+        github_token = sh("gh auth token").strip
+      rescue => e
+        UI.user_error!("Failed to retrieve token from gh CLI. Make sure gh is installed and authenticated, or GITHUB_TOKEN environment variable is set. Error: #{e}")
+      end
+    end
+
+    UI.message("Creating GitHub Release #{tag_name}...")
+    set_github_release(
+      repository_name: "twonlyapp/twonly-app",
+      api_token: github_token,
+      tag_name: tag_name,
+      name: "Release #{tag_name}",
+      description: release_notes,
+      upload_assets: apks
+    )
+    UI.success("Successfully uploaded release #{tag_name} to GitHub!")
+
+    # F-Droid deployment
+    fdroid_repo_dir = "/Users/tobi/Documents/drive/twonly/F-Droid/repo"
+    UI.message("Starting F-Droid deployment...")
+    FileUtils.mkdir_p(fdroid_repo_dir)
+
+    # Delete all APK files in the directory
+    sh("rm -f #{fdroid_repo_dir}/*.apk")
+    
+    UI.message("All APK files deleted.")
+
+    apks.each do |apk_path|
+      basename = File.basename(apk_path)
+      new_name = "eu.twonly_v#{version}-#{basename}"
+      dest_path = File.join(fdroid_repo_dir, new_name)
+      UI.message("Copying APK to F-Droid repo: #{dest_path}")
+      FileUtils.cp(apk_path, dest_path)
+    end
+
+    fdroid_dir = "/Users/tobi/Documents/drive/twonly/F-Droid"
+    update_script = File.join(fdroid_dir, "update.sh")
+    if File.exist?(update_script)
+      UI.message("Executing F-Droid update script...")
+      Dir.chdir(fdroid_dir) do
+        sh("chmod +x ./update.sh && ./update.sh")
+      end
+    else
+      UI.important("F-Droid update script not found at #{update_script}")
+    end
+  end
+end

ios/NotificationService/NotificationService.swift

@@ -15,6 +15,11 @@ class NotificationService: UNNotificationServiceExtension {
         self.contentHandler = contentHandler
         bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
 
+        // Store the current timestamp in Keychain for iOS FCM messaging tracking
+        let nowMs = String(format: "%.0f", Date().timeIntervalSince1970 * 1000)
+        writeToKeychain(key: "last_fcm_message_timestamp", value: nowMs)
+        NSLog("Received APNs push notification, updated last_fcm_message_timestamp to \(nowMs)")
+
         if let bestAttemptContent = bestAttemptContent {
 
             guard bestAttemptContent.userInfo as? [String: Any] != nil,
@@ -188,6 +193,7 @@ func readFromKeychain(key: String) -> String? {
     let query: [String: Any] = [
         kSecClass as String: kSecClassGenericPassword,
         kSecAttrAccount as String: key,
+        kSecAttrService as String: "flutter_secure_storage_service",
         kSecReturnData as String: kCFBooleanTrue!,
         kSecMatchLimit as String: kSecMatchLimitOne,
         kSecAttrAccessGroup as String: "CN332ZUGRP.eu.twonly.shared",  // Use your access group
@@ -205,6 +211,36 @@ func readFromKeychain(key: String) -> String? {
     return nil
 }
 
+// Helper function to write to Keychain
+func writeToKeychain(key: String, value: String) {
+    guard let data = value.data(using: .utf8) else {
+        NSLog("Failed to convert value to data for keychain key: \(key)")
+        return
+    }
+
+    let query: [String: Any] = [
+        kSecClass as String: kSecClassGenericPassword,
+        kSecAttrAccount as String: key,
+        kSecAttrService as String: "flutter_secure_storage_service",
+        kSecAttrAccessGroup as String: "CN332ZUGRP.eu.twonly.shared"
+    ]
+
+    // Delete existing item first to ensure a clean overwrite
+    SecItemDelete(query as CFDictionary)
+
+    // Add the new item with background-compatible accessibility
+    var addQuery = query
+    addQuery[kSecValueData as String] = data
+    addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
+
+    let status = SecItemAdd(addQuery as CFDictionary, nil)
+    if status != errSecSuccess {
+        NSLog("Failed to write keychain item for key \(key): \(status)")
+    } else {
+        NSLog("Successfully wrote keychain item for key: \(key)")
+    }
+}
+
 func getPushNotificationText(pushNotification: PushNotification, userKnown: Bool) -> (String, String) {
     let systemLanguage = Locale.current.language.languageCode?.identifier ?? "en"  // Get the current system language
 

ios/Podfile

@@ -28,17 +28,9 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 
 flutter_ios_podfile_setup
 
-pod 'Firebase', :modular_headers => true
-pod 'FirebaseMessaging', :modular_headers => true
-pod 'FirebaseCoreInternal', :modular_headers => true
-pod 'GoogleUtilities', :modular_headers => true
-pod 'FirebaseCore', :modular_headers => true
-pod 'SwiftProtobuf'
-# pod 'sqlite3', :modular_headers => true
-
-
 
 target 'Runner' do
+  pod 'SwiftProtobuf'
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
     inherit! :search_paths
@@ -76,6 +68,28 @@ post_install do |installer|
 
         ## dart: PermissionGroup.mediaLibrary
         'PERMISSION_PHOTOS=1',
+
+        ## dart: PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse
+        'PERMISSION_LOCATION=0',
+
+        ## dart: PermissionGroup.contacts
+        'PERMISSION_CONTACTS=0',
+
+        ## dart: PermissionGroup.calendar, PermissionGroup.reminders
+        'PERMISSION_EVENTS=0',
+        'PERMISSION_REMINDERS=0',
+
+        ## dart: PermissionGroup.speech
+        'PERMISSION_SPEECH_RECOGNITION=0',
+
+        ## dart: PermissionGroup.bluetooth
+        'PERMISSION_BLUETOOTH=0',
+
+        ## dart: PermissionGroup.appTrackingTransparency
+        'PERMISSION_APP_TRACKING_TRANSPARENCY=0',
+
+        ## dart: PermissionGroup.sensors
+        'PERMISSION_SENSORS=0',
       ]
 
     end
@@ -83,5 +97,6 @@ post_install do |installer|
 end
 
 target 'NotificationService' do
+  pod 'SwiftProtobuf'
   # pod 'Firebase/Messaging'
 end

ios/Podfile.lock

@@ -1,136 +1,18 @@
 PODS:
-  - app_links (7.0.0):
-    - Flutter
   - audio_waveforms (0.0.1):
     - Flutter
-  - background_downloader (0.0.1):
-    - Flutter
-  - camera_avfoundation (0.0.1):
-    - Flutter
-  - connectivity_plus (0.0.1):
-    - Flutter
   - cryptography_flutter_plus (0.2.0):
     - Flutter
-  - device_info_plus (0.0.1):
-    - Flutter
-  - DKImagePickerController/Core (4.3.9):
-    - DKImagePickerController/ImageDataManager
-    - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.9)
-  - DKImagePickerController/PhotoGallery (4.3.9):
-    - DKImagePickerController/Core
-    - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.9)
-  - DKPhotoGallery (0.0.19):
-    - DKPhotoGallery/Core (= 0.0.19)
-    - DKPhotoGallery/Model (= 0.0.19)
-    - DKPhotoGallery/Preview (= 0.0.19)
-    - DKPhotoGallery/Resource (= 0.0.19)
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Core (0.0.19):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Preview
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Model (0.0.19):
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.19):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Resource
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.19):
-    - SDWebImage
-    - SwiftyGif
-  - emoji_picker_flutter (0.0.1):
-    - Flutter
-  - file_picker (0.0.1):
-    - DKImagePickerController/PhotoGallery
-    - Flutter
-  - Firebase (12.9.0):
-    - Firebase/Core (= 12.9.0)
-  - Firebase/Core (12.9.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 12.9.0)
-  - Firebase/CoreOnly (12.9.0):
-    - FirebaseCore (~> 12.9.0)
-  - Firebase/Installations (12.9.0):
-    - Firebase/CoreOnly
-    - FirebaseInstallations (~> 12.9.0)
-  - Firebase/Messaging (12.9.0):
-    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 12.9.0)
-  - firebase_app_installations (0.4.1):
-    - Firebase/Installations (= 12.9.0)
-    - firebase_core
-    - Flutter
-  - firebase_core (4.6.0):
-    - Firebase/CoreOnly (= 12.9.0)
-    - Flutter
-  - firebase_messaging (16.1.3):
-    - Firebase/Messaging (= 12.9.0)
-    - firebase_core
-    - Flutter
-  - FirebaseAnalytics (12.9.0):
-    - FirebaseAnalytics/Default (= 12.9.0)
-    - FirebaseCore (~> 12.9.0)
-    - FirebaseInstallations (~> 12.9.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/MethodSwizzler (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-    - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/Default (12.9.0):
-    - FirebaseCore (~> 12.9.0)
-    - FirebaseInstallations (~> 12.9.0)
-    - GoogleAppMeasurement/Default (= 12.9.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/MethodSwizzler (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-    - nanopb (~> 3.30910.0)
-  - FirebaseCore (12.9.0):
-    - FirebaseCoreInternal (~> 12.9.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreInternal (12.9.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseInstallations (12.9.0):
-    - FirebaseCore (~> 12.9.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
-    - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (12.9.0):
-    - FirebaseCore (~> 12.9.0)
-    - FirebaseInstallations (~> 12.9.0)
-    - GoogleDataTransport (~> 10.1)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Reachability (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
-    - nanopb (~> 3.30910.0)
   - Flutter (1.0.0)
   - flutter_image_compress_common (1.0.0):
     - Flutter
     - Mantle
     - SDWebImage
     - SDWebImageWebPCoder
-  - flutter_keyboard_visibility_temp_fork (0.0.1):
-    - Flutter
-  - flutter_local_notifications (0.0.1):
-    - Flutter
-  - flutter_secure_storage_darwin (10.0.0):
-    - Flutter
-    - FlutterMacOS
   - flutter_sharing_intent (1.0.1):
     - Flutter
   - flutter_volume_controller (0.0.1):
     - Flutter
-  - gal (1.0.0):
-    - Flutter
-    - FlutterMacOS
   - google_mlkit_barcode_scanning (0.14.2):
     - Flutter
     - google_mlkit_commons
@@ -142,33 +24,6 @@ PODS:
     - Flutter
     - google_mlkit_commons
     - GoogleMLKit/FaceDetection (~> 9.0.0)
-  - GoogleAdsOnDeviceConversion (3.2.0):
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/Core (12.9.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/MethodSwizzler (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/Default (12.9.0):
-    - GoogleAdsOnDeviceConversion (~> 3.2.0)
-    - GoogleAppMeasurement/Core (= 12.9.0)
-    - GoogleAppMeasurement/IdentitySupport (= 12.9.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/MethodSwizzler (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/IdentitySupport (12.9.0):
-    - GoogleAppMeasurement/Core (= 12.9.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/MethodSwizzler (~> 8.1)
-    - GoogleUtilities/Network (~> 8.1)
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-    - nanopb (~> 3.30910.0)
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
@@ -185,54 +40,16 @@ PODS:
     - GoogleToolboxForMac/Defines (= 4.2.1)
   - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
     - GoogleToolboxForMac/Defines (= 4.2.1)
-  - GoogleUtilities (8.1.0):
-    - GoogleUtilities/AppDelegateSwizzler (= 8.1.0)
-    - GoogleUtilities/Environment (= 8.1.0)
-    - GoogleUtilities/Logger (= 8.1.0)
-    - GoogleUtilities/MethodSwizzler (= 8.1.0)
-    - GoogleUtilities/Network (= 8.1.0)
-    - "GoogleUtilities/NSData+zlib (= 8.1.0)"
-    - GoogleUtilities/Privacy (= 8.1.0)
-    - GoogleUtilities/Reachability (= 8.1.0)
-    - GoogleUtilities/SwizzlerTestHelpers (= 8.1.0)
-    - GoogleUtilities/UserDefaults (= 8.1.0)
-  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-    - GoogleUtilities/Privacy
   - GoogleUtilities/Environment (8.1.0):
     - GoogleUtilities/Privacy
   - GoogleUtilities/Logger (8.1.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/MethodSwizzler (8.1.0):
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (8.1.0):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Privacy
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (8.1.0)":
-    - GoogleUtilities/Privacy
   - GoogleUtilities/Privacy (8.1.0)
-  - GoogleUtilities/Reachability (8.1.0):
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/SwizzlerTestHelpers (8.1.0):
-    - GoogleUtilities/MethodSwizzler
   - GoogleUtilities/UserDefaults (8.1.0):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
   - GTMSessionFetcher/Core (3.5.0)
-  - image_picker_ios (0.0.1):
-    - Flutter
-  - in_app_purchase_storekit (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - integration_test (0.0.1):
-    - Flutter
   - libwebp (1.5.0):
     - libwebp/demux (= 1.5.0)
     - libwebp/mux (= 1.5.0)
@@ -245,9 +62,6 @@ PODS:
   - libwebp/sharpyuv (1.5.0)
   - libwebp/webp (1.5.0):
     - libwebp/sharpyuv
-  - local_auth_darwin (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - Mantle (2.2.0):
     - Mantle/extobjc (= 2.2.0)
   - Mantle/extobjc (2.2.0)
@@ -276,15 +90,11 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
-  - package_info_plus (0.4.5):
-    - Flutter
   - permission_handler_apple (9.3.0):
     - Flutter
   - pro_video_editor (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
-  - restart_app (1.7.3):
-    - Flutter
   - rust_lib_twonly (0.0.1):
     - Flutter
   - screen_protector (1.5.1):
@@ -297,89 +107,29 @@ PODS:
   - SDWebImageWebPCoder (0.15.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - Sentry/HybridSDK (8.58.0)
+  - SwiftProtobuf (1.38.0)
-  - sentry_flutter (9.16.0):
-    - Flutter
-    - FlutterMacOS
-    - Sentry/HybridSDK (= 8.58.0)
-  - share_plus (0.0.1):
-    - Flutter
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - sqflite_darwin (0.0.4):
-    - Flutter
-    - FlutterMacOS
-  - SwiftProtobuf (1.36.1)
-  - SwiftyGif (5.4.5)
-  - url_launcher_ios (0.0.1):
-    - Flutter
-  - video_player_avfoundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - workmanager_apple (0.0.1):
     - Flutter
 
 DEPENDENCIES:
-  - app_links (from `.symlinks/plugins/app_links/ios`)
   - audio_waveforms (from `.symlinks/plugins/audio_waveforms/ios`)
-  - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
-  - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - cryptography_flutter_plus (from `.symlinks/plugins/cryptography_flutter_plus/ios`)
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`)
-  - file_picker (from `.symlinks/plugins/file_picker/ios`)
-  - Firebase
-  - firebase_app_installations (from `.symlinks/plugins/firebase_app_installations/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
-  - FirebaseCore
-  - FirebaseCoreInternal
-  - FirebaseMessaging
   - Flutter (from `Flutter`)
   - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
-  - flutter_keyboard_visibility_temp_fork (from `.symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - flutter_sharing_intent (from `.symlinks/plugins/flutter_sharing_intent/ios`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-  - gal (from `.symlinks/plugins/gal/darwin`)
   - google_mlkit_barcode_scanning (from `.symlinks/plugins/google_mlkit_barcode_scanning/ios`)
   - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`)
   - google_mlkit_face_detection (from `.symlinks/plugins/google_mlkit_face_detection/ios`)
-  - GoogleUtilities
-  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
-  - integration_test (from `.symlinks/plugins/integration_test/ios`)
-  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - pro_video_editor (from `.symlinks/plugins/pro_video_editor/ios`)
-  - restart_app (from `.symlinks/plugins/restart_app/ios`)
   - rust_lib_twonly (from `.symlinks/plugins/rust_lib_twonly/ios`)
   - screen_protector (from `.symlinks/plugins/screen_protector/ios`)
-  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - SwiftProtobuf
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
   - workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`)
 
 SPEC REPOS:
   trunk:
-    - DKImagePickerController
-    - DKPhotoGallery
-    - Firebase
-    - FirebaseAnalytics
-    - FirebaseCore
-    - FirebaseCoreInternal
-    - FirebaseInstallations
-    - FirebaseMessaging
-    - GoogleAdsOnDeviceConversion
-    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleMLKit
     - GoogleToolboxForMac
@@ -397,136 +147,54 @@ SPEC REPOS:
     - ScreenProtectorKit
     - SDWebImage
     - SDWebImageWebPCoder
-    - Sentry
     - SwiftProtobuf
-    - SwiftyGif
 
 EXTERNAL SOURCES:
-  app_links:
-    :path: ".symlinks/plugins/app_links/ios"
   audio_waveforms:
     :path: ".symlinks/plugins/audio_waveforms/ios"
-  background_downloader:
-    :path: ".symlinks/plugins/background_downloader/ios"
-  camera_avfoundation:
-    :path: ".symlinks/plugins/camera_avfoundation/ios"
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
   cryptography_flutter_plus:
     :path: ".symlinks/plugins/cryptography_flutter_plus/ios"
-  device_info_plus:
-    :path: ".symlinks/plugins/device_info_plus/ios"
-  emoji_picker_flutter:
-    :path: ".symlinks/plugins/emoji_picker_flutter/ios"
-  file_picker:
-    :path: ".symlinks/plugins/file_picker/ios"
-  firebase_app_installations:
-    :path: ".symlinks/plugins/firebase_app_installations/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_messaging:
-    :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
   flutter_image_compress_common:
     :path: ".symlinks/plugins/flutter_image_compress_common/ios"
-  flutter_keyboard_visibility_temp_fork:
-    :path: ".symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_secure_storage_darwin:
-    :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin"
   flutter_sharing_intent:
     :path: ".symlinks/plugins/flutter_sharing_intent/ios"
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-  gal:
-    :path: ".symlinks/plugins/gal/darwin"
   google_mlkit_barcode_scanning:
     :path: ".symlinks/plugins/google_mlkit_barcode_scanning/ios"
   google_mlkit_commons:
     :path: ".symlinks/plugins/google_mlkit_commons/ios"
   google_mlkit_face_detection:
     :path: ".symlinks/plugins/google_mlkit_face_detection/ios"
-  image_picker_ios:
-    :path: ".symlinks/plugins/image_picker_ios/ios"
-  in_app_purchase_storekit:
-    :path: ".symlinks/plugins/in_app_purchase_storekit/darwin"
-  integration_test:
-    :path: ".symlinks/plugins/integration_test/ios"
-  local_auth_darwin:
-    :path: ".symlinks/plugins/local_auth_darwin/darwin"
-  package_info_plus:
-    :path: ".symlinks/plugins/package_info_plus/ios"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   pro_video_editor:
     :path: ".symlinks/plugins/pro_video_editor/ios"
-  restart_app:
-    :path: ".symlinks/plugins/restart_app/ios"
   rust_lib_twonly:
     :path: ".symlinks/plugins/rust_lib_twonly/ios"
   screen_protector:
     :path: ".symlinks/plugins/screen_protector/ios"
-  sentry_flutter:
-    :path: ".symlinks/plugins/sentry_flutter/ios"
-  share_plus:
-    :path: ".symlinks/plugins/share_plus/ios"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite_darwin:
-    :path: ".symlinks/plugins/sqflite_darwin/darwin"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-  video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
   workmanager_apple:
     :path: ".symlinks/plugins/workmanager_apple/ios"
 
 SPEC CHECKSUMS:
-  app_links: a754cbec3c255bd4bbb4d236ecc06f28cd9a7ce8
   audio_waveforms: a6dde7fe7c0ea05f06ffbdb0f7c1b2b2ba6cedcf
-  background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
-  camera_avfoundation: 968a9a5323c79a99c166ad9d7866bfd2047b5a9b
-  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   cryptography_flutter_plus: 44f4e9e4079395fcbb3e7809c0ac2c6ae2d9576f
-  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
-  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
-  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
-  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
-  Firebase: 065f2bb395062046623036d8e6dc857bc2521d56
-  firebase_app_installations: 1abd8d071ea2022d7888f7a9713710c37136ff91
-  firebase_core: 8e6f58412ca227827c366b92e7cee047a2148c60
-  firebase_messaging: c3aa897e0d40109cfb7927c40dc0dea799863f3b
-  FirebaseAnalytics: cd7d01d352f3c237c9a0e31552c257cd0b0c0352
-  FirebaseCore: 428912f751178b06bef0a1793effeb4a5e09a9b8
-  FirebaseCoreInternal: b321eafae5362113bc182956fafc9922cfc77b72
-  FirebaseInstallations: 7b64ffd006032b2b019a59b803858df5112d9eaa
-  FirebaseMessaging: 7d6cdbff969127c4151c824fe432f0e301210f15
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
-  flutter_keyboard_visibility_temp_fork: 95b2d534bacf6ac62e7fcbe5c2a9e2c2a17ce06f
-  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
-  flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   flutter_sharing_intent: 0c1e53949f09fa8df8ac2268505687bde8ff264c
   flutter_volume_controller: c2be490cb0487e8b88d0d9fc2b7e1c139a4ebccb
-  gal: baecd024ebfd13c441269ca7404792a7152fde89
   google_mlkit_barcode_scanning: 12d8422d8f7b00726dedf9cac00188a2b98750c2
   google_mlkit_commons: a5e4ffae5bc59ea4c7b9025dc72cb6cb79dc1166
   google_mlkit_face_detection: ee4b72cfae062b4c972204be955d83055a4bfd36
-  GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f
-  GoogleAppMeasurement: fce7c1c90640d2f9f5c56771f71deacb2ba3f98c
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleMLKit: b1eee21a41c57704fe72483b15c85cb2c0cd7444
   GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  in_app_purchase_storekit: 22cca7d08eebca9babdf4d07d0baccb73325d3c8
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   MLImage: 0de5c6c2bf9e93b80ef752e2797f0836f03b58c0
   MLKitBarcodeScanning: 39de223e7b1b8a8fbf10816a536dd292d8a39343
@@ -534,27 +202,17 @@ SPEC CHECKSUMS:
   MLKitFaceDetection: 32549f1e70e6e7731261bf9cea2b74095e2531cb
   MLKitVision: 39a5a812db83c4a0794445088e567f3631c11961
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   pro_video_editor: 44ef9a6d48dbd757ed428cf35396dd05f35c7830
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  restart_app: 0714144901e260eae68f7afc2fc4aacc1a323ad2
   rust_lib_twonly: 73165b05d0cda50db45852db63f49caa7f319520
   screen_protector: 18c6aca2dc5d2a832f6787a5318f97f03e9d3150
   ScreenProtectorKit: 6ceb3e0808341a9bc15d175bff40dfdd4b32da71
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
-  Sentry: d587a8fe91ca13503ecd69a1905f3e8a0fcf61be
+  SwiftProtobuf: d724b5145bfc609d9a49c1e3e3a3dabb07273ffb
-  sentry_flutter: 31101687061fb85211ebab09ce6eb8db4e9ba74f
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38
-  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
   workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778
 
-PODFILE CHECKSUM: ae041999f13ba7b2285ff9ad9bc688ed647bbcb7
+PODFILE CHECKSUM: 245e6d5f26c858edb6b99a7d972cc93ead4d55cf
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		D25D4D7A2EFF41DB0029F805 /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D25D4D702EFF41DB0029F805 /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D2B2E0FF2F63819600E729C1 /* VideoCompressionChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2B2E0FE2F63819600E729C1 /* VideoCompressionChannel.swift */; };
 		F3C66D726A2EB28484DF0B10 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 16FBC6F5B58E1C6646F5D447 /* GoogleService-Info.plist */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -114,6 +115,7 @@
 		E96A5ACA32A7118204F050A5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		EE2CCFEE4ABECF33852F7735 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F02F7A1D63544AA9F23A1085 /* Pods-NotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.profile.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.profile.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -165,6 +167,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				CA4FDF5DD8F229C30DE512AF /* Pods_Runner.framework in Frameworks */,
 				D25D4D1E2EF626E30029F805 /* StoreKit.framework in Frameworks */,
 			);
@@ -200,6 +203,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -307,6 +311,9 @@
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -378,6 +385,9 @@
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+			);
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
@@ -1309,6 +1319,18 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,194 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "61b85103a1aeed8218f17c794687781505fbbef5",
+        "version" : "11.2.0"
+      }
+    },
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "a10a4148e769fadb01b1ff8d6bb76e9137f35b81",
+        "version" : "4.6.0-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "60da361632d0de02786f709bdc0c4df340f7613e",
+        "version" : "8.1.0"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a",
+        "version" : "5.3.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "sentry-cocoa",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/getsentry/sentry-cocoa",
+      "state" : {
+        "revision" : "16cd512711375fa73f25ae5e373f596bdf4251ae",
+        "version" : "8.58.0"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,194 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "61b85103a1aeed8218f17c794687781505fbbef5",
+        "version" : "11.2.0"
+      }
+    },
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "flutterfire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/flutterfire",
+      "state" : {
+        "revision" : "a10a4148e769fadb01b1ff8d6bb76e9137f35b81",
+        "version" : "4.6.0-firebase-core-swift"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d",
+        "version" : "12.14.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "60da361632d0de02786f709bdc0c4df340f7613e",
+        "version" : "8.1.0"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a",
+        "version" : "5.3.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "sentry-cocoa",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/getsentry/sentry-cocoa",
+      "state" : {
+        "revision" : "16cd512711375fa73f25ae5e373f596bdf4251ae",
+        "version" : "8.58.0"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner/AppDelegate.swift

@@ -36,7 +36,9 @@ import workmanager_apple
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 
-    override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+  override func application(
+    _ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+  ) -> Bool {
 
     let sharingIntent = SwiftFlutterSharingIntentPlugin.instance
     if sharingIntent.hasSameSchemePrefix(url: url) {
@@ -58,7 +60,8 @@ import workmanager_apple
     NSLog(
       "Application delegate method userNotificationCenter:didReceive:withCompletionHandler: is called with user info: %@",
       response.notification.request.content.userInfo)
-    //...
+    super.userNotificationCenter(
+      center, didReceive: response, withCompletionHandler: completionHandler)
   }
 
   override func userNotificationCenter(

ios/Runner/Info.plist

@@ -55,6 +55,8 @@
 	<string>Use your microphone to enable audio when making videos.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>twonly will save photos or videos to your library.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app does not use or store your location information.</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

lib/app.dart

@@ -137,12 +137,14 @@ class _AppMainWidgetState extends State<AppMainWidget> {
   bool _isLoaded = false;
   bool _isTwonlyLocked = true;
   bool _wasLogged = true;
+  late int _initialPage;
 
   (Future<int>?, bool) _proofOfWork = (null, false);
 
   @override
   void initState() {
     super.initState();
+    _initialPage = widget.initialPage;
     Log.info('AppWidgetState: initState started');
     initAsync();
   }
@@ -150,6 +152,12 @@ class _AppMainWidgetState extends State<AppMainWidget> {
   Future<void> initAsync() async {
     Log.info('AppWidgetState: initAsync started');
     if (userService.isUserCreated) {
+      if (_initialPage != 0) {
+        final count = await twonlyDB.contactsDao.getContactsCount();
+        if (count == 0) {
+          _initialPage = 0;
+        }
+      }
       try {
         unawaited(FirebaseMessaging.instance.requestPermission());
       } catch (e) {
@@ -210,7 +218,7 @@ class _AppMainWidgetState extends State<AppMainWidget> {
         );
       } else {
         child = HomeView(
-          initialPage: widget.initialPage,
+          initialPage: _initialPage,
         );
       }
     } else if (_showOnboarding) {

lib/core/bridge/callbacks.dart

@@ -9,8 +9,10 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 // These functions are ignored because they are not marked as `pub`: `get_callbacks`
 // These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `FlutterCallbacks`, `Logging`, `UserDiscoveryCallbacks`
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `clone`, `clone`, `clone`
 
 Future<void> initFlutterCallbacks({
+  required int callbackId,
   required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
   required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
   required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
@@ -39,6 +41,7 @@ Future<void> initFlutterCallbacks({
   required FutureOr<Uint8List?> Function(PlatformInt64)
   userDiscoveryGetContactPromotion,
 }) => RustLib.instance.api.crateBridgeCallbacksInitFlutterCallbacks(
+  callbackId: callbackId,
   loggingGetStreamSink: loggingGetStreamSink,
   userDiscoverySignData: userDiscoverySignData,
   userDiscoveryVerifySignature: userDiscoveryVerifySignature,

lib/core/bridge/wrapper/user_discovery.dart

@@ -9,36 +9,45 @@ import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 class FlutterUserDiscovery {
   const FlutterUserDiscovery();
 
-  static Future<Uint8List> getCurrentVersion() => RustLib.instance.api
+  static Future<Uint8List> getCurrentVersion({required int callbackId}) =>
-      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion();
+      RustLib.instance.api
+          .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion(
+            callbackId: callbackId,
+          );
 
   static Future<List<Uint8List>> getNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> receivedVersion,
   }) => RustLib.instance.api
       .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages(
+        callbackId: callbackId,
         contactId: contactId,
         receivedVersion: receivedVersion,
       );
 
   static Future<void> handleNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
     required List<Uint8List> messages,
   }) => RustLib.instance.api
       .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages(
+        callbackId: callbackId,
         contactId: contactId,
         publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
         messages: messages,
       );
 
   static Future<void> initializeOrUpdate({
+    required int callbackId,
     required int threshold,
     required PlatformInt64 userId,
     required List<int> publicKey,
     required bool sharePromotion,
   }) => RustLib.instance.api
       .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate(
+        callbackId: callbackId,
         threshold: threshold,
         userId: userId,
         publicKey: publicKey,
@@ -46,19 +55,23 @@ class FlutterUserDiscovery {
       );
 
   static Future<Uint8List?> shouldRequestNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> version,
   }) => RustLib.instance.api
       .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages(
+        callbackId: callbackId,
         contactId: contactId,
         version: version,
       );
 
   static Future<void> updateVerificationStateForUser({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
   }) => RustLib.instance.api
       .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser(
+        callbackId: callbackId,
         contactId: contactId,
         publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
       );

lib/core/frb_generated.dart

@@ -87,16 +87,20 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
 
 abstract class RustLibApi extends BaseApi {
   Future<Uint8List>
-  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion();
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion({
+    required int callbackId,
+  });
 
   Future<List<Uint8List>>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> receivedVersion,
   });
 
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
     required List<Uint8List> messages,
@@ -104,6 +108,7 @@ abstract class RustLibApi extends BaseApi {
 
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate({
+    required int callbackId,
     required int threshold,
     required PlatformInt64 userId,
     required List<int> publicKey,
@@ -112,17 +117,20 @@ abstract class RustLibApi extends BaseApi {
 
   Future<Uint8List?>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> version,
   });
 
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
   });
 
   Future<void> crateBridgeCallbacksInitFlutterCallbacks({
+    required int callbackId,
     required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
     required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
     required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
@@ -242,11 +250,14 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
 
   @override
   Future<Uint8List>
-  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion() {
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion({
+    required int callbackId,
+  }) {
     return handler.executeNormal(
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           pdeCallFfi(
             generalizedFrbRustBinding,
             serializer,
@@ -260,7 +271,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersionConstMeta,
-        argValues: [],
+        argValues: [callbackId],
         apiImpl: this,
       ),
     );
@@ -270,12 +281,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersionConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_get_current_version",
-        argNames: [],
+        argNames: ["callbackId"],
       );
 
   @override
   Future<List<Uint8List>>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> receivedVersion,
   }) {
@@ -283,6 +295,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_i_64(contactId, serializer);
           sse_encode_list_prim_u_8_loose(receivedVersion, serializer);
           pdeCallFfi(
@@ -298,7 +311,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessagesConstMeta,
-        argValues: [contactId, receivedVersion],
+        argValues: [callbackId, contactId, receivedVersion],
         apiImpl: this,
       ),
     );
@@ -308,12 +321,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessagesConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_get_new_messages",
-        argNames: ["contactId", "receivedVersion"],
+        argNames: ["callbackId", "contactId", "receivedVersion"],
       );
 
   @override
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
     required List<Uint8List> messages,
@@ -322,6 +336,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_i_64(contactId, serializer);
           sse_encode_opt_box_autoadd_i_64(
             publicKeyVerifiedTimestamp,
@@ -341,7 +356,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessagesConstMeta,
-        argValues: [contactId, publicKeyVerifiedTimestamp, messages],
+        argValues: [
+          callbackId,
+          contactId,
+          publicKeyVerifiedTimestamp,
+          messages,
+        ],
         apiImpl: this,
       ),
     );
@@ -351,12 +371,18 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessagesConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_handle_new_messages",
-        argNames: ["contactId", "publicKeyVerifiedTimestamp", "messages"],
+        argNames: [
+          "callbackId",
+          "contactId",
+          "publicKeyVerifiedTimestamp",
+          "messages",
+        ],
       );
 
   @override
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate({
+    required int callbackId,
     required int threshold,
     required PlatformInt64 userId,
     required List<int> publicKey,
@@ -366,6 +392,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_u_8(threshold, serializer);
           sse_encode_i_64(userId, serializer);
           sse_encode_list_prim_u_8_loose(publicKey, serializer);
@@ -383,7 +410,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdateConstMeta,
-        argValues: [threshold, userId, publicKey, sharePromotion],
+        argValues: [callbackId, threshold, userId, publicKey, sharePromotion],
         apiImpl: this,
       ),
     );
@@ -393,12 +420,19 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdateConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_initialize_or_update",
-        argNames: ["threshold", "userId", "publicKey", "sharePromotion"],
+        argNames: [
+          "callbackId",
+          "threshold",
+          "userId",
+          "publicKey",
+          "sharePromotion",
+        ],
       );
 
   @override
   Future<Uint8List?>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages({
+    required int callbackId,
     required PlatformInt64 contactId,
     required List<int> version,
   }) {
@@ -406,6 +440,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_i_64(contactId, serializer);
           sse_encode_list_prim_u_8_loose(version, serializer);
           pdeCallFfi(
@@ -421,7 +456,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessagesConstMeta,
-        argValues: [contactId, version],
+        argValues: [callbackId, contactId, version],
         apiImpl: this,
       ),
     );
@@ -431,12 +466,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessagesConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_should_request_new_messages",
-        argNames: ["contactId", "version"],
+        argNames: ["callbackId", "contactId", "version"],
       );
 
   @override
   Future<void>
   crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser({
+    required int callbackId,
     required PlatformInt64 contactId,
     PlatformInt64? publicKeyVerifiedTimestamp,
   }) {
@@ -444,6 +480,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_i_64(contactId, serializer);
           sse_encode_opt_box_autoadd_i_64(
             publicKeyVerifiedTimestamp,
@@ -462,7 +499,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta:
             kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUserConstMeta,
-        argValues: [contactId, publicKeyVerifiedTimestamp],
+        argValues: [callbackId, contactId, publicKeyVerifiedTimestamp],
         apiImpl: this,
       ),
     );
@@ -472,11 +509,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUserConstMeta =>
       const TaskConstMeta(
         debugName: "flutter_user_discovery_update_verification_state_for_user",
-        argNames: ["contactId", "publicKeyVerifiedTimestamp"],
+        argNames: ["callbackId", "contactId", "publicKeyVerifiedTimestamp"],
       );
 
   @override
   Future<void> crateBridgeCallbacksInitFlutterCallbacks({
+    required int callbackId,
     required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
     required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
     required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
@@ -513,6 +551,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       NormalTask(
         callFfi: (port_) {
           final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_32(callbackId, serializer);
           sse_encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
             loggingGetStreamSink,
             serializer,
@@ -586,6 +625,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ),
         constMeta: kCrateBridgeCallbacksInitFlutterCallbacksConstMeta,
         argValues: [
+          callbackId,
           loggingGetStreamSink,
           userDiscoverySignData,
           userDiscoveryVerifySignature,
@@ -611,6 +651,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
       const TaskConstMeta(
         debugName: "init_flutter_callbacks",
         argNames: [
+          "callbackId",
           "loggingGetStreamSink",
           "userDiscoverySignData",
           "userDiscoveryVerifySignature",

lib/globals.dart

@@ -1,8 +1,11 @@
 import 'dart:async';
+import 'dart:math';
 import 'package:camera/camera.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:twonly/src/utils/log.dart';
 
+final int isolateCallbackId = Random().nextInt(0x7FFFFFFF);
+
 class AppEnvironment {
   static late String cacheDir;
   static late String supportDir;
@@ -32,5 +35,6 @@ class AppState {
   static bool isInBackgroundTask = false;
   static bool allowErrorTrackingViaSentry = false;
   static bool gotMessageFromServer = false;
-  static int latestAppVersionId = 113;
+  static int latestAppVersionId = 116;
+  static bool hasCameraPermissions = false;
 }

lib/main.dart

@@ -1,6 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:mutex/mutex.dart';
@@ -13,31 +11,24 @@ import 'package:twonly/core/frb_generated.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/locator.dart';
 import 'package:twonly/src/callbacks/callbacks.dart';
-import 'package:twonly/src/constants/secure_storage.keys.dart';
-import 'package:twonly/src/database/signal/signal_signed_pre_key_store.dart'
-    show getSignalSignedPreKeyStoreOld;
-import 'package:twonly/src/database/tables/contacts.table.dart';
-import 'package:twonly/src/model/json/signal_identity.model.dart';
 import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/providers/image_editor.provider.dart';
 import 'package:twonly/src/providers/purchases.provider.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
-import 'package:twonly/src/services/api/mediafiles/download.api.dart';
 import 'package:twonly/src/services/api/mediafiles/media_background.api.dart';
 import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/background/callback_dispatcher.background.dart';
 import 'package:twonly/src/services/backup.service.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
+import 'package:twonly/src/services/memories/memories.service.dart';
+import 'package:twonly/src/services/migrations.service.dart';
 import 'package:twonly/src/services/notifications/fcm.notifications.dart';
 import 'package:twonly/src/services/notifications/setup.notifications.dart';
-import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/services/user_discovery.service.dart';
 import 'package:twonly/src/utils/avatars.dart';
 import 'package:twonly/src/utils/exclusive_access.utils.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/secure_storage.dart';
 import 'package:twonly/src/utils/startup_guard.dart';
-import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
 
 final _initMutex = Mutex();
 
@@ -85,7 +76,7 @@ void main() async {
   unawaited(StartupGuard.markAppStartup());
 
   var storageError = await twonlyMinimumInitialization();
-  await initFCMService();
+  await FcmNotificationService.initStartup();
 
   var userExists = false;
 
@@ -118,6 +109,8 @@ void main() async {
   unawaited(initFileDownloader());
 
   if (userExists) {
+    unawaited(FcmNotificationService.initAfterUserLoaded());
+
     if (userService.currentUser.allowErrorTrackingViaSentry) {
       AppState.allowErrorTrackingViaSentry = true;
       await SentryFlutter.init(
@@ -163,104 +156,10 @@ void main() async {
   );
 }
 
-Future<void> runMigrations() async {
-  if (userService.currentUser.appVersion < 90) {
-    // BUG: Requested media files for reupload where not reuploaded because the wrong state...
-    await twonlyDB.mediaFilesDao.updateAllRetransmissionUploadingState();
-    await UserService.update((u) => u.appVersion = 90);
-  }
-
-  if (userService.currentUser.appVersion < 91) {
-    // BUG: Requested media files for reupload where not reuploaded because the wrong state...
-    await makeMigrationToVersion91();
-    await UserService.update((u) => u.appVersion = 91);
-  }
-
-  if (userService.currentUser.appVersion < 109) {
-    final contacts = await twonlyDB.contactsDao.getAllContacts();
-    for (final contact in contacts) {
-      if (contact.verified) {
-        await twonlyDB.keyVerificationDao.addKeyVerification(
-          contact.userId,
-          VerificationType.migratedFromOldVersion,
-        );
-      }
-    }
-    await UserService.update((u) {
-      u
-        ..appVersion = 109
-        ..skipSetupPages = true;
-      if (u.avatarSvg == null) {
-        u.currentSetupPage = SetupPages.profile.name;
-      } else {
-        u.currentSetupPage = SetupPages.shareYourFriends.name;
-      }
-    });
-  }
-  if (userService.currentUser.appVersion < 113) {
-    var migrationSuccess = true;
-    final signalIdentity = await SecureStorage.instance.read(
-      // ignore: deprecated_member_use_from_same_package
-      key: SecureStorageKeys.signalIdentity,
-    );
-
-    if (signalIdentity != null) {
-      try {
-        final decoded = jsonDecode(signalIdentity);
-        final identity = SignalIdentity.fromJson(
-          decoded as Map<String, dynamic>,
-        );
-
-        await RustKeyManager.importSignalIdentity(
-          identityKeyPairStructure: identity.identityKeyPairU8List,
-          registrationId: identity.registrationId,
-          signedPreKeyStore: await getSignalSignedPreKeyStoreOld(),
-        );
-        Log.info('Importing signal identiy to the rust key manager');
-
-        // Clean up old keys after successful migration
-        await SecureStorage.instance.delete(
-          // ignore: deprecated_member_use_from_same_package
-          key: SecureStorageKeys.signalIdentity,
-        );
-        await SecureStorage.instance.delete(
-          // ignore: deprecated_member_use_from_same_package
-          key: SecureStorageKeys.signalSignedPreKey,
-        );
-      } catch (e) {
-        Log.error('Failed to migrate signal identity: $e');
-        migrationSuccess = false;
-      }
-    }
-
-    if (migrationSuccess) {
-      await UserService.update((u) {
-        u
-          ..appVersion = 113
-          ..canUseLoginTokenForAuth = false
-          // As usernames changes where not considered in the old version force users
-          // to reenter there passwords.
-          // ignore: deprecated_member_use_from_same_package
-          ..twonlySafeBackup?.encryptionKey = []
-          // ignore: deprecated_member_use_from_same_package
-          ..twonlySafeBackup?.backupId = [];
-      });
-    }
-  }
-  if (kDebugMode) {
-    assert(
-      AppState.latestAppVersionId == 113,
-      'Forgot to update the target version in runMigrations() after incrementing AppState.latestAppVersionId.',
-    );
-    assert(
-      AppState.latestAppVersionId == userService.currentUser.appVersion,
-      "Migration incomplete: currentUser.appVersion (${userService.currentUser.appVersion}) does not match AppState.latestAppVersionId (${AppState.latestAppVersionId}). Ensure the user's appVersion is updated in the migration block.",
-    );
-  }
-}
-
 Future<void> postStartupTasks() async {
   Log.info('Post startup started.');
+  unawaited(MemoriesService.prewarmCache());
+
   // 1. Immediate background cleanup (Non-blocking for UI)
   await twonlyDB.messagesDao.purgeMessageTable();
   unawaited(twonlyDB.receiptsDao.purgeReceivedReceipts());

lib/src/callbacks/callbacks.dart

@@ -1,9 +1,11 @@
 import 'package:twonly/core/bridge/callbacks.dart';
+import 'package:twonly/globals.dart';
 import 'package:twonly/src/callbacks/logging.callbacks.dart';
 import 'package:twonly/src/callbacks/user_discovery.callbacks.dart';
 
 Future<void> initFlutterCallbacksForRust() async {
   await initFlutterCallbacks(
+    callbackId: isolateCallbackId,
     loggingGetStreamSink: LoggingCallbacks.getStreamSink,
     userDiscoverySetShares: UserDiscoveryCallbacks.setShares,
     userDiscoveryGetShareForContact:

lib/src/callbacks/logging.callbacks.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -15,7 +16,8 @@ class LoggingCallbacks {
               Log.info(log.split('INFO ')[1]);
             } else if (log.contains('DEBUG ')) {
               Log.info(log.split('DEBUG ')[1]);
-            } else if (kDebugMode) {
+            } else if (kDebugMode && !Platform.environment.containsKey('FLUTTER_TEST')) {
+              // ignore: avoid_print
               print(log);
             }
           },

lib/src/constants/routes.keys.dart

@@ -35,9 +35,14 @@ class Routes {
       '/settings/privacy/block_users';
   static const String settingsPrivacyUserDiscovery =
       '/settings/privacy/user_discovery';
+  static const String settingsPrivacyProfileSelection =
+      '/settings/privacy/profile_selection';
   static const String settingsNotification = '/settings/notification';
   static const String settingsStorage = '/settings/storage_data';
+  static const String settingsStorageManage = '/settings/storage_data/manage';
   static const String settingsStorageImport = '/settings/storage_data/import';
+  static const String settingsStorageImportGallery =
+      '/settings/storage_data/import_gallery';
   static const String settingsStorageExport = '/settings/storage_data/export';
   static const String settingsHelp = '/settings/help';
   static const String settingsHelpFaq = '/settings/help/faq';
@@ -57,5 +62,7 @@ class Routes {
       '/settings/developer/automated_testing';
   static const String settingsDeveloperReduceFlames =
       '/settings/developer/reduce_flames';
+  static const String settingsDeveloperInformations =
+      '/settings/developer/informations';
   static const String settingsInvite = '/settings/invite';
 }

lib/src/constants/secure_storage.keys.dart

@@ -12,4 +12,7 @@ class SecureStorageKeys {
   // Not required for backup...
   static const String receivingPushKeys = 'push_keys_receiving';
   static const String sendingPushKeys = 'push_keys_sending';
+  static const String lastFcmMessageTimestamp = 'last_fcm_message_timestamp';
+  static const String lastServerMessageTimestamp =
+      'last_server_message_timestamp';
 }

lib/src/database/daos/contacts.dao.dart

@@ -103,6 +103,13 @@ class ContactsDao extends DatabaseAccessor<TwonlyDB> with _$ContactsDaoMixin {
     return select(contacts).get();
   }
 
+  Future<int> getContactsCount() async {
+    final count = contacts.userId.count();
+    final query = selectOnly(contacts)..addColumns([count]);
+    final result = await query.map((row) => row.read(count)).getSingle();
+    return result ?? 0;
+  }
+
   Stream<int?> watchContactsBlocked() {
     final count = contacts.userId.count();
     final query = selectOnly(contacts)

lib/src/database/daos/groups.dao.dart

@@ -1,6 +1,8 @@
+import 'package:clock/clock.dart' show clock;
 import 'package:drift/drift.dart';
 import 'package:hashlib/random.dart';
 import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/flame.service.dart';
@@ -292,6 +294,27 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
     return query.map((row) => row.readTable(groups)).getSingleOrNull();
   }
 
+  Future<Group?> createOrGetDirectChat(int contactId) async {
+    var directChat = await getDirectChat(contactId);
+    if (directChat == null) {
+      final contact = await attachedDatabase.contactsDao.getContactById(
+        contactId,
+      );
+      if (contact == null) {
+        Log.error('Contact $contactId not found, cannot create direct chat');
+        return null;
+      }
+      await createNewDirectChat(
+        contactId,
+        GroupsCompanion(
+          groupName: Value(getContactDisplayName(contact)),
+        ),
+      );
+      directChat = await getDirectChat(contactId);
+    }
+    return directChat;
+  }
+
   Stream<int> watchSumTotalMediaCounter() {
     final query = selectOnly(groups)
       ..addColumns([groups.totalMediaCounter.sum()]);
@@ -305,12 +328,16 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
     String groupId,
     DateTime newLastMessage,
   ) async {
+    final now = clock.now();
+    final clampedLastMessage = newLastMessage.isAfter(now)
+        ? now
+        : newLastMessage;
     await (update(groups)..where(
           (t) =>
               t.groupId.equals(groupId) &
-              (t.lastMessageExchange.isSmallerThanValue(newLastMessage)),
+              (t.lastMessageExchange.isSmallerThanValue(clampedLastMessage)),
         ))
-        .write(GroupsCompanion(lastMessageExchange: Value(newLastMessage)));
+        .write(GroupsCompanion(lastMessageExchange: Value(clampedLastMessage)));
   }
 
   Stream<List<Group>> watchNonDirectGroupsForMember(int contactId) {

lib/src/database/daos/key_verification.dao.dart

@@ -1,6 +1,7 @@
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:twonly/core/bridge/wrapper/user_discovery.dart';
+import 'package:twonly/globals.dart';
 import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
@@ -27,7 +28,8 @@ class KeyVerificationDao extends DatabaseAccessor<TwonlyDB>
   KeyVerificationDao(super.db);
 
   Future<List<VerificationToken>> getRecentVerificationTokens() {
-    final cutoff = DateTime.now().subtract(const Duration(hours: 24));
+    // Tokens are only valid for one hour, so if the users are currently offline, the verification notification will still work later.
+    final cutoff = DateTime.now().subtract(const Duration(hours: 1));
     return (select(
       verificationTokens,
     )..where((t) => t.createdAt.isBiggerOrEqualValue(cutoff))).get();
@@ -126,6 +128,35 @@ class KeyVerificationDao extends DatabaseAccessor<TwonlyDB>
     return rows.length;
   }
 
+  Future<int> getCountOfContactsWithVerificationBadge() async {
+    final kv = keyVerifications;
+    final ur = userDiscoveryUserRelations;
+
+    final query = selectOnly(ur, distinct: true)
+      ..addColumns([ur.announcedUserId])
+      ..join([
+        innerJoin(contacts, contacts.userId.equalsExp(ur.fromContactId)),
+        innerJoin(kv, kv.contactId.equalsExp(ur.fromContactId)),
+      ])
+      ..where(
+        ur.publicKeyVerifiedTimestamp.isNotNull() &
+            ur.announcedUserId.equalsExp(ur.fromContactId).not(),
+      )
+      ..groupBy([ur.announcedUserId]);
+
+    final rows = await query.get();
+    final transferredIds = rows.map((r) => r.read(ur.announcedUserId)!).toSet();
+
+    final directVerifications = await select(kv).get();
+    final directIds = directVerifications.map((v) => v.contactId).toSet();
+
+    // Reduce transferred contacts where announcedUserId is already in KeyVerifications
+    transferredIds.removeWhere(directIds.contains);
+
+    // Add count of all users who are in the KeyVerification table
+    return transferredIds.length + directIds.length;
+  }
+
   Stream<VerificationStatus> watchAllGroupMembersVerified(String groupId) {
     final gm = groupMembers;
     final directKv = alias(keyVerifications, 'directKv');
@@ -186,6 +217,7 @@ class KeyVerificationDao extends DatabaseAccessor<TwonlyDB>
       );
       if (userService.currentUser.isUserDiscoveryEnabled) {
         await FlutterUserDiscovery.updateVerificationStateForUser(
+          callbackId: isolateCallbackId,
           contactId: contactId,
           publicKeyVerifiedTimestamp: clock.now().millisecondsSinceEpoch,
         );
@@ -194,4 +226,40 @@ class KeyVerificationDao extends DatabaseAccessor<TwonlyDB>
       Log.error(e);
     }
   }
+
+  Future<void> deleteKeyVerification(int contactId) async {
+    try {
+      await (delete(
+        keyVerifications,
+      )..where((kv) => kv.contactId.equals(contactId))).go();
+      if (userService.currentUser.isUserDiscoveryEnabled) {
+        await FlutterUserDiscovery.updateVerificationStateForUser(
+          callbackId: isolateCallbackId,
+          contactId: contactId,
+        );
+      }
+    } catch (e) {
+      Log.error(e);
+    }
+  }
+
+  Future<void> deleteKeyVerificationById(
+    int verificationId,
+    int contactId,
+  ) async {
+    try {
+      await (delete(
+        keyVerifications,
+      )..where((kv) => kv.verificationId.equals(verificationId))).go();
+      final remaining = await getContactVerification(contactId);
+      if (remaining.isEmpty && userService.currentUser.isUserDiscoveryEnabled) {
+        await FlutterUserDiscovery.updateVerificationStateForUser(
+          callbackId: isolateCallbackId,
+          contactId: contactId,
+        );
+      }
+    } catch (e) {
+      Log.error(e);
+    }
+  }
 }

lib/src/database/daos/mediafiles.dao.dart

@@ -69,7 +69,6 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
     return (select(mediaFiles)..where((t) => t.mediaId.isIn(mediaIds))).get();
   }
 
-
   Future<MediaFile?> getDraftMediaFile() async {
     final medias = await (select(
       mediaFiles,
@@ -115,9 +114,15 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
         .get();
   }
 
-  Future<List<MediaFile>> getAllNonHashedStoredMediaFiles() async {
+  Future<List<MediaFile>> getAllMediaFilesPendingMigration() async {
     return (select(mediaFiles)..where(
-          (t) => t.stored.equals(true) & t.storedFileHash.isNull(),
+          (t) =>
+              t.stored.equals(true) &
+              (t.storedFileHash.isNull() |
+                  t.hasCropAnalyzed.equals(false) |
+                  (t.hasThumbnail.equals(false) &
+                      t.type.equals(MediaType.audio.name).not()) |
+                  t.sizeInBytes.isNull()),
         ))
         .get();
   }
@@ -136,7 +141,9 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
   Stream<List<MediaFile>> watchAllStoredMediaFiles() {
     final query =
         (select(mediaFiles)..where((t) => t.stored.equals(true))).join([])
-          ..groupBy([mediaFiles.storedFileHash]);
+          ..groupBy([
+            const CustomExpression<Object>('COALESCE(stored_file_hash, media_id)')
+          ]);
     return query.map((row) => row.readTable(mediaFiles)).watch();
   }
 
@@ -159,4 +166,43 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
           ),
         );
   }
+
+  Future<List<String>> getMessageIdsByMediaHash(
+    Uint8List hash,
+    int senderId,
+  ) async {
+    final query =
+        select(db.messages).join([
+          innerJoin(
+            mediaFiles,
+            mediaFiles.mediaId.equalsExp(db.messages.mediaId),
+          ),
+        ])..where(
+          mediaFiles.storedFileHash.equals(hash) &
+              db.messages.senderId.equals(senderId) &
+              db.messages.openedAt.isNull(),
+        );
+
+    final rows = await query.get();
+    return rows.map((row) => row.readTable(db.messages).messageId).toList();
+  }
+
+  Future<List<MediaFile>> getMediaByHash(Uint8List hash) async {
+    final query = select(db.mediaFiles)
+      ..where((t) => t.storedFileHash.equals(hash));
+    return query.get();
+  }
+
+  Future<Map<MediaType, int>> getStorageStats() async {
+    final rows = await select(mediaFiles).get();
+    final stats = <MediaType, int>{};
+
+    for (final row in rows) {
+      final type = row.type;
+      final size = row.sizeInBytes ?? 0;
+      stats[type] = (stats[type] ?? 0) + size;
+    }
+
+    return stats;
+  }
 }

lib/src/database/daos/messages.dao.dart

@@ -50,7 +50,8 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
               mediaFiles,
               mediaFiles.mediaId.equalsExp(messages.mediaId),
             ),
-        ])..where(
+          ])
+          ..where(
             mediaFiles.downloadState
                     .equals(DownloadState.reuploadRequested.name)
                     .not() &
@@ -60,7 +61,8 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
                 messages.mediaId.isNotNull() &
                 messages.senderId.isNotNull() &
                 messages.type.equals(MessageType.media.name),
-        );
+          )
+          ..orderBy([OrderingTerm.asc(messages.createdAt)]);
     return query.map((row) => row.readTable(messages)).watch();
   }
 
@@ -93,24 +95,33 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
         milliseconds: group!.deleteMessagesAfterMilliseconds,
       ),
     );
-    return ((select(messages)..where(
+    final query =
-            (t) =>
+        select(messages).join([
-                t.groupId.equals(groupId) &
+            leftOuterJoin(
-                // messages in groups will only be removed in case all members have received it...
+              mediaFiles,
-                // so ensuring that this message is not shown in the messages anymore
+              mediaFiles.mediaId.equalsExp(messages.mediaId),
-                (t.openedAt.isBiggerThanValue(deletionTime) |
+            ),
-                    t.openedAt.isNull() |
+          ])
-                    t.mediaStored.equals(true)) &
+          ..where(
-                (t.isDeletedFromSender.equals(true) |
+            messages.groupId.equals(groupId) &
-                    (t.type.equals(MessageType.text.name).not() |
+                (messages.openedAt.isBiggerThanValue(deletionTime) |
-                        t.type.equals(MessageType.media.name).not()) |
+                    messages.openedAt.isNull() |
-                    (t.type.equals(MessageType.text.name) &
+                    messages.mediaStored.equals(true)) &
-                        t.content.isNotNull()) |
+                (messages.isDeletedFromSender.equals(true) |
-                    (t.type.equals(MessageType.media.name) &
+                    (messages.type.equals(MessageType.text.name).not() &
-                        t.mediaId.isNotNull())),
+                        messages.type.equals(MessageType.media.name).not()) |
-          ))
+                    (messages.type.equals(MessageType.text.name) &
-          ..orderBy([(t) => OrderingTerm.asc(t.createdAt)]))
+                        messages.content.isNotNull()) |
-        .watch();
+                    (messages.type.equals(MessageType.media.name) &
+                        messages.mediaId.isNotNull() &
+                        (mediaFiles.downloadState.isNull() |
+                            mediaFiles.downloadState
+                                .equals(DownloadState.reuploadRequested.name)
+                                .not()))),
+          )
+          ..orderBy([OrderingTerm.asc(messages.createdAt)]);
+
+    return query.map((row) => row.readTable(messages)).watch();
   }
 
   Stream<List<(GroupMember, Contact)>> watchMembersByGroupId(String groupId) {
@@ -153,18 +164,26 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
       );
       final groupIds = entry.value;
 
+      final deletedCount =
           await (delete(messages)..where(
                 (m) =>
                     m.groupId.isIn(groupIds) &
-                (m.mediaStored.equals(true) &
+                    ((m.mediaStored.equals(true) &
-                        m.isDeletedFromSender.equals(true) |
+                            m.isDeletedFromSender.equals(true)) |
                         m.mediaStored.equals(false)) &
                     // Only remove the message when ALL members have seen it. Otherwise the receipt will also be deleted which could cause issues in case a member opens the image later..
-                (m.openedByAll.isSmallerThanValue(deletionTime) |
+                    ((m.openedByAll.isNotNull() &
+                            m.openedByAll.isSmallerThanValue(deletionTime)) |
                         (m.isDeletedFromSender.equals(true) &
                             m.createdAt.isSmallerThanValue(deletionTime))),
               ))
               .go();
+
+      if (deletedCount > 0) {
+        Log.info(
+          'Deleted $deletedCount messages for groups $groupIds due to retention policy.',
+        );
+      }
     }
   }
 
@@ -249,41 +268,70 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
   }
 
   Future<void> handleMessagesOpened(
-    int contactId,
+    Value<int> contactId,
     List<String> messageIds,
     DateTime timestamp,
   ) async {
-    await batch((batch) async {
     for (final messageId in messageIds) {
-        batch.insert(
+      try {
-          messageActions,
+        var actionTimestamp = timestamp;
-          MessageActionsCompanion(
+        final msg = await getMessageById(messageId).getSingleOrNull();
-            messageId: Value(messageId),
+        if (msg != null && actionTimestamp.isBefore(msg.createdAt)) {
-            contactId: Value(contactId),
+          Log.warn(
-            type: const Value(MessageActionType.openedAt),
+            'Receiver clock skew detected for message $messageId. '
-            actionAt: Value(timestamp),
+            'Action timestamp $actionTimestamp is before message creation ${msg.createdAt}. '
-          ),
+            'Clamping to creation time.',
-          mode: InsertMode.insertOrReplace,
           );
+          actionTimestamp = msg.createdAt;
         }
 
-      for (final messageId in messageIds) {
+        final ts = actionTimestamp;
+        await transaction(() async {
+          await into(messageActions).insertOnConflictUpdate(
+            MessageActionsCompanion(
+              messageId: Value(messageId),
+              contactId: contactId,
+              type: const Value(MessageActionType.openedAt),
+              actionAt: Value(ts),
+            ),
+          );
+
           final isOpenedByAll = await haveAllMembers(
             messageId,
             MessageActionType.openedAt,
           );
-        final now = clock.now();
+          await (update(
-
+            messages,
-        batch.update(
+          )..where((tbl) => tbl.messageId.equals(messageId))).write(
-          twonlyDB.messages,
             MessagesCompanion(
-            openedAt: Value(now),
+              openedAt: Value(ts),
-            openedByAll: Value(isOpenedByAll ? now : null),
+              openedByAll: Value(isOpenedByAll ? ts : null),
+            ),
+          );
+        });
+
+        // Read-back verification: confirm the write was persisted.
+        final verified = await getMessageById(messageId).getSingleOrNull();
+        if (verified != null && verified.openedAt == null) {
+          Log.warn(
+            'handleMessagesOpened read-back failed for $messageId, retrying',
+          );
+          await (update(
+            messages,
+          )..where((tbl) => tbl.messageId.equals(messageId))).write(
+            MessagesCompanion(
+              openedAt: Value(actionTimestamp),
             ),
-          where: (tbl) => tbl.messageId.equals(messageId),
           );
         }
-    });
+
+        Log.info(
+          'handleMessagesOpened completed for message $messageId',
+        );
+      } catch (e) {
+        Log.error('handleMessagesOpened failed for $messageId: $e');
+      }
+    }
   }
 
   Future<void> handleMessageAckByServer(
@@ -291,6 +339,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
     String messageId,
     DateTime timestamp,
   ) async {
+    await transaction(() async {
       await into(messageActions).insertOnConflictUpdate(
         MessageActionsCompanion(
           messageId: Value(messageId),
@@ -301,14 +350,16 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
       );
       await twonlyDB.messagesDao.updateMessageId(
         messageId,
-      MessagesCompanion(ackByServer: Value(clock.now())),
+        MessagesCompanion(ackByServer: Value(timestamp)),
       );
+    });
   }
 
   Future<bool> haveAllMembers(
     String messageId,
     MessageActionType action,
   ) async {
+    try {
       final message = await twonlyDB.messagesDao
           .getMessageById(messageId)
           .getSingleOrNull();
@@ -319,29 +370,36 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
 
       final actions =
           await (select(messageActions)..where(
-              (t) => t.type.equals(action.name) & t.messageId.equals(messageId),
+                (t) =>
+                    t.type.equals(action.name) & t.messageId.equals(messageId),
               ))
               .get();
 
       return members.length == actions.length;
+    } catch (e) {
+      Log.error(e);
+      return true;
+    }
   }
 
   Future<void> updateMessageId(
     String messageId,
     MessagesCompanion updatedValues,
   ) async {
-    await (update(
+    final count = await (update(
       messages,
     )..where((c) => c.messageId.equals(messageId))).write(updatedValues);
+    Log.info('Updated $count message(s) with messageId $messageId');
   }
 
   Future<void> updateMessagesByMediaId(
     String mediaId,
     MessagesCompanion updatedValues,
-  ) {
+  ) async {
-    return (update(
+    final count = await (update(
       messages,
     )..where((c) => c.mediaId.equals(mediaId))).write(updatedValues);
+    Log.info('Updated $count message(s) with mediaId $mediaId');
   }
 
   Future<Message?> insertMessage(MessagesCompanion message) async {

lib/src/database/daos/reactions.dao.dart

@@ -29,7 +29,14 @@ class ReactionsDao extends DatabaseAccessor<TwonlyDB> with _$ReactionsDaoMixin {
     final msg = await twonlyDB.messagesDao
         .getMessageById(messageId)
         .getSingleOrNull();
-    if (msg == null || msg.groupId != groupId) return;
+    if (msg == null) {
+      Log.error('updateReaction: Message $messageId not found!');
+      return;
+    }
+    if (msg.groupId != groupId) {
+      Log.error('updateReaction: Message groupId ${msg.groupId} != $groupId');
+      return;
+    }
 
     try {
       if (remove) {

lib/src/database/daos/receipts.dao.dart

@@ -191,6 +191,23 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
     )..where((c) => c.receiptId.equals(receiptId))).write(updates);
   }
 
+  Future<Receipt?> rotateReceiptId(String oldReceiptId) async {
+    final newReceiptId = uuid.v4();
+    await updateReceipt(
+      oldReceiptId,
+      ReceiptsCompanion(
+        receiptId: Value(newReceiptId),
+      ),
+    );
+    final updatedReceipt = await getReceiptById(newReceiptId);
+    if (updatedReceipt == null) {
+      Log.error(
+        'Tried to change the receipt ID, but could not get the updated receipt...',
+      );
+    }
+    return updatedReceipt;
+  }
+
   Future<void> updateReceiptByContactAndMessageId(
     int contactId,
     String messageId,

lib/src/database/daos/user_discovery.dao.dart

@@ -228,6 +228,12 @@ class UserDiscoveryDao extends DatabaseAccessor<TwonlyDB>
     );
   }
 
+  Future<UserDiscoveryAnnouncedUser?> getAnnouncedUserById(int id) async {
+    return (select(
+      userDiscoveryAnnouncedUsers,
+    )..where((tbl) => tbl.announcedUserId.equals(id))).getSingleOrNull();
+  }
+
   Stream<List<UserDiscoveryAnnouncedUser>> watchAllAnnouncedUsers() =>
       select(userDiscoveryAnnouncedUsers).watch();
 

lib/src/database/drift_logging_interceptor.dart

@@ -0,0 +1,164 @@
+import 'dart:async';
+import 'package:drift/drift.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/utils/log.dart';
+
+class DriftLoggingInterceptor extends QueryInterceptor {
+  bool get _isEnabled {
+    try {
+      if (!userService.isUserCreated) return false;
+      return userService.currentUser.enableDatabaseLogging;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  List<String> _findUuids(dynamic value) {
+    if (value == null) return const [];
+    final uuids = <String>[];
+    final uuidRegex = RegExp(
+      '[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}',
+    );
+    if (value is String) {
+      for (final match in uuidRegex.allMatches(value)) {
+        uuids.add(match.group(0)!);
+      }
+    } else if (value is Iterable) {
+      for (final element in value) {
+        uuids.addAll(_findUuids(element));
+      }
+    } else if (value is Map) {
+      for (final element in value.values) {
+        uuids.addAll(_findUuids(element));
+      }
+    } else {
+      final str = value.toString();
+      for (final match in uuidRegex.allMatches(str)) {
+        uuids.add(match.group(0)!);
+      }
+    }
+    return uuids.toSet().toList();
+  }
+
+  Future<T> _run<T>(
+    String operation,
+    String statement,
+    List<Object?> args,
+    Future<T> Function() query,
+  ) async {
+    if (!_isEnabled) {
+      return query();
+    }
+    final stopwatch = Stopwatch()..start();
+    try {
+      final result = await query();
+      final elapsed = stopwatch.elapsedMilliseconds;
+      final uuids = _findUuids(args);
+      if (uuids.isNotEmpty) {
+        Log.info(
+          '[DriftDB] $operation succeeded in ${elapsed}ms: "$statement" | UUIDs: $uuids',
+        );
+      } else {
+        Log.info(
+          '[DriftDB] $operation succeeded in ${elapsed}ms: "$statement"',
+        );
+      }
+      return result;
+    } catch (e) {
+      final elapsed = stopwatch.elapsedMilliseconds;
+      final uuids = _findUuids(args);
+      if (uuids.isNotEmpty) {
+        Log.info(
+          '[DriftDB] $operation failed after ${elapsed}ms ($e): "$statement" | UUIDs: $uuids',
+        );
+      } else {
+        Log.info(
+          '[DriftDB] $operation failed after ${elapsed}ms ($e): "$statement"',
+        );
+      }
+      rethrow;
+    }
+  }
+
+  @override
+  Future<int> runInsert(
+    QueryExecutor executor,
+    String statement,
+    List<Object?> args,
+  ) {
+    return _run('INSERT', statement, args, () => executor.runInsert(statement, args));
+  }
+
+  @override
+  Future<int> runUpdate(
+    QueryExecutor executor,
+    String statement,
+    List<Object?> args,
+  ) {
+    return _run('UPDATE', statement, args, () => executor.runUpdate(statement, args));
+  }
+
+  @override
+  Future<int> runDelete(
+    QueryExecutor executor,
+    String statement,
+    List<Object?> args,
+  ) {
+    return _run('DELETE', statement, args, () => executor.runDelete(statement, args));
+  }
+
+  @override
+  Future<void> runCustom(
+    QueryExecutor executor,
+    String statement,
+    List<Object?> args,
+  ) {
+    return _run('CUSTOM', statement, args, () => executor.runCustom(statement, args));
+  }
+
+  @override
+  Future<void> runBatched(
+    QueryExecutor executor,
+    BatchedStatements statements,
+  ) async {
+    if (!_isEnabled) {
+      return executor.runBatched(statements);
+    }
+    final stopwatch = Stopwatch()..start();
+    try {
+      await executor.runBatched(statements);
+      final elapsed = stopwatch.elapsedMilliseconds;
+      final uuids = <String>[];
+      for (final batchArg in statements.arguments) {
+        uuids.addAll(_findUuids(batchArg.arguments));
+      }
+      final statementsStr = statements.statements.join('; ');
+      if (uuids.isNotEmpty) {
+        Log.info(
+          '[DriftDB] BATCH succeeded in ${elapsed}ms: "$statementsStr" | UUIDs: $uuids',
+        );
+      } else {
+        Log.info(
+          '[DriftDB] BATCH succeeded in ${elapsed}ms: "$statementsStr"',
+        );
+      }
+    } catch (e) {
+      final elapsed = stopwatch.elapsedMilliseconds;
+      final uuids = <String>[];
+      for (final batchArg in statements.arguments) {
+        uuids.addAll(_findUuids(batchArg.arguments));
+      }
+      final statementsStr = statements.statements.join('; ');
+      if (uuids.isNotEmpty) {
+        Log.info(
+          '[DriftDB] BATCH failed after ${elapsed}ms ($e): "$statementsStr" | UUIDs: $uuids',
+        );
+      } else {
+        Log.info(
+          '[DriftDB] BATCH failed after ${elapsed}ms ($e): "$statementsStr"',
+        );
+      }
+      rethrow;
+    }
+  }
+}

lib/src/database/signal/signal_signed_pre_key_store.dart

@@ -1,15 +1,15 @@
 import 'dart:collection';
 import 'dart:convert';
-import 'dart:typed_data';
+import 'package:drift/drift.dart';
-
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/core/bridge/wrapper/key_manager.dart';
+import 'package:twonly/locator.dart';
-import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/secure_storage.dart';
 
 Future<HashMap<int, Uint8List>> getSignalSignedPreKeyStoreOld() async {
   final storeSerialized = await SecureStorage.instance.read(
-    key: SecureStorageKeys.signalSignedPreKey,
+    key: 'signed_pre_key_store',
   );
   final store = HashMap<int, Uint8List>();
   if (storeSerialized == null) {
@@ -26,25 +26,25 @@ Future<HashMap<int, Uint8List>> getSignalSignedPreKeyStoreOld() async {
 class SignalSignedPreKeyStore extends SignedPreKeyStore {
   @override
   Future<SignedPreKeyRecord> loadSignedPreKey(int signedPreKeyId) async {
-    final store = await RustKeyManager.loadSignedPrekey(
+    final record = await (twonlyDB.select(
-      signedPreKeyId: signedPreKeyId,
+      twonlyDB.signalSignedPreKeyStores,
-    );
+    )..where((tbl) => tbl.signedPreKeyId.equals(signedPreKeyId))).get();
-    if (store == null) {
+    if (record.isEmpty) {
       throw InvalidKeyIdException(
         'No such signed prekey record! $signedPreKeyId',
       );
     }
-    return SignedPreKeyRecord.fromSerialized(store);
+    return SignedPreKeyRecord.fromSerialized(record.first.signedPreKey);
   }
 
   @override
   Future<List<SignedPreKeyRecord>> loadSignedPreKeys() async {
-    final store = await RustKeyManager.loadSignedPrekeys();
+    final records = await twonlyDB
-    final results = <SignedPreKeyRecord>[];
+        .select(twonlyDB.signalSignedPreKeyStores)
-    for (final serialized in store.values) {
+        .get();
-      results.add(SignedPreKeyRecord.fromSerialized(serialized));
+    return records
-    }
+        .map((r) => SignedPreKeyRecord.fromSerialized(r.signedPreKey))
-    return results;
+        .toList();
   }
 
   @override
@@ -52,21 +52,32 @@ class SignalSignedPreKeyStore extends SignedPreKeyStore {
     int signedPreKeyId,
     SignedPreKeyRecord record,
   ) async {
-    await RustKeyManager.storeSignedPrekey(
+    final companion = SignalSignedPreKeyStoresCompanion(
-      signedPreKeyId: signedPreKeyId,
+      signedPreKeyId: Value(signedPreKeyId),
-      record: record.serialize(),
+      signedPreKey: Value(record.serialize()),
     );
+
+    try {
+      await twonlyDB
+          .into(twonlyDB.signalSignedPreKeyStores)
+          .insert(companion, mode: InsertMode.insertOrReplace);
+    } catch (e) {
+      Log.error('$e');
+    }
   }
 
   @override
-  Future<bool> containsSignedPreKey(int signedPreKeyId) async =>
+  Future<bool> containsSignedPreKey(int signedPreKeyId) async {
-      await RustKeyManager.loadSignedPrekey(
+    final record = await (twonlyDB.select(
-        signedPreKeyId: signedPreKeyId,
+      twonlyDB.signalSignedPreKeyStores,
-      ) !=
+    )..where((tbl) => tbl.signedPreKeyId.equals(signedPreKeyId))).get();
-      null;
+    return record.isNotEmpty;
+  }
 
   @override
   Future<void> removeSignedPreKey(int signedPreKeyId) async {
-    await RustKeyManager.removeSignedPrekey(signedPreKeyId: signedPreKeyId);
+    await (twonlyDB.delete(
+      twonlyDB.signalSignedPreKeyStores,
+    )..where((tbl) => tbl.signedPreKeyId.equals(signedPreKeyId))).go();
   }
 }

lib/src/database/tables/mediafiles.table.dart

@@ -50,6 +50,9 @@ class MediaFiles extends Table {
 
   BoolColumn get stored => boolean().withDefault(const Constant(false))();
   BoolColumn get isDraftMedia => boolean().withDefault(const Constant(false))();
+  BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
+  BoolColumn get hasCropAnalyzed =>
+      boolean().withDefault(const Constant(false))();
 
   IntColumn get preProgressingProcess => integer().nullable()();
 
@@ -66,7 +69,14 @@ class MediaFiles extends Table {
 
   BlobColumn get storedFileHash => blob().nullable()();
 
+  BoolColumn get hasThumbnail =>
+      boolean().withDefault(const Constant(false))();
+
+  IntColumn get sizeInBytes => integer().nullable()();
+
   DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+  TextColumn get createdAtMonth => text().nullable()();
+
 
   @override
   Set<Column> get primaryKey => {mediaId};

lib/src/database/tables/messages.table.dart

@@ -3,7 +3,7 @@ import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 
-enum MessageType { media, text, contacts, restoreFlameCounter }
+enum MessageType { media, text, contacts, restoreFlameCounter, askAboutUser }
 
 @DataClassName('Message')
 class Messages extends Table {

lib/src/database/tables/signal_signed_pre_key_store.table.dart

@@ -0,0 +1,11 @@
+import 'package:drift/drift.dart';
+
+@DataClassName('SignalSignedPreKeyStore')
+class SignalSignedPreKeyStores extends Table {
+  IntColumn get signedPreKeyId => integer()();
+  BlobColumn get signedPreKey => blob()();
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {signedPreKeyId};
+}

lib/src/database/tables/user_discovery.table.dart

@@ -16,6 +16,8 @@ class UserDiscoveryAnnouncedUsers extends Table {
   BoolColumn get wasShownToTheUser =>
       boolean().withDefault(const Constant(false))();
   BoolColumn get isHidden => boolean().withDefault(const Constant(false))();
+  BoolColumn get wasAskedFriends =>
+      boolean().withDefault(const Constant(false))();
 
   @override
   Set<Column> get primaryKey => {announcedUserId};

lib/src/database/twonly.db.dart

@@ -1,8 +1,8 @@
-import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart'
     show DriftNativeOptions, driftDatabase;
 import 'package:path_provider/path_provider.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/daos/groups.dao.dart';
 import 'package:twonly/src/database/daos/key_verification.dao.dart';
@@ -12,6 +12,7 @@ import 'package:twonly/src/database/daos/reactions.dao.dart';
 import 'package:twonly/src/database/daos/receipts.dao.dart';
 import 'package:twonly/src/database/daos/shortcuts.dao.dart';
 import 'package:twonly/src/database/daos/user_discovery.dao.dart';
+import 'package:twonly/src/database/drift_logging_interceptor.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
@@ -23,6 +24,7 @@ import 'package:twonly/src/database/tables/signal_identity_key_store.table.dart'
 import 'package:twonly/src/database/tables/signal_pre_key_store.table.dart';
 import 'package:twonly/src/database/tables/signal_sender_key_store.table.dart';
 import 'package:twonly/src/database/tables/signal_session_store.table.dart';
+import 'package:twonly/src/database/tables/signal_signed_pre_key_store.table.dart';
 import 'package:twonly/src/database/tables/user_discovery.table.dart';
 import 'package:twonly/src/database/twonly.db.steps.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -45,6 +47,7 @@ part 'twonly.db.g.dart';
     SignalPreKeyStores,
     SignalSenderKeyStores,
     SignalSessionStores,
+    SignalSignedPreKeyStores,
     MessageActions,
     GroupHistories,
     KeyVerifications,
@@ -79,21 +82,29 @@ class TwonlyDB extends _$TwonlyDB {
   TwonlyDB.forTesting(DatabaseConnection super.connection);
 
   @override
-  int get schemaVersion => 13;
+  int get schemaVersion => 17;
 
   static QueryExecutor _openConnection() {
-    return driftDatabase(
+    final connection = driftDatabase(
       name: 'twonly',
       native: DriftNativeOptions(
         databaseDirectory: getApplicationSupportDirectory,
         shareAcrossIsolates: true,
         setup: (rawDb) {
           rawDb
-            ..execute('PRAGMA journal_mode=WAL;')
+            ..execute('PRAGMA journal_mode=DELETE;')
+            ..execute('PRAGMA synchronous=FULL;')
             ..execute('PRAGMA busy_timeout=5000;');
         },
       ),
     );
+    try {
+      if (userService.isUserCreated &&
+          userService.currentUser.enableDatabaseLogging) {
+        return connection.interceptWith(DriftLoggingInterceptor());
+      }
+    } catch (_) {}
+    return connection;
   }
 
   @override
@@ -195,14 +206,44 @@ class TwonlyDB extends _$TwonlyDB {
             await m.createTable(schema.shortcuts);
             await m.createTable(schema.shortcutMembers);
           },
+          from13To14: (m, schema) async {
+            await m.addColumn(
+              schema.mediaFiles,
+              schema.mediaFiles.createdAtMonth,
+            );
+            await m.addColumn(schema.mediaFiles, schema.mediaFiles.isFavorite);
+            await m.addColumn(
+              schema.mediaFiles,
+              schema.mediaFiles.hasCropAnalyzed,
+            );
+          },
+          from14To15: (m, schema) async {
+            await m.createTable(schema.signalSignedPreKeyStores);
+          },
+          from15To16: (m, schema) async {
+            await m.addColumn(
+              schema.mediaFiles,
+              schema.mediaFiles.hasThumbnail,
+            );
+            await m.addColumn(schema.mediaFiles, schema.mediaFiles.sizeInBytes);
+          },
+          from16To17: (m, schema) async {
+            await m.addColumn(
+              schema.userDiscoveryAnnouncedUsers,
+              schema.userDiscoveryAnnouncedUsers.wasAskedFriends,
+            );
+          },
         )(m, from, to);
       },
     );
   }
 
   void markUpdated() {
-    notifyUpdates({TableUpdate.onTable(messages, kind: UpdateKind.update)});
+    notifyUpdates({
-    notifyUpdates({TableUpdate.onTable(contacts, kind: UpdateKind.update)});
+      TableUpdate.onTable(messages, kind: UpdateKind.update),
+      TableUpdate.onTable(contacts, kind: UpdateKind.update),
+      TableUpdate.onTable(groups, kind: UpdateKind.update),
+    });
   }
 
   Future<void> printTableSizes() async {
@@ -216,38 +257,4 @@ class TwonlyDB extends _$TwonlyDB {
       Log.info('Table: $tableName, Size: $tableSize bytes');
     }
   }
-
-  Future<void> deleteDataForTwonlySafe() async {
-    await (delete(messages)..where(
-          (t) =>
-              (t.mediaStored.equals(false) &
-              t.isDeletedFromSender.equals(false)),
-        ))
-        .go();
-    await update(messages).write(
-      const MessagesCompanion(
-        downloadToken: Value(null),
-      ),
-    );
-    await (delete(mediaFiles)..where(
-          (t) => (t.stored.equals(false)),
-        ))
-        .go();
-    await delete(receipts).go();
-    await delete(receivedReceipts).go();
-    await update(contacts).write(
-      const ContactsCompanion(
-        avatarSvgCompressed: Value(null),
-        senderProfileCounter: Value(0),
-      ),
-    );
-    await (delete(signalPreKeyStores)..where(
-          (t) => (t.createdAt.isSmallerThanValue(
-            clock.now().subtract(
-              const Duration(days: 25),
-            ),
-          )),
-        ))
-        .go();
-  }
 }

lib/src/localization/generated/app_localizations.dart

@@ -98,16 +98,10 @@ abstract class AppLocalizations {
     Locale('en'),
   ];
 
-  /// No description provided for @registerTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Welcome to twonly!'**
-  String get registerTitle;
-
   /// No description provided for @registerSlogan.
   ///
   /// In en, this message translates to:
-  /// **'twonly, a privacy friendly way to connect with friends through secure, spontaneous image sharing'**
+  /// **'Stay in touch privately.'**
   String get registerSlogan;
 
   /// No description provided for @onboardingWelcomeTitle.
@@ -146,18 +140,6 @@ abstract class AppLocalizations {
   /// **'Say goodbye to addictive features! twonly was created for sharing moments, free from useless distractions or ads.'**
   String get onboardingFocusBody;
 
-  /// No description provided for @onboardingSendTwonliesTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Send twonlies'**
-  String get onboardingSendTwonliesTitle;
-
-  /// No description provided for @onboardingSendTwonliesBody.
-  ///
-  /// In en, this message translates to:
-  /// **'Share moments securely with your partner. twonly ensures that only your partner can open it, keeping your moments with your partner a two(o)nly thing!'**
-  String get onboardingSendTwonliesBody;
-
   /// No description provided for @onboardingNotProductTitle.
   ///
   /// In en, this message translates to:
@@ -170,16 +152,10 @@ abstract class AppLocalizations {
   /// **'twonly is financed by donations and an optional subscription. Your data will never be sold.'**
   String get onboardingNotProductBody;
 
-  /// No description provided for @onboardingGetStartedTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Let\'s go!'**
-  String get onboardingGetStartedTitle;
-
   /// No description provided for @registerUsernameSlogan.
   ///
   /// In en, this message translates to:
-  /// **'Please select a username so others can find you!'**
+  /// **'Create your account'**
   String get registerUsernameSlogan;
 
   /// No description provided for @registerUsernameDecoration.
@@ -191,7 +167,7 @@ abstract class AppLocalizations {
   /// No description provided for @registerUsernameLimits.
   ///
   /// In en, this message translates to:
-  /// **'Your username must be at least 3 characters long.'**
+  /// **'At least 3 characters.'**
   String get registerUsernameLimits;
 
   /// No description provided for @registerProofOfWorkFailed.
@@ -326,24 +302,12 @@ abstract class AppLocalizations {
   /// **'Username not found'**
   String get searchUsernameNotFound;
 
-  /// No description provided for @searchUsernameNotFoundBody.
-  ///
-  /// In en, this message translates to:
-  /// **'There is no user with the username \"{username}\" registered'**
-  String searchUsernameNotFoundBody(Object username);
-
   /// No description provided for @searchUsernameNewFollowerTitle.
   ///
   /// In en, this message translates to:
   /// **'Open requests'**
   String get searchUsernameNewFollowerTitle;
 
-  /// No description provided for @chatListViewSearchUserNameBtn.
-  ///
-  /// In en, this message translates to:
-  /// **'Add your first twonly contact!'**
-  String get chatListViewSearchUserNameBtn;
-
   /// No description provided for @chatListDetailInput.
   ///
   /// In en, this message translates to:
@@ -482,6 +446,18 @@ abstract class AppLocalizations {
   /// **'Preselected reaction emojis'**
   String get settingsPreSelectedReactions;
 
+  /// No description provided for @settingsAutomaticallyMarkEqualMediaFilesAsOpenedTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Mark duplicates as opened'**
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedTitle;
+
+  /// No description provided for @settingsAutomaticallyMarkEqualMediaFilesAsOpenedSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'If you receive the same media in multiple chats, opening one marks all others as opened.'**
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedSubtitle;
+
   /// No description provided for @settingsPreSelectedReactionsError.
   ///
   /// In en, this message translates to:
@@ -506,12 +482,6 @@ abstract class AppLocalizations {
   /// **'Store in Gallery'**
   String get settingsStorageDataStoreInGTitle;
 
-  /// No description provided for @settingsStorageDataStoreInGSubtitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Store saved images additional in the systems gallery.'**
-  String get settingsStorageDataStoreInGSubtitle;
-
   /// No description provided for @settingsStorageDataMediaAutoDownload.
   ///
   /// In en, this message translates to:
@@ -530,6 +500,36 @@ abstract class AppLocalizations {
   /// **'When using WI-FI'**
   String get settingsStorageDataAutoDownWifi;
 
+  /// No description provided for @settingsStorageManageTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage storage'**
+  String get settingsStorageManageTitle;
+
+  /// No description provided for @settingsStorageUsed.
+  ///
+  /// In en, this message translates to:
+  /// **'Storage used'**
+  String get settingsStorageUsed;
+
+  /// No description provided for @settingsStorageImages.
+  ///
+  /// In en, this message translates to:
+  /// **'Images'**
+  String get settingsStorageImages;
+
+  /// No description provided for @settingsStorageVideos.
+  ///
+  /// In en, this message translates to:
+  /// **'Videos'**
+  String get settingsStorageVideos;
+
+  /// No description provided for @settingsStorageGifs.
+  ///
+  /// In en, this message translates to:
+  /// **'GIFs'**
+  String get settingsStorageGifs;
+
   /// No description provided for @settingsProfileCustomizeAvatar.
   ///
   /// In en, this message translates to:
@@ -575,13 +575,13 @@ abstract class AppLocalizations {
   /// No description provided for @settingsPrivacyBlockUsers.
   ///
   /// In en, this message translates to:
-  /// **'Block users'**
+  /// **'Block contacts'**
   String get settingsPrivacyBlockUsers;
 
   /// No description provided for @settingsPrivacyBlockUsersDesc.
   ///
   /// In en, this message translates to:
-  /// **'Blocked users will not be able to communicate with you. You can unblock a blocked user at any time.'**
+  /// **'Blocked contacts will not be able to communicate with you. You can unblock a blocked contact at any time.'**
   String get settingsPrivacyBlockUsersDesc;
 
   /// No description provided for @settingsPrivacyBlockUsersCount.
@@ -590,6 +590,48 @@ abstract class AppLocalizations {
   /// **'{len} contact(s)'**
   String settingsPrivacyBlockUsersCount(Object len);
 
+  /// No description provided for @settingsPrivacyProfileSelectionTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Security Profile'**
+  String get settingsPrivacyProfileSelectionTitle;
+
+  /// No description provided for @securityProfileTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Security Profile'**
+  String get securityProfileTitle;
+
+  /// No description provided for @securityProfileSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose the level of protection that fits your daily use. This can be changed at any time in your settings.'**
+  String get securityProfileSubtitle;
+
+  /// No description provided for @securityProfileNormalTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Normal Protection'**
+  String get securityProfileNormalTitle;
+
+  /// No description provided for @securityProfileNormalDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Good balance between a convenient mode without bothering you too much.'**
+  String get securityProfileNormalDesc;
+
+  /// No description provided for @securityProfileStrictTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Strict Protection'**
+  String get securityProfileStrictTitle;
+
+  /// No description provided for @securityProfileStrictDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Maximum anti-phishing protection but may be inconvenient.'**
+  String get securityProfileStrictDesc;
+
   /// No description provided for @settingsNotification.
   ///
   /// In en, this message translates to:
@@ -851,13 +893,19 @@ abstract class AppLocalizations {
   /// No description provided for @contactVerifyNumberTitle.
   ///
   /// In en, this message translates to:
-  /// **'Verify contact'**
+  /// **'Verify contacts'**
   String get contactVerifyNumberTitle;
 
+  /// No description provided for @contactVerifyNumberSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify the identity of your contacts to make sure you are texting the right person.'**
+  String get contactVerifyNumberSubtitle;
+
   /// No description provided for @userVerifiedTitle.
   ///
   /// In en, this message translates to:
-  /// **'User verified'**
+  /// **'Contact verified'**
   String get userVerifiedTitle;
 
   /// No description provided for @contactVerifiedBy.
@@ -875,8 +923,8 @@ abstract class AppLocalizations {
   /// No description provided for @verificationTypeSecretQrToken.
   ///
   /// In en, this message translates to:
-  /// **'The other person scanned your QR code.'**
+  /// **'{username} has scanned your QR code.'**
-  String get verificationTypeSecretQrToken;
+  String verificationTypeSecretQrToken(Object username);
 
   /// No description provided for @verificationTypeLink.
   ///
@@ -929,13 +977,13 @@ abstract class AppLocalizations {
   /// No description provided for @contactBlockBody.
   ///
   /// In en, this message translates to:
-  /// **'A blocked user will no longer be able to send you messages and their profile will be hidden from view. To unblock a user, simply navigate to Settings > Privacy > Blocked Users.'**
+  /// **'A blocked contact will no longer be able to send you messages and their profile will be hidden from view. To unblock a contact, simply navigate to Settings > Privacy > Blocked Contacts.'**
   String get contactBlockBody;
 
   /// No description provided for @contactRemove.
   ///
   /// In en, this message translates to:
-  /// **'Remove user'**
+  /// **'Remove contact'**
   String get contactRemove;
 
   /// No description provided for @contactRemoveTitle.
@@ -947,7 +995,7 @@ abstract class AppLocalizations {
   /// No description provided for @contactRemoveBody.
   ///
   /// In en, this message translates to:
-  /// **'Permanently remove the user. If the user tries to send you a new message, you will have to accept the user again first.'**
+  /// **'Permanently remove the contact. If the contact tries to send you a new message, you will have to accept the contact again first.'**
   String get contactRemoveBody;
 
   /// No description provided for @undo.
@@ -1121,8 +1169,8 @@ abstract class AppLocalizations {
   /// No description provided for @userFoundBody.
   ///
   /// In en, this message translates to:
-  /// **'Do you want to create a follow request?'**
+  /// **'Do you want to connect with {username}?'**
-  String get userFoundBody;
+  String userFoundBody(String username);
 
   /// No description provided for @errorInternalError.
   ///
@@ -1178,12 +1226,6 @@ abstract class AppLocalizations {
   /// **'The plan upgrade must be paid for annually, as the current plan is also billed annually.'**
   String get errorPlanUpgradeNotYearly;
 
-  /// No description provided for @upgradeToPaidPlan.
-  ///
-  /// In en, this message translates to:
-  /// **'Upgrade to a paid plan.'**
-  String get upgradeToPaidPlan;
-
   /// No description provided for @upgradeToPaidPlanButton.
   ///
   /// In en, this message translates to:
@@ -1322,12 +1364,6 @@ abstract class AppLocalizations {
   /// **'Delete file'**
   String get galleryDelete;
 
-  /// No description provided for @galleryDetails.
-  ///
-  /// In en, this message translates to:
-  /// **'Show details'**
-  String get galleryDetails;
-
   /// No description provided for @galleryExport.
   ///
   /// In en, this message translates to:
@@ -1340,6 +1376,36 @@ abstract class AppLocalizations {
   /// **'Successfully saved in the Gallery.'**
   String get galleryExportSuccess;
 
+  /// No description provided for @gallerySelectAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Select all'**
+  String get gallerySelectAll;
+
+  /// No description provided for @galleryDeselectAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Deselect all'**
+  String get galleryDeselectAll;
+
+  /// No description provided for @galleryFavorite.
+  ///
+  /// In en, this message translates to:
+  /// **'Favorite'**
+  String get galleryFavorite;
+
+  /// No description provided for @galleryUnfavorite.
+  ///
+  /// In en, this message translates to:
+  /// **'Unfavorite'**
+  String get galleryUnfavorite;
+
+  /// No description provided for @galleryCancel.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get galleryCancel;
+
   /// No description provided for @memoriesEmpty.
   ///
   /// In en, this message translates to:
@@ -1358,6 +1424,12 @@ abstract class AppLocalizations {
   /// **'Delete for all'**
   String get deleteOkBtnForAll;
 
+  /// No description provided for @memoriesDeleteSnackbarSuccess.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1 {Deleted 1 item successfully} other {Deleted {count} items successfully}}'**
+  String memoriesDeleteSnackbarSuccess(num count);
+
   /// No description provided for @deleteOkBtnForMe.
   ///
   /// In en, this message translates to:
@@ -1376,6 +1448,12 @@ abstract class AppLocalizations {
   /// **'The image will be irrevocably deleted.'**
   String get deleteImageBody;
 
+  /// No description provided for @deleteMemoriesBody.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1 {The image will be irrevocably deleted.} other {The {count} images will be irrevocably deleted.}}'**
+  String deleteMemoriesBody(num count);
+
   /// No description provided for @settingsBackup.
   ///
   /// In en, this message translates to:
@@ -1523,15 +1601,9 @@ abstract class AppLocalizations {
   /// No description provided for @twonlySafeRecoverTitle.
   ///
   /// In en, this message translates to:
-  /// **'Recovery'**
+  /// **'Restore backup'**
   String get twonlySafeRecoverTitle;
 
-  /// No description provided for @twonlySafeRecoverDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'If you have created a backup with twonly Backup, you can restore it here.'**
-  String get twonlySafeRecoverDesc;
-
   /// No description provided for @twonlySafeRecoverBtn.
   ///
   /// In en, this message translates to:
@@ -1613,7 +1685,7 @@ abstract class AppLocalizations {
   /// No description provided for @reportUser.
   ///
   /// In en, this message translates to:
-  /// **'Report user'**
+  /// **'Report contact'**
   String get reportUser;
 
   /// No description provided for @newDeviceRegistered.
@@ -2252,18 +2324,6 @@ abstract class AppLocalizations {
   /// **'Draft'**
   String get draftMessage;
 
-  /// No description provided for @exportMemories.
-  ///
-  /// In en, this message translates to:
-  /// **'Export memories (Beta)'**
-  String get exportMemories;
-
-  /// No description provided for @importMemories.
-  ///
-  /// In en, this message translates to:
-  /// **'Import memories (Beta)'**
-  String get importMemories;
-
   /// No description provided for @voiceMessageSlideToCancel.
   ///
   /// In en, this message translates to:
@@ -2294,6 +2354,12 @@ abstract class AppLocalizations {
   /// **'Open your own QR code'**
   String get openYourOwnQRcode;
 
+  /// No description provided for @addContactQrSheetSubtext.
+  ///
+  /// In en, this message translates to:
+  /// **'Let a friend scan this QR code to add you'**
+  String get addContactQrSheetSubtext;
+
   /// No description provided for @finishSetupCardTitle.
   ///
   /// In en, this message translates to:
@@ -2387,13 +2453,13 @@ abstract class AppLocalizations {
   /// No description provided for @userDiscoverySettingsManualApproval.
   ///
   /// In en, this message translates to:
-  /// **'Manual approval'**
+  /// **'Ask every time before sharing'**
   String get userDiscoverySettingsManualApproval;
 
   /// No description provided for @userDiscoverySettingsManualApprovalDesc.
   ///
   /// In en, this message translates to:
-  /// **'Before someone is shared, you\'ll be asked first.'**
+  /// **'Before one of your friends is shared, you will be asked every time.'**
   String get userDiscoverySettingsManualApprovalDesc;
 
   /// No description provided for @onboardingUserDiscoveryLetFriendsFindYou.
@@ -2651,13 +2717,13 @@ abstract class AppLocalizations {
   /// No description provided for @verificationBadgeGeneralDesc.
   ///
   /// In en, this message translates to:
-  /// **'The checkmark gives you the certainty that you are messaging the right person. Scan the contact\'s QR code to verify it.'**
+  /// **'The checkmark gives you the certainty that you are messaging the right person. You can verify contacts at any time by scanning their QR code.'**
   String get verificationBadgeGeneralDesc;
 
   /// No description provided for @verificationBadgeGreenDesc.
   ///
   /// In en, this message translates to:
-  /// **'A contact you have *personally* verified.'**
+  /// **'A contact you have *personally verified* using the QR code.'**
   String get verificationBadgeGreenDesc;
 
   /// No description provided for @verificationBadgeYellowDesc.
@@ -2672,6 +2738,42 @@ abstract class AppLocalizations {
   /// **'A contact whose identity has *not* yet been verified.'**
   String get verificationBadgeRedDesc;
 
+  /// No description provided for @scanNow.
+  ///
+  /// In en, this message translates to:
+  /// **'Scan now'**
+  String get scanNow;
+
+  /// No description provided for @openQrCode.
+  ///
+  /// In en, this message translates to:
+  /// **'Open QR code'**
+  String get openQrCode;
+
+  /// No description provided for @deleteVerificationTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete verification?'**
+  String get deleteVerificationTitle;
+
+  /// No description provided for @deleteVerificationBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to delete this verification?'**
+  String get deleteVerificationBody;
+
+  /// No description provided for @secretQrTokenVerifiedSnackbar.
+  ///
+  /// In en, this message translates to:
+  /// **'{username} has scanned your QR code and is now verified.'**
+  String secretQrTokenVerifiedSnackbar(Object username);
+
+  /// No description provided for @mutualGroupsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{1 mutual group} other{{count} mutual groups}}'**
+  String mutualGroupsTitle(num count);
+
   /// No description provided for @chatEntryFlameRestored.
   ///
   /// In en, this message translates to:
@@ -2744,12 +2846,6 @@ abstract class AppLocalizations {
   /// **'When the typing indicator is turned off, you can\'t see when others are typing a message.'**
   String get settingsTypingIndicationSubtitle;
 
-  /// No description provided for @scanQrOrShow.
-  ///
-  /// In en, this message translates to:
-  /// **'Scan / Show QR'**
-  String get scanQrOrShow;
-
   /// No description provided for @contactActionBlock.
   ///
   /// In en, this message translates to:
@@ -2804,6 +2900,12 @@ abstract class AppLocalizations {
   /// **'Mutual Friends'**
   String get userDiscoverySettingsTitle;
 
+  /// No description provided for @userDiscoveryFeatureOffers.
+  ///
+  /// In en, this message translates to:
+  /// **'Your benefits at a glance'**
+  String get userDiscoveryFeatureOffers;
+
   /// No description provided for @userDiscoveryDisabledLearnMore.
   ///
   /// In en, this message translates to:
@@ -2876,6 +2978,66 @@ abstract class AppLocalizations {
   /// **'Request'**
   String get friendSuggestionsRequest;
 
+  /// No description provided for @friendSuggestionsAskFriend.
+  ///
+  /// In en, this message translates to:
+  /// **'Ask your friends'**
+  String get friendSuggestionsAskFriend;
+
+  /// No description provided for @askFriendsDialogTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Ask about {username}'**
+  String askFriendsDialogTitle(Object username);
+
+  /// No description provided for @askFriendsDialogDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'Select the friends you want to ask about this user:'**
+  String get askFriendsDialogDescription;
+
+  /// No description provided for @askFriendsDialogConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'Ask'**
+  String get askFriendsDialogConfirm;
+
+  /// No description provided for @askFriendsDialogCancel.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get askFriendsDialogCancel;
+
+  /// No description provided for @chatAskAFriendReceivedDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'Your friend just got this as a suggestion and wants to know if he knows this person.'**
+  String get chatAskAFriendReceivedDescription;
+
+  /// No description provided for @chatAskAFriendAddedDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'You have added this user to your contacts.'**
+  String get chatAskAFriendAddedDescription;
+
+  /// No description provided for @chatAskAFriendHide.
+  ///
+  /// In en, this message translates to:
+  /// **'Hide'**
+  String get chatAskAFriendHide;
+
+  /// No description provided for @chatAskAFriendRequest.
+  ///
+  /// In en, this message translates to:
+  /// **'Request'**
+  String get chatAskAFriendRequest;
+
+  /// No description provided for @chatAskAFriendUnknownUser.
+  ///
+  /// In en, this message translates to:
+  /// **'User {userId}'**
+  String chatAskAFriendUnknownUser(Object userId);
+
   /// No description provided for @contactUserDiscoveryImagesLeft.
   ///
   /// In en, this message translates to:
@@ -3020,12 +3182,6 @@ abstract class AppLocalizations {
   /// **'Back'**
   String get back;
 
-  /// No description provided for @onboardingExampleLabel.
-  ///
-  /// In en, this message translates to:
-  /// **'Example'**
-  String get onboardingExampleLabel;
-
   /// No description provided for @makerChangedUsername.
   ///
   /// In en, this message translates to:
@@ -3157,6 +3313,334 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Emoji already used or invalid'**
   String get errorEmojiUsedOrInvalid;
+
+  /// No description provided for @subscriptionPledgeSecureTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Secure by Design'**
+  String get subscriptionPledgeSecureTitle;
+
+  /// No description provided for @subscriptionPledgeSecureDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Your messages and shared moments are fully end-to-end encrypted.'**
+  String get subscriptionPledgeSecureDesc;
+
+  /// No description provided for @subscriptionPledgeNoAdsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'No Ads or Data selling'**
+  String get subscriptionPledgeNoAdsTitle;
+
+  /// No description provided for @subscriptionPledgeNoAdsDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'twonly will never show advertisements or sell your private data.'**
+  String get subscriptionPledgeNoAdsDesc;
+
+  /// No description provided for @subscriptionPledgeSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Zero ads. Total privacy.'**
+  String get subscriptionPledgeSubtitle;
+
+  /// No description provided for @dragToZoom.
+  ///
+  /// In en, this message translates to:
+  /// **'Drag to Zoom'**
+  String get dragToZoom;
+
+  /// No description provided for @onboardingProfileSelectionTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose your setup path'**
+  String get onboardingProfileSelectionTitle;
+
+  /// No description provided for @onboardingProfileSelectionSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose how you want to configure your security and privacy settings.'**
+  String get onboardingProfileSelectionSubtitle;
+
+  /// No description provided for @onboardingProfileSelectionDefaultTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Default'**
+  String get onboardingProfileSelectionDefaultTitle;
+
+  /// No description provided for @onboardingProfileSelectionDefaultDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Instantly applies recommended settings so you can start using the app.'**
+  String get onboardingProfileSelectionDefaultDesc;
+
+  /// No description provided for @onboardingProfileSelectionDefaultBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'Fast Setup'**
+  String get onboardingProfileSelectionDefaultBadge;
+
+  /// No description provided for @onboardingProfileSelectionCustomizeTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Customize'**
+  String get onboardingProfileSelectionCustomizeTitle;
+
+  /// No description provided for @onboardingProfileSelectionCustomizeDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Step-by-step setup so you can decide for yourself.'**
+  String get onboardingProfileSelectionCustomizeDesc;
+
+  /// No description provided for @onboardingProfileSelectionStrictTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Enhanced Protection'**
+  String get onboardingProfileSelectionStrictTitle;
+
+  /// No description provided for @onboardingProfileSelectionStrictDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Maximum anti-phishing defense. Recommended for *journalists & public figures*.'**
+  String get onboardingProfileSelectionStrictDesc;
+
+  /// No description provided for @replyFlameRestored.
+  ///
+  /// In en, this message translates to:
+  /// **'Flames restored'**
+  String get replyFlameRestored;
+
+  /// No description provided for @replyAskAFriend.
+  ///
+  /// In en, this message translates to:
+  /// **'Ask a friend'**
+  String get replyAskAFriend;
+
+  /// No description provided for @unverifiedWarningDirectTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Identity not verified in person'**
+  String get unverifiedWarningDirectTitle;
+
+  /// No description provided for @unverifiedWarningGroupTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Not all members are verified in person'**
+  String get unverifiedWarningGroupTitle;
+
+  /// No description provided for @unverifiedWarningBody.
+  ///
+  /// In en, this message translates to:
+  /// **'*Avoid sharing sensitive data*. Risk of *impersonation* without manual verification.'**
+  String get unverifiedWarningBody;
+
+  /// No description provided for @unverifiedWarningButton.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify now'**
+  String get unverifiedWarningButton;
+
+  /// No description provided for @today.
+  ///
+  /// In en, this message translates to:
+  /// **'Today'**
+  String get today;
+
+  /// No description provided for @yesterday.
+  ///
+  /// In en, this message translates to:
+  /// **'Yesterday'**
+  String get yesterday;
+
+  /// No description provided for @galleryDisableWarningTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Disable gallery saving?'**
+  String get galleryDisableWarningTitle;
+
+  /// No description provided for @galleryDisableWarningBody.
+  ///
+  /// In en, this message translates to:
+  /// **'If you disable this, your media files will not be saved to your gallery and could be permanently lost if twonly is removed or has an issue, as media files are not yet backed up.'**
+  String get galleryDisableWarningBody;
+
+  /// No description provided for @galleryDisableWarningConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'Disable'**
+  String get galleryDisableWarningConfirm;
+
+  /// No description provided for @settingsStorageScanGalleryTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Import from Gallery'**
+  String get settingsStorageScanGalleryTitle;
+
+  /// No description provided for @importGalleryDeselectAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Deselect all'**
+  String get importGalleryDeselectAll;
+
+  /// No description provided for @importGallerySelectAll.
+  ///
+  /// In en, this message translates to:
+  /// **'Select all'**
+  String get importGallerySelectAll;
+
+  /// No description provided for @importGalleryPermissionRequired.
+  ///
+  /// In en, this message translates to:
+  /// **'Permission to access your gallery is required to import previous twonly media files.'**
+  String get importGalleryPermissionRequired;
+
+  /// No description provided for @importGalleryPermissionError.
+  ///
+  /// In en, this message translates to:
+  /// **'An error occurred while requesting permission: {error}'**
+  String importGalleryPermissionError(Object error);
+
+  /// No description provided for @importGalleryLoadError.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to load assets: {error}'**
+  String importGalleryLoadError(Object error);
+
+  /// No description provided for @importGalleryImportingOf.
+  ///
+  /// In en, this message translates to:
+  /// **'Importing {current} of {total}...'**
+  String importGalleryImportingOf(Object current, Object total);
+
+  /// No description provided for @importGalleryStarting.
+  ///
+  /// In en, this message translates to:
+  /// **'Starting import...'**
+  String get importGalleryStarting;
+
+  /// No description provided for @importGalleryComplete.
+  ///
+  /// In en, this message translates to:
+  /// **'Import complete: {imported} successfully imported, {duplicated} duplicated and {failed} failed.'**
+  String importGalleryComplete(
+    Object imported,
+    Object duplicated,
+    Object failed,
+  );
+
+  /// No description provided for @importGalleryGrantAccess.
+  ///
+  /// In en, this message translates to:
+  /// **'Grant Access'**
+  String get importGalleryGrantAccess;
+
+  /// No description provided for @importGalleryOpenSettings.
+  ///
+  /// In en, this message translates to:
+  /// **'Open Settings'**
+  String get importGalleryOpenSettings;
+
+  /// No description provided for @importGalleryPermissionDenied.
+  ///
+  /// In en, this message translates to:
+  /// **'Permission to access gallery denied.'**
+  String get importGalleryPermissionDenied;
+
+  /// No description provided for @importGalleryTryAgain.
+  ///
+  /// In en, this message translates to:
+  /// **'Try Again'**
+  String get importGalleryTryAgain;
+
+  /// No description provided for @importGalleryAlbumNotFound.
+  ///
+  /// In en, this message translates to:
+  /// **'\"twonly\" album not found'**
+  String get importGalleryAlbumNotFound;
+
+  /// No description provided for @importGalleryAlbumNotFoundDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'If you don\'t have this album yet, you can also create it to import photos into twonly.'**
+  String get importGalleryAlbumNotFoundDesc;
+
+  /// No description provided for @importGalleryNoImagesFound.
+  ///
+  /// In en, this message translates to:
+  /// **'No images found'**
+  String get importGalleryNoImagesFound;
+
+  /// No description provided for @importGalleryNoImagesFoundDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'There are no images on your device.'**
+  String get importGalleryNoImagesFoundDesc;
+
+  /// No description provided for @importGalleryFilterTwonly.
+  ///
+  /// In en, this message translates to:
+  /// **'Only show the twonly-Album'**
+  String get importGalleryFilterTwonly;
+
+  /// No description provided for @importGalleryRefresh.
+  ///
+  /// In en, this message translates to:
+  /// **'Refresh'**
+  String get importGalleryRefresh;
+
+  /// No description provided for @importGallerySelectToImport.
+  ///
+  /// In en, this message translates to:
+  /// **'Select items to import'**
+  String get importGallerySelectToImport;
+
+  /// No description provided for @importGalleryImportCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{Import 1 item} other{Import {count} items}}'**
+  String importGalleryImportCount(num count);
+
+  /// No description provided for @emptyChatListTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Find your first friend'**
+  String get emptyChatListTitle;
+
+  /// No description provided for @emptyChatListDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Let friends scan your QR code, or share them your profile.'**
+  String get emptyChatListDesc;
+
+  /// No description provided for @emptyChatListShareBtn.
+  ///
+  /// In en, this message translates to:
+  /// **'Share your profile'**
+  String get emptyChatListShareBtn;
+
+  /// No description provided for @emptyChatListScanBtn.
+  ///
+  /// In en, this message translates to:
+  /// **'QR Code'**
+  String get emptyChatListScanBtn;
+
+  /// No description provided for @emptyChatListAddUsernameBtn.
+  ///
+  /// In en, this message translates to:
+  /// **'By Username'**
+  String get emptyChatListAddUsernameBtn;
+
+  /// No description provided for @avatarCustomizeRandomize.
+  ///
+  /// In en, this message translates to:
+  /// **'Randomize'**
+  String get avatarCustomizeRandomize;
+
+  /// No description provided for @avatarCustomizeReset.
+  ///
+  /// In en, this message translates to:
+  /// **'Reset'**
+  String get avatarCustomizeReset;
 }
 
 class _AppLocalizationsDelegate

lib/src/localization/generated/app_localizations_de.dart

@@ -9,11 +9,7 @@ class AppLocalizationsDe extends AppLocalizations {
   AppLocalizationsDe([String locale = 'de']) : super(locale);
 
   @override
-  String get registerTitle => 'Willkommen bei twonly!';
+  String get registerSlogan => 'Privat in Kontakt bleiben.';
-
-  @override
-  String get registerSlogan =>
-      'twonly, eine private und sichere Möglichkeit um mit Freunden in Kontakt zu bleiben.';
 
   @override
   String get onboardingWelcomeTitle => 'Willkommen bei twonly!';
@@ -37,13 +33,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get onboardingFocusBody =>
       'Verabschiede dich von süchtig machenden Funktionen! twonly wurde für das Teilen von Momenten ohne nutzlose Ablenkungen oder Werbung entwickelt.';
 
-  @override
-  String get onboardingSendTwonliesTitle => 'twonlies senden';
-
-  @override
-  String get onboardingSendTwonliesBody =>
-      'Teile Momente sicher mit deinem Partner. twonly stellt sicher, dass nur dein Partner sie öffnen kann, sodass deine Momente mit deinem Partner eine two(o)nly Sache bleiben!';
-
   @override
   String get onboardingNotProductTitle => 'Du bist nicht das Produkt!';
 
@@ -52,18 +41,13 @@ class AppLocalizationsDe extends AppLocalizations {
       'twonly wird durch Spenden und ein optionales Abonnement finanziert. Deine Daten werden niemals verkauft.';
 
   @override
-  String get onboardingGetStartedTitle => 'Auf geht\'s';
+  String get registerUsernameSlogan => 'Konto erstellen';
-
-  @override
-  String get registerUsernameSlogan =>
-      'Bitte wähle einen Benutzernamen, damit dich andere finden können!';
 
   @override
   String get registerUsernameDecoration => 'Benutzername';
 
   @override
-  String get registerUsernameLimits =>
+  String get registerUsernameLimits => 'Mindestens 3 Zeichen.';
-      'Der Benutzername muss mindestens 3 Zeichen lang sein.';
 
   @override
   String get registerProofOfWorkFailed =>
@@ -132,18 +116,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get searchUsernameNotFound => 'Benutzername nicht gefunden';
 
-  @override
-  String searchUsernameNotFoundBody(Object username) {
-    return 'Es wurde kein Benutzer mit dem Benutzernamen \"$username\" gefunden.';
-  }
-
   @override
   String get searchUsernameNewFollowerTitle => 'Offene Anfragen';
 
-  @override
-  String get chatListViewSearchUserNameBtn =>
-      'Füge deinen ersten twonly-Kontakt hinzu!';
-
   @override
   String get chatListDetailInput => 'Nachricht eingeben';
 
@@ -214,6 +189,14 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsPreSelectedReactions => 'Vorgewählte Reaktions-Emojis';
 
+  @override
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedTitle =>
+      'Duplikate als geöffnet markieren';
+
+  @override
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedSubtitle =>
+      'Wenn du die selbe Mediendatei in mehreren Chats erhältst, markiert das Öffnen einer Kopie alle anderen als geöffnet.';
+
   @override
   String get settingsPreSelectedReactionsError =>
       'Es können maximal 12 Reaktionen ausgewählt werden.';
@@ -227,10 +210,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsStorageDataStoreInGTitle => 'In der Galerie speichern';
 
-  @override
-  String get settingsStorageDataStoreInGSubtitle =>
-      'Speichere Bilder zusätzlich in der Systemgalerie.';
-
   @override
   String get settingsStorageDataMediaAutoDownload =>
       'Automatischer Mediendownload';
@@ -241,6 +220,21 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsStorageDataAutoDownWifi => 'Bei Nutzung von WLAN';
 
+  @override
+  String get settingsStorageManageTitle => 'Speicher verwalten';
+
+  @override
+  String get settingsStorageUsed => 'Speicherplatz belegt';
+
+  @override
+  String get settingsStorageImages => 'Bilder';
+
+  @override
+  String get settingsStorageVideos => 'Videos';
+
+  @override
+  String get settingsStorageGifs => 'GIFs';
+
   @override
   String get settingsProfileCustomizeAvatar => 'Avatar anpassen';
 
@@ -263,17 +257,41 @@ class AppLocalizationsDe extends AppLocalizations {
   String get settingsPrivacy => 'Datenschutz & Sicherheit';
 
   @override
-  String get settingsPrivacyBlockUsers => 'Benutzer blockieren';
+  String get settingsPrivacyBlockUsers => 'Kontakte blockieren';
 
   @override
   String get settingsPrivacyBlockUsersDesc =>
-      'Blockierte Benutzer können nicht mit dir kommunizieren. Du kannst einen blockierten Benutzer jederzeit wieder entsperren.';
+      'Blockierte Kontakte können nicht mit dir kommunizieren. Du kannst einen blockierten Kontakt jederzeit wieder entsperren.';
 
   @override
   String settingsPrivacyBlockUsersCount(Object len) {
     return '$len Kontakt(e)';
   }
 
+  @override
+  String get settingsPrivacyProfileSelectionTitle => 'Sicherheitsprofil';
+
+  @override
+  String get securityProfileTitle => 'Sicherheitsprofil';
+
+  @override
+  String get securityProfileSubtitle =>
+      'Wähle das Schutzniveau, das zu deiner täglichen Nutzung passt. Dies kann jederzeit in den Einstellungen geändert werden.';
+
+  @override
+  String get securityProfileNormalTitle => 'Normaler Schutz';
+
+  @override
+  String get securityProfileNormalDesc =>
+      'Gute Balance zwischen Komfort und Sicherheit, ohne dich zu sehr einzuschränken.';
+
+  @override
+  String get securityProfileStrictTitle => 'Strikter Schutz';
+
+  @override
+  String get securityProfileStrictDesc =>
+      'Maximaler Schutz vor Phishing, kann aber unkomfortabel sein.';
+
   @override
   String get settingsNotification => 'Benachrichtigung';
 
@@ -415,10 +433,14 @@ class AppLocalizationsDe extends AppLocalizations {
       'Dein Konto wird gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.';
 
   @override
-  String get contactVerifyNumberTitle => 'Benutzer verifizieren';
+  String get contactVerifyNumberTitle => 'Kontakte verifizieren';
 
   @override
-  String get userVerifiedTitle => 'Benutzer verifiziert';
+  String get contactVerifyNumberSubtitle =>
+      'Überprüfe die Identität deiner Kontakte, um sicherzugehen, dass du mit der richtigen Person schreibst.';
+
+  @override
+  String get userVerifiedTitle => 'Kontakt verifiziert';
 
   @override
   String contactVerifiedBy(Object username) {
@@ -429,8 +451,9 @@ class AppLocalizationsDe extends AppLocalizations {
   String get verificationTypeQrScanned => 'Du hast den QR-Code gescannt.';
 
   @override
-  String get verificationTypeSecretQrToken =>
+  String verificationTypeSecretQrToken(Object username) {
-      'Die andere Person hat deinen QR-Code gescannt.';
+    return '$username hat deinen QR-Code gescannt.';
+  }
 
   @override
   String get verificationTypeLink => 'Per Link verifiziert.';
@@ -462,10 +485,10 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get contactBlockBody =>
-      'Ein blockierter Benutzer kann dir keine Nachrichten mehr senden, und deren Profil ist nicht mehr sichtbar. Um die Blockierung eines Benutzers aufzuheben, navigiere einfach zu Einstellungen > Datenschutz > Blockierte Benutzer.';
+      'Ein blockierter Kontakt kann dir keine Nachrichten mehr senden, und deren Profil ist nicht mehr sichtbar. Um die Blockierung eines Kontakts aufzuheben, navigiere einfach zu Einstellungen > Datenschutz > Blockierte Kontakte.';
 
   @override
-  String get contactRemove => 'Benutzer löschen';
+  String get contactRemove => 'Kontakt löschen';
 
   @override
   String contactRemoveTitle(Object username) {
@@ -474,7 +497,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get contactRemoveBody =>
-      'Den Benutzer dauerhaft entfernen. Wenn der Benutzer versucht, dir eine neue Nachricht zu senden, musst du den Benutzer erst wieder akzeptieren.';
+      'Den Kontakt dauerhaft entfernen. Wenn der Kontakt versucht, dir eine neue Nachricht zu senden, musst du den Kontakt erst wieder akzeptieren.';
 
   @override
   String get undo => 'Rückgängig';
@@ -564,7 +587,9 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get userFoundBody => 'Möchtest du eine Folgeanfrage stellen?';
+  String userFoundBody(String username) {
+    return 'Möchtest du dich mit $username vernetzen?';
+  }
 
   @override
   String get errorInternalError =>
@@ -601,9 +626,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get errorPlanUpgradeNotYearly =>
       'Das Upgrade des Plans muss jährlich bezahlt werden, da der aktuelle Plan ebenfalls jährlich abgerechnet wird.';
 
-  @override
-  String get upgradeToPaidPlan => 'Upgrade auf einen kostenpflichtigen Plan.';
-
   @override
   String upgradeToPaidPlanButton(Object planId, Object sufix) {
     return 'Auf $planId upgraden$sufix';
@@ -677,15 +699,27 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get galleryDelete => 'Datei löschen';
 
-  @override
-  String get galleryDetails => 'Details anzeigen';
-
   @override
   String get galleryExport => 'In Galerie exportieren';
 
   @override
   String get galleryExportSuccess => 'Erfolgreich in der Gallery gespeichert.';
 
+  @override
+  String get gallerySelectAll => 'Alle auswählen';
+
+  @override
+  String get galleryDeselectAll => 'Auswahl aufheben';
+
+  @override
+  String get galleryFavorite => 'Als Favorit markieren';
+
+  @override
+  String get galleryUnfavorite => 'Favorit entfernen';
+
+  @override
+  String get galleryCancel => 'Abbrechen';
+
   @override
   String get memoriesEmpty =>
       'Sobald du Bilder oder Videos speicherst, landen sie hier in deinen Erinnerungen.';
@@ -696,6 +730,17 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get deleteOkBtnForAll => 'Für alle löschen';
 
+  @override
+  String memoriesDeleteSnackbarSuccess(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count Elemente erfolgreich gelöscht',
+      one: '1 Element erfolgreich gelöscht',
+    );
+    return '$_temp0';
+  }
+
   @override
   String get deleteOkBtnForMe => 'Für mich löschen';
 
@@ -705,6 +750,17 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get deleteImageBody => 'Das Bild wird unwiderruflich gelöscht.';
 
+  @override
+  String deleteMemoriesBody(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Die $count Bilder werden unwiderruflich gelöscht.',
+      one: 'Das Bild wird unwiderruflich gelöscht.',
+    );
+    return '$_temp0';
+  }
+
   @override
   String get settingsBackup => 'Backup';
 
@@ -784,11 +840,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get backupChangePassword => 'Password ändern';
 
   @override
-  String get twonlySafeRecoverTitle => 'Recovery';
+  String get twonlySafeRecoverTitle => 'Backup wiederherstellen';
-
-  @override
-  String get twonlySafeRecoverDesc =>
-      'Wenn du ein Backup mit twonly Backup erstellt hast, kannst du es hier wiederherstellen.';
 
   @override
   String get twonlySafeRecoverBtn => 'Backup wiederherstellen';
@@ -835,7 +887,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get reportUserReason => 'Meldegrund';
 
   @override
-  String get reportUser => 'Benutzer melden';
+  String get reportUser => 'Kontakt melden';
 
   @override
   String get newDeviceRegistered =>
@@ -1232,12 +1284,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get draftMessage => 'Entwurf';
 
-  @override
-  String get exportMemories => 'Memories exportieren (Beta)';
-
-  @override
-  String get importMemories => 'Memories importieren (Beta)';
-
   @override
   String get voiceMessageSlideToCancel => 'Zum Abbrechen ziehen';
 
@@ -1253,6 +1299,10 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get openYourOwnQRcode => 'Eigenen QR-Code öffnen';
 
+  @override
+  String get addContactQrSheetSubtext =>
+      'Lass einen Freund diesen QR-Code scannen, um dich hinzuzufügen';
+
   @override
   String get finishSetupCardTitle => 'Profil vervollständigen';
 
@@ -1306,11 +1356,11 @@ class AppLocalizationsDe extends AppLocalizations {
       'Erfahre, wer dich anfragt';
 
   @override
-  String get userDiscoverySettingsManualApproval => 'Manuelle Zustimmung';
+  String get userDiscoverySettingsManualApproval => 'Vor jedem Teilen fragen';
 
   @override
   String get userDiscoverySettingsManualApprovalDesc =>
-      'Bevor jemand geteilt wird, wirst du zuerst gefragt.';
+      'Bevor einer deiner Freunde geteilt wird, wirst du jedes Mal gefragt.';
 
   @override
   String get onboardingUserDiscoveryLetFriendsFindYou =>
@@ -1478,11 +1528,11 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get verificationBadgeGeneralDesc =>
-      'Der Haken gibt dir die Sicherheit, dass du mit der richtigen Person schreibst. Scanne einen Kontakt, um diesen zu verifizieren.';
+      'Der Haken gibt dir die Sicherheit, dass du mit der richtigen Person schreibst. Du kannst Kontakte jederzeit verifizieren, indem du deren QR-Code scannst.';
 
   @override
   String get verificationBadgeGreenDesc =>
-      'Ein Kontakt, den du *persönlich verifiziert* hast.';
+      'Ein Kontakt, den du über den QR-code *persönlich verifiziert* hast.';
 
   @override
   String get verificationBadgeYellowDesc =>
@@ -1492,6 +1542,35 @@ class AppLocalizationsDe extends AppLocalizations {
   String get verificationBadgeRedDesc =>
       'Ein Kontakt, dessen Identität noch *nicht überprüft* wurde.';
 
+  @override
+  String get scanNow => 'Jetzt scannen';
+
+  @override
+  String get openQrCode => 'QR-Code öffnen';
+
+  @override
+  String get deleteVerificationTitle => 'Verifizierung löschen?';
+
+  @override
+  String get deleteVerificationBody =>
+      'Möchtest du diese Verifizierung wirklich löschen?';
+
+  @override
+  String secretQrTokenVerifiedSnackbar(Object username) {
+    return '$username hat deinen QR-Code gescannt und ist nun verifiziert.';
+  }
+
+  @override
+  String mutualGroupsTitle(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count gemeinsame Gruppen',
+      one: '1 gemeinsame Gruppe',
+    );
+    return '$_temp0';
+  }
+
   @override
   String chatEntryFlameRestored(Object count) {
     return '$count Flammen wiederhergestellt';
@@ -1537,9 +1616,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get settingsTypingIndicationSubtitle =>
       'Bei deaktivierten Tipp-Indikatoren kannst du nicht sehen, wenn andere gerade eine Nachricht tippen.';
 
-  @override
-  String get scanQrOrShow => 'QR scannen / anzeigen';
-
   @override
   String get contactActionBlock => 'Blockieren';
 
@@ -1571,6 +1647,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get userDiscoverySettingsTitle => 'Gemeinsame Freunde';
 
+  @override
+  String get userDiscoveryFeatureOffers => 'Dein Nutzen auf einen Blick';
+
   @override
   String get userDiscoveryDisabledLearnMore => 'Mehr erfahren';
 
@@ -1614,6 +1693,43 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get friendSuggestionsRequest => 'Anfragen';
 
+  @override
+  String get friendSuggestionsAskFriend => 'Deine Freunde fragen';
+
+  @override
+  String askFriendsDialogTitle(Object username) {
+    return 'Nach $username fragen';
+  }
+
+  @override
+  String get askFriendsDialogDescription =>
+      'Wähle die Freunde aus, die du zu diesem Nutzer fragen möchtest:';
+
+  @override
+  String get askFriendsDialogConfirm => 'Fragen';
+
+  @override
+  String get askFriendsDialogCancel => 'Abbrechen';
+
+  @override
+  String get chatAskAFriendReceivedDescription =>
+      'Dein Freund hat diesen Nutzer als Vorschlag erhalten und möchte wissen, ob er diese Person kennt.';
+
+  @override
+  String get chatAskAFriendAddedDescription =>
+      'Du hast diesen Nutzer zu deinen Kontakten hinzugefügt.';
+
+  @override
+  String get chatAskAFriendHide => 'Ausblenden';
+
+  @override
+  String get chatAskAFriendRequest => 'Anfragen';
+
+  @override
+  String chatAskAFriendUnknownUser(Object userId) {
+    return 'Nutzer $userId';
+  }
+
   @override
   String contactUserDiscoveryImagesLeft(Object imagesLeft, Object username) {
     return 'Es fehlen noch $imagesLeft Bilder bis deine Freunde mit $username geteilt werden.';
@@ -1698,9 +1814,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get back => 'Zurück';
 
-  @override
-  String get onboardingExampleLabel => 'Beispiel';
-
   @override
   String makerChangedUsername(Object maker, Object oldName, Object newName) {
     return '$maker hat den Benutzernamen von $oldName zu $newName geändert.';
@@ -1780,4 +1893,201 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get errorEmojiUsedOrInvalid =>
       'Emoji wird bereits verwendet oder ist ungültig';
+
+  @override
+  String get subscriptionPledgeSecureTitle => 'Secure by Design';
+
+  @override
+  String get subscriptionPledgeSecureDesc =>
+      'Deine Nachrichten und Bilder sind immer vollständig Ende-zu-Ende verschlüsselt.';
+
+  @override
+  String get subscriptionPledgeNoAdsTitle => 'Keine Werbung oder Datenverkauf';
+
+  @override
+  String get subscriptionPledgeNoAdsDesc =>
+      'twonly wird niemals Werbung anzeigen oder deine privaten Daten verkaufen.';
+
+  @override
+  String get subscriptionPledgeSubtitle => 'Keine Werbung. Volle Privatsphäre.';
+
+  @override
+  String get dragToZoom => 'Zum Zoomen ziehen';
+
+  @override
+  String get onboardingProfileSelectionTitle => 'Wähle deinen Setup-Weg';
+
+  @override
+  String get onboardingProfileSelectionSubtitle =>
+      'Wähle aus, wie du deine Sicherheits- und Privatsphäre-Einstellungen konfigurieren möchtest.';
+
+  @override
+  String get onboardingProfileSelectionDefaultTitle => 'Standard';
+
+  @override
+  String get onboardingProfileSelectionDefaultDesc =>
+      'Wendet sofort die empfohlenen Einstellungen an, damit du die App direkt nutzen kannst.';
+
+  @override
+  String get onboardingProfileSelectionDefaultBadge => 'Schnelles Setup';
+
+  @override
+  String get onboardingProfileSelectionCustomizeTitle => 'Anpassen';
+
+  @override
+  String get onboardingProfileSelectionCustomizeDesc =>
+      'Schritt-für-Schritt-Einrichtung, damit du selbst entscheiden kannst.';
+
+  @override
+  String get onboardingProfileSelectionStrictTitle => 'Erhöhter Schutz';
+
+  @override
+  String get onboardingProfileSelectionStrictDesc =>
+      'Maximaler Schutz vor Phishing. Empfohlen für *Journalisten & Personen des öffentlichen Lebens*.';
+
+  @override
+  String get replyFlameRestored => 'Flammen wiederhergestellt';
+
+  @override
+  String get replyAskAFriend => 'Einen Freund fragen';
+
+  @override
+  String get unverifiedWarningDirectTitle =>
+      'Identität nicht persönlich verifiziert';
+
+  @override
+  String get unverifiedWarningGroupTitle =>
+      'Nicht alle Mitglieder sind persönlich verifiziert';
+
+  @override
+  String get unverifiedWarningBody =>
+      '*Teile keine geheimen Daten*. Jemand könnte sich *als dein Freund ausgeben*.';
+
+  @override
+  String get unverifiedWarningButton => 'Jetzt verifizieren';
+
+  @override
+  String get today => 'Heute';
+
+  @override
+  String get yesterday => 'Gestern';
+
+  @override
+  String get galleryDisableWarningTitle => 'Galeriespeicherung deaktivieren?';
+
+  @override
+  String get galleryDisableWarningBody =>
+      'Wenn du dies deaktivierst, werden deine Mediendateien nicht in deiner Galerie gespeichert und könnten dauerhaft verloren gehen, wenn twonly deinstalliert wird oder ein Problem auftritt, da Mediendateien noch nicht in Backups enthalten sind.';
+
+  @override
+  String get galleryDisableWarningConfirm => 'Deaktivieren';
+
+  @override
+  String get settingsStorageScanGalleryTitle => 'Aus Galerie importieren';
+
+  @override
+  String get importGalleryDeselectAll => 'Alle abwählen';
+
+  @override
+  String get importGallerySelectAll => 'Alle auswählen';
+
+  @override
+  String get importGalleryPermissionRequired =>
+      'Zugriff auf deine Galerie ist erforderlich, um frühere twonly-Mediendateien zu importieren.';
+
+  @override
+  String importGalleryPermissionError(Object error) {
+    return 'Beim Anfordern der Berechtigung ist ein Fehler aufgetreten: $error';
+  }
+
+  @override
+  String importGalleryLoadError(Object error) {
+    return 'Laden der Medien fehlgeschlagen: $error';
+  }
+
+  @override
+  String importGalleryImportingOf(Object current, Object total) {
+    return '$current von $total wird importiert...';
+  }
+
+  @override
+  String get importGalleryStarting => 'Import wird gestartet...';
+
+  @override
+  String importGalleryComplete(
+    Object imported,
+    Object duplicated,
+    Object failed,
+  ) {
+    return 'Import abgeschlossen: $imported erfolgreich importiert, $duplicated Duplikate und $failed fehlgeschlagen.';
+  }
+
+  @override
+  String get importGalleryGrantAccess => 'Zugriff erlauben';
+
+  @override
+  String get importGalleryOpenSettings => 'Einstellungen öffnen';
+
+  @override
+  String get importGalleryPermissionDenied => 'Zugriff auf Galerie verweigert.';
+
+  @override
+  String get importGalleryTryAgain => 'Erneut versuchen';
+
+  @override
+  String get importGalleryAlbumNotFound => '\"twonly\"-Album nicht gefunden';
+
+  @override
+  String get importGalleryAlbumNotFoundDesc =>
+      'Falls du dieses Album noch nicht hast, kannst du es auch erstellen, um Fotos in twonly zu importieren.';
+
+  @override
+  String get importGalleryNoImagesFound => 'Keine Bilder gefunden';
+
+  @override
+  String get importGalleryNoImagesFoundDesc =>
+      'Es befinden sich keine Bilder auf deinem Gerät.';
+
+  @override
+  String get importGalleryFilterTwonly => 'Nur das twonly-Album anzeigen';
+
+  @override
+  String get importGalleryRefresh => 'Aktualisieren';
+
+  @override
+  String get importGallerySelectToImport =>
+      'Elemente zum Importieren auswählen';
+
+  @override
+  String importGalleryImportCount(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count Elemente importieren',
+      one: '1 Element importieren',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get emptyChatListTitle => 'Finde deinen ersten Freund';
+
+  @override
+  String get emptyChatListDesc =>
+      'Lass Freunde deinen QR-Code scannen oder teile dein Profil mit ihnen.';
+
+  @override
+  String get emptyChatListShareBtn => 'Profil teilen';
+
+  @override
+  String get emptyChatListScanBtn => 'QR-Code';
+
+  @override
+  String get emptyChatListAddUsernameBtn => 'Per Benutzername';
+
+  @override
+  String get avatarCustomizeRandomize => 'Zufällig';
+
+  @override
+  String get avatarCustomizeReset => 'Zurücksetzen';
 }

lib/src/localization/generated/app_localizations_en.dart

@@ -9,11 +9,7 @@ class AppLocalizationsEn extends AppLocalizations {
   AppLocalizationsEn([String locale = 'en']) : super(locale);
 
   @override
-  String get registerTitle => 'Welcome to twonly!';
+  String get registerSlogan => 'Stay in touch privately.';
-
-  @override
-  String get registerSlogan =>
-      'twonly, a privacy friendly way to connect with friends through secure, spontaneous image sharing';
 
   @override
   String get onboardingWelcomeTitle => 'Welcome to twonly!';
@@ -36,13 +32,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get onboardingFocusBody =>
       'Say goodbye to addictive features! twonly was created for sharing moments, free from useless distractions or ads.';
 
-  @override
-  String get onboardingSendTwonliesTitle => 'Send twonlies';
-
-  @override
-  String get onboardingSendTwonliesBody =>
-      'Share moments securely with your partner. twonly ensures that only your partner can open it, keeping your moments with your partner a two(o)nly thing!';
-
   @override
   String get onboardingNotProductTitle => 'You are not the product!';
 
@@ -51,18 +40,13 @@ class AppLocalizationsEn extends AppLocalizations {
       'twonly is financed by donations and an optional subscription. Your data will never be sold.';
 
   @override
-  String get onboardingGetStartedTitle => 'Let\'s go!';
+  String get registerUsernameSlogan => 'Create your account';
-
-  @override
-  String get registerUsernameSlogan =>
-      'Please select a username so others can find you!';
 
   @override
   String get registerUsernameDecoration => 'Username';
 
   @override
-  String get registerUsernameLimits =>
+  String get registerUsernameLimits => 'At least 3 characters.';
-      'Your username must be at least 3 characters long.';
 
   @override
   String get registerProofOfWorkFailed =>
@@ -131,17 +115,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get searchUsernameNotFound => 'Username not found';
 
-  @override
-  String searchUsernameNotFoundBody(Object username) {
-    return 'There is no user with the username \"$username\" registered';
-  }
-
   @override
   String get searchUsernameNewFollowerTitle => 'Open requests';
 
-  @override
-  String get chatListViewSearchUserNameBtn => 'Add your first twonly contact!';
-
   @override
   String get chatListDetailInput => 'Type a message';
 
@@ -211,6 +187,14 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsPreSelectedReactions => 'Preselected reaction emojis';
 
+  @override
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedTitle =>
+      'Mark duplicates as opened';
+
+  @override
+  String get settingsAutomaticallyMarkEqualMediaFilesAsOpenedSubtitle =>
+      'If you receive the same media in multiple chats, opening one marks all others as opened.';
+
   @override
   String get settingsPreSelectedReactionsError =>
       'A maximum of 12 reactions can be selected.';
@@ -224,10 +208,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsStorageDataStoreInGTitle => 'Store in Gallery';
 
-  @override
-  String get settingsStorageDataStoreInGSubtitle =>
-      'Store saved images additional in the systems gallery.';
-
   @override
   String get settingsStorageDataMediaAutoDownload => 'Media auto-download';
 
@@ -237,6 +217,21 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsStorageDataAutoDownWifi => 'When using WI-FI';
 
+  @override
+  String get settingsStorageManageTitle => 'Manage storage';
+
+  @override
+  String get settingsStorageUsed => 'Storage used';
+
+  @override
+  String get settingsStorageImages => 'Images';
+
+  @override
+  String get settingsStorageVideos => 'Videos';
+
+  @override
+  String get settingsStorageGifs => 'GIFs';
+
   @override
   String get settingsProfileCustomizeAvatar => 'Customize your avatar';
 
@@ -259,17 +254,41 @@ class AppLocalizationsEn extends AppLocalizations {
   String get settingsPrivacy => 'Privacy & Security';
 
   @override
-  String get settingsPrivacyBlockUsers => 'Block users';
+  String get settingsPrivacyBlockUsers => 'Block contacts';
 
   @override
   String get settingsPrivacyBlockUsersDesc =>
-      'Blocked users will not be able to communicate with you. You can unblock a blocked user at any time.';
+      'Blocked contacts will not be able to communicate with you. You can unblock a blocked contact at any time.';
 
   @override
   String settingsPrivacyBlockUsersCount(Object len) {
     return '$len contact(s)';
   }
 
+  @override
+  String get settingsPrivacyProfileSelectionTitle => 'Security Profile';
+
+  @override
+  String get securityProfileTitle => 'Security Profile';
+
+  @override
+  String get securityProfileSubtitle =>
+      'Choose the level of protection that fits your daily use. This can be changed at any time in your settings.';
+
+  @override
+  String get securityProfileNormalTitle => 'Normal Protection';
+
+  @override
+  String get securityProfileNormalDesc =>
+      'Good balance between a convenient mode without bothering you too much.';
+
+  @override
+  String get securityProfileStrictTitle => 'Strict Protection';
+
+  @override
+  String get securityProfileStrictDesc =>
+      'Maximum anti-phishing protection but may be inconvenient.';
+
   @override
   String get settingsNotification => 'Notification';
 
@@ -410,10 +429,14 @@ class AppLocalizationsEn extends AppLocalizations {
       'Your account will be deleted. There is no change to restore it.';
 
   @override
-  String get contactVerifyNumberTitle => 'Verify contact';
+  String get contactVerifyNumberTitle => 'Verify contacts';
 
   @override
-  String get userVerifiedTitle => 'User verified';
+  String get contactVerifyNumberSubtitle =>
+      'Verify the identity of your contacts to make sure you are texting the right person.';
+
+  @override
+  String get userVerifiedTitle => 'Contact verified';
 
   @override
   String contactVerifiedBy(Object username) {
@@ -424,8 +447,9 @@ class AppLocalizationsEn extends AppLocalizations {
   String get verificationTypeQrScanned => 'You scanned their QR code.';
 
   @override
-  String get verificationTypeSecretQrToken =>
+  String verificationTypeSecretQrToken(Object username) {
-      'The other person scanned your QR code.';
+    return '$username has scanned your QR code.';
+  }
 
   @override
   String get verificationTypeLink => 'Verified via link.';
@@ -457,10 +481,10 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get contactBlockBody =>
-      'A blocked user will no longer be able to send you messages and their profile will be hidden from view. To unblock a user, simply navigate to Settings > Privacy > Blocked Users.';
+      'A blocked contact will no longer be able to send you messages and their profile will be hidden from view. To unblock a contact, simply navigate to Settings > Privacy > Blocked Contacts.';
 
   @override
-  String get contactRemove => 'Remove user';
+  String get contactRemove => 'Remove contact';
 
   @override
   String contactRemoveTitle(Object username) {
@@ -469,7 +493,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get contactRemoveBody =>
-      'Permanently remove the user. If the user tries to send you a new message, you will have to accept the user again first.';
+      'Permanently remove the contact. If the contact tries to send you a new message, you will have to accept the contact again first.';
 
   @override
   String get undo => 'Undo';
@@ -559,7 +583,9 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get userFoundBody => 'Do you want to create a follow request?';
+  String userFoundBody(String username) {
+    return 'Do you want to connect with $username?';
+  }
 
   @override
   String get errorInternalError =>
@@ -595,9 +621,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get errorPlanUpgradeNotYearly =>
       'The plan upgrade must be paid for annually, as the current plan is also billed annually.';
 
-  @override
-  String get upgradeToPaidPlan => 'Upgrade to a paid plan.';
-
   @override
   String upgradeToPaidPlanButton(Object planId, Object sufix) {
     return 'Upgrade to $planId$sufix';
@@ -671,15 +694,27 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get galleryDelete => 'Delete file';
 
-  @override
-  String get galleryDetails => 'Show details';
-
   @override
   String get galleryExport => 'Export to gallery';
 
   @override
   String get galleryExportSuccess => 'Successfully saved in the Gallery.';
 
+  @override
+  String get gallerySelectAll => 'Select all';
+
+  @override
+  String get galleryDeselectAll => 'Deselect all';
+
+  @override
+  String get galleryFavorite => 'Favorite';
+
+  @override
+  String get galleryUnfavorite => 'Unfavorite';
+
+  @override
+  String get galleryCancel => 'Cancel';
+
   @override
   String get memoriesEmpty =>
       'As soon as you save pictures or videos, they end up here in your memories.';
@@ -690,6 +725,17 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get deleteOkBtnForAll => 'Delete for all';
 
+  @override
+  String memoriesDeleteSnackbarSuccess(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Deleted $count items successfully',
+      one: 'Deleted 1 item successfully',
+    );
+    return '$_temp0';
+  }
+
   @override
   String get deleteOkBtnForMe => 'Delete for me';
 
@@ -699,6 +745,17 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get deleteImageBody => 'The image will be irrevocably deleted.';
 
+  @override
+  String deleteMemoriesBody(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'The $count images will be irrevocably deleted.',
+      one: 'The image will be irrevocably deleted.',
+    );
+    return '$_temp0';
+  }
+
   @override
   String get settingsBackup => 'Backup';
 
@@ -778,11 +835,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get backupChangePassword => 'Change password';
 
   @override
-  String get twonlySafeRecoverTitle => 'Recovery';
+  String get twonlySafeRecoverTitle => 'Restore backup';
-
-  @override
-  String get twonlySafeRecoverDesc =>
-      'If you have created a backup with twonly Backup, you can restore it here.';
 
   @override
   String get twonlySafeRecoverBtn => 'Restore backup';
@@ -829,7 +882,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get reportUserReason => 'Reporting reason';
 
   @override
-  String get reportUser => 'Report user';
+  String get reportUser => 'Report contact';
 
   @override
   String get newDeviceRegistered =>
@@ -1223,12 +1276,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get draftMessage => 'Draft';
 
-  @override
-  String get exportMemories => 'Export memories (Beta)';
-
-  @override
-  String get importMemories => 'Import memories (Beta)';
-
   @override
   String get voiceMessageSlideToCancel => 'Slide to cancel';
 
@@ -1244,6 +1291,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get openYourOwnQRcode => 'Open your own QR code';
 
+  @override
+  String get addContactQrSheetSubtext =>
+      'Let a friend scan this QR code to add you';
+
   @override
   String get finishSetupCardTitle => 'Complete your profile';
 
@@ -1297,11 +1348,12 @@ class AppLocalizationsEn extends AppLocalizations {
       'Be informed about who is requesting';
 
   @override
-  String get userDiscoverySettingsManualApproval => 'Manual approval';
+  String get userDiscoverySettingsManualApproval =>
+      'Ask every time before sharing';
 
   @override
   String get userDiscoverySettingsManualApprovalDesc =>
-      'Before someone is shared, you\'ll be asked first.';
+      'Before one of your friends is shared, you will be asked every time.';
 
   @override
   String get onboardingUserDiscoveryLetFriendsFindYou =>
@@ -1463,11 +1515,11 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get verificationBadgeGeneralDesc =>
-      'The checkmark gives you the certainty that you are messaging the right person. Scan the contact\'s QR code to verify it.';
+      'The checkmark gives you the certainty that you are messaging the right person. You can verify contacts at any time by scanning their QR code.';
 
   @override
   String get verificationBadgeGreenDesc =>
-      'A contact you have *personally* verified.';
+      'A contact you have *personally verified* using the QR code.';
 
   @override
   String get verificationBadgeYellowDesc =>
@@ -1477,6 +1529,35 @@ class AppLocalizationsEn extends AppLocalizations {
   String get verificationBadgeRedDesc =>
       'A contact whose identity has *not* yet been verified.';
 
+  @override
+  String get scanNow => 'Scan now';
+
+  @override
+  String get openQrCode => 'Open QR code';
+
+  @override
+  String get deleteVerificationTitle => 'Delete verification?';
+
+  @override
+  String get deleteVerificationBody =>
+      'Are you sure you want to delete this verification?';
+
+  @override
+  String secretQrTokenVerifiedSnackbar(Object username) {
+    return '$username has scanned your QR code and is now verified.';
+  }
+
+  @override
+  String mutualGroupsTitle(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count mutual groups',
+      one: '1 mutual group',
+    );
+    return '$_temp0';
+  }
+
   @override
   String chatEntryFlameRestored(Object count) {
     return '$count flames restored';
@@ -1522,9 +1603,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get settingsTypingIndicationSubtitle =>
       'When the typing indicator is turned off, you can\'t see when others are typing a message.';
 
-  @override
-  String get scanQrOrShow => 'Scan / Show QR';
-
   @override
   String get contactActionBlock => 'Block';
 
@@ -1556,6 +1634,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get userDiscoverySettingsTitle => 'Mutual Friends';
 
+  @override
+  String get userDiscoveryFeatureOffers => 'Your benefits at a glance';
+
   @override
   String get userDiscoveryDisabledLearnMore => 'Learn more';
 
@@ -1599,6 +1680,43 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get friendSuggestionsRequest => 'Request';
 
+  @override
+  String get friendSuggestionsAskFriend => 'Ask your friends';
+
+  @override
+  String askFriendsDialogTitle(Object username) {
+    return 'Ask about $username';
+  }
+
+  @override
+  String get askFriendsDialogDescription =>
+      'Select the friends you want to ask about this user:';
+
+  @override
+  String get askFriendsDialogConfirm => 'Ask';
+
+  @override
+  String get askFriendsDialogCancel => 'Cancel';
+
+  @override
+  String get chatAskAFriendReceivedDescription =>
+      'Your friend just got this as a suggestion and wants to know if he knows this person.';
+
+  @override
+  String get chatAskAFriendAddedDescription =>
+      'You have added this user to your contacts.';
+
+  @override
+  String get chatAskAFriendHide => 'Hide';
+
+  @override
+  String get chatAskAFriendRequest => 'Request';
+
+  @override
+  String chatAskAFriendUnknownUser(Object userId) {
+    return 'User $userId';
+  }
+
   @override
   String contactUserDiscoveryImagesLeft(Object imagesLeft, Object username) {
     return '$imagesLeft more images are needed until your friends are shared with $username.';
@@ -1683,9 +1801,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get back => 'Back';
 
-  @override
-  String get onboardingExampleLabel => 'Example';
-
   @override
   String makerChangedUsername(Object maker, Object oldName, Object newName) {
     return '$maker changed their username from $oldName to $newName.';
@@ -1764,4 +1879,200 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get errorEmojiUsedOrInvalid => 'Emoji already used or invalid';
+
+  @override
+  String get subscriptionPledgeSecureTitle => 'Secure by Design';
+
+  @override
+  String get subscriptionPledgeSecureDesc =>
+      'Your messages and shared moments are fully end-to-end encrypted.';
+
+  @override
+  String get subscriptionPledgeNoAdsTitle => 'No Ads or Data selling';
+
+  @override
+  String get subscriptionPledgeNoAdsDesc =>
+      'twonly will never show advertisements or sell your private data.';
+
+  @override
+  String get subscriptionPledgeSubtitle => 'Zero ads. Total privacy.';
+
+  @override
+  String get dragToZoom => 'Drag to Zoom';
+
+  @override
+  String get onboardingProfileSelectionTitle => 'Choose your setup path';
+
+  @override
+  String get onboardingProfileSelectionSubtitle =>
+      'Choose how you want to configure your security and privacy settings.';
+
+  @override
+  String get onboardingProfileSelectionDefaultTitle => 'Default';
+
+  @override
+  String get onboardingProfileSelectionDefaultDesc =>
+      'Instantly applies recommended settings so you can start using the app.';
+
+  @override
+  String get onboardingProfileSelectionDefaultBadge => 'Fast Setup';
+
+  @override
+  String get onboardingProfileSelectionCustomizeTitle => 'Customize';
+
+  @override
+  String get onboardingProfileSelectionCustomizeDesc =>
+      'Step-by-step setup so you can decide for yourself.';
+
+  @override
+  String get onboardingProfileSelectionStrictTitle => 'Enhanced Protection';
+
+  @override
+  String get onboardingProfileSelectionStrictDesc =>
+      'Maximum anti-phishing defense. Recommended for *journalists & public figures*.';
+
+  @override
+  String get replyFlameRestored => 'Flames restored';
+
+  @override
+  String get replyAskAFriend => 'Ask a friend';
+
+  @override
+  String get unverifiedWarningDirectTitle => 'Identity not verified in person';
+
+  @override
+  String get unverifiedWarningGroupTitle =>
+      'Not all members are verified in person';
+
+  @override
+  String get unverifiedWarningBody =>
+      '*Avoid sharing sensitive data*. Risk of *impersonation* without manual verification.';
+
+  @override
+  String get unverifiedWarningButton => 'Verify now';
+
+  @override
+  String get today => 'Today';
+
+  @override
+  String get yesterday => 'Yesterday';
+
+  @override
+  String get galleryDisableWarningTitle => 'Disable gallery saving?';
+
+  @override
+  String get galleryDisableWarningBody =>
+      'If you disable this, your media files will not be saved to your gallery and could be permanently lost if twonly is removed or has an issue, as media files are not yet backed up.';
+
+  @override
+  String get galleryDisableWarningConfirm => 'Disable';
+
+  @override
+  String get settingsStorageScanGalleryTitle => 'Import from Gallery';
+
+  @override
+  String get importGalleryDeselectAll => 'Deselect all';
+
+  @override
+  String get importGallerySelectAll => 'Select all';
+
+  @override
+  String get importGalleryPermissionRequired =>
+      'Permission to access your gallery is required to import previous twonly media files.';
+
+  @override
+  String importGalleryPermissionError(Object error) {
+    return 'An error occurred while requesting permission: $error';
+  }
+
+  @override
+  String importGalleryLoadError(Object error) {
+    return 'Failed to load assets: $error';
+  }
+
+  @override
+  String importGalleryImportingOf(Object current, Object total) {
+    return 'Importing $current of $total...';
+  }
+
+  @override
+  String get importGalleryStarting => 'Starting import...';
+
+  @override
+  String importGalleryComplete(
+    Object imported,
+    Object duplicated,
+    Object failed,
+  ) {
+    return 'Import complete: $imported successfully imported, $duplicated duplicated and $failed failed.';
+  }
+
+  @override
+  String get importGalleryGrantAccess => 'Grant Access';
+
+  @override
+  String get importGalleryOpenSettings => 'Open Settings';
+
+  @override
+  String get importGalleryPermissionDenied =>
+      'Permission to access gallery denied.';
+
+  @override
+  String get importGalleryTryAgain => 'Try Again';
+
+  @override
+  String get importGalleryAlbumNotFound => '\"twonly\" album not found';
+
+  @override
+  String get importGalleryAlbumNotFoundDesc =>
+      'If you don\'t have this album yet, you can also create it to import photos into twonly.';
+
+  @override
+  String get importGalleryNoImagesFound => 'No images found';
+
+  @override
+  String get importGalleryNoImagesFoundDesc =>
+      'There are no images on your device.';
+
+  @override
+  String get importGalleryFilterTwonly => 'Only show the twonly-Album';
+
+  @override
+  String get importGalleryRefresh => 'Refresh';
+
+  @override
+  String get importGallerySelectToImport => 'Select items to import';
+
+  @override
+  String importGalleryImportCount(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Import $count items',
+      one: 'Import 1 item',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get emptyChatListTitle => 'Find your first friend';
+
+  @override
+  String get emptyChatListDesc =>
+      'Let friends scan your QR code, or share them your profile.';
+
+  @override
+  String get emptyChatListShareBtn => 'Share your profile';
+
+  @override
+  String get emptyChatListScanBtn => 'QR Code';
+
+  @override
+  String get emptyChatListAddUsernameBtn => 'By Username';
+
+  @override
+  String get avatarCustomizeRandomize => 'Randomize';
+
+  @override
+  String get avatarCustomizeReset => 'Reset';
 }

lib/src/localization/translations

@@ -1 +1 @@
-Subproject commit 9218abf0961c072edd2f8aa5035d06a331b853c6
+Subproject commit 673f6d8c3036d64060b1114912bd5bf5515d5420

lib/src/model/json/userdata.model.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:twonly/src/services/profile.service.dart';
 part 'userdata.model.g.dart';
 
 @JsonSerializable()
@@ -10,6 +11,7 @@ class UserData {
     required this.displayName,
     required this.subscriptionPlan,
     required this.currentSetupPage,
+    required this.appVersion,
   });
   factory UserData.fromJson(Map<String, dynamic> json) =>
       _$UserDataFromJson(json);
@@ -35,6 +37,12 @@ class UserData {
   @JsonKey(defaultValue: 0)
   int deviceId = 0;
 
+  @JsonKey(defaultValue: SetupProfile.standard)
+  SetupProfile setupProfile = SetupProfile.standard;
+
+  @JsonKey(defaultValue: SecurityProfile.normal)
+  SecurityProfile securityProfile = SecurityProfile.normal;
+
   // --- SUBSCRIPTION DTA ---
 
   @JsonKey(defaultValue: 'Free')
@@ -57,6 +65,12 @@ class UserData {
   @JsonKey(defaultValue: false)
   bool requestedAudioPermission = false;
 
+  @JsonKey(defaultValue: false)
+  bool enableDatabaseLogging = false;
+
+  @JsonKey(defaultValue: false)
+  bool automaticallyMarkEqualMediaFilesAsOpened = false;
+
   @JsonKey(defaultValue: true)
   bool videoStabilizationEnabled = true;
 
@@ -73,8 +87,8 @@ class UserData {
 
   Map<String, List<String>>? autoDownloadOptions;
 
-  @JsonKey(defaultValue: false)
+  @JsonKey(defaultValue: true)
-  bool storeMediaFilesInGallery = false;
+  bool storeMediaFilesInGallery = true;
 
   @JsonKey(defaultValue: false)
   bool autoStoreAllSendUnlimitedMediaFiles = false;
@@ -100,8 +114,8 @@ class UserData {
   @JsonKey(defaultValue: 4)
   int requiredSendImages = 4;
 
-  @JsonKey(defaultValue: 2)
+  @JsonKey(defaultValue: 3)
-  int userDiscoveryThreshold = 2;
+  int userDiscoveryThreshold = 3;
 
   @JsonKey(defaultValue: false)
   bool userDiscoveryRequiresManualApproval = false;
@@ -162,6 +176,9 @@ class UserData {
   @JsonKey(defaultValue: false)
   bool skipSetupPages = false;
 
+  @JsonKey(defaultValue: false)
+  bool hasZoomed = false;
+
   Map<String, dynamic> toJson() => _$UserDataToJson(this);
 }
 

lib/src/model/json/userdata.model.g.dart

@@ -13,13 +13,22 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
         displayName: json['displayName'] as String,
         subscriptionPlan: json['subscriptionPlan'] as String? ?? 'Free',
         currentSetupPage: json['currentSetupPage'] as String?,
+        appVersion: (json['appVersion'] as num?)?.toInt() ?? 0,
       )
       ..avatarSvg = json['avatarSvg'] as String?
       ..avatarJson = json['avatarJson'] as String?
-      ..appVersion = (json['appVersion'] as num?)?.toInt() ?? 0
       ..avatarCounter = (json['avatarCounter'] as num?)?.toInt() ?? 0
       ..isDeveloper = json['isDeveloper'] as bool? ?? false
       ..deviceId = (json['deviceId'] as num?)?.toInt() ?? 0
+      ..setupProfile =
+          $enumDecodeNullable(_$SetupProfileEnumMap, json['setupProfile']) ??
+          SetupProfile.standard
+      ..securityProfile =
+          $enumDecodeNullable(
+            _$SecurityProfileEnumMap,
+            json['securityProfile'],
+          ) ??
+          SecurityProfile.normal
       ..subscriptionPlanIdStore = json['subscriptionPlanIdStore'] as String?
       ..lastImageSend = json['lastImageSend'] == null
           ? null
@@ -33,6 +42,9 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
       ..defaultShowTime = (json['defaultShowTime'] as num?)?.toInt()
       ..requestedAudioPermission =
           json['requestedAudioPermission'] as bool? ?? false
+      ..enableDatabaseLogging = json['enableDatabaseLogging'] as bool? ?? false
+      ..automaticallyMarkEqualMediaFilesAsOpened =
+          json['automaticallyMarkEqualMediaFilesAsOpened'] as bool? ?? false
       ..videoStabilizationEnabled =
           json['videoStabilizationEnabled'] as bool? ?? true
       ..showFeedbackShortcut = json['showFeedbackShortcut'] as bool? ?? true
@@ -50,7 +62,7 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
             ),
           )
       ..storeMediaFilesInGallery =
-          json['storeMediaFilesInGallery'] as bool? ?? false
+          json['storeMediaFilesInGallery'] as bool? ?? true
       ..autoStoreAllSendUnlimitedMediaFiles =
           json['autoStoreAllSendUnlimitedMediaFiles'] as bool? ?? false
       ..typingIndicators = json['typingIndicators'] as bool? ?? true
@@ -66,7 +78,7 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
           json['isUserDiscoveryEnabled'] as bool? ?? false
       ..requiredSendImages = (json['requiredSendImages'] as num?)?.toInt() ?? 4
       ..userDiscoveryThreshold =
-          (json['userDiscoveryThreshold'] as num?)?.toInt() ?? 2
+          (json['userDiscoveryThreshold'] as num?)?.toInt() ?? 3
       ..userDiscoveryRequiresManualApproval =
           json['userDiscoveryRequiresManualApproval'] as bool? ?? false
       ..userDiscoverySharePromotion =
@@ -100,7 +112,8 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
       ..lastUserStudyDataUpload = json['lastUserStudyDataUpload'] == null
           ? null
           : DateTime.parse(json['lastUserStudyDataUpload'] as String)
-      ..skipSetupPages = json['skipSetupPages'] as bool? ?? false;
+      ..skipSetupPages = json['skipSetupPages'] as bool? ?? false
+      ..hasZoomed = json['hasZoomed'] as bool? ?? false;
 
 Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'userId': instance.userId,
@@ -112,6 +125,8 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'avatarCounter': instance.avatarCounter,
   'isDeveloper': instance.isDeveloper,
   'deviceId': instance.deviceId,
+  'setupProfile': _$SetupProfileEnumMap[instance.setupProfile]!,
+  'securityProfile': _$SecurityProfileEnumMap[instance.securityProfile]!,
   'subscriptionPlan': instance.subscriptionPlan,
   'subscriptionPlanIdStore': instance.subscriptionPlanIdStore,
   'lastImageSend': instance.lastImageSend?.toIso8601String(),
@@ -121,6 +136,9 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'themeMode': _$ThemeModeEnumMap[instance.themeMode]!,
   'defaultShowTime': instance.defaultShowTime,
   'requestedAudioPermission': instance.requestedAudioPermission,
+  'enableDatabaseLogging': instance.enableDatabaseLogging,
+  'automaticallyMarkEqualMediaFilesAsOpened':
+      instance.automaticallyMarkEqualMediaFilesAsOpened,
   'videoStabilizationEnabled': instance.videoStabilizationEnabled,
   'showFeedbackShortcut': instance.showFeedbackShortcut,
   'showShowImagePreviewWhenSending': instance.showShowImagePreviewWhenSending,
@@ -160,6 +178,18 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
       ?.toIso8601String(),
   'currentSetupPage': instance.currentSetupPage,
   'skipSetupPages': instance.skipSetupPages,
+  'hasZoomed': instance.hasZoomed,
+};
+
+const _$SetupProfileEnumMap = {
+  SetupProfile.standard: 'standard',
+  SetupProfile.customized: 'customized',
+  SetupProfile.maximum: 'maximum',
+};
+
+const _$SecurityProfileEnumMap = {
+  SecurityProfile.normal: 'normal',
+  SecurityProfile.strict: 'strict',
 };
 
 const _$ThemeModeEnumMap = {

lib/src/model/memory_item.model.dart

@@ -5,9 +5,11 @@ class MemoryItem {
   MemoryItem({
     required this.mediaService,
     required this.messages,
+    this.sender,
   });
   final List<Message> messages;
   final MediaFileService mediaService;
+  final Contact? sender;
 
   static Future<Map<String, MemoryItem>> convertFromMessages(
     List<Message> messages,

lib/src/model/protobuf/client/data.proto

@@ -11,10 +11,12 @@ message AdditionalMessageData {
         LINK = 0;
         CONTACTS = 1;
         RESTORED_FLAME_COUNTER = 2;
+        ASK_ABOUT_USER = 3;
     }
     Type type = 1;
 
     optional string link = 2;
     repeated SharedContact contacts = 3;
     optional int64 restored_flame_counter = 4;
+    optional int64 ask_about_user_id = 5;
 }

lib/src/model/protobuf/client/generated/data.pb.dart

@@ -105,6 +105,7 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
     $core.String? link,
     $core.Iterable<SharedContact>? contacts,
     $fixnum.Int64? restoredFlameCounter,
+    $fixnum.Int64? askAboutUserId,
   }) {
     final result = create();
     if (type != null) result.type = type;
@@ -112,6 +113,7 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
     if (contacts != null) result.contacts.addAll(contacts);
     if (restoredFlameCounter != null)
       result.restoredFlameCounter = restoredFlameCounter;
+    if (askAboutUserId != null) result.askAboutUserId = askAboutUserId;
     return result;
   }
 
@@ -133,6 +135,7 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
     ..pPM<SharedContact>(3, _omitFieldNames ? '' : 'contacts',
         subBuilder: SharedContact.create)
     ..aInt64(4, _omitFieldNames ? '' : 'restoredFlameCounter')
+    ..aInt64(5, _omitFieldNames ? '' : 'askAboutUserId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@@ -184,6 +187,15 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
   $core.bool hasRestoredFlameCounter() => $_has(3);
   @$pb.TagNumber(4)
   void clearRestoredFlameCounter() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $fixnum.Int64 get askAboutUserId => $_getI64(4);
+  @$pb.TagNumber(5)
+  set askAboutUserId($fixnum.Int64 value) => $_setInt64(4, value);
+  @$pb.TagNumber(5)
+  $core.bool hasAskAboutUserId() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearAskAboutUserId() => $_clearField(5);
 }
 
 const $core.bool _omitFieldNames =

lib/src/model/protobuf/client/generated/data.pbenum.dart

@@ -22,16 +22,19 @@ class AdditionalMessageData_Type extends $pb.ProtobufEnum {
   static const AdditionalMessageData_Type RESTORED_FLAME_COUNTER =
       AdditionalMessageData_Type._(
           2, _omitEnumNames ? '' : 'RESTORED_FLAME_COUNTER');
+  static const AdditionalMessageData_Type ASK_ABOUT_USER =
+      AdditionalMessageData_Type._(3, _omitEnumNames ? '' : 'ASK_ABOUT_USER');
 
   static const $core.List<AdditionalMessageData_Type> values =
       <AdditionalMessageData_Type>[
     LINK,
     CONTACTS,
     RESTORED_FLAME_COUNTER,
+    ASK_ABOUT_USER,
   ];
 
   static final $core.List<AdditionalMessageData_Type?> _byValue =
-      $pb.ProtobufEnum.$_initByValueList(values, 2);
+      $pb.ProtobufEnum.$_initByValueList(values, 3);
   static AdditionalMessageData_Type? valueOf($core.int value) =>
       value < 0 || value >= _byValue.length ? null : _byValue[value];
 

lib/src/model/protobuf/client/generated/data.pbjson.dart

@@ -67,11 +67,21 @@ const AdditionalMessageData$json = {
       '10': 'restoredFlameCounter',
       '17': true
     },
+    {
+      '1': 'ask_about_user_id',
+      '3': 5,
+      '4': 1,
+      '5': 3,
+      '9': 2,
+      '10': 'askAboutUserId',
+      '17': true
+    },
   ],
   '4': [AdditionalMessageData_Type$json],
   '8': [
     {'1': '_link'},
     {'1': '_restored_flame_counter'},
+    {'1': '_ask_about_user_id'},
   ],
 };
 
@@ -82,6 +92,7 @@ const AdditionalMessageData_Type$json = {
     {'1': 'LINK', '2': 0},
     {'1': 'CONTACTS', '2': 1},
     {'1': 'RESTORED_FLAME_COUNTER', '2': 2},
+    {'1': 'ASK_ABOUT_USER', '2': 3},
   ],
 };
 
@@ -90,6 +101,7 @@ final $typed_data.Uint8List additionalMessageDataDescriptor = $convert.base64Dec
     'ChVBZGRpdGlvbmFsTWVzc2FnZURhdGESLwoEdHlwZRgBIAEoDjIbLkFkZGl0aW9uYWxNZXNzYW'
     'dlRGF0YS5UeXBlUgR0eXBlEhcKBGxpbmsYAiABKAlIAFIEbGlua4gBARIqCghjb250YWN0cxgD'
     'IAMoCzIOLlNoYXJlZENvbnRhY3RSCGNvbnRhY3RzEjkKFnJlc3RvcmVkX2ZsYW1lX2NvdW50ZX'
-    'IYBCABKANIAVIUcmVzdG9yZWRGbGFtZUNvdW50ZXKIAQEiOgoEVHlwZRIICgRMSU5LEAASDAoI'
+    'IYBCABKANIAVIUcmVzdG9yZWRGbGFtZUNvdW50ZXKIAQESLgoRYXNrX2Fib3V0X3VzZXJfaWQY'
-    'Q09OVEFDVFMQARIaChZSRVNUT1JFRF9GTEFNRV9DT1VOVEVSEAJCBwoFX2xpbmtCGQoXX3Jlc3'
+    'BSABKANIAlIOYXNrQWJvdXRVc2VySWSIAQEiTgoEVHlwZRIICgRMSU5LEAASDAoIQ09OVEFDVF'
-    'RvcmVkX2ZsYW1lX2NvdW50ZXI=');
+    'MQARIaChZSRVNUT1JFRF9GTEFNRV9DT1VOVEVSEAISEgoOQVNLX0FCT1VUX1VTRVIQA0IHCgVf'
+    'bGlua0IZChdfcmVzdG9yZWRfZmxhbWVfY291bnRlckIUChJfYXNrX2Fib3V0X3VzZXJfaWQ=');

lib/src/model/protobuf/client/generated/qr.pb.dart

@@ -97,6 +97,7 @@ class PublicProfile extends $pb.GeneratedMessage {
     $core.List<$core.int>? signedPrekeySignature,
     $fixnum.Int64? signedPrekeyId,
     $core.List<$core.int>? secretVerificationToken,
+    $fixnum.Int64? timestamp,
   }) {
     final result = create();
     if (userId != null) result.userId = userId;
@@ -109,6 +110,7 @@ class PublicProfile extends $pb.GeneratedMessage {
     if (signedPrekeyId != null) result.signedPrekeyId = signedPrekeyId;
     if (secretVerificationToken != null)
       result.secretVerificationToken = secretVerificationToken;
+    if (timestamp != null) result.timestamp = timestamp;
     return result;
   }
 
@@ -136,6 +138,7 @@ class PublicProfile extends $pb.GeneratedMessage {
     ..aInt64(7, _omitFieldNames ? '' : 'signedPrekeyId')
     ..a<$core.List<$core.int>>(
         8, _omitFieldNames ? '' : 'secretVerificationToken', $pb.PbFieldType.OY)
+    ..aInt64(9, _omitFieldNames ? '' : 'timestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@@ -230,6 +233,15 @@ class PublicProfile extends $pb.GeneratedMessage {
   $core.bool hasSecretVerificationToken() => $_has(7);
   @$pb.TagNumber(8)
   void clearSecretVerificationToken() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $fixnum.Int64 get timestamp => $_getI64(8);
+  @$pb.TagNumber(9)
+  set timestamp($fixnum.Int64 value) => $_setInt64(8, value);
+  @$pb.TagNumber(9)
+  $core.bool hasTimestamp() => $_has(8);
+  @$pb.TagNumber(9)
+  void clearTimestamp() => $_clearField(9);
 }
 
 const $core.bool _omitFieldNames =

lib/src/model/protobuf/client/generated/qr.pbjson.dart

@@ -77,9 +77,19 @@ const PublicProfile$json = {
       '10': 'secretVerificationToken',
       '17': true
     },
+    {
+      '1': 'timestamp',
+      '3': 9,
+      '4': 1,
+      '5': 3,
+      '9': 1,
+      '10': 'timestamp',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_secret_verification_token'},
+    {'1': '_timestamp'},
   ],
 };
 
@@ -91,4 +101,5 @@ final $typed_data.Uint8List publicProfileDescriptor = $convert.base64Decode(
     'lvbl9pZBgFIAEoA1IOcmVnaXN0cmF0aW9uSWQSNgoXc2lnbmVkX3ByZWtleV9zaWduYXR1cmUY'
     'BiABKAxSFXNpZ25lZFByZWtleVNpZ25hdHVyZRIoChBzaWduZWRfcHJla2V5X2lkGAcgASgDUg'
     '5zaWduZWRQcmVrZXlJZBI/ChlzZWNyZXRfdmVyaWZpY2F0aW9uX3Rva2VuGAggASgMSABSF3Nl'
-    'Y3JldFZlcmlmaWNhdGlvblRva2VuiAEBQhwKGl9zZWNyZXRfdmVyaWZpY2F0aW9uX3Rva2Vu');
+    'Y3JldFZlcmlmaWNhdGlvblRva2VuiAEBEiEKCXRpbWVzdGFtcBgJIAEoA0gBUgl0aW1lc3RhbX'
+    'CIAQFCHAoaX3NlY3JldF92ZXJpZmljYXRpb25fdG9rZW5CDAoKX3RpbWVzdGFtcA==');

lib/src/model/protobuf/client/qr.proto

@@ -17,4 +17,5 @@ message PublicProfile {
   bytes  signed_prekey_signature = 6;
   int64  signed_prekey_id        = 7;
   optional bytes secret_verification_token = 8; 
+  optional int64 timestamp = 9;
 }

lib/src/providers/routing.provider.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:twonly/app.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
@@ -21,10 +22,11 @@ import 'package:twonly/src/visual/views/settings/backup/backup_setup.view.dart';
 import 'package:twonly/src/visual/views/settings/chat/chat_reactions.view.dart';
 import 'package:twonly/src/visual/views/settings/chat/chat_settings.view.dart';
 import 'package:twonly/src/visual/views/settings/data_and_storage.view.dart';
-import 'package:twonly/src/visual/views/settings/data_and_storage/export_media.view.dart';
+import 'package:twonly/src/visual/views/settings/data_and_storage/import_from_gallery.view.dart';
-import 'package:twonly/src/visual/views/settings/data_and_storage/import_media.view.dart';
+import 'package:twonly/src/visual/views/settings/data_and_storage/manage_storage.view.dart';
 import 'package:twonly/src/visual/views/settings/developer/automated_testing.view.dart';
 import 'package:twonly/src/visual/views/settings/developer/developer.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/informations.view.dart';
 import 'package:twonly/src/visual/views/settings/developer/reduce_flames.view.dart';
 import 'package:twonly/src/visual/views/settings/developer/retransmission_data.view.dart';
 import 'package:twonly/src/visual/views/settings/help/changelog.view.dart';
@@ -37,6 +39,7 @@ import 'package:twonly/src/visual/views/settings/help/help.view.dart';
 import 'package:twonly/src/visual/views/settings/notification.view.dart';
 import 'package:twonly/src/visual/views/settings/privacy.view.dart';
 import 'package:twonly/src/visual/views/settings/privacy/block_users.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy/profile_selection.view.dart';
 import 'package:twonly/src/visual/views/settings/privacy/user_discovery.view.dart';
 import 'package:twonly/src/visual/views/settings/profile/modify_avatar.view.dart';
 import 'package:twonly/src/visual/views/settings/profile/profile.view.dart';
@@ -46,7 +49,10 @@ import 'package:twonly/src/visual/views/settings/subscription/subscription.view.
 import 'package:twonly/src/visual/views/user_study/user_study_questionnaire.view.dart';
 import 'package:twonly/src/visual/views/user_study/user_study_welcome.view.dart';
 
+final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
+
 final routerProvider = GoRouter(
+  navigatorKey: rootNavigatorKey,
   routes: [
     GoRoute(
       path: Routes.home,
@@ -200,6 +206,10 @@ final routerProvider = GoRouter(
               path: 'user_discovery',
               builder: (context, state) => const UserDiscoverySettingsView(),
             ),
+            GoRoute(
+              path: 'profile_selection',
+              builder: (context, state) => const ProfileSelectionSettingsView(),
+            ),
           ],
         ),
         GoRoute(
@@ -211,12 +221,12 @@ final routerProvider = GoRouter(
           builder: (context, state) => const DataAndStorageView(),
           routes: [
             GoRoute(
-              path: 'import',
+              path: 'manage',
-              builder: (context, state) => const ImportMediaView(),
+              builder: (context, state) => const ManageStorageView(),
             ),
             GoRoute(
-              path: 'export',
+              path: 'import_gallery',
-              builder: (context, state) => const ExportMediaView(),
+              builder: (context, state) => const ImportFromGalleryView(),
             ),
           ],
         ),
@@ -279,6 +289,10 @@ final routerProvider = GoRouter(
               path: 'automated_testing',
               builder: (context, state) => const AutomatedTestingView(),
             ),
+            GoRoute(
+              path: 'informations',
+              builder: (context, state) => const DeveloperInformationsView(),
+            ),
             GoRoute(
               path: 'reduce_flames',
               builder: (context, state) => const ReduceFlamesView(),

lib/src/services/android_photo_picker.service.dart

@@ -0,0 +1,25 @@
+import 'package:flutter/services.dart';
+
+class AndroidPhotoPickerService {
+  static const MethodChannel _channel = MethodChannel('eu.twonly/photo_picker');
+
+  /// Launches the native Android Photo Picker and returns a list of URIs.
+  static Future<List<String>> pickImages() async {
+    try {
+      final result = await _channel.invokeListMethod<String>('pickImages');
+      return result ?? [];
+    } catch (e) {
+      return [];
+    }
+  }
+
+  /// Reads the raw bytes from a content URI using the Android ContentResolver.
+  static Future<Uint8List?> getUriBytes(String uri) async {
+    try {
+      final bytes = await _channel.invokeMethod<Uint8List>('getUriBytes', {'uri': uri});
+      return bytes;
+    } catch (e) {
+      return null;
+    }
+  }
+}

lib/src/services/api.service.dart

@@ -18,7 +18,6 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:twonly/core/bridge/wrapper/key_manager.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/locator.dart';
-import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pbserver.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
@@ -97,19 +96,27 @@ class ApiService {
         Uri.parse(apiUrl),
         pingInterval: const Duration(seconds: 30),
       );
+
+      try {
+        await channel.ready.timeout(const Duration(seconds: 10));
+      } catch (e) {
+        channel.sink.close().ignore();
+        rethrow;
+      }
+
       _channel = channel;
       _channel!.stream.listen(_onData, onDone: _onDone, onError: _onError);
-      await _channel!.ready;
       Log.info('websocket connected to $apiUrl');
       return true;
-    } catch (_) {
+    } catch (e) {
+      _channel = null;
       return false;
     }
   }
 
   // Function is called after the user is authenticated at the server
   Future<void> onAuthenticated() async {
-    await initFCMAfterAuthenticated();
+    await FcmNotificationService.initFCMAfterAuthenticated();
     _connectionStateController.add(true);
 
     if (AppState.isInBackgroundTask) {
@@ -149,6 +156,7 @@ class ApiService {
   }
 
   Future<void> onClosed() async {
+    if (_channel == null) return;
     Log.info('websocket connection closed');
     _channel = null;
     isAuthenticated = false;
@@ -180,15 +188,19 @@ class ApiService {
     _reconnectionDelay = 3;
   }
 
-  Future<void> close(Function callback) async {
+  Future<void> close(Function? callback) async {
     Log.info('closing websocket connection');
     if (_channel != null) {
-      await _channel!.sink.close();
+      try {
+        await _channel!.sink.close().timeout(const Duration(seconds: 2));
+      } catch (e) {
+        Log.warn('Timeout or error closing websocket: $e');
+      }
       await onClosed();
-      callback();
+      callback?.call();
       return;
     }
-    callback();
+    callback?.call();
   }
 
   Future<void> listenToNetworkChanges() async {
@@ -246,7 +258,10 @@ class ApiService {
 
   Future<void> _onData(dynamic msgBuffer) async {
     try {
-      final msg = server.ServerToClient.fromBuffer(msgBuffer as Uint8List);
+      if (msgBuffer is! Uint8List) {
+        msgBuffer = Uint8List.fromList(msgBuffer as List<int>);
+      }
+      final msg = server.ServerToClient.fromBuffer(msgBuffer);
       if (msg.v0.hasResponse()) {
         final completer = _pendingRequests.remove(msg.v0.seq);
         if (completer != null && !completer.isCompleted) {
@@ -426,7 +441,7 @@ class ApiService {
 
   Future<bool> tryAuthenticateWithToken() async {
     final apiAuthToken = await SecureStorage.instance.read(
-      key: SecureStorageKeys.apiAuthToken,
+      key: 'api_auth_token',
     );
 
     if (apiAuthToken != null) {
@@ -464,7 +479,7 @@ class ApiService {
               Log.info('Switch was successfully.');
               await UserService.update((u) => u.canUseLoginTokenForAuth = true);
               await SecureStorage.instance.delete(
-                key: SecureStorageKeys.apiAuthToken,
+                key: 'api_auth_token',
               );
             }
           } catch (e) {
@@ -586,7 +601,7 @@ class ApiService {
       final apiAuthTokenB64 = base64Encode(apiAuthToken);
 
       await SecureStorage.instance.write(
-        key: SecureStorageKeys.apiAuthToken,
+        key: 'api_auth_token',
         value: apiAuthTokenB64,
       );
 

lib/src/services/api/client2client/additional_data.c2c.dart

@@ -10,9 +10,10 @@ Future<void> handleAdditionalDataMessage(
   int fromUserId,
   String groupId,
   EncryptedContent_AdditionalDataMessage message,
+  String receiptId,
 ) async {
   Log.info(
-    'Got a additional data message: ${message.senderMessageId} from $groupId',
+    '[$receiptId] Got a additional data message: ${message.senderMessageId} from $groupId',
   );
 
   // Prevent message overwrite: reject if a message with this ID already
@@ -22,7 +23,7 @@ Future<void> handleAdditionalDataMessage(
       .getSingleOrNull();
   if (existing != null && existing.senderId != fromUserId) {
     Log.warn(
-      '$fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
+      '[$receiptId] $fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
     );
     return;
   }
@@ -45,6 +46,6 @@ Future<void> handleAdditionalDataMessage(
     fromTimestamp(message.timestamp),
   );
   if (msg != null) {
-    Log.info('Inserted a new text message with ID: ${msg.messageId}');
+    Log.info('[$receiptId] Inserted a new text message with ID: ${msg.messageId}');
   }
 }

lib/src/services/api/client2client/contact.c2c.dart

@@ -28,7 +28,6 @@ Future<bool> handleNewContactRequest(int fromUserId) async {
         await handleContactAccept(fromUserId);
       }
 
-      // contact was already accepted, so just accept the request in the background.
       await sendCipherText(
         contact.userId,
         EncryptedContent(
@@ -36,6 +35,7 @@ Future<bool> handleNewContactRequest(int fromUserId) async {
             type: EncryptedContent_ContactRequest_Type.ACCEPT,
           ),
         ),
+        blocking: false,
       );
       return true;
     }
@@ -88,16 +88,17 @@ Future<void> handleContactAccept(int fromUserId) async {
 Future<bool> handleContactRequest(
   int fromUserId,
   EncryptedContent_ContactRequest contactRequest,
+  String receiptId,
 ) async {
   switch (contactRequest.type) {
     case EncryptedContent_ContactRequest_Type.REQUEST:
-      Log.info('Got a contact request from $fromUserId');
+      Log.info('[$receiptId] Got a contact request from $fromUserId');
       return handleNewContactRequest(fromUserId);
     case EncryptedContent_ContactRequest_Type.ACCEPT:
-      Log.info('Got a contact accept from $fromUserId');
+      Log.info('[$receiptId] Got a contact accept from $fromUserId');
       await handleContactAccept(fromUserId);
     case EncryptedContent_ContactRequest_Type.REJECT:
-      Log.info('Got a contact reject from $fromUserId');
+      Log.info('[$receiptId] Got a contact reject from $fromUserId');
       await twonlyDB.contactsDao.updateContact(
         fromUserId,
         const ContactsCompanion(
@@ -114,14 +115,15 @@ Future<void> handleContactUpdate(
   int fromUserId,
   EncryptedContent_ContactUpdate contactUpdate,
   int? senderProfileCounter,
+  String receiptId,
 ) async {
   switch (contactUpdate.type) {
     case EncryptedContent_ContactUpdate_Type.REQUEST:
-      Log.info('Got a contact update request from $fromUserId');
+      Log.info('[$receiptId] Got a contact update request from $fromUserId');
       await sendContactMyProfileData(fromUserId);
 
     case EncryptedContent_ContactUpdate_Type.UPDATE:
-      Log.info('Got a contact update $fromUserId');
+      Log.info('[$receiptId] Got a contact update $fromUserId');
       Uint8List? avatarSvgCompressed;
       if (contactUpdate.hasAvatarSvgCompressed()) {
         avatarSvgCompressed = Uint8List.fromList(
@@ -188,8 +190,9 @@ Future<void> handleContactUpdate(
 Future<void> handleFlameSync(
   String groupId,
   EncryptedContent_FlameSync flameSync,
+  String receiptId,
 ) async {
-  Log.info('Got a flameSync for group $groupId');
+  Log.info('[$receiptId] Got a flameSync for group $groupId');
 
   final group = await twonlyDB.groupsDao.getGroup(groupId);
   if (group == null || group.lastFlameCounterChange == null) return;
@@ -235,6 +238,7 @@ Future<int?> checkForProfileUpdate(
                 type: EncryptedContent_ContactUpdate_Type.REQUEST,
               ),
             ),
+            blocking: false,
           );
         }
       }

lib/src/services/api/client2client/errors.c2c.dart

@@ -8,8 +8,9 @@ import 'package:twonly/src/utils/log.dart';
 Future<void> handleErrorMessage(
   int fromUserId,
   EncryptedContent_ErrorMessages error,
+  String receiptId,
 ) async {
-  Log.error('Got error from $fromUserId: $error');
+  Log.error('[$receiptId] Got error from $fromUserId: $error');
 
   switch (error.type) {
     case EncryptedContent_ErrorMessages_Type

lib/src/services/api/client2client/groups.c2c.dart

@@ -15,14 +15,13 @@ Future<void> handleGroupCreate(
   int fromUserId,
   String groupId,
   EncryptedContent_GroupCreate newGroup,
+  String receiptId,
 ) async {
-  final user = await twonlyDB.contactsDao
+  final user = await twonlyDB.contactsDao.getContactByUserId(fromUserId).getSingleOrNull();
-      .getContactByUserId(fromUserId)
-      .getSingleOrNull();
   if (user == null) {
     // Only contacts can invite other contacts, so this can (via the UI) not happen.
     Log.error(
-      'User is not a contact. Aborting.',
+      '[$receiptId] User is not a contact. Aborting.',
     );
     return;
   }
@@ -66,7 +65,7 @@ Future<void> handleGroupCreate(
 
   if (group == null) {
     Log.error(
-      'Could not create new group. Probably because the group already existed.',
+      '[$receiptId] Could not create new group. Probably because the group already existed.',
     );
     return;
   }
@@ -108,12 +107,13 @@ Future<void> handleGroupUpdate(
   int fromUserId,
   String groupId,
   EncryptedContent_GroupUpdate update,
+  String receiptId,
 ) async {
-  Log.info('Got group update for $groupId from $fromUserId');
+  Log.info('[$receiptId] Got group update for $groupId from $fromUserId');
 
   final actionType = groupActionTypeFromString(update.groupActionType);
   if (actionType == null) {
-    Log.error('Group action ${update.groupActionType} is unknown ignoring.');
+    Log.error('[$receiptId] Group action ${update.groupActionType} is unknown ignoring.');
     return;
   }
 
@@ -189,10 +189,11 @@ Future<bool> handleGroupJoin(
   int fromUserId,
   String groupId,
   EncryptedContent_GroupJoin join,
+  String receiptId,
 ) async {
   if (await twonlyDB.contactsDao.getContactById(fromUserId) == null) {
     if (!await addNewHiddenContact(fromUserId)) {
-      Log.error('Got group join, but could not load contact.');
+      Log.error('[$receiptId] Got group join, but could not load contact.');
       // This can happen in case the group join was received before the group create.
       // In this case return false, which will cause the receipt to fail and the user
       // will resend this message.
@@ -213,6 +214,7 @@ Future<void> handleResendGroupPublicKey(
   int fromUserId,
   String groupId,
   EncryptedContent_GroupJoin join,
+  String receiptId,
 ) async {
   final group = await twonlyDB.groupsDao.getGroup(groupId);
   if (group == null || group.myGroupPrivateKey == null) return;
@@ -225,6 +227,7 @@ Future<void> handleResendGroupPublicKey(
         groupPublicKey: keyPair.getPublicKey().serialize(),
       ),
     ),
+    blocking: false,
   );
 }
 
@@ -232,6 +235,7 @@ Future<void> handleTypingIndicator(
   int fromUserId,
   String groupId,
   EncryptedContent_TypingIndicator indicator,
+  String receiptId,
 ) async {
   var lastTypeIndicator = const Value<DateTime?>.absent();
 

lib/src/services/api/client2client/media.c2c.dart

@@ -18,9 +18,10 @@ Future<void> handleMedia(
   int fromUserId,
   String groupId,
   EncryptedContent_Media media,
+  String receiptId,
 ) async {
   Log.info(
-    'Got a media message: ${media.senderMessageId} from $groupId with type ${media.type}',
+    '[$receiptId] Got a media message: ${media.senderMessageId} from $groupId with type ${media.type}',
   );
 
   late MediaType mediaType;
@@ -33,7 +34,7 @@ Future<void> handleMedia(
           message.senderId != fromUserId ||
           message.mediaId == null) {
         Log.warn(
-          'Got reupload from $fromUserId for a message that either does not exists (${message == null}) or senderId = ${message?.senderId}',
+          '[$receiptId] Got reupload for a message that either does not exists (${message == null}) or senderId = ${message?.senderId}',
         );
         return;
       }
@@ -82,13 +83,13 @@ Future<void> handleMedia(
   if (messageTmp != null) {
     if (messageTmp.senderId != fromUserId) {
       Log.warn(
-        '$fromUserId tried to modify the message from ${messageTmp.senderId}.',
+        '[$receiptId] $fromUserId tried to modify the message from ${messageTmp.senderId}.',
       );
       return;
     }
     if (messageTmp.mediaId == null) {
       Log.warn(
-        'This message already exit without a mediaId. Message is dropped.',
+        '[$receiptId] This message already exit without a mediaId. Message is dropped.',
       );
       return;
     }
@@ -97,7 +98,7 @@ Future<void> handleMedia(
     );
     if (mediaFile?.downloadState != DownloadState.reuploadRequested) {
       Log.warn(
-        'This message and media file already exit and was not requested again. Dropping it.',
+        '[$receiptId] This message and media file already exit and was not requested again. Dropping it.',
       );
       return;
     }
@@ -121,6 +122,9 @@ Future<void> handleMedia(
   MediaFile? mediaFile;
   Message? message;
 
+  Log.info(
+    '[$receiptId] Starting transaction for media message ${media.senderMessageId}',
+  );
   await twonlyDB.transaction(() async {
     mediaFile = await twonlyDB.mediaFilesDao.insertOrUpdateMedia(
       MediaFilesCompanion(
@@ -140,7 +144,7 @@ Future<void> handleMedia(
     );
 
     if (mediaFile == null) {
-      Log.error('Could not insert media file into database');
+      Log.error('[$receiptId] Could not insert media file into database');
       return;
     }
 
@@ -163,13 +167,18 @@ Future<void> handleMedia(
       ),
     );
   });
+  Log.info(
+    '[$receiptId] Finished transaction for media message ${media.senderMessageId}. Success: ${message != null}',
+  );
 
   if (message != null && mediaFile != null) {
     await twonlyDB.groupsDao.increaseLastMessageExchange(
       groupId,
       fromTimestamp(media.timestamp),
     );
-    Log.info('Inserted a new media message with ID: ${message!.messageId}');
+    Log.info(
+      '[$receiptId] Inserted a new media message with ID: ${message!.messageId}',
+    );
     await incFlameCounter(
       message!.groupId,
       true,
@@ -180,12 +189,16 @@ Future<void> handleMedia(
   } else {
     if (mediaFile == null && message == null) {
       Log.error(
-        'Could not insert new message as both the message and mediaFile are empty.',
+        '[$receiptId] Could not insert new message as both the message and mediaFile are empty.',
       );
     } else if (mediaFile == null) {
-      Log.error('Could not insert new message as the mediaFile is empty.');
+      Log.error(
+        '[$receiptId] Could not insert new message as the mediaFile is empty.',
+      );
     } else {
-      Log.error('Could not insert new message as the message is empty.');
+      Log.error(
+        '[$receiptId] Could not insert new message as the message is empty.',
+      );
     }
   }
 }
@@ -193,6 +206,7 @@ Future<void> handleMedia(
 Future<void> handleMediaUpdate(
   int fromUserId,
   EncryptedContent_MediaUpdate mediaUpdate,
+  String receiptId,
 ) async {
   final message = await twonlyDB.messagesDao
       .getMessageById(mediaUpdate.targetMessageId)
@@ -200,14 +214,14 @@ Future<void> handleMediaUpdate(
   if (message == null) {
     // this can happen, in case the message was already deleted.
     Log.info(
-      'Got media update to message ${mediaUpdate.targetMessageId} but message not found.',
+      '[$receiptId] Got media update to message ${mediaUpdate.targetMessageId} but message not found.',
     );
     return;
   }
   if (message.mediaId == null) {
     // this can happen, in case the message was already deleted.
     Log.warn(
-      'Got media update for message ${mediaUpdate.targetMessageId} which does not have a mediaId defined.',
+      '[$receiptId] Got media update for message ${mediaUpdate.targetMessageId} which does not have a mediaId defined.',
     );
     return;
   }
@@ -216,14 +230,14 @@ Future<void> handleMediaUpdate(
   );
   if (mediaFile == null) {
     Log.info(
-      'Got media file update, but media file was not found ${message.mediaId}',
+      '[$receiptId] Got media file update, but media file was not found ${message.mediaId}',
     );
     return;
   }
 
   switch (mediaUpdate.type) {
     case EncryptedContent_MediaUpdate_Type.REOPENED:
-      Log.info('Got media file reopened ${mediaFile.mediaId}');
+      Log.info('[$receiptId] Got media file reopened ${mediaFile.mediaId}');
       await twonlyDB.messagesDao.updateMessageId(
         message.messageId,
         const MessagesCompanion(
@@ -231,7 +245,7 @@ Future<void> handleMediaUpdate(
         ),
       );
     case EncryptedContent_MediaUpdate_Type.STORED:
-      Log.info('Got media file stored ${mediaFile.mediaId}');
+      Log.info('[$receiptId] Got media file stored ${mediaFile.mediaId}');
       final mediaService = MediaFileService(mediaFile);
       await mediaService.storeMediaFile();
       await twonlyDB.messagesDao.updateMessageId(
@@ -242,7 +256,9 @@ Future<void> handleMediaUpdate(
       );
 
     case EncryptedContent_MediaUpdate_Type.DECRYPTION_ERROR:
-      Log.info('Got media file decryption error ${mediaFile.mediaId}');
+      Log.info(
+        '[$receiptId] Got media file decryption error ${mediaFile.mediaId}',
+      );
       await reuploadMediaFile(fromUserId, mediaFile, message.messageId);
   }
 }

lib/src/services/api/client2client/messages.c2c.dart

@@ -1,3 +1,4 @@
+import 'package:drift/drift.dart' show Value;
 import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
 import 'package:twonly/src/services/api/utils.api.dart';
@@ -6,26 +7,27 @@ import 'package:twonly/src/utils/log.dart';
 Future<void> handleMessageUpdate(
   int contactId,
   EncryptedContent_MessageUpdate messageUpdate,
+  String receiptId,
 ) async {
   switch (messageUpdate.type) {
     case EncryptedContent_MessageUpdate_Type.OPENED:
       Log.info(
-        'Opened message ${messageUpdate.multipleTargetMessageIds}',
+        '[$receiptId] Opened message ${messageUpdate.multipleTargetMessageIds}',
       );
       try {
         await twonlyDB.messagesDao.handleMessagesOpened(
-          contactId,
+          Value(contactId),
           messageUpdate.multipleTargetMessageIds,
           fromTimestamp(messageUpdate.timestamp),
         );
       } catch (e) {
-        Log.warn(e);
+        Log.warn('[$receiptId] Error handling messages opened: $e');
       }
     case EncryptedContent_MessageUpdate_Type.DELETE:
-      if (!await isSender(contactId, messageUpdate.senderMessageId)) {
+      if (!await isSender(contactId, messageUpdate.senderMessageId, receiptId)) {
         return;
       }
-      Log.info('Delete message ${messageUpdate.senderMessageId}');
+      Log.info('[$receiptId] Delete message ${messageUpdate.senderMessageId}');
       try {
         await twonlyDB.messagesDao.handleMessageDeletion(
           contactId,
@@ -33,13 +35,13 @@ Future<void> handleMessageUpdate(
           fromTimestamp(messageUpdate.timestamp),
         );
       } catch (e) {
-        Log.warn(e);
+        Log.warn('[$receiptId] Error handling message deletion: $e');
       }
     case EncryptedContent_MessageUpdate_Type.EDIT_TEXT:
-      if (!await isSender(contactId, messageUpdate.senderMessageId)) {
+      if (!await isSender(contactId, messageUpdate.senderMessageId, receiptId)) {
         return;
       }
-      Log.info('Edit message ${messageUpdate.senderMessageId}');
+      Log.info('[$receiptId] Edit message ${messageUpdate.senderMessageId}');
       try {
         await twonlyDB.messagesDao.handleTextEdit(
           contactId,
@@ -48,12 +50,12 @@ Future<void> handleMessageUpdate(
           fromTimestamp(messageUpdate.timestamp),
         );
       } catch (e) {
-        Log.warn(e);
+        Log.warn('[$receiptId] Error handling text edit: $e');
       }
   }
 }
 
-Future<bool> isSender(int fromUserId, String messageId) async {
+Future<bool> isSender(int fromUserId, String messageId, String receiptId) async {
   final message = await twonlyDB.messagesDao
       .getMessageById(messageId)
       .getSingleOrNull();
@@ -61,6 +63,6 @@ Future<bool> isSender(int fromUserId, String messageId) async {
   if (message.senderId == fromUserId) {
     return true;
   }
-  Log.error('Contact $fromUserId tried to modify the message $messageId');
+  Log.error('[$receiptId] Contact $fromUserId tried to modify the message $messageId');
   return false;
 }

lib/src/services/api/client2client/pushkeys.c2c.dart

@@ -10,10 +10,11 @@ DateTime lastPushKeyRequest = clock.now().subtract(const Duration(hours: 1));
 Future<void> handlePushKey(
   int contactId,
   EncryptedContent_PushKeys pushKeys,
+  String receiptId,
 ) async {
   switch (pushKeys.type) {
     case EncryptedContent_PushKeys_Type.REQUEST:
-      Log.info('Got a pushkey request from $contactId');
+      Log.info('[$receiptId] Got a pushkey request from $contactId');
       if (lastPushKeyRequest.isBefore(
         clock.now().subtract(const Duration(seconds: 60)),
       )) {
@@ -22,7 +23,7 @@ Future<void> handlePushKey(
       }
 
     case EncryptedContent_PushKeys_Type.UPDATE:
-      Log.info('Got a pushkey update from $contactId');
+      Log.info('[$receiptId] Got a pushkey update from $contactId');
       await handleNewPushKey(contactId, pushKeys.keyId.toInt(), pushKeys.key);
   }
 }

lib/src/services/api/client2client/reaction.c2c.dart

@@ -8,8 +8,12 @@ Future<void> handleReaction(
   int fromUserId,
   String groupId,
   EncryptedContent_Reaction reaction,
+  String receiptId,
 ) async {
-  Log.info('Got a reaction from $fromUserId (remove=${reaction.remove})');
+  Log.info(
+    '[$receiptId] Got a reaction from for ${reaction.targetMessageId} (remove=${reaction.remove})',
+  );
+
   await twonlyDB.reactionsDao.updateReaction(
     fromUserId,
     reaction.targetMessageId,

lib/src/services/api/client2client/text_message.c2c.dart

@@ -11,9 +11,10 @@ Future<void> handleTextMessage(
   int fromUserId,
   String groupId,
   EncryptedContent_TextMessage textMessage,
+  String receiptId,
 ) async {
   Log.info(
-    'Got a text message: ${textMessage.senderMessageId} from $groupId',
+    '[$receiptId] Got a text message: ${textMessage.senderMessageId} from $groupId',
   );
 
   // Prevent message overwrite: reject if a message with this ID already
@@ -23,7 +24,7 @@ Future<void> handleTextMessage(
       .getSingleOrNull();
   if (existing != null && existing.senderId != fromUserId) {
     Log.warn(
-      '$fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
+      '[$receiptId] $fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
     );
     return;
   }
@@ -47,6 +48,6 @@ Future<void> handleTextMessage(
     fromTimestamp(textMessage.timestamp),
   );
   if (message != null) {
-    Log.info('Inserted a new text message with ID: ${message.messageId}');
+    Log.info('[$receiptId] Inserted a new text message with ID: ${message.messageId}');
   }
 }

lib/src/services/api/client2client/user_discovery.c2c.dart

@@ -15,7 +15,9 @@ void resetUserDiscoveryRequestUpdates() {
 Future<void> checkForUserDiscoveryChanges(
   int fromUserId,
   List<int> receivedVersion,
+  String receiptId,
 ) async {
+  Log.info('[$receiptId] Checking for a new user discovery version.');
   final currentVersion = await UserDiscoveryService.shouldRequestNewMessages(
     fromUserId,
     receivedVersion,
@@ -26,7 +28,7 @@ Future<void> checkForUserDiscoveryChanges(
       // Only request a new version once per app session
       return;
     }
-    Log.info('Having old version from contact. Requesting new version.');
+    Log.info('[$receiptId] Having old version from contact. Requesting new version.');
     _requestedUpdates.add(fromUserId);
     await sendCipherText(
       fromUserId,
@@ -35,6 +37,7 @@ Future<void> checkForUserDiscoveryChanges(
           currentVersion: currentVersion.toList(),
         ),
       ),
+      blocking: false,
     );
   }
 }
@@ -42,18 +45,19 @@ Future<void> checkForUserDiscoveryChanges(
 Future<void> handleUserDiscoveryRequest(
   int fromUserId,
   EncryptedContent_UserDiscoveryRequest request,
+  String receiptId,
 ) async {
-  Log.info('Got a user discovery request');
+  Log.info('[$receiptId] Got a user discovery request');
 
   if (!userService.currentUser.isUserDiscoveryEnabled) {
-    Log.warn('Got a user discovery request while it is disabled');
+    Log.warn('[$receiptId] Got a user discovery request while it is disabled');
     return;
   }
   final contact = await twonlyDB.contactsDao.getContactById(fromUserId);
 
   if (!UserDiscoveryService.isContactAllowed(contact)) {
     Log.warn(
-      'Got a request to update user discovery, but mediaSendCounter (${contact?.mediaSendCounter}) < ${userService.currentUser.requiredSendImages} or user is excluded ${contact?.userDiscoveryExcluded}',
+      '[$receiptId] Got a request to update user discovery, but mediaSendCounter (${contact?.mediaSendCounter}) < ${userService.currentUser.requiredSendImages} or user is excluded ${contact?.userDiscoveryExcluded}',
     );
     return;
   }
@@ -63,7 +67,7 @@ Future<void> handleUserDiscoveryRequest(
     request.currentVersion,
   );
   if (newMessages != null && newMessages.isNotEmpty) {
-    Log.info('Sending ${newMessages.length} user discovery messages');
+    Log.info('[$receiptId] Sending ${newMessages.length} user discovery messages');
     await sendCipherText(
       fromUserId,
       EncryptedContent(
@@ -71,21 +75,23 @@ Future<void> handleUserDiscoveryRequest(
           messages: newMessages,
         ),
       ),
+      blocking: false,
     );
   } else {
-    Log.info('Got update request, but there are no new updates for the user');
+    Log.info('[$receiptId] Got update request, but there are no new updates for the user');
   }
 }
 
 Future<void> handleUserDiscoveryUpdate(
   int fromUserId,
   EncryptedContent_UserDiscoveryUpdate update,
+  String receiptId,
 ) async {
   if (!userService.currentUser.isUserDiscoveryEnabled) {
-    Log.warn('Got a user discovery update while it is disabled');
+    Log.warn('[$receiptId] Got a user discovery update while it is disabled');
     return;
   }
-  Log.info('Got ${update.messages.length} user discovery messages');
+  Log.info('[$receiptId] Got ${update.messages.length} user discovery messages');
   await UserDiscoveryService.handleNewMessages(
     fromUserId,
     update.messages.map(Uint8List.fromList).toList(),

lib/src/services/api/mediafiles/download.api.dart

@@ -252,7 +252,7 @@ Future<void> downloadFileFast(
   } else {
     if (response.statusCode == 404 || response.statusCode == 403) {
       Log.error(
-        'Got ${response.statusCode} from server. Requesting upload again',
+        'Got ${response.statusCode} from server for media ID ${media.mediaId}. Requesting upload again',
       );
       // Message was deleted from the server. Requesting it again from the sender to upload it again...
       await requestMediaReupload(media.mediaId);
@@ -353,6 +353,8 @@ Future<void> handleEncryptedFile(String mediaId) async {
         ),
       );
 
+      await mediaService.hashMediaFile();
+
       Log.info('Decryption of $mediaId was successful');
 
       mediaService.encryptedPath.deleteSync();

lib/src/services/api/mediafiles/upload.api.dart

@@ -27,6 +27,15 @@ import 'package:twonly/src/utils/misc.dart';
 import 'package:workmanager/workmanager.dart' hide TaskStatus;
 
 final lockRetransmission = Mutex();
+final Map<String, Mutex> _uploadMutexes = {};
+
+Future<void> _protectMediaUpload(
+  String mediaId,
+  Future<void> Function() action,
+) async {
+  final mutex = _uploadMutexes.putIfAbsent(mediaId, Mutex.new);
+  await mutex.protect(action);
+}
 
 Future<void> reuploadMediaFiles() async {
   return exclusiveAccess(
@@ -45,15 +54,16 @@ Future<void> reuploadMediaFiles() async {
       for (final receipt in receipts) {
         if (receipt.retryCount > 1 && receipt.lastRetry != null) {
           final twentyFourHoursAgo = DateTime.now().subtract(
-            const Duration(hours: 24),
+            const Duration(hours: 6),
           );
           if (receipt.lastRetry!.isAfter(twentyFourHoursAgo)) {
             Log.info(
-              'Ignoring ${receipt.receiptId} as it was retried in the last 24h',
+              'Ignoring ${receipt.receiptId} as it was retried in the last 6h',
             );
             continue;
           }
         }
+
         var messageId = receipt.messageId;
         if (receipt.messageId == null) {
           Log.info('Message not in receipt. Loading it from the content.');
@@ -146,7 +156,7 @@ Future<void> reuploadMediaFiles() async {
           Log.info('Reuploading media file $messageId');
           // the media file should be still on the server, so it should be enough
           // to just resend the message containing the download token.
-          await tryToSendCompleteMessage(receipt: receipt);
+          await tryToSendCompleteMessage(receiptId: receipt.receiptId);
         }
       }
     },
@@ -158,6 +168,7 @@ Future<void> reuploadMediaFile(
   MediaFile mediaFile,
   String messageId,
 ) async {
+  return _protectMediaUpload(mediaFile.mediaId, () async {
     Log.info('Reuploading media file: ${mediaFile.mediaId}');
 
     await twonlyDB.receiptsDao.updateReceiptByContactAndMessageId(
@@ -169,8 +180,14 @@ Future<void> reuploadMediaFile(
       ),
     );
 
-  final reuploadRequestedBy = (mediaFile.reuploadRequestedBy ?? [])
+    // Refresh media file to get latest reuploadRequestedBy
+    final currentMedia = await twonlyDB.mediaFilesDao.getMediaFileById(
+      mediaFile.mediaId,
+    );
+
+    final reuploadRequestedBy = (currentMedia?.reuploadRequestedBy ?? [])
       ..add(contactId);
+
     await twonlyDB.mediaFilesDao.updateMedia(
       mediaFile.mediaId,
       MediaFilesCompanion(
@@ -185,8 +202,9 @@ Future<void> reuploadMediaFile(
       if (mediaFileUpdated.uploadRequestPath.existsSync()) {
         mediaFileUpdated.uploadRequestPath.deleteSync();
       }
-    unawaited(startBackgroundMediaUpload(mediaFileUpdated));
+      await _startBackgroundMediaUploadInternal(mediaFileUpdated);
     }
+  });
 }
 
 final Mutex _lockPreprocessing = Mutex();
@@ -381,6 +399,9 @@ Future<void> insertMediaFileInMessagesTable(
     );
     await twonlyDB.groupsDao.increaseLastMessageExchange(groupId, clock.now());
     if (message != null) {
+      Log.info(
+        'Created message ${message.messageId} for media ${message.mediaId}',
+      );
       // de-archive contact when sending a new message
       await twonlyDB.groupsDao.updateGroup(
         message.groupId,
@@ -398,8 +419,24 @@ Future<void> insertMediaFileInMessagesTable(
 }
 
 Future<void> startBackgroundMediaUpload(MediaFileService mediaService) async {
+  return _protectMediaUpload(
+    mediaService.mediaFile.mediaId,
+    () => _startBackgroundMediaUploadInternal(mediaService),
+  );
+}
+
+Future<void> _startBackgroundMediaUploadInternal(
+  MediaFileService mediaService,
+) async {
+  // Refresh the media file state inside the mutex
+  await mediaService.updateFromDB();
+
   if (mediaService.mediaFile.uploadState == UploadState.initialized ||
       mediaService.mediaFile.uploadState == UploadState.preprocessing) {
+    Log.info(
+      'Hanlding media file ${mediaService.mediaFile.mediaId} in ${mediaService.mediaFile.uploadState}',
+    );
+
     await mediaService.setUploadState(UploadState.preprocessing);
 
     if (!mediaService.tempPath.existsSync()) {
@@ -603,10 +640,7 @@ Future<void> _createUploadRequest(MediaFileService media) async {
   await media.uploadRequestPath.writeAsBytes(uploadRequestBytes);
 }
 
-Mutex protectUpload = Mutex();
-
 Future<void> _uploadUploadRequest(MediaFileService media) async {
-  await protectUpload.protect(() async {
   final currentMedia = await twonlyDB.mediaFilesDao.getMediaFileById(
     media.mediaFile.mediaId,
   );
@@ -614,7 +648,7 @@ Future<void> _uploadUploadRequest(MediaFileService media) async {
   if (currentMedia == null ||
       currentMedia.uploadState == UploadState.backgroundUploadTaskStarted) {
     Log.info('Download for ${media.mediaFile.mediaId} already started.');
-      return null;
+    return;
   }
 
   final apiUrl =
@@ -650,7 +684,6 @@ Future<void> _uploadUploadRequest(MediaFileService media) async {
   } else {
     unawaited(uploadFileFastOrEnqueue(task, media));
   }
-  });
 }
 
 Future<void> uploadFileFastOrEnqueue(

lib/src/services/api/messages.api.dart

@@ -61,6 +61,8 @@ Future<void> retransmitAllMessages() async {
   });
 }
 
+final Map<String, Mutex> _tryToSendLocks = {};
+
 // When the ackByServerAt is set this value is written in the receipted
 Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
   String? receiptId,
@@ -68,27 +70,67 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
   bool onlyReturnEncryptedData = false,
   bool blocking = true,
 }) async {
+  final rId = receiptId ?? receipt?.receiptId;
+  if (rId == null) {
+    Log.error(
+      'Cannot try to send complete message as both receiptId and receipt are null.',
+    );
+    return null;
+  }
+
+  final mutex = _tryToSendLocks.putIfAbsent(rId, Mutex.new);
+  return mutex.protect(() async {
+    return _tryToSendCompleteMessageInternal(
+      receiptId: receiptId,
+      receipt: receipt,
+      onlyReturnEncryptedData: onlyReturnEncryptedData,
+      blocking: blocking,
+    );
+  });
+}
+
+Future<(Uint8List, Uint8List?)?> _tryToSendCompleteMessageInternal({
+  String? receiptId,
+  Receipt? receipt,
+  bool onlyReturnEncryptedData = false,
+  bool blocking = true,
+}) async {
+  // this should have a lock for every receiptID, split the function into a _internal withou the lock and a normal with the lock
   if (apiService.appIsOutdated) return null;
+  if (receiptId == null && receipt == null) return null;
 
   try {
-    if (receiptId == null && receipt == null) return null;
     if (receipt == null) {
       // ignore: parameter_assignments
       receipt = await twonlyDB.receiptsDao.getReceiptById(receiptId!);
       if (receipt == null) {
-        Log.warn('Receipt not found.');
+        Log.warn('[$receiptId] Receipt not found.');
         return null;
       }
     }
-    // ignore: parameter_assignments
+
-    receiptId = receipt.receiptId;
+    if (receipt.retryCount >= 2) {
+      // After two retries, change the receiptId. This addresses a bug where the receiver received the message and marked it as received,
+      // but the app was closed before the message was fully processed. Because the receipt was already stored, subsequent retries were
+      // detected as duplicates and rejected.
+      final oldReceiptId = receipt.receiptId;
+      final updatedReceipt = await twonlyDB.receiptsDao.rotateReceiptId(
+        oldReceiptId,
+      );
+      if (updatedReceipt != null) {
+        Log.info(
+          'Changed receiptId $oldReceiptId to ${updatedReceipt.receiptId} as retryCount is ${receipt.retryCount}',
+        );
+        receipt = updatedReceipt;
+      }
+    }
 
     final contact = await twonlyDB.contactsDao.getContactById(
       receipt.contactId,
     );
     if (contact == null || contact.accountDeleted) {
       Log.warn('Will not send message again as user does not exist anymore.');
-      await twonlyDB.receiptsDao.deleteReceipt(receiptId);
+      await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
       return null;
     }
 
@@ -100,14 +142,12 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
     }
 
     final message = pb.Message.fromBuffer(receipt.message)
-      ..receiptId = receiptId;
+      ..receiptId = receipt.receiptId;
 
     final encryptedContent = pb.EncryptedContent.fromBuffer(
       message.encryptedContent,
     );
 
-    Log.info('Uploading $receiptId.');
-
     Uint8List? pushData;
     if (receipt.retryCount == 0) {
       final pushNotification = await getPushNotificationFromEncryptedContent(
@@ -152,9 +192,12 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
     }
 
     if (onlyReturnEncryptedData) {
+      Log.info('Returning message  with receiptID ${receipt.receiptId}.');
       return (message.writeToBuffer(), pushData);
     }
 
+    Log.info('Uploading message with receiptID ${receipt.receiptId}.');
+
     final resp = await apiService.sendTextMessage(
       receipt.contactId,
       message.writeToBuffer(),
@@ -162,9 +205,9 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
     );
 
     if (resp.isError) {
-      Log.warn('Could not transmit message got ${resp.error}.');
+      Log.warn('Could not transmit ${receipt.receiptId} got ${resp.error}.');
       if (resp.error == ErrorCode.UserIdNotFound) {
-        await twonlyDB.receiptsDao.deleteReceipt(receiptId);
+        await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
         await twonlyDB.contactsDao.updateContact(
           receipt.contactId,
           const ContactsCompanion(accountDeleted: Value(true)),
@@ -182,10 +225,10 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
         );
       }
       if (!receipt.contactWillSendsReceipt) {
-        await twonlyDB.receiptsDao.deleteReceipt(receiptId);
+        await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
       } else {
         await twonlyDB.receiptsDao.updateReceipt(
-          receiptId,
+          receipt.receiptId,
           ReceiptsCompanion(
             ackByServerAt: Value(clock.now()),
             retryCount: Value(receipt.retryCount + 1),
@@ -196,9 +239,9 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
       }
     }
   } catch (e) {
-    Log.error('Unknown Error when sending message: $e');
+    Log.error('[$receiptId] unknown error when sending message: $e');
-    if (receiptId != null) {
+    if (receipt != null) {
-      await twonlyDB.receiptsDao.deleteReceipt(receiptId);
+      await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
     }
   }
   return null;
@@ -302,6 +345,54 @@ Future<void> insertAndSendContactShareMessage(
   );
 }
 
+Future<void> insertAndSendAskAboutUserMessage(
+  int contactId,
+  int askAboutUserId,
+) async {
+  final directChat = await twonlyDB.groupsDao.createOrGetDirectChat(contactId);
+  if (directChat == null) {
+    Log.error(
+      'Failed to get or create direct chat group for contact $contactId',
+    );
+    return;
+  }
+
+  final groupId = directChat.groupId;
+
+  final additionalMessageData = AdditionalMessageData(
+    type: AdditionalMessageData_Type.ASK_ABOUT_USER,
+    askAboutUserId: Int64(askAboutUserId),
+  );
+
+  final message = await twonlyDB.messagesDao.insertMessage(
+    MessagesCompanion(
+      groupId: Value(groupId),
+      type: Value(MessageType.askAboutUser.name),
+      additionalMessageData: Value(additionalMessageData.writeToBuffer()),
+    ),
+  );
+
+  if (message == null) {
+    Log.error('Could not insert message into database');
+    return;
+  }
+
+  final encryptedContent = pb.EncryptedContent(
+    additionalDataMessage: pb.EncryptedContent_AdditionalDataMessage(
+      senderMessageId: message.messageId,
+      additionalMessageData: additionalMessageData.writeToBuffer(),
+      timestamp: Int64(message.createdAt.millisecondsSinceEpoch),
+      type: MessageType.askAboutUser.name,
+    ),
+  );
+
+  await sendCipherTextToGroup(
+    groupId,
+    encryptedContent,
+    messageId: message.messageId,
+  );
+}
+
 Future<void> sendCipherTextToGroup(
   String groupId,
   pb.EncryptedContent encryptedContent, {
@@ -395,6 +486,17 @@ Future<(Uint8List, Uint8List?)?> sendCipherText(
   );
 
   if (receipt != null) {
+    try {
+      final typeKeys = _getEncryptedContentTypes(encryptedContent);
+      Log.info(
+        'sendCipherText: type=[$typeKeys] messageId=$messageId receiptId=${receipt.receiptId}',
+      );
+    } catch (_) {
+      Log.info(
+        'sendCipherText: messageId=$messageId receiptId=${receipt.receiptId}',
+      );
+    }
+
     final tmp = tryToSendCompleteMessage(
       receipt: receipt,
       onlyReturnEncryptedData: onlyReturnEncryptedData,
@@ -478,5 +580,23 @@ Future<void> sendContactMyProfileData(int contactId) async {
       username: userService.currentUser.username,
     ),
   );
-  await sendCipherText(contactId, encryptedContent);
+  await sendCipherText(contactId, encryptedContent, blocking: false);
+}
+
+String _getEncryptedContentTypes(pb.EncryptedContent content) {
+  final ignoredFields = {
+    'groupId',
+    'isDirectChat',
+    'senderProfileCounter',
+    'senderUserDiscoveryVersion',
+  };
+
+  final types = <String>[];
+  for (final field in content.info_.byName.values) {
+    if (content.hasField(field.tagNumber) &&
+        !ignoredFields.contains(field.name)) {
+      types.add(field.name);
+    }
+  }
+  return types.join(', ');
 }

lib/src/services/api/server_messages.api.dart

@@ -4,6 +4,8 @@ import 'dart:io';
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:hashlib/random.dart';
+import 'package:mutex/mutex.dart';
+
 import 'package:twonly/globals.dart';
 import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
@@ -30,6 +32,7 @@ import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/group.service.dart';
 import 'package:twonly/src/services/key_verification.service.dart';
 import 'package:twonly/src/services/notifications/background.notifications.dart';
+import 'package:twonly/src/services/notifications/fcm.notifications.dart';
 import 'package:twonly/src/services/signal/encryption.signal.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -72,33 +75,50 @@ Future<void> handleServerMessage(server.ServerToClient msg) async {
 
   await apiService.sendResponse(ClientToServer()..v0 = v0);
   AppState.gotMessageFromServer = true;
-  Log.info('Message from server proccessed.');
+  Log.info('All messages from the server proccessed.');
 }
 
 DateTime lastPushKeyRequest = clock.now().subtract(const Duration(hours: 1));
 
+final Map<String, Mutex> _messageLocks = {};
+
 Future<void> handleClient2ClientMessage(NewMessage newMessage) async {
   final body = Uint8List.fromList(newMessage.body);
-  final fromUserId = newMessage.fromUserId.toInt();
-
   final message = Message.fromBuffer(body);
   final receiptId = message.receiptId;
 
+  final mutex = _messageLocks.putIfAbsent(receiptId, Mutex.new);
+  if (mutex.isLocked) {
+    Log.info(
+      '[$receiptId] Skipping — already being processed by another handler',
+    );
+    return;
+  }
+  await mutex.protect(() async {
+    try {
+      await _handleClient2ClientMessage(newMessage, message);
+    } finally {
+      _messageLocks.remove(receiptId);
+    }
+  });
+}
+
+Future<void> _handleClient2ClientMessage(
+  NewMessage newMessage,
+  Message message,
+) async {
+  final fromUserId = newMessage.fromUserId.toInt();
+  final receiptId = message.receiptId;
+
   if (await twonlyDB.receiptsDao.isDuplicated(receiptId)) {
     return;
   }
 
-  try {
+  Log.info('[$receiptId] Started processing message');
-    await twonlyDB.receiptsDao.gotReceipt(receiptId);
-    Log.info('Got a message with receiptId $receiptId');
-  } catch (e) {
-    Log.error(e);
-    return;
-  }
 
   switch (message.type) {
     case Message_Type.SENDER_DELIVERY_RECEIPT:
-      Log.info('Got delivery receipt for $receiptId!');
+      Log.info('[$receiptId] Got delivery receipt!');
       await twonlyDB.receiptsDao.confirmReceipt(receiptId, fromUserId);
 
     case Message_Type.PLAINTEXT_CONTENT:
@@ -111,13 +131,13 @@ Future<void> handleClient2ClientMessage(NewMessage newMessage) async {
             await handleSessionResync(fromUserId);
           }
           Log.info(
-            'Got decryption error: ${message.plaintextContent.decryptionErrorMessage.type} for $receiptId',
+            '[$receiptId] Got decryption error: ${message.plaintextContent.decryptionErrorMessage.type}',
           );
           retry = true;
         }
         if (message.plaintextContent.hasRetryControlError()) {
           Log.info(
-            'Got access control error for $receiptId. Resending message.',
+            '[$receiptId] Got access control error. Resending message.',
           );
           retry = true;
         }
@@ -132,7 +152,13 @@ Future<void> handleClient2ClientMessage(NewMessage newMessage) async {
             ackByServerAt: const Value(null),
           ),
         );
-        await tryToSendCompleteMessage(receiptId: newReceiptId);
+        Log.info(
+          '[$receiptId] Sending error message to the original sender with receiptId $newReceiptId.',
+        );
+        await tryToSendCompleteMessage(
+          receiptId: newReceiptId,
+          blocking: false,
+        );
       }
 
     case Message_Type.CIPHERTEXT:
@@ -188,7 +214,6 @@ Future<void> handleClient2ClientMessage(NewMessage newMessage) async {
             receiptIdDB = const Value.absent();
           } else {
             // Message was successful processed
-            //
           }
         }
 
@@ -204,12 +229,19 @@ Future<void> handleClient2ClientMessage(NewMessage newMessage) async {
             ),
           );
         } catch (e) {
-          Log.warn(e);
+          Log.warn('[$receiptId] Error inserting receipt: $e');
         }
-        await tryToSendCompleteMessage(receiptId: receiptId);
+        await tryToSendCompleteMessage(receiptId: receiptId, blocking: false);
       }
     case Message_Type.TEST_NOTIFICATION:
-      return;
+      break;
+  }
+
+  try {
+    await twonlyDB.receiptsDao.gotReceipt(receiptId);
+    Log.info('[$receiptId] Finished processing');
+  } catch (e) {
+    Log.error('[$receiptId] Error marking message as received: $e');
   }
 }
 
@@ -219,25 +251,27 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessageRaw(
   Message_Type messageType,
   String receiptId,
 ) async {
-  final (encryptedContent, decryptionErrorType) = await signalDecryptMessage(
+  Log.info('[$receiptId] calling signalDecryptMessage');
+  var (encryptedContent, decryptionErrorType) = await signalDecryptMessage(
     fromUserId,
     encryptedContentRaw,
     messageType.value,
   );
 
   if (encryptedContent == null) {
-    if (decryptionErrorType == null) {
-      // Duplicate message
-      return (null, null);
-    }
     return (
       null,
-      PlaintextContent()
+      PlaintextContent(
-        ..decryptionErrorMessage = (PlaintextContent_DecryptionErrorMessage()
+        decryptionErrorMessage: PlaintextContent_DecryptionErrorMessage(
-          ..type = decryptionErrorType),
+          type: decryptionErrorType ??=
+              PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN,
+        ),
+      ),
     );
   }
 
+  Log.info('[$receiptId] Calling handleEncryptedMessage');
+
   final (a, b) = await handleEncryptedMessage(
     fromUserId,
     encryptedContent,
@@ -245,9 +279,17 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessageRaw(
     receiptId,
   );
 
-  if (Platform.isAndroid && a == null && b == null) {
+  Log.info('[$receiptId] Finished handleEncryptedMessage');
-    // Message was handled without any error -> Show push notification to the user.
+
-    await showPushNotificationFromServerMessages(fromUserId, encryptedContent);
+  if (a == null && b == null) {
+    unawaited(FcmNotificationService.updateLastServerMessageTimestamp());
+    if (Platform.isAndroid) {
+      // Message was handled without any error. Show push notification to the user for Android.
+      await showPushNotificationFromServerMessages(
+        fromUserId,
+        encryptedContent,
+      );
+    }
   }
 
   return (a, b);
@@ -274,11 +316,16 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await checkForUserDiscoveryChanges(
       fromUserId,
       content.senderUserDiscoveryVersion,
+      receiptId,
     );
   }
 
   if (content.hasContactRequest()) {
-    if (!await handleContactRequest(fromUserId, content.contactRequest)) {
+    if (!await handleContactRequest(
+      fromUserId,
+      content.contactRequest,
+      receiptId,
+    )) {
       return (
         null,
         PlaintextContent()
@@ -292,6 +339,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await handleErrorMessage(
       fromUserId,
       content.errorMessages,
+      receiptId,
     );
     return (null, null);
   }
@@ -301,6 +349,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.contactUpdate,
       senderProfileCounter,
+      receiptId,
     );
     return (null, null);
   }
@@ -309,6 +358,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await handleUserDiscoveryRequest(
       fromUserId,
       content.userDiscoveryRequest,
+      receiptId,
     );
     return (null, null);
   }
@@ -317,12 +367,13 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await handleUserDiscoveryUpdate(
       fromUserId,
       content.userDiscoveryUpdate,
+      receiptId,
     );
     return (null, null);
   }
 
   if (content.hasPushKeys()) {
-    await handlePushKey(fromUserId, content.pushKeys);
+    await handlePushKey(fromUserId, content.pushKeys, receiptId);
     return (null, null);
   }
 
@@ -330,6 +381,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await handleMessageUpdate(
       fromUserId,
       content.messageUpdate,
+      receiptId,
     );
     return (null, null);
   }
@@ -346,12 +398,13 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     await handleMediaUpdate(
       fromUserId,
       content.mediaUpdate,
+      receiptId,
     );
     return (null, null);
   }
 
   if (!content.hasGroupId()) {
-    Log.error('Messages should have a groupId $fromUserId.');
+    Log.error('[$receiptId] Messages should have a groupId $fromUserId.');
     return (null, null);
   }
 
@@ -360,6 +413,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.groupCreate,
+      receiptId,
     );
     return (null, null);
   }
@@ -372,12 +426,12 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
           .getContactByUserId(fromUserId)
           .getSingleOrNull();
       Log.info(
-        'Contact exists?: ${contact != null} Is deleted? ${contact?.deletedByUser} Accepted? (${contact?.accepted})',
+        '[$receiptId] Contact exists?: ${contact != null} Is deleted? ${contact?.deletedByUser} Accepted? (${contact?.accepted})',
       );
       if (contact == null || !contact.accepted || contact.deletedByUser) {
         await handleNewContactRequest(fromUserId);
         Log.error(
-          'User tries to send message to direct chat while the user does not exists !',
+          '[$receiptId] User tries to send message to direct chat while the user does not exist!',
         );
         return (
           EncryptedContent(
@@ -391,7 +445,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
         );
       }
       Log.info(
-        'Creating new DirectChat between two users',
+        '[$receiptId] Creating new DirectChat between two users',
       );
       await twonlyDB.groupsDao.createNewDirectChat(
         fromUserId,
@@ -402,7 +456,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     } else {
       if (content.hasGroupJoin()) {
         Log.error(
-          'Got group join message, but group does not exists yet, retry later. As probably the GroupCreate was not yet received.',
+          '[$receiptId] Got group join message, but group does not exist yet, retry later. As probably the GroupCreate was not yet received.',
         );
         // In case the group join was received before the GroupCreate the sender should send it later again.
         return (
@@ -412,13 +466,15 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
         );
       }
 
-      Log.error('User $fromUserId tried to access group ${content.groupId}.');
+      Log.error(
+        '[$receiptId] User $fromUserId tried to access group ${content.groupId}.',
+      );
       return (null, null);
     }
   }
 
   if (content.hasFlameSync()) {
-    await handleFlameSync(content.groupId, content.flameSync);
+    await handleFlameSync(content.groupId, content.flameSync, receiptId);
     return (null, null);
   }
 
@@ -427,6 +483,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.groupUpdate,
+      receiptId,
     );
     return (null, null);
   }
@@ -436,6 +493,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.groupJoin,
+      receiptId,
     )) {
       return (
         null,
@@ -451,6 +509,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.groupJoin,
+      receiptId,
     );
     return (null, null);
   }
@@ -460,6 +519,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.additionalDataMessage,
+      receiptId,
     );
     return (null, null);
   }
@@ -469,6 +529,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.textMessage,
+      receiptId,
     );
     return (null, null);
   }
@@ -478,6 +539,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.reaction,
+      receiptId,
     );
     return (null, null);
   }
@@ -487,6 +549,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.media,
+      receiptId,
     );
     return (null, null);
   }
@@ -496,6 +559,7 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
       fromUserId,
       content.groupId,
       content.typingIndicator,
+      receiptId,
     );
   }
 

lib/src/services/api/utils.api.dart

@@ -4,7 +4,6 @@ import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:twonly/core/bridge/wrapper/key_manager.dart';
 import 'package:twonly/locator.dart';
-import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pb.dart'
@@ -129,7 +128,7 @@ Future<Map<String, String>?> getAuthenticationHeader() async {
     };
   } else {
     final apiAuthTokenRaw = await SecureStorage.instance.read(
-      key: SecureStorageKeys.apiAuthToken,
+      key: 'api_auth_token',
     );
 
     if (apiAuthTokenRaw == null) {

lib/src/services/background/callback_dispatcher.background.dart

@@ -119,9 +119,15 @@ Future<void> handlePeriodicTask({int lastExecutionInSecondsLimit = 120}) async {
   if (!shouldBeExecuted) return;
 
   Log.info('eu.twonly.periodic_task was called.');
+  AppState.gotMessageFromServer = false;
 
   final stopwatch = Stopwatch()..start();
 
+  // Issue: Because the background isolate can be reused across multiple periodic tasks,
+  // the API connection state might be stale or disconnected from a previous run.
+  // Explicitly close it here to ensure a clean slate before connecting.
+  await apiService.close(null);
+
   if (!await apiService.connect()) {
     Log.info('Could not connect to the api. Returning early.');
     return;

lib/src/services/flame.service.dart

@@ -65,23 +65,18 @@ Future<void> syncFlameCounters({String? forceForGroup}) async {
 ({int counter, bool isExpiring}) getFlameCounterFromGroup(Group? group) {
   const zero = (counter: 0, isExpiring: false);
   if (group == null) return zero;
-  if (group.lastMessageSend == null ||
+  if (group.lastMessageSend == null || group.lastMessageReceived == null || group.lastFlameCounterChange == null) {
-      group.lastMessageReceived == null ||
-      group.lastFlameCounterChange == null) {
     return zero;
   }
   final now = clock.now();
   final startOfToday = DateTime(now.year, now.month, now.day);
   final twoDaysAgo = startOfToday.subtract(const Duration(days: 2));
   final oneDayAgo = startOfToday.subtract(const Duration(days: 1));
-  if (group.lastMessageSend!.isAfter(twoDaysAgo) &&
+  if (group.lastMessageSend!.isAfter(twoDaysAgo) && group.lastMessageReceived!.isAfter(twoDaysAgo) ||
-          group.lastMessageReceived!.isAfter(twoDaysAgo) ||
       group.lastFlameCounterChange!.isAfter(oneDayAgo)) {
     // Flame is expiring when today no exchange has happened yet:
     // both lastMessageSend and lastMessageReceived are before startOfToday.
-    final isExpiring =
+    final isExpiring = group.lastMessageSend!.isBefore(oneDayAgo) || group.lastMessageReceived!.isBefore(oneDayAgo);
-        group.lastMessageSend!.isBefore(oneDayAgo) ||
-        group.lastMessageReceived!.isBefore(oneDayAgo);
     return (counter: group.flameCounter, isExpiring: isExpiring);
   } else {
     return zero;
@@ -104,10 +99,10 @@ Future<void> incFlameCounter(
       contact.userId,
       ContactsCompanion(
         mediaReceivedCounter: Value(
-          contacts.first.mediaReceivedCounter + (received ? 1 : 0),
+          contact.mediaReceivedCounter + (received ? 1 : 0),
         ),
         mediaSendCounter: Value(
-          contacts.first.mediaSendCounter + (received ? 0 : 1),
+          contact.mediaSendCounter + (received ? 0 : 1),
         ),
       ),
     );
@@ -122,8 +117,7 @@ Future<void> incFlameCounter(
     final now = clock.now();
     final startOfToday = DateTime(now.year, now.month, now.day);
     final twoDaysAgo = startOfToday.subtract(const Duration(days: 2));
-    if (group.lastMessageSend!.isBefore(twoDaysAgo) ||
+    if (group.lastMessageSend!.isBefore(twoDaysAgo) || group.lastMessageReceived!.isBefore(twoDaysAgo)) {
-        group.lastMessageReceived!.isBefore(twoDaysAgo)) {
       flameCounter = 0;
     }
   }
@@ -135,25 +129,21 @@ Future<void> incFlameCounter(
   final now = clock.now();
   final startOfToday = DateTime(now.year, now.month, now.day);
 
-  if (group.lastFlameCounterChange == null ||
+  if (group.lastFlameCounterChange == null || group.lastFlameCounterChange!.isBefore(startOfToday)) {
-      group.lastFlameCounterChange!.isBefore(startOfToday)) {
     // last flame update was yesterday. check if it can be updated.
     var updateFlame = false;
     if (received) {
-      if (group.lastMessageSend != null &&
+      if (group.lastMessageSend != null && group.lastMessageSend!.isAfter(startOfToday)) {
-          group.lastMessageSend!.isAfter(startOfToday)) {
         // today a message was already send -> update flame
         updateFlame = true;
       }
-    } else if (group.lastMessageReceived != null &&
+    } else if (group.lastMessageReceived != null && group.lastMessageReceived!.isAfter(startOfToday)) {
-        group.lastMessageReceived!.isAfter(startOfToday)) {
       // today a message was already received -> update flame
       updateFlame = true;
     }
     if (updateFlame) {
       flameCounter += 1;
-      if (group.lastFlameCounterChange == null ||
+      if (group.lastFlameCounterChange == null || group.lastFlameCounterChange!.isBefore(timestamp)) {
-          group.lastFlameCounterChange!.isBefore(timestamp)) {
         // only update if the timestamp is newer
         lastFlameCounterChange = Value(timestamp);
       }
@@ -170,13 +160,11 @@ Future<void> incFlameCounter(
   }
 
   if (received) {
-    if (group.lastMessageReceived == null ||
+    if (group.lastMessageReceived == null || group.lastMessageReceived!.isBefore(timestamp)) {
-        group.lastMessageReceived!.isBefore(timestamp)) {
       lastMessageReceived = Value(timestamp);
     }
   } else {
-    if (group.lastMessageSend == null ||
+    if (group.lastMessageSend == null || group.lastMessageSend!.isBefore(timestamp)) {
-        group.lastMessageSend!.isBefore(timestamp)) {
       lastMessageSend = Value(timestamp);
     }
   }
@@ -203,3 +191,18 @@ bool isItPossibleToRestoreFlames(Group group) {
         clock.now().subtract(const Duration(days: 7)),
       );
 }
+
+Future<void> restoreFlames(String groupId) async {
+  final group = await twonlyDB.groupsDao.getGroup(groupId);
+  if (group == null) return;
+  final now = clock.now();
+  await twonlyDB.groupsDao.updateGroup(
+    groupId,
+    GroupsCompanion(
+      flameCounter: Value(group.maxFlameCounter),
+      lastFlameCounterChange: Value(now),
+      lastMessageSend: Value(now),
+      lastMessageReceived: Value(now),
+    ),
+  );
+}

lib/src/services/key_verification.service.dart

@@ -3,14 +3,17 @@ import 'dart:typed_data';
 import 'package:collection/collection.dart';
 import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     as pb;
+import 'package:twonly/src/providers/routing.provider.dart';
 import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/signal/identity.signal.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/snackbar.dart';
 
 class KeyVerificationService {
   static Future<List<int>> getNewSecretVerificationToken() async {
@@ -70,6 +73,18 @@ class KeyVerificationService {
           VerificationType.secretQrToken,
         );
         Log.info('Contact was verified via secretQrToken');
+
+        final contact = await twonlyDB.contactsDao.getContactById(fromUserId);
+        final context = rootNavigatorKey.currentContext;
+        if (context != null && context.mounted && contact != null) {
+          showSnackbar(
+            context,
+            context.lang.secretQrTokenVerifiedSnackbar(
+              getContactDisplayName(contact),
+            ),
+            level: SnackbarLevel.success,
+          );
+        }
         return;
       }
     }