Merge pull request 'merge changes from the main fork' (#1) from cwtch.im/cwtch-ui:trunk into trunk

Reviewed-on: #1

.drone.yml

@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: cirrusci/flutter:dev
+    image: cirrusci/flutter:2.5.0-6.0.pre
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -47,7 +47,7 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: openpriv/flutter-desktop:linux-dev
+    image: openpriv/flutter-desktop:linux-fdev2.5rc
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -61,7 +61,7 @@ steps:
       - rm -r cwtch
 
   - name: test-build-android
-    image: cirrusci/flutter:dev
+    image: cirrusci/flutter:2.5.0-6.0.pre
     when:
       event: pull_request
     volumes:
@@ -71,7 +71,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: cirrusci/flutter:dev
+    image: cirrusci/flutter:2.5.0-6.0.pre
     when:
       event: push
     environment:
@@ -95,7 +95,7 @@ steps:
       #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android
 
   - name: widget-tests
-    image: cirrusci/flutter:dev
+    image: cirrusci/flutter:2.5.0-6.0.pre
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -126,7 +126,7 @@ steps:
       - mv ./../sha256s.txt .
       - cd ..
       # TODO: do deployment once files actaully compile
-      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
 
   - name: notify-email
     image: drillster/drone-email
@@ -175,7 +175,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.5rc
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -193,16 +193,16 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.5rc
     commands:
-      - powershell -command "Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.5a17/tor-win64-0.4.6.5.zip -OutFile tor.zip"
+      - powershell -command "Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip"
       - powershell -command "if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }"
       - git describe --tags --abbrev=1 > VERSION
       - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.5rc
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
@@ -213,9 +213,9 @@ steps:
       # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense
       # https://github.com/google/flutter-desktop-embedding/issues/587
       # https://github.com/flutter/flutter/issues/53167
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:releasedir
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30133\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:releasedir
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30133\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30133\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir
       - copy README.md $Env:releasedir\
       - copy windows\*.bat $Env:releasedir\
       - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor"
@@ -258,7 +258,7 @@ steps:
       - move *.sha512 deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.5rc
     when:
       event: push
       status: [ success ]
@@ -268,7 +268,7 @@ steps:
     commands:
       - echo $Env:BUILDFILES_KEY > id_rsab64
       - certutil -decode id_rsab64 id_rsa
-      - scp -r -o StrictHostKeyChecking=no -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      - scp -r -o StrictHostKeyChecking=no -i id_rsa deploy\\* buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
 
 trigger:
   repo: cwtch.im/cwtch-ui

LIBCWTCH-GO.version

@@ -1 +1 @@
-v1.1.0-2021-07-15-19-15
+v1.1.1-16-g7376218-2021-08-25-16-54

fetch-tor-win.ps1

@@ -1,6 +1,6 @@
 
-Invoke-WebRequest -Uri https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip -OutFile tor.zip
+Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip
 
-if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '72764eb07ad8ab511603aba0734951ca003989f5f4686af91ba220217b4a8a4bcc5f571b59f52c847932f6efedf847b111621983050fcddbb8099d43ca66fb07' ) { Write-Error 'tor.zip sha512sum mismatch' }
+if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }
 
 Expand-Archive -Path tor.zip -DestinationPath Tor

lib/cwtch/ffi.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:io' show Platform;
 import 'package:cwtch/cwtch/cwtchNotifier.dart';
-import 'package:flutter/src/services/text_input.dart';
 import 'package:path/path.dart' as path;
 
 import 'package:ffi/ffi.dart';
@@ -22,6 +21,9 @@ typedef StartCwtchFn = int Function(Pointer<Utf8> dir, int len, Pointer<Utf8> to
 typedef void_from_void_funtion = Void Function();
 typedef VoidFromVoidFunction = void Function();
 
+typedef free_function = Void Function(Pointer<Utf8>);
+typedef FreeFn = void Function(Pointer<Utf8>);
+
 typedef void_from_string_string_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
 typedef VoidFromStringStringFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int);
 
@@ -34,25 +36,15 @@ typedef VoidFromStringStringStringStringFn = void Function(Pointer<Utf8>, int, P
 typedef void_from_string_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int64, Int64);
 typedef VoidFromStringStringIntIntFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int, int);
 
-typedef access_cwtch_eventbus_function = Void Function();
-typedef NextEventFn = void Function();
-
 typedef string_to_void_function = Void Function(Pointer<Utf8> str, Int32 length);
 typedef StringFn = void Function(Pointer<Utf8> dir, int);
 
 typedef string_string_to_void_function = Void Function(Pointer<Utf8> str, Int32 length, Pointer<Utf8> str2, Int32 length2);
 typedef StringStringFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int);
 
-typedef get_json_blob_void_function = Pointer<Utf8> Function();
-typedef GetJsonBlobVoidFn = Pointer<Utf8> Function();
-
 typedef get_json_blob_string_function = Pointer<Utf8> Function(Pointer<Utf8> str, Int32 length);
 typedef GetJsonBlobStringFn = Pointer<Utf8> Function(Pointer<Utf8> str, int len);
 
-//func NumMessages(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int) (n C.int) {
-typedef get_int_from_str_str_function = Int32 Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
-typedef GetIntFromStrStrFn = int Function(Pointer<Utf8>, int, Pointer<Utf8>, int);
-
 //func GetMessage(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, message_index C.int) *C.char {
 typedef get_json_blob_from_str_str_int_function = Pointer<Utf8> Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int32);
 typedef GetJsonBlobFromStrStrIntFn = Pointer<Utf8> Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int);
@@ -138,9 +130,7 @@ class CwtchFfi implements Cwtch {
   // Called on object being disposed to (presumably on app close) to close the isolate that's listening to libcwtch-go events
   @override
   void dispose() {
-    if (cwtchIsolate != null) {
-      cwtchIsolate.kill(priority: Isolate.immediate);
-    }
+    cwtchIsolate.kill(priority: Isolate.immediate);
   }
 
   // Entry point for an isolate to listen to a stream of events pulled from libcwtch-go and return them on the sendPort
@@ -165,9 +155,21 @@ class CwtchFfi implements Cwtch {
     // ignore: non_constant_identifier_names
     final GetAppbusEvent = getAppbusEventC.asFunction<AppbusEventsFn>();
 
-    while (true) {
+    // Embedded Version of _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved
+    var free = library.lookup<NativeFunction<free_function>>("c_FreePointer");
+    final Free = free.asFunction<FreeFn>();
+
+    // ignore: non_constant_identifier_names
+    final GetAppBusEvent = () {
+      // ignore: non_constant_identifier_names
       Pointer<Utf8> result = GetAppbusEvent();
       String event = result.toDartString();
+      Free(result);
+      return event;
+    };
+
+    while (true) {
+      final event = GetAppBusEvent();
 
       if (event.startsWith("{\"EventType\":\"Shutdown\"")) {
         print("Shutting down isolate thread: $event");
@@ -184,6 +186,7 @@ class CwtchFfi implements Cwtch {
     final SelectProfile = selectProfileC.asFunction<GetJsonBlobStringFn>();
     final ut8Onion = onion.toNativeUtf8();
     SelectProfile(ut8Onion, ut8Onion.length);
+    malloc.free(ut8Onion);
   }
 
   // ignore: non_constant_identifier_names
@@ -194,6 +197,8 @@ class CwtchFfi implements Cwtch {
     final utf8nick = nick.toNativeUtf8();
     final ut8pass = pass.toNativeUtf8();
     CreateProfile(utf8nick, utf8nick.length, ut8pass, ut8pass.length);
+    malloc.free(utf8nick);
+    malloc.free(ut8pass);
   }
 
   // ignore: non_constant_identifier_names
@@ -203,6 +208,7 @@ class CwtchFfi implements Cwtch {
     final LoadProfiles = loadProfileC.asFunction<StringFn>();
     final ut8pass = pass.toNativeUtf8();
     LoadProfiles(ut8pass, ut8pass.length);
+    malloc.free(ut8pass);
   }
 
   // ignore: non_constant_identifier_names
@@ -214,6 +220,9 @@ class CwtchFfi implements Cwtch {
     final utf8handle = handle.toNativeUtf8();
     Pointer<Utf8> jsonMessageBytes = GetMessage(utf8profile, utf8profile.length, utf8handle, utf8handle.length, index);
     String jsonMessage = jsonMessageBytes.toDartString();
+    _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
+    malloc.free(utf8profile);
+    malloc.free(utf8handle);
     return jsonMessage;
   }
 
@@ -226,6 +235,8 @@ class CwtchFfi implements Cwtch {
     final utf8onion = onion.toNativeUtf8();
     final utf8json = json.toNativeUtf8();
     SendAppBusEvent(utf8onion, utf8onion.length, utf8json, utf8json.length);
+    malloc.free(utf8onion);
+    malloc.free(utf8json);
   }
 
   @override
@@ -236,6 +247,7 @@ class CwtchFfi implements Cwtch {
     final SendAppBusEvent = sendAppBusEvent.asFunction<StringFn>();
     final utf8json = json.toNativeUtf8();
     SendAppBusEvent(utf8json, utf8json.length);
+    malloc.free(utf8json);
   }
 
   @override
@@ -247,6 +259,8 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = contactHandle.toNativeUtf8();
     AcceptContact(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
@@ -258,6 +272,8 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = contactHandle.toNativeUtf8();
     BlockContact(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
@@ -270,6 +286,9 @@ class CwtchFfi implements Cwtch {
     final u2 = contactHandle.toNativeUtf8();
     final u3 = message.toNativeUtf8();
     SendMessage(u1, u1.length, u2, u2.length, u3, u3.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
   }
 
   @override
@@ -282,6 +301,9 @@ class CwtchFfi implements Cwtch {
     final u2 = contactHandle.toNativeUtf8();
     final u3 = target.toNativeUtf8();
     SendInvitation(u1, u1.length, u2, u2.length, u3, u3.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
   }
 
   @override
@@ -302,6 +324,8 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = bundle.toNativeUtf8();
     ImportBundle(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
@@ -315,6 +339,10 @@ class CwtchFfi implements Cwtch {
     final u3 = key.toNativeUtf8();
     final u4 = value.toNativeUtf8();
     SetGroupAttribute(u1, u1.length, u2, u2.length, u3, u3.length, u4, u4.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
+    malloc.free(u4);
   }
 
   @override
@@ -326,9 +354,12 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = groupHandle.toNativeUtf8();
     RejectInvite(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
+  // ignore: non_constant_identifier_names
   void CreateGroup(String profileOnion, String server, String groupName) {
     var createGroup = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_CreateGroup");
     // ignore: non_constant_identifier_names
@@ -337,6 +368,10 @@ class CwtchFfi implements Cwtch {
     final u2 = server.toNativeUtf8();
     final u3 = groupName.toNativeUtf8();
     CreateGroup(u1, u1.length, u2, u2.length, u3, u3.length);
+
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
   }
 
   @override
@@ -348,6 +383,8 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = handle.toNativeUtf8();
     LeaveConversation(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
@@ -359,9 +396,12 @@ class CwtchFfi implements Cwtch {
     final u1 = profileOnion.toNativeUtf8();
     final u2 = groupHandle.toNativeUtf8();
     LeaveGroup(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
+  // ignore: non_constant_identifier_names
   void UpdateMessageFlags(String profile, String handle, int index, int flags) {
     var updateMessageFlagsC = library.lookup<NativeFunction<void_from_string_string_int_int_function>>("c_UpdateMessageFlags");
     // ignore: non_constant_identifier_names
@@ -369,6 +409,8 @@ class CwtchFfi implements Cwtch {
     final utf8profile = profile.toNativeUtf8();
     final utf8handle = handle.toNativeUtf8();
     updateMessageFlags(utf8profile, utf8profile.length, utf8handle, utf8handle.length, index, flags);
+    malloc.free(utf8profile);
+    malloc.free(utf8handle);
   }
 
   @override
@@ -380,14 +422,18 @@ class CwtchFfi implements Cwtch {
     final u1 = onion.toNativeUtf8();
     final u2 = currentPassword.toNativeUtf8();
     DeleteProfile(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
   }
 
   @override
+  // ignore: non_constant_identifier_names
   Future<void> Shutdown() async {
     var shutdown = library.lookup<NativeFunction<void_from_void_funtion>>("c_ShutdownCwtch");
     // ignore: non_constant_identifier_names
 
     // Shutdown Cwtch + Tor...
+    // ignore: non_constant_identifier_names
     final Shutdown = shutdown.asFunction<VoidFromVoidFunction>();
     Shutdown();
 
@@ -400,6 +446,7 @@ class CwtchFfi implements Cwtch {
   }
 
   @override
+  // ignore: non_constant_identifier_names
   Future GetMessageByContentHash(String profile, String handle, String contentHash) async {
     var getMessagesByContentHashC = library.lookup<NativeFunction<get_json_blob_from_str_str_str_function>>("c_GetMessagesByContentHash");
     // ignore: non_constant_identifier_names
@@ -409,6 +456,20 @@ class CwtchFfi implements Cwtch {
     final utf8contentHash = contentHash.toNativeUtf8();
     Pointer<Utf8> jsonMessageBytes = GetMessagesByContentHash(utf8profile, utf8profile.length, utf8handle, utf8handle.length, utf8contentHash, utf8contentHash.length);
     String jsonMessage = jsonMessageBytes.toDartString();
+
+    _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
+    malloc.free(utf8profile);
+    malloc.free(utf8handle);
+    malloc.free(utf8contentHash);
     return jsonMessage;
   }
+
+  // ignore: non_constant_identifier_names
+  // Incredibly dangerous function which invokes a free in libCwtch, should only be used
+  // as documented in `MEMORY.md` in libCwtch repo.
+  void _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(Pointer<Utf8> ptr) {
+    var free = library.lookup<NativeFunction<free_function>>("c_FreePointer");
+    final Free = free.asFunction<FreeFn>();
+    Free(ptr);
+  }
 }

lib/l10n/intl_de.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "de",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Senden Sie diese Adresse an Peers, mit denen Sie sich verbinden möchten",
+    "addPeerTab": "Einen anderen Nutzer hinzufügen",
+    "addPeer": "Anderen Nutzer hinzufügen",
+    "peerNotOnline": "Der andere Nutzer ist offline. Die App kann momentan nicht verwendet werden.",
+    "peerBlockedMessage": "Anderer Nutzer ist blockiert",
+    "peerOfflineMessage": "Anderer Nutzer ist offline, Nachrichten können derzeit nicht zugestellt werden",
+    "blockBtn": "Anderen Nutzer blockieren",
+    "savePeerHistory": "Peer-Verlauf speichern",
+    "savePeerHistoryDescription": "Legt fest, ob ein mit dem anderen Nutzer verknüpfter Verlauf gelöscht werden soll oder nicht.",
+    "dontSavePeerHistory": "Verlauf mit anderem Nutzer löschen",
+    "unblockBtn": "Anderen Nutzer entsperren",
+    "blockUnknownLabel": "Unbekannte Peers blockieren",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Verbinde zu Netzwerk und Peers ...",
     "showMessageButton": "Show Message",
     "blockedMessageMessage": "This message is from a profile you have blocked.",
     "placeholderEnterMessage": "Type a message...",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "noch zu erledigen",
     "newConnectionPaneTitle": "Neue Verbindung",
     "networkStatusOnline": "Online",
-    "networkStatusConnecting": "Verbinde zu Netzwerk und Peers ...",
     "networkStatusAttemptingTor": "Versuche, eine Verbindung mit dem Tor-Netzwerk herzustellen",
     "networkStatusDisconnected": "Vom Internet getrennt, überprüfe deine Verbindung",
     "viewGroupMembershipTooltip": "Gruppenmitgliedschaft anzeigen",
@@ -104,7 +117,6 @@
     "localeFr": "Frances",
     "localeEn": "English",
     "settingLanguage": "Sprache",
-    "blockUnknownLabel": "Unbekannte Peers blockieren",
     "zoomLabel": "Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)",
     "versionBuilddate": "Version: %1 Aufgebaut auf: %2",
     "cwtchSettingsTitle": "Cwtch Einstellungen",
@@ -128,7 +140,6 @@
     "password1Label": "Passwort",
     "currentPasswordLabel": "aktuelles Passwort",
     "yourDisplayName": "Dein Anzeigename",
-    "profileOnionLabel": "Senden Sie diese Adresse an Peers, mit denen Sie sich verbinden möchten",
     "noPasswordWarning": "Wenn für dieses Konto kein Passwort verwendet wird, bedeutet dies, dass alle lokal gespeicherten Daten nicht verschlüsselt werden.",
     "radioNoPassword": "Unverschlüsselt (kein Passwort)",
     "radioUsePassword": "Passwort",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Profil bearbeiten",
     "addProfileTitle": "Neues Profil hinzufügen",
     "deleteBtn": "Löschen",
-    "unblockBtn": "Anderen Nutzer entsperren",
-    "dontSavePeerHistory": "Verlauf mit anderem Nutzer löschen",
-    "savePeerHistoryDescription": "Legt fest, ob ein mit dem anderen Nutzer verknüpfter Verlauf gelöscht werden soll oder nicht.",
-    "savePeerHistory": "Peer-Verlauf speichern",
-    "blockBtn": "Anderen Nutzer blockieren",
     "saveBtn": "Speichern",
     "displayNameLabel": "Angezeigename",
     "addressLabel": "Adresse",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "Möchtest Du die Einladung annehmen",
     "newGroupBtn": "Neue Gruppe anlegen",
     "copiedClipboardNotification": "in die Zwischenablage kopiert",
-    "peerOfflineMessage": "Anderer Nutzer ist offline, Nachrichten können derzeit nicht zugestellt werden",
-    "peerBlockedMessage": "Anderer Nutzer ist blockiert",
     "pendingLabel": "Bestätigung ausstehend",
     "acknowledgedLabel": "bestätigt",
     "couldNotSendMsgError": "Nachricht konnte nicht gesendet werden",
     "dmTooltip": "Klicken, um Direktnachricht zu senden",
     "membershipDescription": "Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben.  Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben.",
     "addListItemBtn": "Element hinzufügen",
-    "peerNotOnline": "Der andere Nutzer ist offline. Die App kann momentan nicht verwendet werden.",
     "searchList": "Liste durchsuchen",
     "update": "Update",
     "inviteBtn": "Einladen",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "Neue Meldung",
     "joinGroup": "Gruppe beitreten",
     "createGroup": "Gruppe erstellen",
-    "addPeer": "Anderen Nutzer hinzufügen",
     "groupAddr": "Adresse",
     "invitation": "Einladung",
     "server": "Server",
@@ -201,7 +203,6 @@
     "peerAddress": "Adresse",
     "joinGroupTab": "Einer Gruppe beitreten",
     "createGroupTab": "Eine Gruppe erstellen",
-    "addPeerTab": "Einen anderen Nutzer hinzufügen",
     "createGroupBtn": "Anlegen",
     "defaultGroupName": "Tolle Gruppe",
     "createGroupTitle": "Gruppe Anlegen"

lib/l10n/intl_en.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "en",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Send this address to people you want to connect with",
+    "addPeerTab": "Add a contact",
+    "addPeer": "Add Contact",
+    "peerNotOnline": "Contact is offline. Applications cannot be used right now.",
+    "peerBlockedMessage": "Contact is blocked",
+    "peerOfflineMessage": "Contact is offline, messages can't be delivered right now",
+    "blockBtn": "Block Contact",
+    "savePeerHistory": "Save History",
+    "savePeerHistoryDescription": "Determines whether or not to delete any history associated with the contact.",
+    "dontSavePeerHistory": "Delete History",
+    "unblockBtn": "Unblock Contact",
+    "blockUnknownLabel": "Block Unknown Contacts",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Connecting to network and contacts...",
     "showMessageButton": "Show Message",
     "blockedMessageMessage": "This message is from a profile you have blocked.",
     "placeholderEnterMessage": "Type a message...",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "Todo...",
     "newConnectionPaneTitle": "New Connection",
     "networkStatusOnline": "Online",
-    "networkStatusConnecting": "Connecting to network and peers...",
     "networkStatusAttemptingTor": "Attempting to connect to Tor network",
     "networkStatusDisconnected": "Disconnected from the internet, check your connection",
     "viewGroupMembershipTooltip": "View Group Membership",
@@ -104,7 +117,6 @@
     "localeFr": "Frances",
     "localeEn": "English",
     "settingLanguage": "Language",
-    "blockUnknownLabel": "Block Unknown Peers",
     "zoomLabel": "Interface zoom (mostly affects text and button sizes)",
     "versionBuilddate": "Version: %1 Built on: %2",
     "cwtchSettingsTitle": "Cwtch Settings",
@@ -128,7 +140,6 @@
     "password1Label": "Password",
     "currentPasswordLabel": "Current Password",
     "yourDisplayName": "Your Display Name",
-    "profileOnionLabel": "Send this address to peers you want to connect with",
     "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted",
     "radioNoPassword": "Unencrypted (No password)",
     "radioUsePassword": "Password",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Edit Profile",
     "addProfileTitle": "Add new profile",
     "deleteBtn": "Delete",
-    "unblockBtn": "Unblock Peer",
-    "dontSavePeerHistory": "Delete Peer History",
-    "savePeerHistoryDescription": "Determines whether or not to delete any history associated with the peer.",
-    "savePeerHistory": "Save Peer History",
-    "blockBtn": "Block Peer",
     "saveBtn": "Save",
     "displayNameLabel": "Display Name",
     "addressLabel": "Address",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "Do you want to accept the invitation to",
     "newGroupBtn": "Create new group",
     "copiedClipboardNotification": "Copied to clipboard",
-    "peerOfflineMessage": "Peer is offline, messages can't be delivered right now",
-    "peerBlockedMessage": "Peer is blocked",
     "pendingLabel": "Pending",
     "acknowledgedLabel": "Acknowledged",
     "couldNotSendMsgError": "Could not send this message",
     "dmTooltip": "Click to DM",
     "membershipDescription": "Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.",
     "addListItemBtn": "Add Item",
-    "peerNotOnline": "Peer is Offline. Applications cannot be used right now.",
     "searchList": "Search List",
     "update": "Update",
     "inviteBtn": "Invite",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "New Bulletin",
     "joinGroup": "Join group",
     "createGroup": "Create group",
-    "addPeer": "Add Peer",
     "groupAddr": "Address",
     "invitation": "Invitation",
     "server": "Server",
@@ -201,7 +203,6 @@
     "peerAddress": "Address",
     "joinGroupTab": "Join a group",
     "createGroupTab": "Create a group",
-    "addPeerTab": "Add a peer",
     "createGroupBtn": "Create",
     "defaultGroupName": "Awesome Group",
     "createGroupTitle": "Create Group"

lib/l10n/intl_es.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "es",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Envía esta dirección a los contactos con los que quieras conectarte",
+    "addPeerTab": "Agregar Contacto",
+    "addPeer": "Agregar Contacto",
+    "peerNotOnline": "Este contacto no está en línea, la aplicación no puede ser usada en este momento",
+    "peerBlockedMessage": "Contacto bloqueado",
+    "peerOfflineMessage": "Este contacto no está en línea, los mensajes no pueden ser entregados en este momento",
+    "blockBtn": "Bloquear contacto",
+    "savePeerHistory": "Guardar el historial con contacto",
+    "savePeerHistoryDescription": "Determina si eliminar o no el historial asociado con el contacto.",
+    "dontSavePeerHistory": "Eliminar historial de contacto",
+    "unblockBtn": "Desbloquear contacto",
+    "blockUnknownLabel": "Bloquear conexiones desconocidas",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Conectando a la red y a los contactos...",
     "showMessageButton": "Show Message",
     "blockedMessageMessage": "This message is from a profile you have blocked.",
     "placeholderEnterMessage": "Type a message...",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "Por hacer...",
     "newConnectionPaneTitle": "Nueva conexión",
     "networkStatusOnline": "En línea",
-    "networkStatusConnecting": "Conectando a la red y a los contactos...",
     "networkStatusAttemptingTor": "Intentando conectarse a la red Tor",
     "networkStatusDisconnected": "Sin conexión, comprueba tu conexión",
     "viewGroupMembershipTooltip": "Ver membresía del grupo",
@@ -104,7 +117,6 @@
     "localeFr": "Francés",
     "localeEn": "Inglés",
     "settingLanguage": "Idioma",
-    "blockUnknownLabel": "Bloquear conexiones desconocidas",
     "zoomLabel": "Zoom de la interfaz (afecta principalmente el tamaño del texto y de los botones)",
     "versionBuilddate": "Versión: %1 Basado en %2",
     "cwtchSettingsTitle": "Configuración de Cwtch",
@@ -128,7 +140,6 @@
     "password1Label": "Contraseña",
     "currentPasswordLabel": "Contraseña actual",
     "yourDisplayName": "Tu nombre de usuario",
-    "profileOnionLabel": "Envía esta dirección a los contactos con los que quieras conectarte",
     "noPasswordWarning": "No usar una contraseña para esta cuenta significa que los datos almacenados localmente no serán encriptados",
     "radioNoPassword": "Sin cifrado (sin contraseña)",
     "radioUsePassword": "Contraseña",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Editar perfil",
     "addProfileTitle": "Agregar nuevo perfil",
     "deleteBtn": "Eliminar",
-    "unblockBtn": "Desbloquear contacto",
-    "dontSavePeerHistory": "Eliminar historial de contacto",
-    "savePeerHistoryDescription": "Determina si eliminar o no el historial asociado con el contacto.",
-    "savePeerHistory": "Guardar el historial con contacto",
-    "blockBtn": "Bloquear contacto",
     "saveBtn": "Guardar",
     "displayNameLabel": "Nombre de Usuario",
     "addressLabel": "Dirección",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "¿Quieres aceptar la invitación a ",
     "newGroupBtn": "Crear un nuevo grupo de chat",
     "copiedClipboardNotification": "Copiado al portapapeles",
-    "peerOfflineMessage": "Este contacto no está en línea, los mensajes no pueden ser entregados en este momento",
-    "peerBlockedMessage": "Contacto bloqueado",
     "pendingLabel": "Pendiente",
     "acknowledgedLabel": "Reconocido",
     "couldNotSendMsgError": "No se pudo enviar este mensaje",
     "dmTooltip": "Haz clic para enviar mensaje directo",
     "membershipDescription": "La lista a continuación solo muestra los miembros que han enviado mensajes al grupo, no incluye a todos los usuarios dentro del grupo",
     "addListItemBtn": "Agregar artículo",
-    "peerNotOnline": "Este contacto no está en línea, la aplicación no puede ser usada en este momento",
     "searchList": "Buscar en la lista",
     "update": "Actualizar",
     "inviteBtn": "Invitar",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "Nuevo Boletín",
     "joinGroup": "Únete al grupo",
     "createGroup": "Crear perfil",
-    "addPeer": "Agregar Contacto",
     "groupAddr": "Dirección",
     "invitation": "Invitación",
     "server": "Servidor",
@@ -201,7 +203,6 @@
     "peerAddress": "Dirección",
     "joinGroupTab": "Únete a un grupo",
     "createGroupTab": "Crear un grupo",
-    "addPeerTab": "Agregar Contacto",
     "createGroupBtn": "Crear",
     "defaultGroupName": "El Grupo Asombroso",
     "createGroupTitle": "Crear un grupo"

lib/l10n/intl_fr.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "fr",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Envoyez cette adresse aux personnes avec lesquelles vous souhaitez entrer en contact.",
+    "addPeerTab": "Ajouter un pair",
+    "addPeer": "Ajouter un pair",
+    "peerNotOnline": "Le pair est hors ligne, les messages ne peuvent pas être remis pour le moment",
+    "peerBlockedMessage": "Le pair est bloqué",
+    "peerOfflineMessage": "Le pair est hors ligne, les messages ne peuvent pas être remis pour le moment",
+    "blockBtn": "Bloquer le pair",
+    "savePeerHistory": "Sauvegarder l'historique des pairs",
+    "savePeerHistoryDescription": "Détermine s'il faut ou non supprimer tout historique associé au pair.",
+    "dontSavePeerHistory": "Supprimer l'historique des pairs",
+    "unblockBtn": "Débloquer le pair",
+    "blockUnknownLabel": "Bloquer les pairs inconnus",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Se connecter au réseau et aux pairs...",
     "showMessageButton": "Afficher le message",
     "blockedMessageMessage": "Ce message provient d'un profil que vous avez bloqué.",
     "placeholderEnterMessage": "saisissez un message",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "À faire...",
     "newConnectionPaneTitle": "Nouvelle connexion",
     "networkStatusOnline": "En ligne",
-    "networkStatusConnecting": "Se connecter au réseau et aux pairs...",
     "networkStatusAttemptingTor": "Tentative de connexion au réseau Tor",
     "networkStatusDisconnected": "Déconnecté d'Internet, vérifiez votre connexion",
     "viewGroupMembershipTooltip": "Afficher les membres du groupe",
@@ -104,7 +117,6 @@
     "localeFr": "Français",
     "localeEn": "Anglais",
     "settingLanguage": "Langue",
-    "blockUnknownLabel": "Bloquer les pairs inconnus",
     "zoomLabel": "Zoom de l'interface (affecte principalement la taille du texte et des boutons)",
     "versionBuilddate": "Version : %1 Construite le : %2",
     "cwtchSettingsTitle": "Préférences Cwtch",
@@ -128,7 +140,6 @@
     "password1Label": "Mot de passe",
     "currentPasswordLabel": "Mot de passe actuel",
     "yourDisplayName": "Pseudo",
-    "profileOnionLabel": "Envoyez cette adresse aux personnes avec lesquelles vous souhaitez entrer en contact.",
     "noPasswordWarning": "Ne pas utiliser de mot de passe sur ce compte signifie que toutes les données stockées localement ne seront pas chiffrées.",
     "radioNoPassword": "Non chiffré (pas de mot de passe)",
     "radioUsePassword": "Mot de passe",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Modifier le profil",
     "addProfileTitle": "Ajouter un nouveau profil",
     "deleteBtn": "Effacer",
-    "unblockBtn": "Débloquer le pair",
-    "dontSavePeerHistory": "Supprimer l'historique des pairs",
-    "savePeerHistoryDescription": "Détermine s'il faut ou non supprimer tout historique associé au pair.",
-    "savePeerHistory": "Sauvegarder l'historique des pairs",
-    "blockBtn": "Bloquer le pair",
     "saveBtn": "Sauvegarder",
     "displayNameLabel": "Pseudo",
     "addressLabel": "Adresse",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "Voulez-vous accepter l'invitation au groupe",
     "newGroupBtn": "Créer un nouveau groupe",
     "copiedClipboardNotification": "Copié dans le presse-papier",
-    "peerOfflineMessage": "Le pair est hors ligne, les messages ne peuvent pas être remis pour le moment",
-    "peerBlockedMessage": "Le pair est bloqué",
     "pendingLabel": "En attente",
     "acknowledgedLabel": "Accusé de réception",
     "couldNotSendMsgError": "Impossible d'envoyer ce message",
     "dmTooltip": "Envoyer un message privé",
     "membershipDescription": "Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être représentatives de l'ensemble des membres du groupe.",
     "addListItemBtn": "Ajouter un élément",
-    "peerNotOnline": "Le pair est hors ligne, les messages ne peuvent pas être remis pour le moment",
     "searchList": "Liste de recherche",
     "update": "Mise à jour",
     "inviteBtn": "Invitation",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "Nouveau bulletin",
     "joinGroup": "Rejoindre le groupe",
     "createGroup": "Créer un groupe",
-    "addPeer": "Ajouter un pair",
     "groupAddr": "Adresse",
     "invitation": "Invitation",
     "server": "Serveur",
@@ -201,7 +203,6 @@
     "peerAddress": "Adresse",
     "joinGroupTab": "Rejoindre un groupe",
     "createGroupTab": "Créer un groupe",
-    "addPeerTab": "Ajouter un pair",
     "createGroupBtn": "Créer",
     "defaultGroupName": "Un groupe génial",
     "createGroupTitle": "Créer un groupe"

lib/l10n/intl_it.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "it",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Inviare questo indirizzo ai peer con cui si desidera connettersi",
+    "addPeerTab": "Aggiungi un peer",
+    "addPeer": "Aggiungi peer",
+    "peerNotOnline": "Il peer è offline. Le applicazioni non possono essere utilizzate in questo momento.",
+    "peerBlockedMessage": "Il peer è bloccato",
+    "peerOfflineMessage": "Il peer è offline, i messaggi non possono essere recapitati in questo momento",
+    "blockBtn": "Blocca il peer",
+    "savePeerHistory": "Salva cronologia peer",
+    "savePeerHistoryDescription": "Determina se eliminare o meno ogni cronologia eventualmente associata al peer.",
+    "dontSavePeerHistory": "Elimina cronologia dei peer",
+    "unblockBtn": "Sblocca il peer",
+    "blockUnknownLabel": "Blocca peer sconosciuti",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Connessione alla rete e ai peer ...",
     "showMessageButton": "Show Message",
     "blockedMessageMessage": "This message is from a profile you have blocked.",
     "placeholderEnterMessage": "Type a message...",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "Da fare...",
     "newConnectionPaneTitle": "Nuova connessione",
     "networkStatusOnline": "Online",
-    "networkStatusConnecting": "Connessione alla rete e ai peer ...",
     "networkStatusAttemptingTor": "Tentativo di connessione alla rete Tor",
     "networkStatusDisconnected": "Disconnesso da Internet, controlla la tua connessione",
     "viewGroupMembershipTooltip": "Visualizza i membri del gruppo",
@@ -104,7 +117,6 @@
     "localeFr": "Francese",
     "localeEn": "Inglese",
     "settingLanguage": "Lingua",
-    "blockUnknownLabel": "Blocca peer sconosciuti",
     "zoomLabel": "Zoom dell'interfaccia (influisce principalmente sulle dimensioni del testo e dei pulsanti)",
     "versionBuilddate": "Versione: %1 Costruito il: %2",
     "cwtchSettingsTitle": "Impostazioni di Cwtch",
@@ -128,7 +140,6 @@
     "password1Label": "Password",
     "currentPasswordLabel": "Password corrente",
     "yourDisplayName": "Il tuo nome visualizzato",
-    "profileOnionLabel": "Inviare questo indirizzo ai peer con cui si desidera connettersi",
     "noPasswordWarning": "Non utilizzare una password su questo account significa che tutti i dati archiviati localmente non verranno criptati",
     "radioNoPassword": "Non criptato (senza password)",
     "radioUsePassword": "Password",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Modifica profilo",
     "addProfileTitle": "Aggiungi nuovo profilo",
     "deleteBtn": "Elimina",
-    "unblockBtn": "Sblocca il peer",
-    "dontSavePeerHistory": "Elimina cronologia dei peer",
-    "savePeerHistoryDescription": "Determina se eliminare o meno ogni cronologia eventualmente associata al peer.",
-    "savePeerHistory": "Salva cronologia peer",
-    "blockBtn": "Blocca il peer",
     "saveBtn": "Salva",
     "displayNameLabel": "Nome visualizzato",
     "addressLabel": "Indirizzo",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "Vuoi accettare l'invito a",
     "newGroupBtn": "Crea un nuovo gruppo",
     "copiedClipboardNotification": "Copiato negli Appunti",
-    "peerOfflineMessage": "Il peer è offline, i messaggi non possono essere recapitati in questo momento",
-    "peerBlockedMessage": "Il peer è bloccato",
     "pendingLabel": "In corso",
     "acknowledgedLabel": "Riconosciuto",
     "couldNotSendMsgError": "Impossibile inviare questo messaggio",
     "dmTooltip": "Clicca per inviare un Messagio Diretto",
     "membershipDescription": "Di seguito è riportato un elenco di utenti che hanno inviato messaggi al gruppo. Questo elenco potrebbe non corrispondere a tutti gli utenti che hanno accesso al gruppo.",
     "addListItemBtn": "Aggiungi elemento",
-    "peerNotOnline": "Il peer è offline. Le applicazioni non possono essere utilizzate in questo momento.",
     "searchList": "Cerca nella lista",
     "update": "Aggiornamento",
     "inviteBtn": "Invitare",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "Nuovo bollettino",
     "joinGroup": "Unisciti al gruppo",
     "createGroup": "Crea un gruppo",
-    "addPeer": "Aggiungi peer",
     "groupAddr": "Indirizzo",
     "invitation": "Invito",
     "server": "Server",
@@ -201,7 +203,6 @@
     "peerAddress": "Indirizzo",
     "joinGroupTab": "Unisciti a un gruppo",
     "createGroupTab": "Crea un gruppo",
-    "addPeerTab": "Aggiungi un peer",
     "createGroupBtn": "Crea",
     "defaultGroupName": "Gruppo fantastico",
     "createGroupTitle": "Crea un gruppo"

lib/l10n/intl_pt.arb

@@ -1,6 +1,20 @@
 {
     "@@locale": "pt",
-    "@@last_modified": "2021-07-14T23:49:07+02:00",
+    "@@last_modified": "2021-08-26T23:44:51+02:00",
+    "profileOnionLabel": "Send this address to contacts you want to connect with",
+    "addPeerTab": "Add a contact",
+    "addPeer": "Add Contact",
+    "peerNotOnline": "Contact is offline. Applications cannot be used right now.",
+    "peerBlockedMessage": "Contact is blocked",
+    "peerOfflineMessage": "Contact is offline, messages can't be delivered right now",
+    "blockBtn": "Block Contact",
+    "savePeerHistory": "Save History",
+    "savePeerHistoryDescription": "Determines whether or not to delete any history associated with the contact.",
+    "dontSavePeerHistory": "Delete History",
+    "unblockBtn": "Unblock Contact",
+    "blockUnknownLabel": "Block Unknown Contacts",
+    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "networkStatusConnecting": "Connecting to network and contacts...",
     "showMessageButton": "Show Message",
     "blockedMessageMessage": "This message is from a profile you have blocked.",
     "placeholderEnterMessage": "Type a message...",
@@ -84,7 +98,6 @@
     "todoPlaceholder": "Afazer…",
     "newConnectionPaneTitle": "New Connection",
     "networkStatusOnline": "Online",
-    "networkStatusConnecting": "Connecting to network and peers...",
     "networkStatusAttemptingTor": "Attempting to connect to Tor network",
     "networkStatusDisconnected": "Disconnected from the internet, check your connection",
     "viewGroupMembershipTooltip": "View Group Membership",
@@ -104,7 +117,6 @@
     "localeFr": "Frances",
     "localeEn": "English",
     "settingLanguage": "Language",
-    "blockUnknownLabel": "Block Unknown Peers",
     "zoomLabel": "Zoom da interface (afeta principalmente tamanho de texto e botões)",
     "versionBuilddate": "Version: %1 Built on: %2",
     "cwtchSettingsTitle": "Configurações do Cwtch",
@@ -128,7 +140,6 @@
     "password1Label": "Password",
     "currentPasswordLabel": "Current Password",
     "yourDisplayName": "Your Display Name",
-    "profileOnionLabel": "Send this address to peers you want to connect with",
     "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted",
     "radioNoPassword": "Unencrypted (No password)",
     "radioUsePassword": "Password",
@@ -141,11 +152,6 @@
     "editProfileTitle": "Edit Profile",
     "addProfileTitle": "Add new profile",
     "deleteBtn": "Deletar",
-    "unblockBtn": "Unblock Peer",
-    "dontSavePeerHistory": "Delete Peer History",
-    "savePeerHistoryDescription": "Determines whether or not to delete any history associated with the peer.",
-    "savePeerHistory": "Save Peer History",
-    "blockBtn": "Block Peer",
     "saveBtn": "Salvar",
     "displayNameLabel": "Nome de Exibição",
     "addressLabel": "Endereço",
@@ -158,15 +164,12 @@
     "acceptGroupInviteLabel": "Você quer aceitar o convite para",
     "newGroupBtn": "Criar novo grupo",
     "copiedClipboardNotification": "Copiado",
-    "peerOfflineMessage": "Peer is offline, messages can't be delivered right now",
-    "peerBlockedMessage": "Peer is blocked",
     "pendingLabel": "Pendente",
     "acknowledgedLabel": "Confirmada",
     "couldNotSendMsgError": "Não deu para enviar esta mensagem",
     "dmTooltip": "Clique para DM",
     "membershipDescription": "A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo.",
     "addListItemBtn": "Add Item",
-    "peerNotOnline": "Peer is Offline. Applications cannot be used right now.",
     "searchList": "Search List",
     "update": "Update",
     "inviteBtn": "Convidar",
@@ -192,7 +195,6 @@
     "newBulletinLabel": "Novo Boletim",
     "joinGroup": "Join group",
     "createGroup": "Create group",
-    "addPeer": "Add Peer",
     "groupAddr": "Address",
     "invitation": "Invitation",
     "server": "Server",
@@ -201,7 +203,6 @@
     "peerAddress": "Address",
     "joinGroupTab": "Join a group",
     "createGroupTab": "Create a group",
-    "addPeerTab": "Add a peer",
     "createGroupBtn": "Criar",
     "defaultGroupName": "Grupo incrível",
     "createGroupTitle": "Criar Grupo"

lib/main.dart

@@ -169,7 +169,7 @@ class FlwtchState extends State<Flwtch> {
     var args = jsonDecode(call.arguments);
     var profile = profs.getProfile(args["ProfileOnion"])!;
     var convo = profile.contactList.getContact(args["Handle"])!;
-    var initialIndex = convo.unreadMessages;
+    Provider.of<AppState>(navKey.currentContext!, listen: false).initialScrollIndex = convo.unreadMessages;
     convo.unreadMessages = 0;
 
     // single pane mode pushes; double pane mode reads AppState.selectedProfile/Conversation
@@ -187,7 +187,7 @@ class FlwtchState extends State<Flwtch> {
                 ChangeNotifierProvider.value(value: profile),
                 ChangeNotifierProvider.value(value: convo),
               ],
-              builder: (context, child) => MessageView(initialIndex),
+              builder: (context, child) => MessageView(),
             );
           },
         ),

lib/model.dart

@@ -30,6 +30,7 @@ class AppState extends ChangeNotifier {
   String appError = "";
   String? _selectedProfile;
   String? _selectedConversation;
+  int _initialScrollIndex = 0;
   int? _selectedIndex;
   bool _unreadMessagesBelow = false;
 
@@ -67,6 +68,12 @@ class AppState extends ChangeNotifier {
     notifyListeners();
   }
 
+  int get initialScrollIndex => _initialScrollIndex;
+  set initialScrollIndex(int newVal) {
+    this._initialScrollIndex = newVal;
+    notifyListeners();
+  }
+
   bool isLandscape(BuildContext c) => MediaQuery.of(c).size.width > MediaQuery.of(c).size.height;
 }
 

lib/views/contactsview.dart

@@ -23,18 +23,19 @@ class ContactsView extends StatefulWidget {
 
 // selectConversation can be called from anywhere to set the active conversation
 void selectConversation(BuildContext context, String handle) {
-  var initialIndex = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages;
   // requery instead of using contactinfostate directly because sometimes listview gets confused about data that resorts
+  var initialIndex = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages;
   Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages = 0;
   // triggers update in Double/TripleColumnView
+  Provider.of<AppState>(context, listen: false).initialScrollIndex = initialIndex;
   Provider.of<AppState>(context, listen: false).selectedConversation = handle;
   Provider.of<AppState>(context, listen: false).selectedIndex = null;
   // if in singlepane mode, push to the stack
   var isLandscape = Provider.of<AppState>(context, listen: false).isLandscape(context);
-  if (Provider.of<Settings>(context, listen: false).uiColumns(isLandscape).length == 1) _pushMessageView(context, handle, initialIndex);
+  if (Provider.of<Settings>(context, listen: false).uiColumns(isLandscape).length == 1) _pushMessageView(context, handle);
 }
 
-void _pushMessageView(BuildContext context, String handle, int initialIndex) {
+void _pushMessageView(BuildContext context, String handle) {
   var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
   Navigator.of(context).push(
     MaterialPageRoute<void>(
@@ -47,7 +48,7 @@ void _pushMessageView(BuildContext context, String handle, int initialIndex) {
             ChangeNotifierProvider.value(value: profile),
             ChangeNotifierProvider.value(value: profile.contactList.getContact(handle)!),
           ],
-          builder: (context, child) => MessageView(initialIndex),
+          builder: (context, child) => MessageView(),
         );
       },
     ),
@@ -86,18 +87,7 @@ class _ContactsViewState extends State<ContactsView> {
                 child: Text("%1 » %2".replaceAll("%1", Provider.of<ProfileInfoState>(context).nickname).replaceAll("%2", AppLocalizations.of(context)!.titleManageContacts),
                     overflow: TextOverflow.ellipsis, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor()))),
           ])),
-          actions: [
-            IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
-            IconButton(
-                // need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
-                icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
-                onPressed: () {
-                  Provider.of<ContactListState>(context, listen: false).filter = "";
-                  setState(() {
-                    showSearchBar = !showSearchBar;
-                  });
-                })
-          ],
+          actions: getActions(context),
         ),
         floatingActionButton: FloatingActionButton(
           onPressed: _pushAddContact,
@@ -107,6 +97,26 @@ class _ContactsViewState extends State<ContactsView> {
         body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList());
   }
 
+  List<Widget> getActions(context) {
+    var actions = List<Widget>.empty(growable: true);
+    if (Provider.of<Settings>(context).blockUnknownConnections) {
+      actions.add(Tooltip(message: AppLocalizations.of(context)!.blockUnknownConnectionsEnabledDescription, child: Icon(CwtchIcons.block_unknown)));
+    }
+    actions.add(
+      IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
+    );
+    actions.add(IconButton(
+        // need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
+        icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
+        onPressed: () {
+          Provider.of<ContactListState>(context, listen: false).filter = "";
+          setState(() {
+            showSearchBar = !showSearchBar;
+          });
+        }));
+    return actions;
+  }
+
   Widget _buildFilterable() {
     Widget txtfield = CwtchTextField(
       controller: ctrlrFilter,

lib/views/doublecolview.dart

@@ -17,7 +17,6 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
   Widget build(BuildContext context) {
     var flwtch = Provider.of<AppState>(context);
     var cols = Provider.of<Settings>(context).uiColumns(true);
-    var initialIndex = flwtch.selectedConversation == null ? 0 : Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(flwtch.selectedConversation!)!.unreadMessages;
     return Flex(
       direction: Axis.horizontal,
       children: <Widget>[
@@ -36,7 +35,7 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
                   ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),
                   ChangeNotifierProvider.value(
                       value: flwtch.selectedConversation != null ? Provider.of<ProfileInfoState>(context).contactList.getContact(flwtch.selectedConversation!)! : ContactInfoState("", "")),
-                ], child: Container(child: MessageView(initialIndex))),
+                ], child: Container(child: MessageView())),
         ),
       ],
     );

lib/views/messageview.dart

@@ -22,9 +22,6 @@ import '../widgets/messagelist.dart';
 import 'groupsettingsview.dart';
 
 class MessageView extends StatefulWidget {
-  int initialIndex;
-  MessageView(this.initialIndex);
-
   @override
   _MessageViewState createState() => _MessageViewState();
 }
@@ -38,24 +35,31 @@ class _MessageViewState extends State<MessageView> {
 
   @override
   void initState() {
-    // using "8" because "# of messages that fit on one screen" isnt trivial to calculate at this point
-    if (widget.initialIndex > 8) {
-      WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) {
-        Provider.of<AppState>(context, listen: false).unreadMessagesBelow = true;
-      });
-    }
-
     scrollListener.itemPositions.addListener(() {
       var first = scrollListener.itemPositions.value.first.index;
       var last = scrollListener.itemPositions.value.last.index;
       // sometimes these go hi->lo and sometimes they go lo->hi because [who tf knows]
-      if (first == 0 || last == 0) {
+      if ((first == 0 || last == 0) && Provider.of<AppState>(context, listen: false).unreadMessagesBelow == true) {
+        Provider.of<AppState>(context, listen: false).initialScrollIndex = 0;
         Provider.of<AppState>(context, listen: false).unreadMessagesBelow = false;
       }
     });
     super.initState();
   }
 
+  @override
+  void didChangeDependencies() {
+    var appState = Provider.of<AppState>(context, listen: false);
+
+    // using "8" because "# of messages that fit on one screen" isnt trivial to calculate at this point
+    if (appState.initialScrollIndex > 8 && appState.unreadMessagesBelow == false) {
+      WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) {
+        appState.unreadMessagesBelow = true;
+      });
+    }
+    super.didChangeDependencies();
+  }
+
   @override
   void dispose() {
     focusNode.dispose();
@@ -74,9 +78,13 @@ class _MessageViewState extends State<MessageView> {
     return WillPopScope(
         onWillPop: _onWillPop,
         child: Scaffold(
-          floatingActionButton: appState.unreadMessagesBelow ? FloatingActionButton(child: Icon(Icons.arrow_downward), onPressed: (){
-            scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
-          }) : null,
+          floatingActionButton: appState.unreadMessagesBelow
+              ? FloatingActionButton(
+                  child: Icon(Icons.arrow_downward),
+                  onPressed: () {
+                    scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
+                  })
+              : null,
           appBar: AppBar(
             // setting leading to null makes it do the default behaviour; container() hides it
             leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null,
@@ -101,13 +109,19 @@ class _MessageViewState extends State<MessageView> {
               //IconButton(icon: Icon(Icons.chat), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings),
+              IconButton(
+                  icon: Icon(CwtchIcons.send_invite, size: 24),
+                  tooltip: AppLocalizations.of(context)!.sendInvite,
+                  onPressed: () {
+                    _modalSendInvitation(context);
+                  }),
               IconButton(
                   icon: Provider.of<ContactInfoState>(context, listen: false).isGroup == true ? Icon(CwtchIcons.group_settings_24px) : Icon(CwtchIcons.peer_settings_24px),
                   tooltip: AppLocalizations.of(context)!.conversationSettings,
                   onPressed: _pushContactSettings),
             ],
           ),
-          body: Padding(padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 108.0), child: MessageList(widget.initialIndex, scrollController, scrollListener)),
+          body: Padding(padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 108.0), child: MessageList(scrollController, scrollListener)),
           bottomSheet: _buildComposeBox(),
         ));
   }
@@ -196,42 +210,37 @@ class _MessageViewState extends State<MessageView> {
       child: Row(
         children: <Widget>[
           Expanded(
-            child: Container(
-                decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
-                child: RawKeyboardListener(
-                    focusNode: FocusNode(),
-                    onKey: handleKeyPress,
-                    child: TextFormField(
-                        key: Key('txtCompose'),
-                        controller: ctrlrCompose,
-                        focusNode: focusNode,
-                        autofocus: !Platform.isAndroid,
-                        textInputAction: TextInputAction.newline,
-                        keyboardType: TextInputType.multiline,
-                        minLines: 1,
-                        maxLines: null,
-                        onFieldSubmitted: _sendMessage,
-                        enabled: !isOffline,
-                        decoration: InputDecoration(
-                          hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
-                          hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
-                          enabledBorder: InputBorder.none,
-                          focusedBorder: InputBorder.none,
-                          enabled: true,
-                          prefixIcon: IconButton(
-                              icon: Icon(CwtchIcons.send_invite, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                              tooltip: AppLocalizations.of(context)!.sendInvite,
-                              enableFeedback: true,
-                              splashColor: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
-                              hoverColor: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
-                              onPressed: () => _modalSendInvitation(context)),
-                          suffixIcon: IconButton(
-                            icon: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                            tooltip: AppLocalizations.of(context)!.sendMessage,
-                            onPressed: isOffline ? null : _sendMessage,
-                          ),
-                        )))),
-          ),
+              child: Container(
+                  decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
+                  child: RawKeyboardListener(
+                      focusNode: FocusNode(),
+                      onKey: handleKeyPress,
+                      child: Padding(
+                        padding: EdgeInsets.all(8),
+                        child: TextFormField(
+                            key: Key('txtCompose'),
+                            controller: ctrlrCompose,
+                            focusNode: focusNode,
+                            autofocus: !Platform.isAndroid,
+                            textInputAction: TextInputAction.newline,
+                            keyboardType: TextInputType.multiline,
+                            enableIMEPersonalizedLearning: false,
+                            minLines: 1,
+                            maxLines: null,
+                            onFieldSubmitted: _sendMessage,
+                            enabled: !isOffline,
+                            decoration: InputDecoration(
+                                hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
+                                hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
+                                enabledBorder: InputBorder.none,
+                                focusedBorder: InputBorder.none,
+                                enabled: true,
+                                suffixIcon: ElevatedButton(
+                                  style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()),
+                                  child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
+                                  onPressed: isOffline ? null : _sendMessage,
+                                ))),
+                      )))),
         ],
       ),
     );

lib/views/triplecolview.dart

@@ -35,7 +35,7 @@ class _TripleColumnViewState extends State<TripleColumnView> {
         child: appState.selectedConversation == null
             ? Center(child: Text(AppLocalizations.of(context)!.addContactFirst))
             : //dev
-            Container(child: MessageView(0/*todo:setme*/)),
+            Container(child: MessageView()),
       ),
     ]);
   }

lib/widgets/buttontextfield.dart

@@ -37,6 +37,7 @@ class _CwtchButtonTextFieldState extends State<CwtchButtonTextField> {
         readOnly: widget.readonly,
         showCursor: !widget.readonly,
         focusNode: _focusNode,
+        enableIMEPersonalizedLearning: false,
         decoration: InputDecoration(
             suffixIcon: IconButton(
               onPressed: widget.onPressed,

lib/widgets/contactrow.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cwtch/views/contactsview.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
@@ -127,9 +129,9 @@ class _ContactRowState extends State<ContactRow> {
     }
     // If the last message was over a day ago, just state the date
     if (DateTime.now().difference(date).inDays > 1) {
-      return DateFormat.yMd().format(date.toLocal());
+      return DateFormat.yMd(Platform.localeName).format(date.toLocal());
     }
     // Otherwise just state the time.
-    return DateFormat.Hm().format(date.toLocal());
+    return DateFormat.Hm(Platform.localeName).format(date.toLocal());
   }
 }

lib/widgets/invitationbubble.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/message.dart';
@@ -39,7 +40,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
     var borderRadiousEh = 15.0;
     var showGroupInvite = Provider.of<Settings>(context).isExperimentEnabled(TapirGroupsExperiment);
     rejected = Provider.of<MessageMetadata>(context).flags & 0x01 == 0x01;
-    var prettyDate = DateFormat.yMd().add_jm().format(Provider.of<MessageMetadata>(context).timestamp);
+    var prettyDate = DateFormat.yMd(Platform.localeName).add_jm().format(Provider.of<MessageMetadata>(context).timestamp);
 
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";

lib/widgets/messagebubble.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:flutter/material.dart';
@@ -28,7 +30,7 @@ class MessageBubbleState extends State<MessageBubble> {
     // var myKey = Provider.of<MessageState>(context).profileOnion + "::" + Provider.of<MessageState>(context).contactHandle + "::" + Provider.of<MessageState>(context).messageIndex.toString();
 
     DateTime messageDate = Provider.of<MessageMetadata>(context).timestamp;
-    prettyDate = DateFormat.yMd().add_jm().format(messageDate.toLocal());
+    prettyDate = DateFormat.yMd(Platform.localeName).add_jm().format(messageDate.toLocal());
 
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";

lib/widgets/messagelist.dart

@@ -9,10 +9,9 @@ import '../model.dart';
 import '../settings.dart';
 
 class MessageList extends StatefulWidget {
-  int initialIndex;
   ItemScrollController scrollController;
   ItemPositionsListener scrollListener;
-  MessageList(this.initialIndex, this.scrollController, this.scrollListener);
+  MessageList(this.scrollController, this.scrollListener);
 
   @override
   _MessageListState createState() => _MessageListState();
@@ -21,6 +20,7 @@ class MessageList extends StatefulWidget {
 class _MessageListState extends State<MessageList> {
   @override
   Widget build(BuildContext outerContext) {
+    var initi = Provider.of<AppState>(outerContext, listen: false).initialScrollIndex;
     bool isP2P = !Provider.of<ContactInfoState>(context).isGroup;
     bool isGroupAndSyncing = Provider.of<ContactInfoState>(context).isGroup == true && Provider.of<ContactInfoState>(context).status == "Authenticated";
     bool isGroupAndSynced = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status == "Synced";
@@ -72,7 +72,7 @@ class _MessageListState extends State<MessageList> {
                       ? ScrollablePositionedList.builder(
                           itemPositionsListener: widget.scrollListener,
                           itemScrollController: widget.scrollController,
-                          initialScrollIndex: widget.initialIndex,
+                          initialScrollIndex: Provider.of<AppState>(outerContext, listen: false).initialScrollIndex,
                           itemCount: Provider.of<ContactInfoState>(outerContext).totalMessages,
                           reverse: true, // NOTE: There seems to be a bug in flutter that corrects the mouse wheel scroll, but not the drag direction...
                           itemBuilder: (itemBuilderContext, index) {

lib/widgets/messagerow.dart

@@ -5,6 +5,7 @@ import 'package:cwtch/models/message.dart';
 import 'package:cwtch/views/contactsview.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/widgets/profileimage.dart';
+import 'package:flutter/physics.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -20,9 +21,31 @@ class MessageRow extends StatefulWidget {
   MessageRowState createState() => MessageRowState();
 }
 
-class MessageRowState extends State<MessageRow> {
+class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMixin {
   bool showMenu = false;
   bool showBlockedMessage = false;
+  late AnimationController _controller;
+  late Animation<Alignment> _animation;
+  late Alignment _dragAlignment = Alignment.center;
+  Alignment _dragAffinity = Alignment.center;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(vsync: this);
+    _controller.addListener(() {
+      setState(() {
+        _dragAlignment = _animation.value;
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
@@ -30,6 +53,12 @@ class MessageRowState extends State<MessageRow> {
     var isBlocked = isContact ? Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle)!.isBlocked : false;
     var actualMessage = Flexible(flex: 3, fit: FlexFit.loose, child: widget.child);
 
+    _dragAffinity = fromMe ? Alignment.centerRight : Alignment.centerLeft;
+
+    if (_dragAlignment == Alignment.center) {
+      _dragAlignment = fromMe ? Alignment.centerRight : Alignment.centerLeft;
+    }
+
     var senderDisplayStr = "";
     if (!fromMe) {
       ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
@@ -52,7 +81,7 @@ class MessageRowState extends State<MessageRow> {
               Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
             },
             icon: Icon(Icons.reply, color: Provider.of<Settings>(context).theme.dropShadowColor())));
-    Widget wdgSpacer = Expanded(child: SizedBox(width: 60, height: 10));
+    Widget wdgSpacer = Flexible(child: SizedBox(width: 60, height: 10));
     var widgetRow = <Widget>[];
 
     if (fromMe) {
@@ -131,10 +160,9 @@ class MessageRowState extends State<MessageRow> {
         wdgSpacer,
       ];
     }
-
+    var size = MediaQuery.of(context).size;
     return MouseRegion(
         // For desktop...
-
         onHover: (event) {
           setState(() {
             this.showMenu = true;
@@ -146,14 +174,55 @@ class MessageRowState extends State<MessageRow> {
           });
         },
         child: GestureDetector(
+            onPanUpdate: (details) {
+              setState(() {
+                _dragAlignment += Alignment(
+                  details.delta.dx / (size.width * 0.5),
+                  0,
+                );
+              });
+            },
+            onPanDown: (details) {
+              _controller.stop();
+            },
+            onPanEnd: (details) {
+              _runAnimation(details.velocity.pixelsPerSecond, size);
+              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
+            },
+            child: Padding(
+                padding: EdgeInsets.all(2),
+                child: Align(
+                    widthFactor: 1,
+                    alignment: _dragAlignment,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: widgetRow,
+                    )))));
+  }
 
-            // Swipe to quote on Android
-            onHorizontalDragEnd: Platform.isAndroid
-                ? (details) {
-                    Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
-                  }
-                : null,
-            child: Padding(padding: EdgeInsets.all(2), child: Row(mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start, children: widgetRow))));
+  void _runAnimation(Offset pixelsPerSecond, Size size) {
+    _animation = _controller.drive(
+      AlignmentTween(
+        begin: _dragAlignment,
+        end: _dragAffinity,
+      ),
+    );
+    // Calculate the velocity relative to the unit interval, [0,1],
+    // used by the animation controller.
+    final unitsPerSecondX = pixelsPerSecond.dx / size.width;
+    final unitsPerSecondY = pixelsPerSecond.dy / size.height;
+    final unitsPerSecond = Offset(unitsPerSecondX, unitsPerSecondY);
+    final unitVelocity = unitsPerSecond.distance;
+
+    const spring = SpringDescription(
+      mass: 30,
+      stiffness: 1,
+      damping: 1,
+    );
+
+    final simulation = SpringSimulation(spring, 0, 1, -unitVelocity);
+    _controller.animateWith(simulation);
   }
 
   void _btnGoto() {

lib/widgets/passwordfield.dart

@@ -37,6 +37,7 @@ class _CwtchTextFieldState extends State<CwtchPasswordField> {
         controller: widget.controller,
         validator: widget.validator,
         obscureText: obscureText,
+        enableIMEPersonalizedLearning: false,
         autofillHints: widget.autoFillHints,
         autovalidateMode: AutovalidateMode.always,
         onFieldSubmitted: widget.action,

lib/widgets/textfield.dart

@@ -39,6 +39,7 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
         validator: widget.validator,
         onChanged: widget.onChanged,
         autofocus: widget.autofocus,
+        enableIMEPersonalizedLearning: false,
         focusNode: _focusNode,
         decoration: InputDecoration(
             labelText: widget.labelText,

pubspec.lock

@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.7.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -181,7 +181,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.7.0"
   msix:
     dependency: "direct dev"
     description:
@@ -329,6 +329,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.0"
+  scrollable_positioned_list:
+    dependency: "direct main"
+    description:
+      name: scrollable_positioned_list
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0-nullsafety.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -375,7 +382,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description: