messagecache stub

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: clone
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:2.5.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:2.5.3
     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-fstable-2.8.0
+    image: openpriv/flutter-desktop:linux-fstable-2.5.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -61,7 +61,7 @@ steps:
       - rm -r cwtch
 
   - name: test-build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:2.5.3
     when:
       event: pull_request
     volumes:
@@ -71,7 +71,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:2.5.3
     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:2.8.0
+    image: cirrusci/flutter:2.5.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -106,7 +106,6 @@ steps:
 
   - name: deploy-buildfiles
     image: kroniak/ssh-client
-    pull: if-not-exists
     environment:
       BUILDFILES_KEY:
         from_secret: buildfiles_key
@@ -130,7 +129,6 @@ steps:
 
   - name: notify-email
     image: drillster/drone-email
-    pull: if-not-exists
     settings:
       host: build.openprivacy.ca
       port: 25
@@ -141,7 +139,6 @@ steps:
 
   - name: notify-gogs
     image: openpriv/drone-gogs
-    pull: if-not-exists
     when:
       event: pull_request
       status: [ success, changed, failure ]
@@ -177,7 +174,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable2.5.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -195,7 +192,7 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable2.5.3
     commands:
       - 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' }"
@@ -204,7 +201,7 @@ steps:
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable2.5.3
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
@@ -223,8 +220,7 @@ steps:
       - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor"
 
   - name: package-windows
-    image: openpriv/nsis
-    pull: if-not-exists
+    image: openpriv/nsis:latest
     when:
       event: push
       status: [ success ]
@@ -261,7 +257,7 @@ steps:
       - move *.sha512 deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable2.5.3
     when:
       event: push
       status: [ success ]

LIBCWTCH-GO-MACOS.version

@@ -1 +1 @@
-2021-12-20-18-47-v1.5.2
+2021-11-09-18-25-v1.4.2

LIBCWTCH-GO.version

@@ -1 +1 @@
-2021-12-20-23-47-v1.5.2
+2021-11-09-23-25-v1.4.2

README.md

@@ -28,7 +28,7 @@ Cwtch processes the following environment variables:
 First you will need a valid [flutter sdk installation](https://flutter.dev/docs/get-started/install).
 You will probably want to disable Analytics on the Flutter Tool: `flutter config --no-analytics`
 
-This project uses the flutter `stable` channel
+This project uses the flutter `dev` channel, which you will need to switch to: `flutter channel dev; flutter upgrade`.
 
 Once flutter is set up, run `flutter pub get` from this project folder to fetch dependencies.
 
@@ -42,20 +42,17 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 - set `LD_LIBRARY_PATH="$PWD/linux"`
 - copy a `tor` binary to `linux/` or run `fetch-tor.sh` to download one
 - run `flutter config --enable-linux-desktop` if you've never done so before
-- optional: launch cwtch-ui debug build by running `flutter run -d linux`
+- optional: launch cwtch-ui directly by running `flutter run -d linux`
 - to build cwtch-ui, run `flutter build linux`
-- optional: launch cwtch-ui release build with `env LD_LIBRARY_PATH=linux ./build/linux/x64/release/bundle/cwtch`
+- optional: launch cwtch-ui build with `env LD_LIBRARY_PATH=linux ./build/linux/x64/release/bundle/cwtch`
 - to package the build, run `linux/package-release.sh`
 
 ### Building on Windows (for Windows)
 
 - copy `libCwtch.dll` to `windows/`, or run `fetch-libcwtch-go.ps1` to download it
 - run `fetch-tor-win.ps1` to fetch Tor for windows
-- optional: launch cwtch-ui debug build by running `flutter run -d windows`
+- optional: launch cwtch-ui directly by running `flutter run -d windows`
 - to build cwtch-ui, run `flutter build windows`
-- optional: to run the release build:
-	- `cp windows/libCwtch.dll .`
-	- `./build/windows/runner/Release/cwtch.exe`
 
 ### Building on Linux/Windows (for Android)
 
@@ -68,8 +65,10 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 - copy `libCwtch.dylib` into the root folder, or run `fetch-libcwtch-go-macos.sh` to download it
 - run `fetch-tor-macos.sh` to fetch Tor or Download and install Tor Browser and `cp -r /Applications/Tor\ Browser.app/Contents/MacOS/Tor ./macos/`
 - `flutter build macos`
-- optional: launch cwtch-ui release build with `./build/macos/Build/Products/Release/Cwtch.app/Contents/MacOS/Cwtch`
-- To package the UI: `./macos/package-release.sh`, which results in a Cwtch.dmg that has libCwtch.dylib and tor in it as well and can be installed into Applications
+- optional: launch cwtch-ui build with `./build/linux/x64/release/bundle/cwtch`
+- `./macos/package-release.sh`
+
+results in a Cwtch.dmg that has libCwtch.dylib and tor in it as well and can be installed into Applications
 
 ### Known Platform Issues
 

android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt

@@ -133,21 +133,21 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                                 notificationManager.notify(dlID, newNotification);
                             }
                         } catch (e: Exception) {
-                            Log.d("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
+                            Log.i("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
                         }
                     } else if (evt.EventType == "FileDownloaded") {
-                        Log.d("FlwtchWorker", "file downloaded!");
+                        Log.i("FlwtchWorker", "file downloaded!");
                         val data = JSONObject(evt.Data);
                         val tempFile = data.getString("TempFile");
                         val fileKey = data.getString("FileKey");
-                        if (tempFile != "" && tempFile != data.getString("FilePath")) {
+                        if (tempFile != "") {
                             val filePath = data.getString("FilePath");
                             Log.i("FlwtchWorker", "moving "+tempFile+" to "+filePath);
                             val sourcePath = Paths.get(tempFile);
                             val targetUri = Uri.parse(filePath);
                             val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
                             val bytesWritten = Files.copy(sourcePath, os);
-                            Log.d("FlwtchWorker", "copied " + bytesWritten.toString() + " bytes");
+                            Log.i("FlwtchWorker", "copied " + bytesWritten.toString() + " bytes");
                             if (bytesWritten != 0L) {
                                 os?.flush();
                                 os?.close();
@@ -180,78 +180,62 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val pass = (a.get("pass") as? String) ?: ""
                 Cwtch.loadProfiles(pass)
             }
-            "ChangePassword" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val pass = (a.get("OldPass") as? String) ?: ""
-                val passNew = (a.get("NewPass") as? String) ?: ""
-                val passNew2 = (a.get("NewPassAgain") as? String) ?: ""
-                Cwtch.changePassword(profile, pass, passNew, passNew2)
-            }
             "GetMessage" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val indexI = a.getInt("index").toLong()
-                Log.d("FlwtchWorker", "Cwtch GetMessage " + profile + " " + conversation.toString() + " " + indexI.toString())
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, conversation, indexI)).build())
-            }
-            "GetMessageByID" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val id = a.getInt("id").toLong()
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessageByID(profile, conversation, id)).build())
+                val profile = (a.get("profile") as? String) ?: ""
+                val handle = (a.get("contact") as? String) ?: ""
+                val indexI = a.getInt("index")
+                return Result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, handle, indexI.toLong())).build())
             }
             "GetMessageByContentHash" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
+                val profile = (a.get("profile") as? String) ?: ""
+                val handle = (a.get("contact") as? String) ?: ""
                 val contentHash = (a.get("contentHash") as? String) ?: ""
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessagesByContentHash(profile, conversation, contentHash)).build())
+                return Result.success(Data.Builder().putString("result", Cwtch.getMessagesByContentHash(profile, handle, contentHash)).build())
             }
-            "UpdateMessageAttribute" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val channel = a.getInt("chanenl").toLong()
-                val midx = a.getInt("midx").toLong()
-                val key = (a.get("key") as? String) ?: ""
-                val value = (a.get("value") as? String) ?: ""
-                Cwtch.setMessageAttribute(profile, conversation, channel, midx, key, value)
+            "UpdateMessageFlags" -> {
+                val profile = (a.get("profile") as? String) ?: ""
+                val handle = (a.get("contact") as? String) ?: ""
+                val midx = (a.get("midx") as? Long) ?: 0
+                val flags = (a.get("flags") as? Long) ?: 0
+                Cwtch.updateMessageFlags(profile, handle, midx, flags)
             }
-            "AcceptConversation" -> {
+            "AcceptContact" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.acceptConversation(profile, conversation)
+                val handle = (a.get("handle") as? String) ?: ""
+                Cwtch.acceptContact(profile, handle)
             }
             "BlockContact" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.blockContact(profile, conversation)
+                val handle = (a.get("handle") as? String) ?: ""
+                Cwtch.blockContact(profile, handle)
             }
             "SendMessage" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
+                val handle = (a.get("handle") as? String) ?: ""
                 val message = (a.get("message") as? String) ?: ""
-                Cwtch.sendMessage(profile, conversation, message)
+                Cwtch.sendMessage(profile, handle, message)
             }
             "SendInvitation" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val target = (a.get("target") as? Long) ?: -1
-                Cwtch.sendInvitation(profile, conversation, target)
+                val handle = (a.get("handle") as? String) ?: ""
+                val target = (a.get("target") as? String) ?: ""
+                Cwtch.sendInvitation(profile, handle, target)
             }
             "ShareFile" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
+                val handle = (a.get("handle") as? String) ?: ""
                 val filepath = (a.get("filepath") as? String) ?: ""
-                Cwtch.shareFile(profile, conversation, filepath)
+                Cwtch.shareFile(profile, handle, filepath)
             }
             "DownloadFile" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
+                val handle = (a.get("handle") as? String) ?: ""
                 val filepath = (a.get("filepath") as? String) ?: ""
                 val manifestpath = (a.get("manifestpath") as? String) ?: ""
                 val filekey = (a.get("filekey") as? String) ?: ""
                 // FIXME: Prevent spurious calls by Intent
                 if (profile != "") {
-                    Cwtch.downloadFile(profile, conversation, filepath, manifestpath, filekey)
+                    Cwtch.downloadFile(profile, handle, filepath, manifestpath, filekey)
                 }
             }
             "CheckDownloadStatus" -> {
@@ -261,9 +245,9 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
             }
             "VerifyOrResumeDownload" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
+                val handle = (a.get("handle") as? String) ?: ""
                 val fileKey = (a.get("fileKey") as? String) ?: ""
-                Cwtch.verifyOrResumeDownload(profile, conversation, fileKey)
+                Cwtch.verifyOrResumeDownload(profile, handle, fileKey)
             }
             "SendProfileEvent" -> {
                 val onion = (a.get("onion") as? String) ?: ""
@@ -282,6 +266,13 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val bundle = (a.get("bundle") as? String) ?: ""
                 Cwtch.importBundle(profile, bundle)
             }
+            "SetGroupAttribute" -> {
+                val profile = (a.get("ProfileOnion") as? String) ?: ""
+                val groupHandle = (a.get("groupHandle") as? String) ?: ""
+                val key = (a.get("key") as? String) ?: ""
+                val value = (a.get("value") as? String) ?: ""
+                Cwtch.setGroupAttribute(profile, groupHandle, key, value)
+            }
             "CreateGroup" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
                 val server = (a.get("server") as? String) ?: ""
@@ -295,13 +286,18 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
             }
             "ArchiveConversation" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = (a.get("conversation") as? Long) ?: -1
-                Cwtch.archiveConversation(profile, conversation)
+                val contactHandle = (a.get("handle") as? String) ?: ""
+                Cwtch.archiveConversation(profile, contactHandle)
             }
-            "DeleteConversation" -> {
+            "DeleteContact" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = (a.get("conversation") as? Long) ?: -1
-                Cwtch.deleteContact(profile, conversation)
+                val handle = (a.get("handle") as? String) ?: ""
+                Cwtch.deleteContact(profile, handle)
+            }
+            "RejectInvite" -> {
+                val profile = (a.get("ProfileOnion") as? String) ?: ""
+                val groupHandle = (a.get("groupHandle") as? String) ?: ""
+                Cwtch.rejectInvite(profile, groupHandle)
             }
             "SetProfileAttribute" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
@@ -309,12 +305,12 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val v = (a.get("Val") as? String) ?: ""
                 Cwtch.setProfileAttribute(profile, key, v)
             }
-            "SetConversationAttribute" -> {
+            "SetContactAttribute" -> {
                 val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = (a.get("conversation") as? Long) ?: -1
+                val contact = (a.get("Contact") as? String) ?: ""
                 val key = (a.get("Key") as? String) ?: ""
                 val v = (a.get("Val") as? String) ?: ""
-                Cwtch.setConversationAttribute(profile, conversation, key, v)
+                Cwtch.setContactAttribute(profile, contact, key, v)
             }
             "Shutdown" -> {
                 Cwtch.shutdownCwtch();
@@ -358,10 +354,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val v = (a.get("Val") as? String) ?: ""
                 Cwtch.setServerAttribute(serverOnion, key, v)
             }
-            else -> {
-                Log.i("FlwtchWorker", "unknown command: " + method);
-                return Result.failure()
-            }
+            else -> return Result.failure()
         }
         return Result.success()
     }

android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt

@@ -22,10 +22,6 @@ import io.flutter.plugin.common.ErrorLogResult
 
 import org.json.JSONObject
 import java.util.concurrent.TimeUnit
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.nio.file.StandardCopyOption
 
 import android.net.Uri
 import android.provider.DocumentsContract
@@ -61,11 +57,9 @@ class MainActivity: FlutterActivity() {
 
     // "Download to..." prompt extra arguments
     private val FILEPICKER_REQUEST_CODE = 234
-    private val PREVIEW_EXPORT_REQUEST_CODE = 235
     private var dlToProfile = ""
     private var dlToHandle = ""
     private var dlToFileKey = ""
-    private var exportFromPath = ""
 
     // handles clicks received from outside the app (ie, notifications)
     override fun onNewIntent(intent: Intent) {
@@ -108,20 +102,6 @@ class MainActivity: FlutterActivity() {
                     "manifestpath" to manifestPath,
                     "filekey" to this.dlToFileKey
             )), ErrorLogResult(""));//placeholder; this Result is never actually invoked
-        } else if (requestCode == PREVIEW_EXPORT_REQUEST_CODE) {
-            val targetPath = intent!!.getData().toString()
-            var srcFile = File(this.exportFromPath)
-            Log.i("MainActivity:PREVIEW_EXPORT", "exporting previewed file")
-            val sourcePath = Paths.get(this.exportFromPath);
-            val targetUri = Uri.parse(targetPath);
-            val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
-            val bytesWritten = Files.copy(sourcePath, os);
-            Log.d("MainActivity:PREVIEW_EXPORT", "copied " + bytesWritten.toString() + " bytes");
-            if (bytesWritten != 0L) {
-                os?.flush();
-                os?.close();
-                //Files.delete(sourcePath);
-            }
         }
     }
 
@@ -167,7 +147,11 @@ class MainActivity: FlutterActivity() {
             // that we can divert this method call to ReconnectCwtchForeground instead if so.
             val works = WorkManager.getInstance(this).getWorkInfosByTag(WORKER_TAG).get()
             for (workInfo in works) {
-                WorkManager.getInstance(this).cancelWorkById(workInfo.id)
+                Log.i("handleCwtch:WorkManager", "$workInfo")
+                if (!workInfo.tags.contains(uniqueTag)) {
+                    Log.i("handleCwtch:WorkManager", "canceling ${workInfo.id} bc tags don't include $uniqueTag")
+                    WorkManager.getInstance(this).cancelWorkById(workInfo.id)
+                }
             }
             WorkManager.getInstance(this).pruneWork()
 
@@ -190,26 +174,6 @@ class MainActivity: FlutterActivity() {
             }
             startActivityForResult(intent, FILEPICKER_REQUEST_CODE)
             return
-        } else if (call.method == "ExportPreviewedFile") {
-            this.exportFromPath = argmap["Path"] ?: ""
-            val suggestion = argmap["FileName"] ?: "filename.ext"
-            var imgType = "jpeg"
-            if (suggestion.endsWith("png")) {
-                imgType = "png"
-            } else if (suggestion.endsWith("webp")) {
-                imgType = "webp"
-            } else if (suggestion.endsWith("bmp")) {
-                imgType = "bmp"
-            } else if (suggestion.endsWith("gif")) {
-                imgType = "gif"
-            }
-            val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = "image/" + imgType
-                putExtra(Intent.EXTRA_TITLE, suggestion)
-            }
-            startActivityForResult(intent, PREVIEW_EXPORT_REQUEST_CODE)
-            return
         }
 
         // ...otherwise fallthru to a normal ffi method call (and return the result using the result callback)

lib/cwtch/cwtch.dart

@@ -10,14 +10,14 @@ abstract class Cwtch {
   // ignore: non_constant_identifier_names
   Future<void> ReconnectCwtchForeground();
 
+  // ignore: non_constant_identifier_names
+  void SelectProfile(String onion);
   // ignore: non_constant_identifier_names
   void CreateProfile(String nick, String pass);
   // ignore: non_constant_identifier_names
   void LoadProfiles(String pass);
   // ignore: non_constant_identifier_names
-  void DeleteProfile(String profile, String pass);
-  // ignore: non_constant_identifier_names
-  void ChangePassword(String profile, String pass, String newpass, String newpassAgain);
+  void DeleteProfile(String onion, String pass);
 
   // ignore: non_constant_identifier_names
   void ResetTor();
@@ -51,16 +51,12 @@ abstract class Cwtch {
   void ShareFile(String profile, int handle, String filepath);
   // ignore: non_constant_identifier_names
   void DownloadFile(String profile, int handle, String filepath, String manifestpath, String filekey);
-  // android-only
   // ignore: non_constant_identifier_names
   void CreateDownloadableFile(String profile, int handle, String filenameSuggestion, String filekey);
   // ignore: non_constant_identifier_names
   void CheckDownloadStatus(String profile, String fileKey);
   // ignore: non_constant_identifier_names
   void VerifyOrResumeDownload(String profile, int handle, String filekey);
-  // android-only
-  // ignore: non_constant_identifier_names
-  void ExportPreviewedFile(String sourceFile, String suggestion);
 
   // ignore: non_constant_identifier_names
   void ArchiveConversation(String profile, int handle);
@@ -73,11 +69,12 @@ abstract class Cwtch {
   // ignore: non_constant_identifier_names
   void ImportBundle(String profile, String bundle);
   // ignore: non_constant_identifier_names
+  void RejectInvite(String profileOnion, int groupHandle);
+  // ignore: non_constant_identifier_names
   void SetProfileAttribute(String profile, String key, String val);
   // ignore: non_constant_identifier_names
-  void SetConversationAttribute(String profile, int conversation, String key, String val);
-  // ignore: non_constant_identifier_names
-  void SetMessageAttribute(String profile, int conversation, int channel, int message, String key, String val);
+  void SetConversationAttribute(String profile, int contact, String key, String val);
+
   // ignore: non_constant_identifier_names
   void LoadServers(String password);
   // ignore: non_constant_identifier_names
@@ -100,8 +97,5 @@ abstract class Cwtch {
   // ignore: non_constant_identifier_names
   void Shutdown();
 
-  // non-ffi
-  String defaultDownloadPath();
-
   void dispose();
 }

lib/cwtch/cwtchNotifier.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:cwtch/main.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/servers.dart';
@@ -36,7 +35,7 @@ class CwtchNotifier {
   }
 
   void handleMessage(String type, dynamic data) {
-    //EnvironmentConfig.debugLog("NewEvent $type $data");
+    EnvironmentConfig.debugLog("NewEvent $type $data");
     switch (type) {
       case "CwtchStarted":
         appState.SetCwtchInit();
@@ -79,21 +78,16 @@ class CwtchNotifier {
           server.setRunning(data["Intent"] == "running");
         }
         break;
-      case "ServerStatsUpdate":
-        EnvironmentConfig.debugLog("ServerStatsUpdate $data");
-        var totalMessages = int.parse(data["TotalMessages"]);
-        var connections = int.parse(data["Connections"]);
-        serverListState.updateServerStats(data["Identity"], totalMessages, connections);
-        break;
       case "GroupCreated":
+
         // Retrieve Server Status from Cache...
         String status = "";
         RemoteServerInfoState? serverInfoState = profileCN.getProfile(data["ProfileOnion"])?.serverList.getServer(data["GroupServer"]);
         if (serverInfoState != null) {
           status = serverInfoState.status;
         }
-        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(int.parse(data["ConversationID"])) == null) {
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], int.parse(data["ConversationID"]), data["GroupID"],
+        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"]) == null) {
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["ConversationID"], data["GroupID"],
               authorization: ContactAuthorization.approved,
               imagePath: data["PicturePath"],
               nickname: data["GroupName"],
@@ -101,7 +95,7 @@ class CwtchNotifier {
               server: data["GroupServer"],
               isGroup: true,
               lastMessageTime: DateTime.now()));
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(int.parse(data["ConversationID"]), DateTime.now());
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
         }
         break;
       case "PeerDeleted":
@@ -137,29 +131,19 @@ class CwtchNotifier {
       case "NewMessageFromPeer":
         notificationManager.notify("New Message From Peer!");
         var identifier = int.parse(data["ConversationID"]);
-        var messageID = int.parse(data["Index"]);
-        var timestamp = DateTime.tryParse(data['TimestampReceived'])!;
-        var senderHandle = data['RemotePeer'];
-        var senderImage = data['Picture'];
-        var isAuto = data['Auto'] == "true";
+        if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != identifier) {
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.unreadMessages++;
+        } else {
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.newMarker++;
+        }
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages++;
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, DateTime.now());
 
-        // We might not have received a contact created for this contact yet...
-        // In that case the **next** event we receive will actually update these values...
-        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier) != null) {
-          if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != identifier) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.unreadMessages++;
-          } else {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.newMarker++;
-          }
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, DateTime.now());
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.updateMessageCache(identifier, messageID, timestamp, senderHandle, senderImage, isAuto, data["Data"]);
-
-          // We only ever see messages from authenticated peers.
-          // If the contact is marked as offline then override this - can happen when the contact is removed from the front
-          // end during syncing.
-          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.isOnline() == false) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.status = "Authenticated";
-          }
+        // We only ever see messages from authenticated peers.
+        // If the contact is marked as offline then override this - can happen when the contact is removed from the front
+        // end during syncing.
+        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.isOnline() == false) {
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.status = "Authenticated";
         }
 
         break;
@@ -167,42 +151,38 @@ class CwtchNotifier {
         // We don't use these anymore, IndexedAcknowledgement is more suited to the UI front end...
         break;
       case "IndexedAcknowledgement":
-        var conversation = int.parse(data["ConversationID"]);
-        var messageID = int.parse(data["Index"]);
+        var messageID = data["Index"];
+        var identifier = int.parse(data["ConversationID"]);
+        var idx = identifier.toString() + messageID;
 
-        var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation);
         // We return -1 for protocol message acks if there is no message
-        if (messageID == -1) break;
-        var key = contact!.getMessageKeyOrFail(conversation, messageID);
+        if (idx == "-1") break;
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.getMessageKey(idx);
         if (key == null) break;
         try {
           var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
-          message.ackd = true;
-
+          if (message == null) break;
           // We only ever see acks from authenticated peers.
           // If the contact is marked as offline then override this - can happen when the contact is removed from the front
           // end during syncing.
-          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation)!.isOnline() == false) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation)!.status = "Authenticated";
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.isOnline() == false) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.status = "Authenticated";
           }
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation)!.ackCache(messageID);
+          message.ackd = true;
         } catch (e) {
-          // ignore, most likely cause is the key got optimized out...
+          // ignore, we received an ack for a message that hasn't loaded onto the screen yet...
+          // the protocol was faster than the ui....yay?
         }
         break;
       case "NewMessageFromGroup":
         var identifier = int.parse(data["ConversationID"]);
         if (data["ProfileOnion"] != data["RemotePeer"]) {
           var idx = int.parse(data["Index"]);
-          var senderHandle = data['RemotePeer'];
-          var senderImage = data['Picture'];
-          var timestampSent = DateTime.tryParse(data['TimestampSent'])!;
           var currentTotal = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages;
-          var isAuto = data['Auto'] == "true";
 
           // Only bother to do anything if we know about the group and the provided index is greater than our current total...
           if (currentTotal != null && idx >= currentTotal) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.updateMessageCache(identifier, idx, timestampSent, senderHandle, senderImage, isAuto, data["Data"]);
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages = idx + 1;
 
             //if not currently open
             if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != identifier) {
@@ -211,6 +191,7 @@ class CwtchNotifier {
               profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.newMarker++;
             }
 
+            var timestampSent = DateTime.tryParse(data['TimestampSent'])!;
             // TODO: There are 2 timestamps associated with a new group message - time sent and time received.
             // Sent refers to the time a profile alleges they sent a message
             // Received refers to the time we actually saw the message from the server
@@ -225,18 +206,52 @@ class CwtchNotifier {
             notificationManager.notify("New Message From Group!");
           }
         } else {
-          // This is dealt with by IndexedAcknowledgment
-          EnvironmentConfig.debugLog("new message from group from yourself - this should not happen");
+          // from me (already displayed - do not update counter)
+          var idx = data["Signature"];
+          var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)?.getMessageKey(idx);
+          if (key == null) break;
+          try {
+            var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
+            if (message == null) break;
+            message.ackd = true;
+          } catch (e) {
+            // ignore, we likely have an old key that has been replaced with an actual signature
+          }
         }
         break;
+      case "MessageCounterResync":
+        var contactHandle = data["RemotePeer"];
+        if (contactHandle == null || contactHandle == "") contactHandle = data["GroupID"];
+        var total = int.parse(data["Data"]);
+        if (total != profileCN.getProfile(data["Identity"])?.contactList.findContact(contactHandle)!.totalMessages) {
+          profileCN.getProfile(data["Identity"])?.contactList.findContact(contactHandle)!.totalMessages = total;
+        }
+        break;
+      case "SendMessageToPeerError":
+        // Ignore
+        break;
       case "IndexedFailure":
-        var identifier = int.parse(data["ConversationID"]);
-        var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
-        var idx = int.parse(data["Index"]);
-        var key = contact?.getMessageKeyOrFail(contact.identifier, idx);
-        if (key != null) {
-          var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
+        var idx = data["Index"];
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"])?.getMessageKey(idx);
+        try {
+          var message = Provider.of<MessageMetadata>(key!.currentContext!, listen: false);
           message.error = true;
+        } catch (e) {
+          // ignore, we likely have an old key that has been replaced with an actual signature
+        }
+        break;
+      case "SendMessageToGroupError":
+        // from me (already displayed - do not update counter)
+        EnvironmentConfig.debugLog("SendMessageToGroupError");
+        var idx = data["Signature"];
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["GroupID"])!.getMessageKey(idx);
+        if (key == null) break;
+        try {
+          var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
+          if (message == null) break;
+          message.error = true;
+        } catch (e) {
+          // ignore, we likely have an old key that has been replaced with an actual signature
         }
         break;
       case "AppError":
@@ -274,6 +289,7 @@ class CwtchNotifier {
         profileCN.getProfile(data["ProfileOnion"])?.replaceServers(data["ServerList"]);
         break;
       case "NewGroup":
+        EnvironmentConfig.debugLog("new group");
         String invite = data["GroupInvite"].toString();
         if (invite.startsWith("torv3")) {
           String inviteJson = new String.fromCharCodes(base64Decode(invite.substring(5)));
@@ -287,8 +303,7 @@ class CwtchNotifier {
           }
 
           if (profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(groupInvite["GroupID"]) == null) {
-            var identifier = int.parse(data["ConversationID"]);
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], identifier, groupInvite["GroupID"],
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["ConversationID"], groupInvite["GroupID"],
                 authorization: ContactAuthorization.approved,
                 imagePath: data["PicturePath"],
                 nickname: groupInvite["GroupName"],
@@ -296,12 +311,19 @@ class CwtchNotifier {
                 status: status,
                 isGroup: true,
                 lastMessageTime: DateTime.fromMillisecondsSinceEpoch(0)));
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, DateTime.fromMillisecondsSinceEpoch(0));
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(groupInvite["GroupID"], DateTime.fromMillisecondsSinceEpoch(0));
           }
         }
         break;
+      case "AcceptGroupInvite":
+        EnvironmentConfig.debugLog("accept group invite");
+
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.authorization = ContactAuthorization.approved;
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.fromMillisecondsSinceEpoch(0));
+        break;
       case "ServerStateChange":
         // Update the Server Cache
+        EnvironmentConfig.debugLog("server state changes $data");
         profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
         profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
           if (contact.isGroup == true && contact.server == data["GroupServer"]) {
@@ -310,23 +332,42 @@ class CwtchNotifier {
         });
         profileCN.getProfile(data["ProfileOnion"])?.contactList.resort();
         break;
-      case "NewRetValMessageFromPeer":
-        if (data["Path"] == "profile.name") {
-          if (data["Data"].toString().trim().length > 0) {
-            // Update locally on the UI...
-            if (profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"]) != null) {
-              profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"])!.nickname = data["Data"];
-            }
+      case "SetGroupAttribute":
+        if (data["Key"] == "local.name") {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"]) != null) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.nickname = data["Data"];
+          }
+        } else if (data["Key"] == "local.archived") {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"]) != null) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.isArchived = data["Data"] == "true";
           }
-        } else if (data['Path'] == "profile.picture") {
-          // Not yet..
         } else {
-          EnvironmentConfig.debugLog("unhandled ret val event: ${data['Path']}");
+          EnvironmentConfig.debugLog("unhandled set group attribute event: ${data['Key']}");
         }
         break;
-      case "ManifestSizeReceived":
-        if (!profileCN.getProfile(data["ProfileOnion"])!.downloadActive(data["FileKey"])) {
-          profileCN.getProfile(data["ProfileOnion"])?.downloadUpdate(data["FileKey"], 0, 1);
+      case "SetPeerAttribute":
+        if (data["Key"] == "local.name") {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.nickname = data["Data"];
+          }
+        } else if (data["Key"] == "local.archived") {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isArchived = data["Data"] == "true";
+          }
+        } else if (data["Key"] == "LastKnowSignature") {
+          // group syncing information that isn't relevant to the UI...
+        } else {
+          EnvironmentConfig.debugLog("unhandled set peer attribute event: ${data['Key']}");
+        }
+        break;
+      case "NewRetValMessageFromPeer":
+        if (data["Path"] == "name" && data["Data"].toString().trim().length > 0) {
+          // Update locally on the UI...
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.nickname = data["Data"];
+          }
+        } else {
+          EnvironmentConfig.debugLog("unhandled peer attribute event: ${data['Path']}");
         }
         break;
       case "ManifestSaved":
@@ -343,14 +384,6 @@ class CwtchNotifier {
       case "FileDownloaded":
         profileCN.getProfile(data["ProfileOnion"])?.downloadMarkFinished(data["FileKey"], data["FilePath"]);
         break;
-      case "ImportingProfileEvent":
-        break;
-      case "StartingStorageMigration":
-        appState.SetModalState(ModalState.storageMigration);
-        break;
-      case "DoneStorageMigration":
-        appState.SetModalState(ModalState.none);
-        break;
       default:
         EnvironmentConfig.debugLog("unhandled event: $type");
     }

lib/cwtch/ffi.dart

@@ -84,9 +84,6 @@ typedef VoidFromStringIntStringFn = void Function(Pointer<Utf8>, int, int, Point
 typedef void_from_string_int_string_string_function = Void Function(Pointer<Utf8>, Int32, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
 typedef VoidFromStringIntStringStringFn = void Function(Pointer<Utf8>, int, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
 
-typedef void_from_string_int_int_int_string_string_function = Void Function(Pointer<Utf8>, Int32, Int32, Int32, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
-typedef VoidFromStringIntIntIntStringStringFn = void Function(Pointer<Utf8>, int, int, int, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
-
 typedef void_from_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Int32, Int32);
 typedef VoidFromStringIntIntFn = void Function(Pointer<Utf8>, int, int, int);
 
@@ -115,13 +112,13 @@ class CwtchFfi implements Cwtch {
   }
 
   CwtchFfi(CwtchNotifier _cwtchNotifier) {
-    String libraryPath = getLibraryPath();
-    if (libraryPath == UNSUPPORTED_OS) {
+    String library_path = getLibraryPath();
+    if (library_path == UNSUPPORTED_OS) {
       print("OS ${Platform.operatingSystem} not supported by cwtch/ffi");
       // emergency, ideally the app stays on splash and just posts the error till user closes
       exit(0);
     }
-    library = DynamicLibrary.open(libraryPath);
+    library = DynamicLibrary.open(library_path);
     cwtchNotifier = _cwtchNotifier;
   }
 
@@ -261,6 +258,16 @@ class CwtchFfi implements Cwtch {
     }
   }
 
+  // ignore: non_constant_identifier_names
+  void SelectProfile(String onion) async {
+    var selectProfileC = library.lookup<NativeFunction<get_json_blob_string_function>>("c_SelectProfile");
+    // ignore: non_constant_identifier_names
+    final SelectProfile = selectProfileC.asFunction<GetJsonBlobStringFn>();
+    final ut8Onion = onion.toNativeUtf8();
+    SelectProfile(ut8Onion, ut8Onion.length);
+    malloc.free(ut8Onion);
+  }
+
   // ignore: non_constant_identifier_names
   void CreateProfile(String nick, String pass) {
     var createProfileC = library.lookup<NativeFunction<void_from_string_string_function>>("c_CreateProfile");
@@ -402,11 +409,6 @@ class CwtchFfi implements Cwtch {
     // android only - do nothing
   }
 
-  // ignore: non_constant_identifier_names
-  void ExportPreviewedFile(String sourceFile, String suggestion) {
-    // android only - do nothing
-  }
-
   @override
   // ignore: non_constant_identifier_names
   void CheckDownloadStatus(String profileOnion, String fileKey) {
@@ -455,6 +457,17 @@ class CwtchFfi implements Cwtch {
     malloc.free(u2);
   }
 
+  @override
+  // ignore: non_constant_identifier_names
+  void RejectInvite(String profileOnion, int groupHandle) {
+    var rejectInvite = library.lookup<NativeFunction<string_int_to_void_function>>("c_RejectInvite");
+    // ignore: non_constant_identifier_names
+    final RejectInvite = rejectInvite.asFunction<VoidFromStringIntFn>();
+    final u1 = profileOnion.toNativeUtf8();
+    RejectInvite(u1, u1.length, groupHandle);
+    malloc.free(u1);
+  }
+
   @override
   // ignore: non_constant_identifier_names
   void CreateGroup(String profileOnion, String server, String groupName) {
@@ -536,21 +549,6 @@ class CwtchFfi implements Cwtch {
     malloc.free(u4);
   }
 
-  @override
-  // ignore: non_constant_identifier_names
-  void SetMessageAttribute(String profile, int conversation, int channel, int message, String key, String val) {
-    var setMessageAttribute = library.lookup<NativeFunction<void_from_string_int_int_int_string_string_function>>("c_SetMessageAttribute");
-    // ignore: non_constant_identifier_names
-    final SetMessageAttribute = setMessageAttribute.asFunction<VoidFromStringIntIntIntStringStringFn>();
-    final u1 = profile.toNativeUtf8();
-    final u3 = key.toNativeUtf8();
-    final u4 = val.toNativeUtf8();
-    SetMessageAttribute(u1, u1.length, conversation, channel, message, u3, u3.length, u4, u4.length);
-    malloc.free(u1);
-    malloc.free(u3);
-    malloc.free(u4);
-  }
-
   @override
   // ignore: non_constant_identifier_names
   void LoadServers(String password) {
@@ -698,13 +696,6 @@ class CwtchFfi implements Cwtch {
   }
 
   @override
-  String defaultDownloadPath() {
-    Map<String, String> envVars = Platform.environment;
-    return path.join(envVars[Platform.isWindows ? 'UserProfile' : 'HOME']!, "Downloads");
-  }
-
-  @override
-  // ignore: non_constant_identifier_names
   Future<String> GetMessageByID(String profile, int handle, int index) async {
     var getMessageC = library.lookup<NativeFunction<get_json_blob_from_str_int_int_function>>("c_GetMessageByID");
     // ignore: non_constant_identifier_names
@@ -716,21 +707,4 @@ class CwtchFfi implements Cwtch {
     malloc.free(utf8profile);
     return jsonMessage;
   }
-
-  @override
-  // ignore: non_constant_identifier_names
-  void ChangePassword(String profile, String pass, String newpass, String newpassAgain) {
-    var changePasswordC = library.lookup<NativeFunction<void_from_string_string_string_string_function>>("c_ChangePassword");
-    // ignore: non_constant_identifier_names
-    final ChangePasswordFn = changePasswordC.asFunction<VoidFromStringStringStringStringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final utf8pass = pass.toNativeUtf8();
-    final utf8newpass = newpass.toNativeUtf8();
-    final utf8newpasssagain = newpassAgain.toNativeUtf8();
-    ChangePasswordFn(utf8profile, utf8profile.length, utf8pass, utf8pass.length, utf8newpass, utf8newpass.length, utf8newpasssagain, utf8newpasssagain.length);
-    malloc.free(utf8profile);
-    malloc.free(utf8pass);
-    malloc.free(utf8newpass);
-    malloc.free(utf8newpasssagain);
-  }
 }

lib/cwtch/gomobile.dart

@@ -28,7 +28,6 @@ class CwtchGomobile implements Cwtch {
 
   late Future<dynamic> androidLibraryDir;
   late Future<dynamic> androidHomeDirectory;
-  String androidHomeDirectoryStr = "";
   late CwtchNotifier cwtchNotifier;
 
   CwtchGomobile(CwtchNotifier _cwtchNotifier) {
@@ -45,8 +44,7 @@ class CwtchGomobile implements Cwtch {
   // ignore: non_constant_identifier_names
   Future<void> Start() async {
     print("gomobile.dart: Start()...");
-    androidHomeDirectoryStr = (await androidHomeDirectory).path;
-    var cwtchDir = path.join(androidHomeDirectoryStr, ".cwtch");
+    var cwtchDir = path.join((await androidHomeDirectory).path, ".cwtch");
     if (EnvironmentConfig.BUILD_VER == dev_version) {
       cwtchDir = path.join(cwtchDir, "dev");
     }
@@ -68,6 +66,11 @@ class CwtchGomobile implements Cwtch {
     cwtchNotifier.handleMessage(call.method, obj);
   }
 
+  // ignore: non_constant_identifier_names
+  void SelectProfile(String onion) {
+    cwtchPlatform.invokeMethod("SelectProfile", {"profile": onion});
+  }
+
   // ignore: non_constant_identifier_names
   void CreateProfile(String nick, String pass) {
     cwtchPlatform.invokeMethod("CreateProfile", {"nick": nick, "pass": pass});
@@ -84,13 +87,13 @@ class CwtchGomobile implements Cwtch {
   }
 
   // ignore: non_constant_identifier_names
-  Future<dynamic> GetMessage(String profile, int conversation, int index) {
-    return cwtchPlatform.invokeMethod("GetMessage", {"ProfileOnion": profile, "conversation": conversation, "index": index});
+  Future<dynamic> GetMessage(String profile, int handle, int index) {
+    return cwtchPlatform.invokeMethod("GetMessage", {"profile": profile, "contact": handle, "index": index});
   }
 
   // ignore: non_constant_identifier_names
-  Future<dynamic> GetMessageByID(String profile, int conversation, int id) {
-    return cwtchPlatform.invokeMethod("GetMessageByID", {"ProfileOnion": profile, "conversation": conversation, "id": id});
+  Future<dynamic> GetMessageByID(String profile, int handle, int index) {
+    return cwtchPlatform.invokeMethod("GetMessageByID", {"profile": profile, "contact": handle, "index": index});
   }
 
   @override
@@ -110,51 +113,43 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void AcceptContact(String profileOnion, int conversation) {
-    cwtchPlatform.invokeMethod("AcceptContact", {"ProfileOnion": profileOnion, "conversation": conversation});
+  void AcceptContact(String profileOnion, int contactHandle) {
+    cwtchPlatform.invokeMethod("AcceptContact", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void BlockContact(String profileOnion, int conversation) {
-    cwtchPlatform.invokeMethod("BlockContact", {"ProfileOnion": profileOnion, "conversation": conversation});
+  void BlockContact(String profileOnion, int contactHandle) {
+    cwtchPlatform.invokeMethod("BlockContact", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendMessage(String profileOnion, int conversation, String message) {
-    cwtchPlatform.invokeMethod("SendMessage", {"ProfileOnion": profileOnion, "conversation": conversation, "message": message});
+  void SendMessage(String profileOnion, int contactHandle, String message) {
+    cwtchPlatform.invokeMethod("SendMessage", {"ProfileOnion": profileOnion, "handle": contactHandle, "message": message});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendInvitation(String profileOnion, int conversation, int target) {
-    cwtchPlatform.invokeMethod("SendInvitation", {"ProfileOnion": profileOnion, "conversation": conversation, "target": target});
+  void SendInvitation(String profileOnion, int contactHandle, int target) {
+    cwtchPlatform.invokeMethod("SendInvitation", {"ProfileOnion": profileOnion, "handle": contactHandle, "target": target});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void ShareFile(String profileOnion, int conversation, String filepath) {
-    cwtchPlatform.invokeMethod("ShareFile", {"ProfileOnion": profileOnion, "conversation": conversation, "filepath": filepath});
+  void ShareFile(String profileOnion, int contactHandle, String filepath) {
+    cwtchPlatform.invokeMethod("ShareFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filepath": filepath});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void DownloadFile(String profileOnion, int conversation, String filepath, String manifestpath, String filekey) {
-    cwtchPlatform.invokeMethod("DownloadFile", {"ProfileOnion": profileOnion, "conversation": conversation, "filepath": filepath, "manifestpath": manifestpath, "filekey": filekey});
+  void DownloadFile(String profileOnion, int contactHandle, String filepath, String manifestpath, String filekey) {
+    cwtchPlatform.invokeMethod("DownloadFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filepath": filepath, "manifestpath": manifestpath, "filekey": filekey});
   }
 
   // ignore: non_constant_identifier_names
-  void CreateDownloadableFile(String profileOnion, int conversation, String filenameSuggestion, String filekey) {
-    cwtchPlatform.invokeMethod("CreateDownloadableFile", {"ProfileOnion": profileOnion, "conversation": conversation, "filename": filenameSuggestion, "filekey": filekey});
-  }
-
-  // ignore: non_constant_identifier_names
-  void ExportPreviewedFile(String sourceFile, String suggestion) {
-    cwtchPlatform.invokeMethod("ExportPreviewedFile", {
-      "Path": sourceFile,
-      "FileName": suggestion,
-    });
+  void CreateDownloadableFile(String profileOnion, int contactHandle, String filenameSuggestion, String filekey) {
+    cwtchPlatform.invokeMethod("CreateDownloadableFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filename": filenameSuggestion, "filekey": filekey});
   }
 
   @override
@@ -165,8 +160,8 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void VerifyOrResumeDownload(String profileOnion, int conversation, String filekey) {
-    cwtchPlatform.invokeMethod("VerifyOrResumeDownload", {"ProfileOnion": profileOnion, "conversation": conversation, "filekey": filekey});
+  void VerifyOrResumeDownload(String profileOnion, int contactHandle, String filekey) {
+    cwtchPlatform.invokeMethod("VerifyOrResumeDownload", {"ProfileOnion": profileOnion, "handle": contactHandle, "filekey": filekey});
   }
 
   @override
@@ -181,6 +176,18 @@ class CwtchGomobile implements Cwtch {
     cwtchPlatform.invokeMethod("ImportBundle", {"ProfileOnion": profileOnion, "bundle": bundle});
   }
 
+  @override
+  // ignore: non_constant_identifier_names
+  void SetGroupAttribute(String profileOnion, String groupHandle, String key, String value) {
+    cwtchPlatform.invokeMethod("SetGroupAttribute", {"ProfileOnion": profileOnion, "groupHandle": groupHandle, "key": key, "value": value});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void RejectInvite(String profileOnion, int groupHandle) {
+    cwtchPlatform.invokeMethod("RejectInvite", {"ProfileOnion": profileOnion, "groupHandle": groupHandle});
+  }
+
   @override
   void CreateGroup(String profileOnion, String server, String groupName) {
     cwtchPlatform.invokeMethod("CreateGroup", {"ProfileOnion": profileOnion, "server": server, "groupName": groupName});
@@ -188,14 +195,14 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void DeleteContact(String profileOnion, int conversation) {
-    cwtchPlatform.invokeMethod("DeleteContact", {"ProfileOnion": profileOnion, "conversation": conversation});
+  void DeleteContact(String profileOnion, int handle) {
+    cwtchPlatform.invokeMethod("DeleteContact", {"ProfileOnion": profileOnion, "handle": handle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void ArchiveConversation(String profileOnion, int conversation) {
-    cwtchPlatform.invokeMethod("ArchiveConversation", {"ProfileOnion": profileOnion, "conversation": conversation});
+  void ArchiveConversation(String profileOnion, int contactHandle) {
+    cwtchPlatform.invokeMethod("ArchiveConversation", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
   @override
@@ -206,8 +213,8 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void SetConversationAttribute(String profile, int conversation, String key, String val) {
-    cwtchPlatform.invokeMethod("SetContactAttribute", {"ProfileOnion": profile, "conversation": conversation, "Key": key, "Val": val});
+  void SetConversationAttribute(String profile, int contact, String key, String val) {
+    cwtchPlatform.invokeMethod("SetContactAttribute", {"ProfileOnion": profile, "Contact": contact, "Key": key, "Val": val});
   }
 
   @override
@@ -271,22 +278,7 @@ class CwtchGomobile implements Cwtch {
   }
 
   @override
-  Future GetMessageByContentHash(String profile, int conversation, String contentHash) {
-    return cwtchPlatform.invokeMethod("GetMessageByContentHash", {"ProfileOnion": profile, "conversation": conversation, "contentHash": contentHash});
-  }
-
-  @override
-  void SetMessageAttribute(String profile, int conversation, int channel, int message, String key, String val) {
-    cwtchPlatform.invokeMethod("SetMessageAttribute", {"ProfileOnion": profile, "conversation": conversation, "Channel": channel, "Message": message, "Key": key, "Val": val});
-  }
-
-  @override
-  String defaultDownloadPath() {
-    return this.androidHomeDirectoryStr;
-  }
-
-  @override
-  void ChangePassword(String profile, String pass, String newpass, String newpassAgain) {
-    cwtchPlatform.invokeMethod("ChangePassword", {"ProfileOnion": profile, "OldPass": pass, "NewPass": newpass, "NewPassAgain": newpassAgain});
+  Future GetMessageByContentHash(String profile, int handle, String contentHash) {
+    return cwtchPlatform.invokeMethod("GetMessageByContentHash", {"profile": profile, "contact": handle, "contentHash": contentHash});
   }
 }

lib/errorHandler.dart

@@ -6,17 +6,12 @@ class ErrorHandler extends ChangeNotifier {
 
   // Add Contact Specific Errors...
   static const String addContactErrorPrefix = "addcontact";
-  static const String changePasswordErrorPrefix = "changepassword";
   static const String invalidImportStringErrorType = "invalid_import_string";
   static const String contactAlreadyExistsErrorType = "contact_already_exists";
   bool invalidImportStringError = false;
   bool contactAlreadyExistsError = false;
   bool explicitAddContactSuccess = false;
 
-  // ChangePassword
-  bool changePasswordError = false;
-  bool explicitChangePasswordSuccess = false;
-
   // Import Bundle Specific Errors
   static const String importBundleErrorPrefix = "importBundle";
   bool importBundleError = false;
@@ -44,9 +39,6 @@ class ErrorHandler extends ChangeNotifier {
     deletedServerError = false;
     deletedServerSuccess = false;
 
-    changePasswordError = false;
-    explicitChangePasswordSuccess = false;
-
     notifyListeners();
   }
 
@@ -66,9 +58,6 @@ class ErrorHandler extends ChangeNotifier {
       case deleteProfileErrorPrefix:
         handleDeleteProfileError(errorType);
         break;
-      case changePasswordErrorPrefix:
-        handleChangePasswordError(errorType);
-        break;
       case deletedServerErrorPrefix:
         handleDeletedServerError(errorType);
     }
@@ -126,21 +115,6 @@ class ErrorHandler extends ChangeNotifier {
     }
   }
 
-  handleChangePasswordError(String errorType) {
-    // Reset add contact errors
-    changePasswordError = false;
-    explicitChangePasswordSuccess = false;
-
-    switch (errorType) {
-      case successErrorType:
-        explicitChangePasswordSuccess = true;
-        break;
-      default:
-        changePasswordError = true;
-        break;
-    }
-  }
-
   handleDeletedServerError(String errorType) {
     // reset
     deletedServerError = false;

lib/l10n/intl_de.arb

@@ -1,39 +1,6 @@
 {
     "@@locale": "de",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "btnSendFile": "Send File",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "loadingCwtch": "Loading Cwtch...",
-    "themeColorLabel": "Color Theme",
-    "themeNameNeon2": "Neon2",
-    "themeNameNeon1": "Neon1",
-    "themeNameMidnight": "Midnight",
-    "themeNameMermaid": "Mermaid",
-    "themeNamePumpkin": "Pumpkin",
-    "themeNameGhost": "Ghost",
-    "themeNameVampire": "Vampire",
-    "themeNameWitch": "Witch",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Download Folder",
-    "settingImagePreviewsDescription": "Images will be downloaded and previewed automatically. Please note that image previews can often lead to security vulnerabilities, and you should not enable this Experiment if you use Cwtch with untrusted contacts. Profile pictures are planned for Cwtch 1.6.",
-    "settingImagePreviews": "Image Previews and Profile Pictures",
-    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
-    "enableExperimentClickableLinks": "Enable Clickable Links",
-    "serverConnectionsLabel": "Connection",
-    "serverTotalMessagesLabel": "Total Messages",
-    "serverMetricsLabel": "Server Metrics",
-    "manageKnownServersShort": "Servers",
-    "manageKnownServersLong": "Manage Known Servers",
-    "displayNameTooltip": "Please enter a display name",
-    "manageKnownServersButton": "Manage Known Servers",
-    "fieldDescriptionLabel": "Description",
-    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
-    "importLocalServerButton": "Import %1",
-    "importLocalServerSelectText": "Select Local Server",
-    "importLocalServerLabel": "Import a locally hosted server",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
     "newMessagesLabel": "New Messages",
     "localeRU": "Russian",
     "copyServerKeys": "Copy keys",
@@ -41,8 +8,8 @@
     "fileCheckingStatus": "Checking download status",
     "fileInterrupted": "Interrupted",
     "fileSavedTo": "Saved to",
-    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "deleteServerConfirmBtn": "Really delete server",
     "deleteServerSuccess": "Successfully deleted server",
     "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
@@ -65,8 +32,8 @@
     "serverAddress": "Server Address",
     "editServerTitle": "Edit Server",
     "addServerTitle": "Add Server",
-    "downloadFileButton": "Herunterladen",
     "titleManageProfilesShort": "Profiles",
+    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "descriptionFileSharing": "The file sharing experiment allows you to send and receive files from Cwtch contacts and groups. Note that sharing a file with a group will result in members of that group connecting with you directly over Cwtch to download it.",
     "settingFileSharing": "File Sharing",
     "tooltipSendFile": "Send File",
@@ -75,12 +42,25 @@
     "messageEnableFileSharing": "Enable the file sharing experiment to view this message.",
     "labelFilesize": "Size",
     "labelFilename": "Filename",
+    "downloadFileButton": "Herunterladen",
     "openFolderButton": "Open Folder",
     "retrievingManifestMessage": "Retrieving file information...",
-    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
+    "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...",
@@ -100,31 +80,17 @@
     "tooltipReplyToThisMessage": "Reply to this message",
     "tooltipRejectContactRequest": "Reject this contact request",
     "tooltipAcceptContactRequest": "Accept this contact request.",
-    "experimentsEnabled": "Experimente aktiviert",
-    "malformedMessage": "Fehlerhafte Nachricht",
-    "contactSuggestion": "Dieser Kontaktvorschlag ist für: ",
-    "descriptionBlockUnknownConnections": "Falls aktiviert, wird diese Einstellung alle Verbindungen von Cwtch Usern autmoatisch schliessen, wenn sie nicht in deinen Kontakten sind.",
-    "descriptionExperimentsGroups": "Mit experimentellen Gruppen kann Cwtch über nicht vertrauenswürdige Serverinfrastruktur die Kommunikation mit mehr als einem Kontakt vereinfachen.",
-    "descriptionExperiments": "Experimentelle Cwtch Features sind optionale, opt-in Features für die andere Privatsphärenaspekte berücksichtigt werden als bei traditionellen 1:1 metadatenresistenten Chats, wie z. B. Gruppennachrichten, Bots usw.",
-    "networkStatusDisconnected": "Vom Internet getrennt, überprüfe deine Verbindung",
-    "yourServers": "Deine Server",
-    "yourProfiles": "Deine Profile",
-    "enterProfilePassword": "Gib ein Passwort ein, um deine Profile anzuzeigen",
-    "deleteConfirmLabel": "Gib LÖSCHEN ein um zu bestätigen",
-    "profileOnionLabel": "Senden Sie diese Adresse an Peers, mit denen Sie sich verbinden möchten",
-    "cycleColoursAndroid": "Klicken um Farbe zu wechseln.\nGedrückt halten zum zurücksetzen.",
-    "cycleMorphsDesktop": "Klicken um Morph zu wechseln.\nRechtsklick zum zurücksetzen.",
-    "cycleMorphsAndroid": "Klicken um Morph zu wechseln.\nGedrückt halten zum zurücksetzen.",
-    "pasteAddressToAddContact": "Adresse, Einladung oder Schlüssel hier hinzufügen, um einen Kontakt hinzuzufügen",
     "notificationNewMessageFromGroup": "Neue Nachricht in einer Gruppe!",
     "notificationNewMessageFromPeer": "Neue Nachricht von einem Kontakt!",
     "tooltipHidePassword": "Password verstecken",
     "tooltipShowPassword": "Password anzeigen",
+    "serverNotSynced": "Neue Nachrichten abrufen (Dies kann eine Weile dauern...)",
     "groupInviteSettingsWarning": "Du wurdest eingeladen einer Gruppe beizutreten! Bitte aktiviere das Gruppenchat Experiment in den Einstellungen um diese Einladung anzusehen.",
     "shutdownCwtchAction": "Cwtch schliessen",
     "shutdownCwtchDialog": "Bist du sicher, dass du Cwtch schliessen möchtest? Alle Verbindungen werden geschlossen und die App wird beendet.",
     "shutdownCwtchDialogTitle": "Cwtch schliessen?",
     "shutdownCwtchTooltip": "Cwtch schliessen",
+    "malformedMessage": "Fehlerhafte Nachricht",
     "profileDeleteSuccess": "Profil erfolgreich gelöscht",
     "debugLog": "Konsolendebuglogging aktivivieren",
     "torNetworkStatus": "Tor Netzwerkstatus",
@@ -140,6 +106,7 @@
     "torStatus": "Tor Status",
     "torVersion": "Tor Version",
     "sendAnInvitation": "Du hast eine Einladung geschickt für: ",
+    "contactSuggestion": "Dieser Kontaktvorschlag ist für: ",
     "rejected": "Abgelehnt!",
     "accepted": "Angenommen!",
     "chatHistoryDefault": "Diese Unterhaltung wird gelöscht sobald Cwtch geschlossen wird! Der Nachrichtenverlauf für jede Unterhaltung kann im Einstellungsmenü oben rechts geändert werden.",
@@ -148,6 +115,9 @@
     "reallyLeaveThisGroupPrompt": "Bist du sicher, dass du diese Unterhaltung beenden möchtest? Alle Nachrichten und Attribute werden gelöscht.",
     "leaveGroup": "Unterhaltung beenden",
     "inviteToGroup": "Du wurdest eingeladen einer Gruppe beizutreten:",
+    "pasteAddressToAddContact": "Adresse, Einladung oder Schlüssel hier hinzufügen, um einen Kontakt hinzuzufügen",
+    "tooltipAddContact": "Neuen Kontakt oder Unterhaltung hinzufügen",
+    "titleManageContacts": "Unterhaltungen",
     "titleManageServers": "Server verwalten",
     "dateNever": "Nie",
     "dateLastYear": "Letzes Jahr",
@@ -155,110 +125,81 @@
     "dateLastMonth": "Letzter Monat",
     "dateRightNow": "Jetzt",
     "successfullAddedContact": "Erfolgreich hinzugefügt",
+    "descriptionBlockUnknownConnections": "Falls aktiviert, wird diese Einstellung alle Verbindungen von Cwtch Usern autmoatisch schliessen, wenn sie nicht in deinen Kontakten sind.",
+    "descriptionExperimentsGroups": "Mit experimentellen Gruppen kann Cwtch über nicht vertrauenswürdige Serverinfrastruktur die Kommunikation mit mehr als einem Kontakt vereinfachen.",
+    "descriptionExperiments": "Experimentelle Cwtch Features sind optionale, opt-in Features für die andere Privatsphärenaspekte berücksichtigt werden als bei traditionellen 1:1 metadatenresistenten Chats, wie z. B. Gruppennachrichten, Bots usw.",
     "titleManageProfiles": "Cwtch Profile verwalten",
     "tooltipUnlockProfiles": "Entsperre verschlüsselte Profile durch Eingabe des Passworts.",
-    "titleManageContacts": "Unterhaltungen",
-    "tooltipAddContact": "Neuen Kontakt oder Unterhaltung hinzufügen",
     "tooltipOpenSettings": "Öfffne das Einstellungsmenü",
-    "contactAlreadyExists": "Kontakt existiert bereits",
     "invalidImportString": "Ungültiger Importstring",
+    "contactAlreadyExists": "Kontakt existiert bereits",
     "conversationSettings": "Unterhaltungseinstellungen",
     "enterCurrentPasswordForDelete": "Bitte gib das aktuelle Passwort ein, um diese Profil zu löschen.",
     "enableGroups": "Gruppenchat aktivieren",
+    "experimentsEnabled": "Experimente aktiviert",
     "localeIt": "Italiana",
     "localeEs": "Espanol",
+    "addListItem": "Liste hinzufügen",
+    "addNewItem": "Ein neues Element zur Liste hinzufügen",
+    "todoPlaceholder": "noch zu erledigen",
+    "newConnectionPaneTitle": "Neue Verbindung",
+    "networkStatusOnline": "Online",
+    "networkStatusAttemptingTor": "Versuche, eine Verbindung mit dem Tor-Netzwerk herzustellen",
+    "networkStatusDisconnected": "Vom Internet getrennt, überprüfe deine Verbindung",
+    "viewGroupMembershipTooltip": "Gruppenmitgliedschaft anzeigen",
+    "loadingTor": "Tor wird geladen...",
+    "smallTextLabel": "Klein",
+    "defaultScalingText": "defaultmäßige Textgröße (Skalierungsfaktor:",
+    "builddate": "Aufgebaut auf: %2",
+    "version": "Version %1",
+    "versionTor": "Version %1 mit tor %2",
+    "themeDark": "Dunkel",
+    "themeLight": "Licht",
+    "settingTheme": "Thema",
+    "largeTextLabel": "Groß",
+    "settingInterfaceZoom": "Zoomstufe",
+    "localeDe": "Deutsche",
     "localePt": "Portuguesa",
     "localeFr": "Frances",
     "localeEn": "English",
-    "passwordErrorEmpty": "Passwort darf nicht leer sein",
-    "currentPasswordLabel": "aktuelles Passwort",
-    "yourDisplayName": "Dein Anzeigename",
-    "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.",
-    "blockBtn": "Anderen Nutzer blockieren",
-    "displayNameLabel": "Angezeigename",
-    "peerOfflineMessage": "Anderer Nutzer ist offline, Nachrichten können derzeit nicht zugestellt werden",
-    "peerBlockedMessage": "Anderer Nutzer ist blockiert",
-    "dmTooltip": "Klicken, um Direktnachricht zu senden",
-    "peerNotOnline": "Der andere Nutzer ist offline. Die App kann momentan nicht verwendet werden.",
-    "searchList": "Liste durchsuchen",
-    "update": "Update",
-    "viewServerInfo": "Serverinfo",
-    "serverNotSynced": "Neue Nachrichten abrufen (Dies kann eine Weile dauern...)",
-    "serverSynced": "synchronisiert",
-    "cycleColoursDesktop": "Klicken um Farbe zu wechseln.\nRechtsklick zum zurücksetzen.",
-    "cycleCatsDesktop": "Klicken um Kategorie zu wechseln.\nRechtslick zum zurücksetzen.",
-    "cycleCatsAndroid": "Klicken um Kategorie zu wechseln.\nLanger Klick zum zurücksetzen.",
-    "addPeer": "Anderen Nutzer hinzufügen",
-    "addPeerTab": "Einen anderen Nutzer hinzufügen",
-    "todoPlaceholder": "noch zu erledigen",
-    "addListItem": "Liste hinzufügen",
-    "addNewItem": "Ein neues Element zur Liste hinzufügen",
-    "createGroupTab": "Eine Gruppe erstellen",
-    "joinGroupTab": "Einer Gruppe beitreten",
-    "peerAddress": "Adresse",
-    "peerName": "Namen",
-    "groupName": "Gruppenname",
-    "server": "Server",
-    "invitation": "Einladung",
-    "groupAddr": "Adresse",
-    "createGroup": "Gruppe erstellen",
-    "joinGroup": "Gruppe beitreten",
-    "blocked": "Blockiert",
-    "search": "Suche...",
-    "serverInfo": "Server-Informationen",
-    "serverConnectivityConnected": "Server verbunden",
-    "serverConnectivityDisconnected": "Server getrennt",
-    "addListItemBtn": "Element hinzufügen",
-    "savePeerHistory": "Peer-Verlauf speichern",
-    "addProfileTitle": "Neues Profil hinzufügen",
-    "editProfileTitle": "Profil bearbeiten",
-    "profileName": "Anzeigename",
-    "defaultProfileName": "Alice",
-    "newProfile": "Neues Profil",
-    "editProfile": "Profil bearbeiten",
-    "radioUsePassword": "Passwort",
-    "radioNoPassword": "Unverschlüsselt (kein Passwort)",
-    "noPasswordWarning": "Wenn für dieses Konto kein Passwort verwendet wird, bedeutet dies, dass alle lokal gespeicherten Daten nicht verschlüsselt werden.",
-    "deleteProfileBtn": "Profil löschen",
+    "settingLanguage": "Sprache",
+    "zoomLabel": "Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)",
+    "versionBuilddate": "Version: %1 Aufgebaut auf: %2",
+    "cwtchSettingsTitle": "Cwtch Einstellungen",
+    "unlock": "Entsperren",
+    "yourServers": "Deine Server",
+    "yourProfiles": "Deine Profile",
+    "error0ProfilesLoadedForPassword": "0 Profile mit diesem Passwort geladen",
+    "password": "Passwort",
+    "enterProfilePassword": "Gib ein Passwort ein, um deine Profile anzuzeigen",
+    "addNewProfileBtn": "Neues Profil hinzufügen",
     "deleteConfirmText": "LÖSCHEN",
     "deleteProfileConfirmBtn": "Profil wirklich löschen",
-    "addNewProfileBtn": "Neues Profil hinzufügen",
-    "networkStatusConnecting": "Verbinde zu Netzwerk und Peers ...",
-    "newConnectionPaneTitle": "Neue Verbindung",
-    "password1Label": "Passwort",
-    "password2Label": "Passwort erneut eingeben",
-    "createProfileBtn": "Profil speichern",
-    "saveProfileBtn": "Profil speichern",
-    "passwordErrorMatch": "Passwörter stimmen nicht überein",
+    "deleteConfirmLabel": "Gib LÖSCHEN ein um zu bestätigen",
+    "deleteProfileBtn": "Profil löschen",
     "passwordChangeError": "Fehler beim Ändern des Passworts: Das Passwort wurde abgelehnt",
-    "password": "Passwort",
-    "error0ProfilesLoadedForPassword": "0 Profile mit diesem Passwort geladen",
-    "unlock": "Entsperren",
-    "versionBuilddate": "Version: %1 Aufgebaut auf: %2",
-    "blockUnknownLabel": "Unbekannte Peers blockieren",
-    "settingLanguage": "Sprache",
-    "localeDe": "Deutsche",
-    "settingInterfaceZoom": "Zoomstufe",
-    "settingTheme": "Thema",
-    "themeLight": "Licht",
-    "themeDark": "Dunkel",
-    "versionTor": "Version %1 mit tor %2",
-    "version": "Version %1",
-    "builddate": "Aufgebaut auf: %2",
-    "loadingTor": "Tor wird geladen...",
-    "viewGroupMembershipTooltip": "Gruppenmitgliedschaft anzeigen",
-    "networkStatusAttemptingTor": "Versuche, eine Verbindung mit dem Tor-Netzwerk herzustellen",
-    "networkStatusOnline": "Online",
-    "smallTextLabel": "Klein",
-    "defaultScalingText": "defaultmäßige Textgröße (Skalierungsfaktor:",
-    "largeTextLabel": "Groß",
-    "zoomLabel": "Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)",
-    "cwtchSettingsTitle": "Cwtch Einstellungen",
+    "passwordErrorMatch": "Passwörter stimmen nicht überein",
+    "saveProfileBtn": "Profil speichern",
+    "createProfileBtn": "Profil speichern",
+    "passwordErrorEmpty": "Passwort darf nicht leer sein",
+    "password2Label": "Passwort erneut eingeben",
+    "password1Label": "Passwort",
+    "currentPasswordLabel": "aktuelles Passwort",
+    "yourDisplayName": "Dein Anzeigename",
+    "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",
     "copiedToClipboardNotification": "in die Zwischenablage kopiert",
+    "copyBtn": "Kopieren",
+    "editProfile": "Profil bearbeiten",
+    "newProfile": "Neues Profil",
+    "defaultProfileName": "Alice",
+    "profileName": "Anzeigename",
+    "editProfileTitle": "Profil bearbeiten",
+    "addProfileTitle": "Neues Profil hinzufügen",
     "deleteBtn": "Löschen",
     "saveBtn": "Speichern",
+    "displayNameLabel": "Angezeigename",
     "addressLabel": "Adresse",
     "puzzleGameBtn": "Puzzlespiel",
     "bulletinsBtn": "Meldungen",
@@ -269,19 +210,45 @@
     "acceptGroupInviteLabel": "Möchtest Du die Einladung annehmen",
     "newGroupBtn": "Neue Gruppe anlegen",
     "copiedClipboardNotification": "in die Zwischenablage kopiert",
-    "copyBtn": "Kopieren",
     "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",
+    "searchList": "Liste durchsuchen",
+    "update": "Update",
     "inviteBtn": "Einladen",
     "inviteToGroupLabel": "In die Gruppe einladen",
     "groupNameLabel": "Gruppenname",
+    "viewServerInfo": "Serverinfo",
+    "serverSynced": "synchronisiert",
+    "serverConnectivityDisconnected": "Server getrennt",
+    "serverConnectivityConnected": "Server verbunden",
+    "serverInfo": "Server-Informationen",
     "invitationLabel": "Einladung",
     "serverLabel": "Server",
+    "search": "Suche...",
+    "cycleColoursDesktop": "Klicken um Farbe zu wechseln.\nRechtsklick zum zurücksetzen.",
+    "cycleColoursAndroid": "Klicken um Farbe zu wechseln.\nGedrückt halten zum zurücksetzen.",
+    "cycleMorphsDesktop": "Klicken um Morph zu wechseln.\nRechtsklick zum zurücksetzen.",
+    "cycleMorphsAndroid": "Klicken um Morph zu wechseln.\nGedrückt halten zum zurücksetzen.",
+    "cycleCatsDesktop": "Klicken um Kategorie zu wechseln.\nRechtslick zum zurücksetzen.",
+    "cycleCatsAndroid": "Klicken um Kategorie zu wechseln.\nLanger Klick zum zurücksetzen.",
+    "blocked": "Blockiert",
     "titlePlaceholder": "Titel...",
     "postNewBulletinLabel": "Neue Meldung veröffentlichen",
     "newBulletinLabel": "Neue Meldung",
+    "joinGroup": "Gruppe beitreten",
+    "createGroup": "Gruppe erstellen",
+    "groupAddr": "Adresse",
+    "invitation": "Einladung",
+    "server": "Server",
+    "groupName": "Gruppenname",
+    "peerName": "Namen",
+    "peerAddress": "Adresse",
+    "joinGroupTab": "Einer Gruppe beitreten",
+    "createGroupTab": "Eine Gruppe erstellen",
     "createGroupBtn": "Anlegen",
     "defaultGroupName": "Tolle Gruppe",
     "createGroupTitle": "Gruppe Anlegen"

lib/l10n/intl_en.arb

@@ -1,40 +1,6 @@
 {
     "@@locale": "en",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "btnSendFile": "Send File",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "loadingCwtch": "Loading Cwtch...",
-    "themeColorLabel": "Color Theme",
-    "themeNameNeon2": "Neon2",
-    "themeNameNeon1": "Neon1",
-    "themeNameMidnight": "Midnight",
-    "themeNameMermaid": "Mermaid",
-    "themeNamePumpkin": "Pumpkin",
-    "themeNameGhost": "Ghost",
-    "themeNameVampire": "Vampire",
-    "themeNameWitch": "Witch",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Download Folder",
-    "settingImagePreviewsDescription": "Images will be downloaded and previewed automatically. Please note that image previews can often lead to security vulnerabilities, and you should not enable this Experiment if you use Cwtch with untrusted contacts. Profile pictures are planned for Cwtch 1.6.",
-    "settingImagePreviews": "Image Previews and Profile Pictures",
-    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
-    "enableExperimentClickableLinks": "Enable Clickable Links",
-    "serverConnectionsLabel": "Connection",
-    "serverTotalMessagesLabel": "Total Messages",
-    "serverMetricsLabel": "Server Metrics",
-    "manageKnownServersShort": "Servers",
-    "manageKnownServersLong": "Manage Known Servers",
-    "displayNameTooltip": "Please enter a display name",
-    "manageKnownServersButton": "Manage Known Servers",
-    "fieldDescriptionLabel": "Description",
-    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
-    "importLocalServerButton": "Import %1",
-    "importLocalServerSelectText": "Select Local Server",
-    "importLocalServerLabel": "Import a locally hosted server",
-    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
     "newMessagesLabel": "New Messages",
     "localeRU": "Russian",
     "copyServerKeys": "Copy keys",
@@ -89,6 +55,7 @@
     "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",
@@ -223,6 +190,7 @@
     "radioNoPassword": "Unencrypted (No password)",
     "radioUsePassword": "Password",
     "copiedToClipboardNotification": "Copied to Clipboard",
+    "copyBtn": "Copy",
     "editProfile": "Edit Profille",
     "newProfile": "New Profile",
     "defaultProfileName": "Alice",
@@ -242,7 +210,6 @@
     "acceptGroupInviteLabel": "Do you want to accept the invitation to",
     "newGroupBtn": "Create new group",
     "copiedClipboardNotification": "Copied to clipboard",
-    "copyBtn": "Copy",
     "pendingLabel": "Pending",
     "acknowledgedLabel": "Acknowledged",
     "couldNotSendMsgError": "Could not send this message",

lib/l10n/intl_es.arb

@@ -1,39 +1,6 @@
 {
     "@@locale": "es",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "btnSendFile": "Send File",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "loadingCwtch": "Loading Cwtch...",
-    "themeColorLabel": "Color Theme",
-    "themeNameNeon2": "Neon2",
-    "themeNameNeon1": "Neon1",
-    "themeNameMidnight": "Midnight",
-    "themeNameMermaid": "Mermaid",
-    "themeNamePumpkin": "Pumpkin",
-    "themeNameGhost": "Ghost",
-    "themeNameVampire": "Vampire",
-    "themeNameWitch": "Witch",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Download Folder",
-    "settingImagePreviewsDescription": "Images will be downloaded and previewed automatically. Please note that image previews can often lead to security vulnerabilities, and you should not enable this Experiment if you use Cwtch with untrusted contacts. Profile pictures are planned for Cwtch 1.6.",
-    "settingImagePreviews": "Image Previews and Profile Pictures",
-    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
-    "enableExperimentClickableLinks": "Enable Clickable Links",
-    "serverConnectionsLabel": "Connection",
-    "serverTotalMessagesLabel": "Total Messages",
-    "serverMetricsLabel": "Server Metrics",
-    "manageKnownServersShort": "Servers",
-    "manageKnownServersLong": "Manage Known Servers",
-    "displayNameTooltip": "Please enter a display name",
-    "manageKnownServersButton": "Manage Known Servers",
-    "fieldDescriptionLabel": "Description",
-    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
-    "importLocalServerButton": "Import %1",
-    "importLocalServerSelectText": "Select Local Server",
-    "importLocalServerLabel": "Import a locally hosted server",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
     "newMessagesLabel": "New Messages",
     "localeRU": "Russian",
     "copyServerKeys": "Copy keys",
@@ -41,8 +8,8 @@
     "fileCheckingStatus": "Checking download status",
     "fileInterrupted": "Interrupted",
     "fileSavedTo": "Saved to",
-    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "deleteServerConfirmBtn": "Really delete server",
     "deleteServerSuccess": "Successfully deleted server",
     "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
@@ -66,6 +33,7 @@
     "editServerTitle": "Edit Server",
     "addServerTitle": "Add Server",
     "titleManageProfilesShort": "Profiles",
+    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "descriptionFileSharing": "The file sharing experiment allows you to send and receive files from Cwtch contacts and groups. Note that sharing a file with a group will result in members of that group connecting with you directly over Cwtch to download it.",
     "settingFileSharing": "File Sharing",
     "tooltipSendFile": "Send File",
@@ -77,10 +45,22 @@
     "downloadFileButton": "Download",
     "openFolderButton": "Open Folder",
     "retrievingManifestMessage": "Retrieving file information...",
-    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
+    "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...",
@@ -104,6 +84,7 @@
     "notificationNewMessageFromPeer": "New message from a contact!",
     "tooltipHidePassword": "Hide Password",
     "tooltipShowPassword": "Show Password",
+    "serverNotSynced": "Fuera de sincronización con el servidor",
     "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.",
     "shutdownCwtchAction": "Shutdown Cwtch",
     "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.",
@@ -134,6 +115,9 @@
     "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
     "leaveGroup": "Leave This Conversation",
     "inviteToGroup": "You have been invited to join a group:",
+    "pasteAddressToAddContact": "...pegar una dirección aquí para añadir contacto...",
+    "tooltipAddContact": "Add a new contact or conversation",
+    "titleManageContacts": "Conversations",
     "titleManageServers": "Manage Servers",
     "dateNever": "Never",
     "dateLastYear": "Last Year",
@@ -146,143 +130,126 @@
     "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.",
     "titleManageProfiles": "Manage Cwtch Profiles",
     "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
-    "titleManageContacts": "Conversations",
-    "tooltipAddContact": "Add a new contact or conversation",
     "tooltipOpenSettings": "Open the settings pane",
-    "contactAlreadyExists": "Contact Already Exists",
     "invalidImportString": "Invalid import string",
+    "contactAlreadyExists": "Contact Already Exists",
     "conversationSettings": "Conversation Settings",
     "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.",
     "enableGroups": "Enable Group Chat",
-    "defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
+    "experimentsEnabled": "Experimentos habilitados",
+    "localeIt": "Italiano",
+    "localeEs": "Español",
+    "addListItem": "Añadir un nuevo elemento a la lista",
+    "addNewItem": "Añadir un nuevo elemento a la lista",
     "todoPlaceholder": "Por hacer...",
-    "bulletinsBtn": "Boletines",
-    "radioNoPassword": "Sin cifrado (sin contraseña)",
-    "themeDark": "Oscuro",
-    "smallTextLabel": "Pequeño",
+    "newConnectionPaneTitle": "Nueva conexión",
+    "networkStatusOnline": "En línea",
+    "networkStatusAttemptingTor": "Intentando conectarse a la red Tor",
+    "networkStatusDisconnected": "Sin conexión, comprueba tu conexión",
+    "viewGroupMembershipTooltip": "Ver membresía del grupo",
     "loadingTor": "Cargando tor...",
-    "cycleCatsAndroid": "Click para cambiar categoría. Mantenga pulsado para reiniciar.",
-    "cycleCatsDesktop": "Click para cambiar categoría. Click derecho para reiniciar.",
-    "cycleColoursDesktop": "Click para cambiar colores. Click derecho para reiniciar.",
-    "cycleColoursAndroid": "Click para cambiar colores. Mantenga pulsado para reiniciar.",
+    "smallTextLabel": "Pequeño",
+    "defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
     "builddate": "Basado en: %2",
-    "cycleMorphsAndroid": "Click para cambiar transformaciones. Mantenga pulsado para reiniciar.",
-    "cycleMorphsDesktop": "Click para cambiar transformaciones. Click derecho para reiniciar.",
+    "version": "Versión %1",
+    "versionTor": "Versión %1 con tor %2",
+    "themeDark": "Oscuro",
+    "themeLight": "Claro",
+    "settingTheme": "Tema",
+    "largeTextLabel": "Grande",
+    "settingInterfaceZoom": "Nivel de zoom",
     "localeDe": "Alemán",
     "localePt": "Portugués",
     "localeFr": "Francés",
-    "addListItem": "Añadir un nuevo elemento a la lista",
-    "unblockBtn": "Desbloquear contacto",
-    "joinGroupTab": "Únete a un grupo",
-    "viewGroupMembershipTooltip": "Ver membresía del grupo",
-    "peerBlockedMessage": "Contacto bloqueado",
-    "peerOfflineMessage": "Este contacto no está en línea, los mensajes no pueden ser entregados en este momento",
-    "profileOnionLabel": "Envía esta dirección a los contactos con los que quieras conectarte",
-    "couldNotSendMsgError": "No se pudo enviar este mensaje",
-    "pendingLabel": "Pendiente",
-    "chatBtn": "Chat",
-    "dontSavePeerHistory": "Eliminar historial de contacto",
-    "password": "Contraseña",
-    "peerNotOnline": "Este contacto no está en línea, la aplicación no puede ser usada en este momento",
-    "enterProfilePassword": "Ingresa tu contraseña para ver tus perfiles",
-    "networkStatusConnecting": "Conectando a la red y a los contactos...",
-    "localeIt": "Italiano",
-    "savePeerHistoryDescription": "Determina si eliminar o no el historial asociado con el contacto.",
-    "acknowledgedLabel": "Reconocido",
-    "blockBtn": "Bloquear contacto",
-    "savePeerHistory": "Guardar el historial con contacto",
-    "defaultProfileName": "Alicia",
-    "versionBuilddate": "Versión: %1 Basado en %2",
-    "zoomLabel": "Zoom de la interfaz (afecta principalmente el tamaño del texto y de los botones)",
-    "settingTheme": "Tema",
-    "themeLight": "Claro",
-    "experimentsEnabled": "Experimentos habilitados",
-    "versionTor": "Versión %1 con tor %2",
-    "localeEs": "Español",
-    "networkStatusOnline": "En línea",
-    "newConnectionPaneTitle": "Nueva conexión",
-    "addNewItem": "Añadir un nuevo elemento a la lista",
-    "createGroupTitle": "Crear un grupo",
-    "serverLabel": "Servidor",
-    "groupNameLabel": "Nombre del grupo",
-    "defaultGroupName": "El Grupo Asombroso",
-    "createGroupBtn": "Crear",
-    "copiedToClipboardNotification": "Copiado al portapapeles",
-    "addPeerTab": "Agregar Contacto",
-    "createGroupTab": "Crear un grupo",
-    "peerAddress": "Dirección",
-    "peerName": "Nombre",
-    "groupName": "Nombre del grupo",
-    "server": "Servidor",
-    "invitation": "Invitación",
-    "groupAddr": "Dirección",
-    "addPeer": "Agregar Contacto",
-    "createGroup": "Crear perfil",
-    "joinGroup": "Únete al grupo",
-    "newBulletinLabel": "Nuevo Boletín",
-    "postNewBulletinLabel": "Publicar nuevo boletín",
-    "titlePlaceholder": "título...",
-    "pasteAddressToAddContact": "...pegar una dirección aquí para añadir contacto...",
-    "blocked": "Bloqueado",
-    "search": "Búsqueda...",
-    "invitationLabel": "Invitación",
-    "serverInfo": "Información del servidor",
-    "serverConnectivityConnected": "Servidor conectado",
-    "serverConnectivityDisconnected": "Servidor desconectado",
-    "serverSynced": "Sincronizado",
-    "serverNotSynced": "Fuera de sincronización con el servidor",
-    "viewServerInfo": "Información del servidor",
-    "saveBtn": "Guardar",
-    "inviteToGroupLabel": "Invitar al grupo",
-    "inviteBtn": "Invitar",
-    "deleteBtn": "Eliminar",
-    "update": "Actualizar",
-    "searchList": "Buscar en la lista",
-    "addListItemBtn": "Agregar artículo",
-    "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",
-    "dmTooltip": "Haz clic para enviar mensaje directo",
-    "copyBtn": "Copiar",
-    "copiedClipboardNotification": "Copiado al portapapeles",
-    "newGroupBtn": "Crear un nuevo grupo de chat",
-    "acceptGroupInviteLabel": "¿Quieres aceptar la invitación a ",
-    "acceptGroupBtn": "Aceptar",
-    "rejectGroupBtn": "Rechazar",
-    "listsBtn": "Listas",
-    "puzzleGameBtn": "Juego de rompecabezas",
-    "addressLabel": "Dirección",
-    "displayNameLabel": "Nombre de Usuario",
-    "addProfileTitle": "Agregar nuevo perfil",
-    "editProfileTitle": "Editar perfil",
-    "profileName": "Nombre de Usuario",
-    "newProfile": "Nuevo perfil",
-    "editProfile": "Editar perfil",
-    "radioUsePassword": "Contraseña",
-    "noPasswordWarning": "No usar una contraseña para esta cuenta significa que los datos almacenados localmente no serán encriptados",
-    "password2Label": "Vuelve a ingresar tu contraseña",
-    "yourDisplayName": "Tu nombre de usuario",
-    "currentPasswordLabel": "Contraseña actual",
-    "password1Label": "Contraseña",
-    "passwordErrorEmpty": "El campo de contraseña no puede estar vacío",
-    "createProfileBtn": "Crear perfil",
-    "saveProfileBtn": "Guardar perfil",
-    "passwordErrorMatch": "Las contraseñas no coinciden",
-    "passwordChangeError": "Hubo un error cambiando tu contraseña: la contraseña ingresada fue rechazada",
-    "deleteProfileBtn": "Eliminar Perfil",
-    "deleteConfirmLabel": "Escribe ELIMINAR para confirmar",
-    "deleteProfileConfirmBtn": "Confirmar eliminar perfil",
-    "deleteConfirmText": "ELIMINAR",
-    "addNewProfileBtn": "Agregar nuevo perfil",
-    "error0ProfilesLoadedForPassword": "0 perfiles cargados con esa contraseña",
-    "yourProfiles": "Tus perfiles",
-    "yourServers": "Tus servidores",
-    "unlock": "Desbloquear",
-    "cwtchSettingsTitle": "Configuración de Cwtch",
-    "blockUnknownLabel": "Bloquear conexiones desconocidas",
-    "settingLanguage": "Idioma",
     "localeEn": "Inglés",
-    "settingInterfaceZoom": "Nivel de zoom",
-    "largeTextLabel": "Grande",
-    "version": "Versión %1",
-    "networkStatusDisconnected": "Sin conexión, comprueba tu conexión",
-    "networkStatusAttemptingTor": "Intentando conectarse a la red Tor"
+    "settingLanguage": "Idioma",
+    "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",
+    "unlock": "Desbloquear",
+    "yourServers": "Tus servidores",
+    "yourProfiles": "Tus perfiles",
+    "error0ProfilesLoadedForPassword": "0 perfiles cargados con esa contraseña",
+    "password": "Contraseña",
+    "enterProfilePassword": "Ingresa tu contraseña para ver tus perfiles",
+    "addNewProfileBtn": "Agregar nuevo perfil",
+    "deleteConfirmText": "ELIMINAR",
+    "deleteProfileConfirmBtn": "Confirmar eliminar perfil",
+    "deleteConfirmLabel": "Escribe ELIMINAR para confirmar",
+    "deleteProfileBtn": "Eliminar Perfil",
+    "passwordChangeError": "Hubo un error cambiando tu contraseña: la contraseña ingresada fue rechazada",
+    "passwordErrorMatch": "Las contraseñas no coinciden",
+    "saveProfileBtn": "Guardar perfil",
+    "createProfileBtn": "Crear perfil",
+    "passwordErrorEmpty": "El campo de contraseña no puede estar vacío",
+    "password2Label": "Vuelve a ingresar tu contraseña",
+    "password1Label": "Contraseña",
+    "currentPasswordLabel": "Contraseña actual",
+    "yourDisplayName": "Tu nombre de usuario",
+    "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",
+    "copiedToClipboardNotification": "Copiado al portapapeles",
+    "copyBtn": "Copiar",
+    "editProfile": "Editar perfil",
+    "newProfile": "Nuevo perfil",
+    "defaultProfileName": "Alicia",
+    "profileName": "Nombre de Usuario",
+    "editProfileTitle": "Editar perfil",
+    "addProfileTitle": "Agregar nuevo perfil",
+    "deleteBtn": "Eliminar",
+    "saveBtn": "Guardar",
+    "displayNameLabel": "Nombre de Usuario",
+    "addressLabel": "Dirección",
+    "puzzleGameBtn": "Juego de rompecabezas",
+    "bulletinsBtn": "Boletines",
+    "listsBtn": "Listas",
+    "chatBtn": "Chat",
+    "rejectGroupBtn": "Rechazar",
+    "acceptGroupBtn": "Aceptar",
+    "acceptGroupInviteLabel": "¿Quieres aceptar la invitación a ",
+    "newGroupBtn": "Crear un nuevo grupo de chat",
+    "copiedClipboardNotification": "Copiado al portapapeles",
+    "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",
+    "searchList": "Buscar en la lista",
+    "update": "Actualizar",
+    "inviteBtn": "Invitar",
+    "inviteToGroupLabel": "Invitar al grupo",
+    "groupNameLabel": "Nombre del grupo",
+    "viewServerInfo": "Información del servidor",
+    "serverSynced": "Sincronizado",
+    "serverConnectivityDisconnected": "Servidor desconectado",
+    "serverConnectivityConnected": "Servidor conectado",
+    "serverInfo": "Información del servidor",
+    "invitationLabel": "Invitación",
+    "serverLabel": "Servidor",
+    "search": "Búsqueda...",
+    "cycleColoursDesktop": "Click para cambiar colores. Click derecho para reiniciar.",
+    "cycleColoursAndroid": "Click para cambiar colores. Mantenga pulsado para reiniciar.",
+    "cycleMorphsDesktop": "Click para cambiar transformaciones. Click derecho para reiniciar.",
+    "cycleMorphsAndroid": "Click para cambiar transformaciones. Mantenga pulsado para reiniciar.",
+    "cycleCatsDesktop": "Click para cambiar categoría. Click derecho para reiniciar.",
+    "cycleCatsAndroid": "Click para cambiar categoría. Mantenga pulsado para reiniciar.",
+    "blocked": "Bloqueado",
+    "titlePlaceholder": "título...",
+    "postNewBulletinLabel": "Publicar nuevo boletín",
+    "newBulletinLabel": "Nuevo Boletín",
+    "joinGroup": "Únete al grupo",
+    "createGroup": "Crear perfil",
+    "groupAddr": "Dirección",
+    "invitation": "Invitación",
+    "server": "Servidor",
+    "groupName": "Nombre del grupo",
+    "peerName": "Nombre",
+    "peerAddress": "Dirección",
+    "joinGroupTab": "Únete a un grupo",
+    "createGroupTab": "Crear un grupo",
+    "createGroupBtn": "Crear",
+    "defaultGroupName": "El Grupo Asombroso",
+    "createGroupTitle": "Crear un grupo"
 }

lib/l10n/intl_fr.arb

@@ -1,108 +1,74 @@
 {
     "@@locale": "fr",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgConfirmSend": "Êtes-vous sûr de vouloir envoyer",
-    "acceptGroupInviteLabel": "Voulez-vous accepter l'invitation au groupe de",
-    "msgFileTooBig": "La taille du fichier ne peut pas dépasser 10 Go",
-    "msgAddToAccept": "Ajoutez ce compte à vos contacts afin d'accepter ce fichier.",
-    "btnSendFile": "Envoyer le fichier",
-    "storageMigrationModalMessage": "Migration des profils vers un nouveau format de stockage. Cela peut prendre quelques minutes...",
-    "loadingCwtch": "Chargement de Cwtch...",
-    "experimentClickableLinksDescription": "L'expérience des liens cliquables vous permet de cliquer sur les URLs partagés dans les messages",
-    "themeNameWitch": "Sorcière",
-    "themeNameVampire": "Vampire",
-    "themeNamePumpkin": "Citrouille",
-    "themeNameNeon2": "Néon2",
-    "themeNameNeon1": "Néon1",
-    "themeNameMidnight": "Minuit",
-    "themeNameMermaid": "Sirène",
-    "themeNameGhost": "Fantôme",
-    "themeNameCwtch": "Cwtch",
-    "themeColorLabel": "Thème de couleur",
-    "settingImagePreviewsDescription": "Les images seront téléchargées et prévisualisées automatiquement. Veuillez noter que la prévisualisation des images peut souvent conduire à des failles de sécurité, et vous ne devriez pas activer cette expérience si vous utilisez Cwtch avec des contacts non fiables. Les images de profil sont prévues pour Cwtch 1.6.",
-    "settingImagePreviews": "Aperçu des images et photos de profil",
-    "settingDownloadFolder": "Dossier de téléchargement",
-    "enableExperimentClickableLinks": "Activer les liens cliquables",
-    "serverMetricsLabel": "Métriques du serveur",
-    "serverTotalMessagesLabel": "Nombre total de messages",
-    "serverConnectionsLabel": "Connexion",
-    "manageKnownServersShort": "Serveurs",
-    "manageKnownServersLong": "Gérer les serveurs connus",
-    "manageKnownServersButton": "Gérer les serveurs connus",
-    "importLocalServerSelectText": "Sélectionnez le serveur local",
-    "importLocalServerLabel": "Importer un serveur hébergé localement",
-    "importLocalServerButton": "Importer %1",
-    "groupsOnThisServerLabel": "Les groupes dont je fais partie sont hébergés sur ce serveur",
-    "fieldDescriptionLabel": "Description",
-    "displayNameTooltip": "Veuillez entrer un nom d'usage s'il vous plaît",
-    "savePeerHistoryDescription": "Détermine s'il faut ou non supprimer tout historique associé au contact.",
-    "newMessagesLabel": "Nouveaux messages",
-    "localeRU": "Russe",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
+    "newMessagesLabel": "New Messages",
+    "localeRU": "Russian",
     "copyServerKeys": "Copier les clés",
     "verfiyResumeButton": "Vérifier\/reprendre",
-    "fileSavedTo": "Enregistré dans",
-    "fileInterrupted": "Interrompu",
     "fileCheckingStatus": "Vérification de l'état du téléchargement",
+    "fileInterrupted": "Interrompu",
+    "fileSavedTo": "Enregistré dans",
     "plainServerDescription": "Nous vous recommandons de protéger vos serveurs Cwtch par un mot de passe. Si vous ne définissez pas de mot de passe sur ce serveur, toute personne ayant accès à cet appareil peut être en mesure d'accéder aux informations concernant ce serveur, y compris les clés cryptographiques sensibles.",
-    "enterCurrentPasswordForDeleteServer": "Veuillez saisir le mot de passe actuel pour supprimer ce serveur",
     "encryptedServerDescription": "Le chiffrement d’un serveur avec un mot de passe le protège des autres personnes qui peuvent également utiliser cet appareil. Les serveurs cryptés ne peuvent pas être déchiffrés, affichés ou accessibles tant que le mot de passe correct n’est pas entré pour les déverrouiller.",
-    "deleteServerSuccess": "Le serveur a été supprimé avec succès",
     "deleteServerConfirmBtn": "Supprimer vraiment le serveur",
-    "unlockServerTip": "Veuillez créer ou déverrouiller un serveur pour commencer !",
-    "unlockProfileTip": "Veuillez créer ou déverrouiller un profil pour commencer !",
+    "deleteServerSuccess": "Le serveur a été supprimé avec succès",
+    "enterCurrentPasswordForDeleteServer": "Veuillez saisir le mot de passe actuel pour supprimer ce serveur",
+    "copyAddress": "Copier l'adresse",
     "settingServersDescription": "L'expérience des serveurs d'hébergement permet d'héberger et de gérer les serveurs Cwtch.",
     "settingServers": "Serveurs d'hébergement",
+    "enterServerPassword": "Entrez le mot de passe pour déverrouiller le serveur",
+    "unlockProfileTip": "Veuillez créer ou déverrouiller un profil pour commencer !",
+    "unlockServerTip": "Veuillez créer ou déverrouiller un serveur pour commencer !",
+    "addServerTooltip": "Ajouter un nouveau serveur",
     "serversManagerTitleShort": "Serveurs",
     "serversManagerTitleLong": "Serveurs que vous hébergez",
+    "saveServerButton": "Enregistrer le serveur",
+    "serverAutostartDescription": "Contrôle si l'application lance automatiquement le serveur au démarrage.",
+    "serverAutostartLabel": "Démarrage automatique",
     "serverEnabledDescription": "Démarrer ou arrêter le serveur",
     "serverEnabled": "Serveur activé",
-    "serverDescriptionLabel": "Description du serveur",
     "serverDescriptionDescription": "Votre description du serveur est à des fins de gestion personnelle uniquement, elle ne sera jamais partagée.",
-    "serverAutostartLabel": "Démarrage automatique",
-    "serverAutostartDescription": "Contrôle si l'application lance automatiquement le serveur au démarrage.",
+    "serverDescriptionLabel": "Description du serveur",
     "serverAddress": "Adresse du serveur",
-    "saveServerButton": "Enregistrer le serveur",
-    "enterServerPassword": "Entrez le mot de passe pour déverrouiller le serveur",
     "editServerTitle": "Modifier le serveur",
-    "copyAddress": "Copier l'adresse",
-    "addServerTooltip": "Ajouter un nouveau serveur",
     "addServerTitle": "Ajouter un serveur",
     "titleManageProfilesShort": "Profils",
     "descriptionStreamerMode": "Si elle est activée, cette option donne un rendu visuel plus privé à l'application pour la diffusion en direct ou la présentation, par exemple, en masquant profil et adresses de contacts.",
-    "tooltipSendFile": "Envoyer le fichier",
+    "descriptionFileSharing": "L'expérience de partage de fichiers vous permet d'envoyer et de recevoir des fichiers à partir de contacts et de groupes Cwtch. Notez que si vous partagez un fichier avec un groupe, les membres de ce groupe se connecteront avec vous directement via Cwtch pour le télécharger.",
     "settingFileSharing": "Partage de fichiers",
-    "retrievingManifestMessage": "Récupération des informations sur le fichier...",
-    "openFolderButton": "Ouvrir le dossier",
-    "messageFileSent": "Vous avez envoyé un fichier",
+    "tooltipSendFile": "Envoyer le fichier",
     "messageFileOffered": "Contact vous propose de vous envoyer un fichier",
+    "messageFileSent": "Vous avez envoyé un fichier",
     "messageEnableFileSharing": "Activez l'expérience de partage de fichiers pour afficher ce message.",
     "labelFilesize": "Taille",
     "labelFilename": "Nom de fichier",
     "downloadFileButton": "Télécharger",
-    "descriptionFileSharing": "L'expérience de partage de fichiers vous permet d'envoyer et de recevoir des fichiers à partir de contacts et de groupes Cwtch. Notez que si vous partagez un fichier avec un groupe, les membres de ce groupe se connecteront avec vous directement via Cwtch pour le télécharger.",
+    "openFolderButton": "Ouvrir le dossier",
+    "retrievingManifestMessage": "Récupération des informations sur le fichier...",
     "streamerModeLabel": "Mode Streamer\/Présentation",
-    "addPeer": "Ajouter le contact",
-    "networkStatusConnecting": "Connexion au réseau et aux contacts...",
+    "archiveConversation": "Archiver cette conversation",
     "profileOnionLabel": "Envoyez cette adresse aux personnes avec lesquelles vous souhaitez entrer en contact.",
     "addPeerTab": "Ajouter un contact",
+    "addPeer": "Ajouter le contact",
     "peerNotOnline": "Le contact est hors ligne. Les applications ne peuvent pas être utilisées pour le moment.",
     "peerBlockedMessage": "Le contact est bloqué",
     "peerOfflineMessage": "Le contact est hors ligne, les messages ne peuvent pas être transmis pour le moment.",
     "blockBtn": "Bloquer le contact",
     "savePeerHistory": "Enregistrer l'historique",
+    "savePeerHistoryDescription": "Détermine s'il faut ou non supprimer tout historique associé au contact.",
     "dontSavePeerHistory": "Supprimer l'historique",
     "unblockBtn": "Débloquer le contact",
     "blockUnknownLabel": "Bloquer les pairs inconnus",
     "blockUnknownConnectionsEnabledDescription": "Les connexions provenant de contacts inconnus sont bloquées. Vous pouvez modifier cela dans les paramètres",
-    "archiveConversation": "Archiver cette conversation",
-    "blockedMessageMessage": "Ce message provient d'un profil que vous avez bloqué.",
+    "networkStatusConnecting": "Connexion au réseau et aux contacts...",
     "showMessageButton": "Afficher le message",
+    "blockedMessageMessage": "Ce message provient d'un profil que vous avez bloqué.",
     "placeholderEnterMessage": "saisissez un message",
-    "encryptedProfileDescription": "Le chiffrement d'un profil à l'aide d'un mot de passe le protège des autres personnes susceptibles d'utiliser également cet appareil. Les profils chiffrés ne peuvent pas être déchiffrés , affichés ou accessibles tant que le mot de passe correct n'a pas été saisi pour les déverrouiller.",
     "plainProfileDescription": "Nous vous recommandons de protéger vos profils Cwtch par un mot de passe. Si vous ne définissez pas de mot de passe sur ce profil, toute personne ayant accès à cet appareil peut être en mesure d'accéder aux informations relatives à ce profil, y compris les contacts, les messages et les clés de chiffrement sensibles.",
+    "encryptedProfileDescription": "Le chiffrement d'un profil à l'aide d'un mot de passe le protège des autres personnes susceptibles d'utiliser également cet appareil. Les profils chiffrés ne peuvent pas être déchiffrés , affichés ou accessibles tant que le mot de passe correct n'a pas été saisi pour les déverrouiller.",
     "addContactConfirm": "Ajouter le contact %1",
-    "contactGoto": "Aller à la conversation avec %1",
     "addContact": "Ajouter le contact",
+    "contactGoto": "Aller à la conversation avec %1",
     "settingUIColumnOptionSame": "Même réglage que pour le mode portrait",
     "settingUIColumnDouble14Ratio": "Double (1:4)",
     "settingUIColumnDouble12Ratio": "Double (1:2)",
@@ -110,158 +76,128 @@
     "settingUIColumnLandscape": "Colonnes de l'interface utilisateur en mode paysage",
     "settingUIColumnPortrait": "Colonnes de l'interface utilisateur en mode portrait",
     "localePl": "Polonais",
-    "tooltipReplyToThisMessage": "Répondre à ce message",
     "tooltipRemoveThisQuotedMessage": "Supprimer le message cité.",
-    "deleteProfileConfirmBtn": "Supprimer vraiment le profil ?",
-    "groupNameLabel": "Nom du groupe",
-    "defaultGroupName": "Un groupe génial",
-    "inviteToGroupLabel": "Inviter au groupe",
-    "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.",
-    "shutdownCwtchTooltip": "Arrêt de Cwtch",
-    "shutdownCwtchAction": "Arrêt de Cwtch",
-    "deleteBtn": "Effacer",
-    "acknowledgedLabel": "Accusé de réception",
-    "zoomLabel": "Zoom de l'interface (affecte principalement la taille du texte et des boutons)",
-    "localeIt": "Italien",
-    "versionTor": "Version %1 avec tor %2",
-    "version": "Version %1",
-    "builddate": "Construit le : %2",
-    "versionBuilddate": "Version : %1 Construite le : %2",
-    "tooltipAcceptContactRequest": "Acceptez cette demande de contact.",
+    "tooltipReplyToThisMessage": "Répondre à ce message",
     "tooltipRejectContactRequest": "Refuser cette demande de contact",
-    "addNewItem": "Ajouter un nouvel élément à la liste",
-    "localeEs": "Espagnol",
-    "todoPlaceholder": "À faire...",
-    "pasteAddressToAddContact": "Collez une adresse cwtch, une invitation ou un ensemble de clés ici pour ajouter une nouvelle conversation",
-    "addListItem": "Ajouter un nouvel élément de liste",
-    "cycleMorphsAndroid": "Cliquez pour faire défiler les morphes.\n Appuyez longuement pour réinitialiser.",
-    "cycleMorphsDesktop": "Cliquez pour faire défiler les morphes.\n Faites un clic droit pour réinitialiser.",
-    "debugLog": "Activer le journal de la console de débogage",
-    "joinGroupTab": "Rejoindre un groupe",
-    "createGroupTab": "Créer un groupe",
-    "peerAddress": "Adresse",
-    "peerName": "Nom",
-    "groupName": "Nom du groupe",
-    "server": "Serveur",
-    "invitation": "Invitation",
-    "cycleCatsAndroid": "Cliquez pour faire défiler les catégories.\nAppuyez longuement pour réinitialiser.",
-    "cycleCatsDesktop": "Cliquez pour parcourir la catégorie.\n Faites un clic droit pour réinitialiser.",
-    "cycleColoursAndroid": "Cliquez pour faire défiler les couleurs.\nAppuyez longuement pour réinitialiser.",
-    "groupAddr": "Adresse",
-    "createGroup": "Créer un groupe",
-    "joinGroup": "Rejoindre le groupe",
-    "blocked": "Bloqué",
-    "cycleColoursDesktop": "Cliquez pour faire défiler les couleurs.\nCliquez avec le bouton droit de la souris pour réinitialiser.",
-    "search": "Recherche...",
-    "serverInfo": "Informations sur le serveur",
-    "serverConnectivityConnected": "Serveur connecté",
-    "serverConnectivityDisconnected": "Serveur déconnecté",
-    "serverSynced": "Synchronisé",
+    "tooltipAcceptContactRequest": "Acceptez cette demande de contact.",
+    "notificationNewMessageFromGroup": "Nouveau message dans un groupe !",
+    "notificationNewMessageFromPeer": "Nouveau message d'un contact !",
+    "tooltipHidePassword": "Masquer le mot de passe",
+    "tooltipShowPassword": "Afficher le mot de passe",
     "serverNotSynced": "Synchronisation des nouveaux messages (Cela peut prendre un certain temps)...",
-    "viewServerInfo": "Informations sur le serveur",
-    "update": "Mise à jour",
-    "searchList": "Liste de recherche",
-    "addListItemBtn": "Ajouter un élément",
-    "addProfileTitle": "Ajouter un nouveau profil",
-    "editProfileTitle": "Modifier le profil",
-    "profileName": "Pseudo",
-    "defaultProfileName": "Alice",
-    "newProfile": "Nouveau profil",
-    "deleteConfirmText": "SUPPRIMER",
-    "deleteConfirmLabel": "Tapez SUPPRIMER pour confirmer",
-    "addNewProfileBtn": "Ajouter un nouveau profil",
-    "enterProfilePassword": "Entrez un mot de passe pour consulter vos profils",
-    "editProfile": "Modifier le profil",
-    "radioUsePassword": "Mot de passe",
-    "radioNoPassword": "Non chiffré (pas de mot de passe)",
-    "saveProfileBtn": "Sauvegarder le profil",
-    "passwordErrorMatch": "Les mots de passe ne correspondent pas",
-    "passwordChangeError": "Erreur lors de la modification du mot de passe : le mot de passe fourni est rejeté",
-    "deleteProfileBtn": "Supprimer le profil",
-    "password": "Mot de passe",
-    "error0ProfilesLoadedForPassword": "Aucun profils chargés avec ce mot de passe",
-    "yourProfiles": "Vos profils",
-    "yourServers": "Vos serveurs",
-    "unlock": "Déverrouiller",
-    "settingLanguage": "Langue",
-    "localeEn": "Anglais",
-    "localeFr": "Français",
-    "localePt": "Portugais",
-    "localeDe": "Allemand",
-    "settingInterfaceZoom": "Niveau de zoom",
-    "settingTheme": "Thème",
-    "themeLight": "Clair",
-    "themeDark": "Sombre",
-    "experimentsEnabled": "Activer les expériences",
-    "dateLastYear": "L'année dernière",
-    "dateNever": "Jamais",
-    "titleManageServers": "Gérer les serveurs",
-    "inviteToGroup": "Vous avez été invité à rejoindre un groupe :",
-    "leaveGroup": "Quittez cette conversation",
-    "reallyLeaveThisGroupPrompt": "Êtes-vous sûr de vouloir quitter cette conversation ? Tous les messages et attributs seront supprimés.",
+    "groupInviteSettingsWarning": "Vous avez été invité à rejoindre un groupe ! Veuillez activer l'expérience de discussion de groupe dans les paramètres pour afficher cette invitation.",
+    "shutdownCwtchAction": "Arrêt de Cwtch",
+    "shutdownCwtchDialog": "Êtes-vous sûr de vouloir arrêter Cwtch ? Ceci fermera toutes les connexions, et quittera l'application.",
+    "shutdownCwtchDialogTitle": "Arrêter Cwtch ?",
+    "shutdownCwtchTooltip": "Arrêt de Cwtch",
+    "malformedMessage": "Message mal formé",
+    "profileDeleteSuccess": "Le profil a été supprimé avec succès",
+    "debugLog": "Activer le journal de la console de débogage",
+    "torNetworkStatus": "Statut du réseau Tor",
+    "addContactFirst": "Ajoutez ou choisissez un contact pour commencer à discuter.",
+    "createProfileToBegin": "Veuillez créer ou déverrouiller un profil pour commencer",
+    "nickChangeSuccess": "Le pseudo du profil a été modifié avec succès",
+    "addServerFirst": "Vous devez ajouter un serveur avant de pouvoir créer un groupe.",
+    "deleteProfileSuccess": "Le profil a été supprimé avec succès",
+    "sendInvite": "Envoyer une invitation à un contact ou à un groupe",
+    "sendMessage": "Envoyer un message",
+    "cancel": "Annuler",
+    "resetTor": "Réinitialiser",
+    "torStatus": "Statut de Tor",
+    "torVersion": "Version de Tor",
+    "sendAnInvitation": "Vous avez envoyé une invitation pour : ",
+    "contactSuggestion": "Il s'agit d'une suggestion de contact pour : ",
+    "rejected": "Rejeté !",
+    "accepted": "Accepté !",
+    "chatHistoryDefault": "Cette conversation sera supprimée lorsque Cwtch sera fermé ! L'historique des messages peut être activé pour la conversation via le menu Paramètres en haut à droite.",
+    "newPassword": "Nouveau mot de passe",
     "yesLeave": "Oui, quittez cette conversation",
-    "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.",
-    "yourDisplayName": "Pseudo",
-    "currentPasswordLabel": "Mot de passe actuel",
-    "password1Label": "Mot de passe",
-    "password2Label": "Saisissez à nouveau le mot de passe",
-    "passwordErrorEmpty": "Le mot de passe ne peut pas être vide",
-    "createProfileBtn": "Créer un profil",
-    "loadingTor": "Chargement de  tor...",
-    "viewGroupMembershipTooltip": "Afficher les membres du groupe",
-    "networkStatusDisconnected": "Déconnecté d'Internet, vérifiez votre connexion",
-    "networkStatusAttemptingTor": "Tentative de connexion au réseau Tor",
-    "networkStatusOnline": "En ligne",
-    "newConnectionPaneTitle": "Nouvelle connexion",
-    "enableGroups": "Activer la discussion de groupe",
-    "enterCurrentPasswordForDelete": "Veuillez entrer le mot de passe actuel pour supprimer ce profil.",
-    "conversationSettings": "Paramètres de conversation",
-    "invalidImportString": "Chaîne d'importation non valide",
-    "contactAlreadyExists": "Le contact existe déjà",
-    "tooltipOpenSettings": "Ouvrez le volet des paramètres",
+    "reallyLeaveThisGroupPrompt": "Êtes-vous sûr de vouloir quitter cette conversation ? Tous les messages et attributs seront supprimés.",
+    "leaveGroup": "Quittez cette conversation",
+    "inviteToGroup": "Vous avez été invité à rejoindre un groupe :",
+    "pasteAddressToAddContact": "Collez une adresse cwtch, une invitation ou un ensemble de clés ici pour ajouter une nouvelle conversation",
     "tooltipAddContact": "Ajouter un nouveau contact ou une nouvelle conversation",
     "titleManageContacts": "Conversations",
-    "tooltipUnlockProfiles": "Déverrouillez les profils chiffrés en saisissant leur mot de passe.",
-    "titleManageProfiles": "Gérer les profils Cwtch",
-    "descriptionExperiments": "Les expériences de Cwtch sont des fonctionnalités optionnelles et facultatives qui ajoutent des fonctionnalités supplémentaires à Cwtch et qui peuvent avoir des considérations de confidentialité différentes de celles du chat traditionnel résistant aux métadonnées 1:1, par exemple le chat de groupe, l'intégration de robots, etc.",
-    "descriptionExperimentsGroups": "L'expérience de groupe permet à Cwtch de se connecter à une infrastructure de serveurs non fiables pour faciliter la communication avec plus d'un contact.",
-    "descriptionBlockUnknownConnections": "Si elle est activée, cette option fermera automatiquement les connexions des utilisateurs de Cwtch qui n'ont pas été ajoutés à votre liste de contacts.",
-    "successfullAddedContact": "Ajouté avec succès ",
-    "dateRightNow": "Maintenant",
-    "dateLastMonth": "Le mois dernier",
+    "titleManageServers": "Gérer les serveurs",
+    "dateNever": "Jamais",
+    "dateLastYear": "L'année dernière",
     "dateYesterday": "Hier",
-    "newPassword": "Nouveau mot de passe",
-    "chatHistoryDefault": "Cette conversation sera supprimée lorsque Cwtch sera fermé ! L'historique des messages peut être activé pour la conversation via le menu Paramètres en haut à droite.",
-    "accepted": "Accepté !",
-    "rejected": "Rejeté !",
-    "contactSuggestion": "Il s'agit d'une suggestion de contact pour : ",
-    "sendAnInvitation": "Vous avez envoyé une invitation pour : ",
-    "torVersion": "Version de Tor",
-    "torStatus": "Statut de Tor",
-    "resetTor": "Réinitialiser",
-    "cancel": "Annuler",
-    "sendMessage": "Envoyer un message",
-    "sendInvite": "Envoyer une invitation à un contact ou à un groupe",
-    "deleteProfileSuccess": "Le profil a été supprimé avec succès",
-    "addServerFirst": "Vous devez ajouter un serveur avant de pouvoir créer un groupe.",
-    "nickChangeSuccess": "Le pseudo du profil a été modifié avec succès",
-    "createProfileToBegin": "Veuillez créer ou déverrouiller un profil pour commencer",
-    "addContactFirst": "Ajoutez ou choisissez un contact pour commencer à discuter.",
-    "torNetworkStatus": "Statut du réseau Tor",
-    "profileDeleteSuccess": "Le profil a été supprimé avec succès",
-    "malformedMessage": "Message mal formé",
-    "shutdownCwtchDialogTitle": "Arrêter Cwtch ?",
-    "shutdownCwtchDialog": "Êtes-vous sûr de vouloir arrêter Cwtch ? Ceci fermera toutes les connexions, et quittera l'application.",
-    "groupInviteSettingsWarning": "Vous avez été invité à rejoindre un groupe ! Veuillez activer l'expérience de discussion de groupe dans les paramètres pour afficher cette invitation.",
-    "tooltipShowPassword": "Afficher le mot de passe",
-    "tooltipHidePassword": "Masquer le mot de passe",
-    "notificationNewMessageFromPeer": "Nouveau message d'un contact !",
-    "notificationNewMessageFromGroup": "Nouveau message dans un groupe !",
+    "dateLastMonth": "Le mois dernier",
+    "dateRightNow": "Maintenant",
+    "successfullAddedContact": "Ajouté avec succès ",
+    "descriptionBlockUnknownConnections": "Si elle est activée, cette option fermera automatiquement les connexions des utilisateurs de Cwtch qui n'ont pas été ajoutés à votre liste de contacts.",
+    "descriptionExperimentsGroups": "L'expérience de groupe permet à Cwtch de se connecter à une infrastructure de serveurs non fiables pour faciliter la communication avec plus d'un contact.",
+    "descriptionExperiments": "Les expériences de Cwtch sont des fonctionnalités optionnelles et facultatives qui ajoutent des fonctionnalités supplémentaires à Cwtch et qui peuvent avoir des considérations de confidentialité différentes de celles du chat traditionnel résistant aux métadonnées 1:1, par exemple le chat de groupe, l'intégration de robots, etc.",
+    "titleManageProfiles": "Gérer les profils Cwtch",
+    "tooltipUnlockProfiles": "Déverrouillez les profils chiffrés en saisissant leur mot de passe.",
+    "tooltipOpenSettings": "Ouvrez le volet des paramètres",
+    "invalidImportString": "Chaîne d'importation non valide",
+    "contactAlreadyExists": "Le contact existe déjà",
+    "conversationSettings": "Paramètres de conversation",
+    "enterCurrentPasswordForDelete": "Veuillez entrer le mot de passe actuel pour supprimer ce profil.",
+    "enableGroups": "Activer la discussion de groupe",
+    "experimentsEnabled": "Activer les expériences",
+    "localeIt": "Italien",
+    "localeEs": "Espagnol",
+    "addListItem": "Ajouter un nouvel élément de liste",
+    "addNewItem": "Ajouter un nouvel élément à la liste",
+    "todoPlaceholder": "À faire...",
+    "newConnectionPaneTitle": "Nouvelle connexion",
+    "networkStatusOnline": "En ligne",
+    "networkStatusAttemptingTor": "Tentative de connexion au réseau Tor",
+    "networkStatusDisconnected": "Déconnecté d'Internet, vérifiez votre connexion",
+    "viewGroupMembershipTooltip": "Afficher les membres du groupe",
+    "loadingTor": "Chargement de  tor...",
     "smallTextLabel": "Petit",
     "defaultScalingText": "Taille par défaut du texte (échelle:",
+    "builddate": "Construit le : %2",
+    "version": "Version %1",
+    "versionTor": "Version %1 avec tor %2",
+    "themeDark": "Sombre",
+    "themeLight": "Clair",
+    "settingTheme": "Thème",
     "largeTextLabel": "Large",
+    "settingInterfaceZoom": "Niveau de zoom",
+    "localeDe": "Allemand",
+    "localePt": "Portugais",
+    "localeFr": "Français",
+    "localeEn": "Anglais",
+    "settingLanguage": "Langue",
+    "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",
+    "unlock": "Déverrouiller",
+    "yourServers": "Vos serveurs",
+    "yourProfiles": "Vos profils",
+    "error0ProfilesLoadedForPassword": "Aucun profils chargés avec ce mot de passe",
+    "password": "Mot de passe",
+    "enterProfilePassword": "Entrez un mot de passe pour consulter vos profils",
+    "addNewProfileBtn": "Ajouter un nouveau profil",
+    "deleteConfirmText": "SUPPRIMER",
+    "deleteProfileConfirmBtn": "Supprimer vraiment le profil ?",
+    "deleteConfirmLabel": "Tapez SUPPRIMER pour confirmer",
+    "deleteProfileBtn": "Supprimer le profil",
+    "passwordChangeError": "Erreur lors de la modification du mot de passe : le mot de passe fourni est rejeté",
+    "passwordErrorMatch": "Les mots de passe ne correspondent pas",
+    "saveProfileBtn": "Sauvegarder le profil",
+    "createProfileBtn": "Créer un profil",
+    "passwordErrorEmpty": "Le mot de passe ne peut pas être vide",
+    "password2Label": "Saisissez à nouveau le mot de passe",
+    "password1Label": "Mot de passe",
+    "currentPasswordLabel": "Mot de passe actuel",
+    "yourDisplayName": "Pseudo",
+    "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",
     "copiedToClipboardNotification": "Copié dans le presse-papier",
+    "copyBtn": "Copier",
+    "editProfile": "Modifier le profil",
+    "newProfile": "Nouveau profil",
+    "defaultProfileName": "Alice",
+    "profileName": "Pseudo",
+    "editProfileTitle": "Modifier le profil",
+    "addProfileTitle": "Ajouter un nouveau profil",
+    "deleteBtn": "Effacer",
     "saveBtn": "Sauvegarder",
     "displayNameLabel": "Pseudo",
     "addressLabel": "Adresse",
@@ -271,18 +207,49 @@
     "chatBtn": "Discuter",
     "rejectGroupBtn": "Refuser",
     "acceptGroupBtn": "Accepter",
+    "acceptGroupInviteLabel": "Voulez-vous accepter l'invitation au groupe",
     "newGroupBtn": "Créer un nouveau groupe",
     "copiedClipboardNotification": "Copié dans le presse-papier",
-    "copyBtn": "Copier",
     "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",
+    "searchList": "Liste de recherche",
+    "update": "Mise à jour",
     "inviteBtn": "Invitation",
+    "inviteToGroupLabel": "Inviter au groupe",
+    "groupNameLabel": "Nom du groupe",
+    "viewServerInfo": "Informations sur le serveur",
+    "serverSynced": "Synchronisé",
+    "serverConnectivityDisconnected": "Serveur déconnecté",
+    "serverConnectivityConnected": "Serveur connecté",
+    "serverInfo": "Informations sur le serveur",
     "invitationLabel": "Invitation",
     "serverLabel": "Serveur",
+    "search": "Recherche...",
+    "cycleColoursDesktop": "Cliquez pour faire défiler les couleurs.\nCliquez avec le bouton droit de la souris pour réinitialiser.",
+    "cycleColoursAndroid": "Cliquez pour faire défiler les couleurs.\nAppuyez longuement pour réinitialiser.",
+    "cycleMorphsDesktop": "Cliquez pour faire défiler les morphes.\n Faites un clic droit pour réinitialiser.",
+    "cycleMorphsAndroid": "Cliquez pour faire défiler les morphes.\n Appuyez longuement pour réinitialiser.",
+    "cycleCatsDesktop": "Cliquez pour parcourir la catégorie.\n Faites un clic droit pour réinitialiser.",
+    "cycleCatsAndroid": "Cliquez pour faire défiler les catégories.\nAppuyez longuement pour réinitialiser.",
+    "blocked": "Bloqué",
     "titlePlaceholder": "titre...",
     "postNewBulletinLabel": "Envoyer un nouveau bulletin",
     "newBulletinLabel": "Nouveau bulletin",
+    "joinGroup": "Rejoindre le groupe",
+    "createGroup": "Créer un groupe",
+    "groupAddr": "Adresse",
+    "invitation": "Invitation",
+    "server": "Serveur",
+    "groupName": "Nom du groupe",
+    "peerName": "Nom",
+    "peerAddress": "Adresse",
+    "joinGroupTab": "Rejoindre un groupe",
+    "createGroupTab": "Créer un groupe",
     "createGroupBtn": "Créer",
+    "defaultGroupName": "Un groupe génial",
     "createGroupTitle": "Créer un groupe"
 }

lib/l10n/intl_it.arb

@@ -1,288 +1,255 @@
 {
     "@@locale": "it",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "blockUnknownLabel": "Blocca Contatti Sconosciuti",
-    "unblockBtn": "Sblocca il Contatto",
-    "dontSavePeerHistory": "Elimina Cronologia",
-    "blockBtn": "Blocca il Contatto",
-    "addPeer": "Aggiungi Contatto",
-    "importLocalServerSelectText": "Seleziona il Server Locale",
-    "manageKnownServersButton": "Gestisci i Server Conosciuti",
-    "manageKnownServersLong": "Gestisci i Server Conosciuti",
-    "serverMetricsLabel": "Metriche del Server",
-    "serverTotalMessagesLabel": "Numero Totale di Messaggi",
-    "enableExperimentClickableLinks": "Abilita Link Cliccabili",
-    "settingDownloadFolder": "Cartella di Download",
-    "themeColorLabel": "Schema di Colori",
-    "btnSendFile": "Invia File",
-    "newMessagesLabel": "Nuovi Messaggi",
-    "copiedToClipboardNotification": "Copiato negli Appunti",
-    "groupNameLabel": "Nome del gruppo",
-    "titleManageServers": "Gestisci i Server",
-    "leaveGroup": "Lascia Questa Conversazione",
-    "yesLeave": "Sì, Lascia Questa Conversazione",
-    "newPassword": "Nuova Password",
-    "sendMessage": "Invia Messaggio",
-    "tooltipShowPassword": "Mostra la Password",
-    "tooltipHidePassword": "Nascondi la Password",
-    "showMessageButton": "Mostra il Messaggio",
-    "addServerTitle": "Aggiungi Server",
-    "editServerTitle": "Modifica il Server",
-    "serverAddress": "Indirizzo del Server",
-    "serverEnabled": "Server Abilitato",
-    "saveServerButton": "Salva il Server",
-    "serversManagerTitleLong": "Server che Gestisci",
-    "settingServers": "Server di Hosting",
-    "openFolderButton": "Apri Cartella",
-    "reallyLeaveThisGroupPrompt": "Confermi di voler lasciare questa conversazione? Tutti i messaggi e gli attributi verranno eliminati.",
-    "dateLastMonth": "Mese Scorso",
-    "dateLastYear": "L'Anno Scorso",
-    "titleManageProfiles": "Gestisci i Profili Cwtch",
-    "contactAlreadyExists": "Il Contatto Esiste Già",
-    "conversationSettings": "Impostazioni di Conversazione",
-    "enableGroups": "Abilita la Chat di Gruppo",
-    "addListItem": "Aggiungi un Nuovo Elemento alla Lista",
-    "newConnectionPaneTitle": "Nuova Connessione",
-    "viewGroupMembershipTooltip": "Visualizza i Membri del Gruppo",
-    "experimentsEnabled": "Abilita Esperimenti",
-    "yourServers": "I Tuoi Server",
-    "yourProfiles": "I Tuoi Profili",
-    "deleteProfileConfirmBtn": "Elimina Definitivamente il Profilo",
-    "deleteProfileBtn": "Elimina Profilo",
-    "saveProfileBtn": "Salva il Profilo",
-    "createProfileBtn": "Crea un Profilo",
-    "currentPasswordLabel": "Password Corrente",
-    "yourDisplayName": "Il tuo Nome Visualizzato",
-    "editProfile": "Modifica Profilo",
-    "newProfile": "Nuovo Profilo",
-    "editProfileTitle": "Modifica Profilo",
-    "puzzleGameBtn": "Gioco di Puzzle",
-    "searchList": "Elenco di Ricerca",
-    "dmTooltip": "Clicca per inviare un Messaggio Diretto",
-    "addListItemBtn": "Aggiungi Elemento",
-    "viewServerInfo": "Informazioni sul Server",
-    "serverConnectivityDisconnected": "Server Disconnesso",
-    "serverConnectivityConnected": "Server Connesso",
-    "newBulletinLabel": "Nuovo Bollettino",
-    "createGroupTitle": "Crea un Gruppo",
-    "defaultGroupName": "Gruppo Fantastico",
-    "pasteAddressToAddContact": "Incolla qui un indirizzo cwtch, un invito o un gruppo di chiavi per aggiungere una nuova conversazione",
-    "cycleCatsAndroid": "Clicca per scorrere le categorie.\nPressione lunga per resettare.",
-    "cycleCatsDesktop": "Clicca per scorrere le categorie.\nClicca con il tasto destro per resettare.",
-    "cycleMorphsAndroid": "Clicca per scorrere i morph.\nPressione lunga per resettare.",
-    "cycleMorphsDesktop": "Clicca per scorrere i morph.\nClicca con il tasto destro per resettare.",
-    "cycleColoursAndroid": "Clicca per scorrere i colori.\nPressione lunga per resettare.",
-    "cycleColoursDesktop": "Clicca per scorrere i colori.\nClicca con il tasto destro per resettare.",
-    "noPasswordWarning": "Se non utilizzi una password su questo account, tutti i dati archiviati localmente non verranno criptati",
-    "descriptionExperiments": "Gli esperimenti di Cwtch sono opzioni abilitabili per aggiungere a Cwtch funzionalità che possono considerare la privacy diversamente rispetto alla tradizionale chat 1:1 resistente ai metadati, ad esempio chat di gruppo, integrazione di bot ecc.",
-    "shutdownCwtchDialog": "Confermi di voler chiudere Cwtch? Questo chiuderà tutte le connessioni e uscirà dall'applicazione.",
-    "groupInviteSettingsWarning": "Hai ricevuto l'invito ad unirti ad un gruppo! Abilita l'Esperimento di chat di gruppo in Impostazioni per visualizzare questo Invito.",
-    "addPeerTab": "Aggiungi un contatto",
-    "peerNotOnline": "Il contatto è offline. Le applicazioni non possono essere utilizzate in questo momento.",
-    "peerBlockedMessage": "Il contatto è bloccato",
-    "peerOfflineMessage": "Il contatto è offline, i messaggi non possono essere recapitati in questo momento",
-    "networkStatusConnecting": "Connessione alla rete e ai contatti...",
-    "savePeerHistoryDescription": "Determina se eliminare la cronologia eventualmente associata al contatto.",
-    "savePeerHistory": "Salva cronologia ",
-    "profileOnionLabel": "Invia questo indirizzo ai contatti con cui vuoi connetterti",
-    "importLocalServerLabel": "Importa un server ospitato localmente",
-    "importLocalServerButton": "Importa %1",
-    "groupsOnThisServerLabel": "Gruppi di cui sono parte su questo server",
-    "fieldDescriptionLabel": "Descrizione",
-    "displayNameTooltip": "Inserisci un nome visualizzato",
-    "manageKnownServersShort": "Server",
-    "serverConnectionsLabel": "Connessione",
-    "experimentClickableLinksDescription": "L'esperimento dei link cliccabili permette di cliccare sugli URL condivisi nei messaggi",
-    "settingImagePreviews": "Anteprime delle immagini e immagini del profilo",
-    "settingImagePreviewsDescription": "Le immagini verranno scaricate e visualizzate in anteprima automaticamente. Tieni presente che le anteprime delle immagini possono spesso portare a vulnerabilità di sicurezza e non dovresti abilitare questo esperimento se usi Cwtch con contatti non attendibili. Le immagini del profilo sono previste per Cwtch 1.6.",
-    "themeNameCwtch": "Cwtch",
-    "themeNameWitch": "Strega",
-    "themeNameVampire": "Vampiro",
-    "themeNameGhost": "Fantasma",
-    "themeNamePumpkin": "Zucca",
-    "themeNameMermaid": "Sirena",
-    "themeNameMidnight": "Mezzanotte",
-    "themeNameNeon1": "Neon1",
-    "themeNameNeon2": "Neon2",
-    "loadingCwtch": "Caricamento Cwtch...",
-    "storageMigrationModalMessage": "Migrazione dei profili al nuovo formato di archiviazione. L'operazione potrebbe richiedere alcuni minuti...",
-    "msgAddToAccept": "Aggiungi questo account ai tuoi contatti per accettare questo file.",
-    "msgConfirmSend": "Confermi di voler inviare?",
-    "msgFileTooBig": "La dimensione del file non può superare i 10 GB",
-    "descriptionStreamerMode": "Se attivata, questa opzione rende l'applicazione visivamente più privata per lo streaming o la presentazione, ad esempio nascondendo il profilo e gli indirizzi di contatto",
-    "retrievingManifestMessage": "Recupero delle informazioni sul file in corso...",
-    "downloadFileButton": "Scarica",
-    "labelFilename": "Nome del file",
-    "labelFilesize": "Dimensione",
-    "messageEnableFileSharing": "Abilita l'esperimento di condivisione dei file per visualizzare questo messaggio.",
-    "messageFileSent": "Hai inviato un file",
-    "titleManageProfilesShort": "Profili",
-    "tooltipReplyToThisMessage": "Rispondi a questo messaggio",
-    "tooltipRemoveThisQuotedMessage": "Rimuovi il messaggio citato.",
-    "localePl": "Polacco",
-    "settingUIColumnPortrait": "Colonne dell'interfaccia utente in modalità verticale",
-    "settingUIColumnLandscape": "Colonne dell'interfaccia utente in modalità orizzontale",
-    "settingUIColumnSingle": "Singola",
-    "settingUIColumnDouble12Ratio": "Doppia (1:2)",
-    "settingUIColumnDouble14Ratio": "Doppia (1:4)",
-    "settingUIColumnOptionSame": "Stessa impostazione della modalità verticale",
-    "contactGoto": "Vai alla conversazione con %1",
-    "addContact": "Aggiungi contatto",
-    "addContactConfirm": "Aggiungi %1 come contatto",
-    "encryptedProfileDescription": "Criptare un profilo con una password lo protegge da altre persone che potrebbero usare questo dispositivo. I profili criptati non possono essere decriptati, visualizzati o accessibili finché non viene inserita la password corretta per sbloccarli.",
-    "plainServerDescription": "Ti raccomandiamo di proteggere i tuoi server Cwtch con una password. Se non imposti una password su questo server, chiunque abbia accesso a questo dispositivo potrebbe essere in grado di accedere alle relativ informazioni, compresi dati sensibili come le chiavi crittografiche.",
-    "plainProfileDescription": "Ti raccomandiamo di proteggere i tuoi profili Cwtch con una password. Se non imposti una password su questo profilo, chiunque abbia accesso a questo dispositivo potrebbe essere in grado di accedere alle relative informazioni, compresi contatti, messaggi e altri dati sensibili come le chiavi crittografiche.",
-    "placeholderEnterMessage": "Scrivi un messaggio...",
-    "blockedMessageMessage": "Questo messaggio proviene da un profilo che hai bloccato.",
-    "blockUnknownConnectionsEnabledDescription": "Le connessioni da contatti sconosciuti sono bloccate. Puoi modificare questa impostazione in Impostazioni",
-    "archiveConversation": "Archivia questa conversazione",
-    "streamerModeLabel": "Modalità Streamer\/Presentazione",
-    "serverDescriptionLabel": "Descrizione del server",
-    "serverDescriptionDescription": "La tua descrizione del server solo per gestione personale, non sarà mai condivisa",
-    "serverEnabledDescription": "Avvia o arresta il server",
-    "serverAutostartLabel": "Avvio automatico",
-    "serverAutostartDescription": "Controlla se l'applicazione avvierà automaticamente il server all'avvio",
-    "serversManagerTitleShort": "Gestisci i server",
-    "addServerTooltip": "Aggiungi nuovo server",
-    "unlockServerTip": "Crea o sblocca un server per iniziare!",
-    "unlockProfileTip": "Crea o sblocca un profilo per iniziare!",
-    "enterServerPassword": "Inserisci la password per sbloccare il server",
-    "settingServersDescription": "L'esperimento dei server di hosting permette di allocare e gestire i server Cwtch",
-    "copyAddress": "Copia indirizzo",
-    "enterCurrentPasswordForDeleteServer": "Inserisci la password attuale per eliminare questo server",
-    "deleteServerSuccess": "Server eliminato con successo",
-    "deleteServerConfirmBtn": "Elimina davvero il server",
-    "encryptedServerDescription": "Criptare un server con una password lo protegge da altre persone che potrebbero usare questo dispositivo. I server criptati non possono essere decriptati, visualizzati o accessibili finché non viene inserita la password corretta per sbloccarli.",
-    "fileSavedTo": "Salvato in",
-    "fileInterrupted": "Interrotto",
-    "fileCheckingStatus": "Controllo dello stato del download",
-    "verfiyResumeButton": "Verifica\/riprendi",
-    "copyServerKeys": "Copia chiavi",
-    "localeRU": "Russo",
-    "messageFileOffered": "Il contatto offre l'invio di un file",
-    "tooltipSendFile": "Invia file",
-    "settingFileSharing": "Condivisione file",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
+    "newMessagesLabel": "New Messages",
+    "localeRU": "Russian",
+    "copyServerKeys": "Copy keys",
+    "verfiyResumeButton": "Verify\/resume",
+    "fileCheckingStatus": "Checking download status",
+    "fileInterrupted": "Interrupted",
+    "fileSavedTo": "Saved to",
+    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
+    "deleteServerConfirmBtn": "Really delete server",
+    "deleteServerSuccess": "Successfully deleted server",
+    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
+    "copyAddress": "Copy Address",
+    "settingServersDescription": "The hosting servers experiment enables hosting and managing Cwtch servers",
+    "settingServers": "Hosting Servers",
+    "enterServerPassword": "Enter password to unlock server",
+    "unlockProfileTip": "Please create or unlock a profile to begin!",
+    "unlockServerTip": "Please create or unlock a server to begin!",
+    "addServerTooltip": "Add new server",
+    "serversManagerTitleShort": "Servers",
+    "serversManagerTitleLong": "Servers You Host",
+    "saveServerButton": "Save Server",
+    "serverAutostartDescription": "Controls if the application will automatically launch the server on start",
+    "serverAutostartLabel": "Autostart",
+    "serverEnabledDescription": "Start or stop the server",
+    "serverEnabled": "Server Enabled",
+    "serverDescriptionDescription": "Your description of the server for personal management use only, will never be shared",
+    "serverDescriptionLabel": "Server Description",
+    "serverAddress": "Server Address",
+    "editServerTitle": "Edit Server",
+    "addServerTitle": "Add Server",
+    "titleManageProfilesShort": "Profiles",
+    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "descriptionFileSharing": "L'esperimento di condivisione dei file ti consente di inviare e ricevere file dai contatti e dai gruppi di Cwtch. Tieni presente che la condivisione di un file con un gruppo farà sì che i membri di quel gruppo si colleghino con te direttamente su Cwtch per scaricarlo.",
+    "settingFileSharing": "Condivisione file",
+    "tooltipSendFile": "Invia file",
+    "messageFileOffered": "Il contatto offre l'invio di un file",
+    "messageFileSent": "You sent a file",
+    "messageEnableFileSharing": "Enable the file sharing experiment to view this message.",
+    "labelFilesize": "Size",
+    "labelFilename": "Filename",
+    "downloadFileButton": "Download",
+    "openFolderButton": "Open Folder",
+    "retrievingManifestMessage": "Retrieving file information...",
+    "streamerModeLabel": "Streamer\/Presentation Mode",
+    "archiveConversation": "Archive this Conversation",
+    "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...",
+    "plainProfileDescription": "We recommend that you protect your Cwtch profiles with a password. If you do not set a password on this profile then anyone who has access to this device may be able to access information about this profile, including contacts, messages and sensitive cryptographic keys.",
+    "encryptedProfileDescription": "Encrypting a profile with a password protects it from other people who may also use this device. Encrypted profiles cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
+    "addContactConfirm": "Add contact %1",
+    "addContact": "Add contact",
+    "contactGoto": "Go to conversation with %1",
+    "settingUIColumnOptionSame": "Same as portrait mode setting",
+    "settingUIColumnDouble14Ratio": "Double (1:4)",
+    "settingUIColumnDouble12Ratio": "Double (1:2)",
+    "settingUIColumnSingle": "Single",
+    "settingUIColumnLandscape": "UI Columns in Landscape Mode",
+    "settingUIColumnPortrait": "UI Columns in Portrait Mode",
+    "localePl": "Polish",
+    "tooltipRemoveThisQuotedMessage": "Remove quoted message.",
+    "tooltipReplyToThisMessage": "Reply to this message",
+    "tooltipRejectContactRequest": "Rifiuta questa richiesta di contatto",
+    "tooltipAcceptContactRequest": "Accetta questa richiesta di contatto.",
+    "notificationNewMessageFromGroup": "Nuovo messaggio in un gruppo!",
+    "notificationNewMessageFromPeer": "Nuovo messaggio da un contatto!",
+    "tooltipHidePassword": "Nascondi la password",
+    "tooltipShowPassword": "Mostra la password",
     "serverNotSynced": "Sincronizzazione nuovi messaggi (l'operazione può richiedere del tempo)...",
-    "enterCurrentPasswordForDelete": "Inserisci la password attuale per eliminare questo profilo.",
-    "invalidImportString": "Importazione stringa non valida",
-    "tooltipOpenSettings": "Aprire il pannello delle impostazioni",
+    "groupInviteSettingsWarning": "Sei stato invitato ad unirti ad un gruppo! Abilita l'Esperimento di chat di gruppo in Impostazioni per visualizzare questo Invito.",
+    "shutdownCwtchAction": "Chiudi Cwtch",
+    "shutdownCwtchDialog": "Sei sicuro di voler chiudere Cwtch? Questo chiuderà tutte le connessioni e uscirà dall'applicazione.",
+    "shutdownCwtchDialogTitle": "Chiudi Cwtch?",
+    "shutdownCwtchTooltip": "Chiudi Cwtch",
+    "malformedMessage": "Messaggio non valido",
+    "profileDeleteSuccess": "Profilo eliminato con successo",
+    "debugLog": "Attiva la registrazione del debug della console",
+    "torNetworkStatus": "Stato della rete Tor",
+    "addContactFirst": "Aggiungi o scegli un contatto per iniziare a chattare.",
+    "createProfileToBegin": "Crea o sblocca un profilo per iniziare",
+    "nickChangeSuccess": "Nickname del profilo modificato con successo",
+    "addServerFirst": "È necessario aggiungere un server prima di poter creare un gruppo",
+    "deleteProfileSuccess": "Profilo eliminato con successo",
+    "sendInvite": "Invia un invito a un contatto o a un gruppo",
+    "sendMessage": "Invia messaggio",
+    "cancel": "Annulla",
+    "resetTor": "Resettare",
+    "torStatus": "Stato di Tor",
+    "torVersion": "Versione di Tor",
+    "sendAnInvitation": "Hai inviato un invito per:",
+    "contactSuggestion": "Questo è un suggerimento di contatto per:",
+    "rejected": "Rifiutato!",
+    "accepted": "Accettato!",
+    "chatHistoryDefault": "Questa conversazione sarà cancellata quando Cwtch sarà chiuso! La cronologia dei messaggi può essere abilitata per ogni conversazione tramite il menu Impostazioni in alto a destra.",
+    "newPassword": "Nuova password",
+    "yesLeave": "Sì, lascia questa conversazione",
+    "reallyLeaveThisGroupPrompt": "Uscire da questa conversazione? Tutti i messaggi e gli attributi verranno eliminati.",
+    "leaveGroup": "Lascia questa conversazione",
+    "inviteToGroup": "Hai ricevuto un invito a unirti a un gruppo:",
+    "pasteAddressToAddContact": "Incolla qui un indirizzo cwtch, un invito o un mazzo di chiavi per aggiungere una nuova conversazione",
     "tooltipAddContact": "Aggiungi un nuovo contatto o conversazione",
     "titleManageContacts": "Conversazioni",
-    "tooltipUnlockProfiles": "Sblocca i profili crittografati inserendo la loro password.",
-    "descriptionExperimentsGroups": "L'esperimento di gruppo permette a Cwtch di connettersi con un'infrastruttura server non fidata per facilitare la comunicazione con più di un contatto.",
-    "descriptionBlockUnknownConnections": "Se attivata, questa opzione chiuderà automaticamente le connessioni degli utenti Cwtch che non sono stati aggiunti alla tua lista di contatti.",
-    "successfullAddedContact": "Aggiunto con successo ",
-    "dateRightNow": "Ora",
-    "dateYesterday": "Ieri",
+    "titleManageServers": "Gestisci i server",
     "dateNever": "Mai",
-    "inviteToGroup": "Hai ricevuto un invito a unirti a un gruppo:",
-    "chatHistoryDefault": "Questa conversazione sarà cancellata quando Cwtch sarà chiuso! La cronologia dei messaggi può essere abilitata per ogni conversazione tramite il menu Impostazioni in alto a destra.",
-    "accepted": "Accettato!",
-    "rejected": "Rifiutato!",
-    "contactSuggestion": "Questo è un suggerimento di contatto per:",
-    "sendAnInvitation": "Hai inviato un invito per:",
-    "torVersion": "Versione di Tor",
-    "torStatus": "Stato di Tor",
-    "resetTor": "Resettare",
-    "cancel": "Annulla",
-    "sendInvite": "Invia un invito a un contatto o a un gruppo",
-    "deleteProfileSuccess": "Profilo eliminato con successo",
-    "addServerFirst": "È necessario aggiungere un server prima di poter creare un gruppo",
-    "nickChangeSuccess": "Nickname del profilo modificato con successo",
-    "createProfileToBegin": "Crea o sblocca un profilo per iniziare",
-    "addContactFirst": "Aggiungi o scegli un contatto per iniziare a chattare.",
-    "torNetworkStatus": "Stato della rete Tor",
-    "debugLog": "Attiva la registrazione del debug della console",
-    "profileDeleteSuccess": "Profilo eliminato con successo",
-    "malformedMessage": "Messaggio non valido",
-    "shutdownCwtchTooltip": "Chiudi Cwtch",
-    "shutdownCwtchDialogTitle": "Chiudi Cwtch?",
-    "shutdownCwtchAction": "Chiudi Cwtch",
-    "notificationNewMessageFromPeer": "Nuovo messaggio da un contatto!",
-    "notificationNewMessageFromGroup": "Nuovo messaggio in un gruppo!",
-    "tooltipAcceptContactRequest": "Accetta questa richiesta di contatto.",
-    "tooltipRejectContactRequest": "Rifiuta questa richiesta di contatto",
-    "versionBuilddate": "Versione: %1 Costruito il: %2",
-    "versionTor": "Versione %1 con tor %2",
-    "version": "Versione %1",
-    "builddate": "Costruito il: %2",
-    "localeEn": "Inglese",
+    "dateLastYear": "L'anno scorso",
+    "dateYesterday": "Ieri",
+    "dateLastMonth": "Mese scorso",
+    "dateRightNow": "Ora",
+    "successfullAddedContact": "Aggiunto con successo ",
+    "descriptionBlockUnknownConnections": "Se attivata, questa opzione chiuderà automaticamente le connessioni degli utenti Cwtch che non sono stati aggiunti alla tua lista di contatti.",
+    "descriptionExperimentsGroups": "L'esperimento di gruppo permette a Cwtch di connettersi con un'infrastruttura server non fidata per facilitare la comunicazione con più di un contatto.",
+    "descriptionExperiments": "Gli esperimenti di Cwtch sono opzioni a scelta che aggiungono a Cwtch funzionalità che possono avere diverse considerazioni sulla privacy rispetto alla tradizionale chat 1:1 resistente ai metadati, ad esempio chat di gruppo, integrazione di bot ecc.",
+    "titleManageProfiles": "Gestisci i profili Cwtch",
+    "tooltipUnlockProfiles": "Sblocca i profili crittografati inserendo la loro password.",
+    "tooltipOpenSettings": "Aprire il pannello delle impostazioni",
+    "invalidImportString": "Importazione stringa non valida",
+    "contactAlreadyExists": "Il contatto esiste già",
+    "conversationSettings": "Impostazioni di conversazione",
+    "enterCurrentPasswordForDelete": "Inserisci la password attuale per eliminare questo profilo.",
+    "enableGroups": "Abilita la chat di gruppo",
+    "experimentsEnabled": "Abilita esperimenti",
     "localeIt": "Italiano",
     "localeEs": "Spagnolo",
+    "addListItem": "Aggiungi un nuovo elemento alla lista",
+    "addNewItem": "Aggiungi un nuovo elemento alla lista",
+    "todoPlaceholder": "Da fare...",
+    "newConnectionPaneTitle": "Nuova connessione",
+    "networkStatusOnline": "Online",
+    "networkStatusAttemptingTor": "Tentativo di connessione alla rete Tor",
+    "networkStatusDisconnected": "Disconnesso da Internet, controlla la tua connessione",
+    "viewGroupMembershipTooltip": "Visualizza i membri del gruppo",
+    "loadingTor": "Caricamento di tor...",
+    "smallTextLabel": "Piccolo",
+    "defaultScalingText": "Testo di dimensioni predefinite (fattore di scala:",
+    "builddate": "Costruito il: %2",
+    "version": "Versione %1",
+    "versionTor": "Versione %1 con tor %2",
+    "themeDark": "Scuro",
+    "themeLight": "Chiaro",
+    "settingTheme": "Tema",
+    "largeTextLabel": "Grande",
+    "settingInterfaceZoom": "Livello di zoom",
     "localeDe": "Tedesco",
     "localePt": "Portoghese",
     "localeFr": "Francese",
-    "serverLabel": "Server",
-    "createGroupBtn": "Crea",
-    "createGroupTab": "Crea un gruppo",
-    "joinGroupTab": "Unisciti a un gruppo",
-    "peerAddress": "Indirizzo",
-    "peerName": "Nome",
-    "groupName": "Nome del gruppo",
-    "server": "Server",
-    "invitation": "Invito",
-    "groupAddr": "Indirizzo",
-    "createGroup": "Crea un gruppo",
-    "joinGroup": "Unisciti al gruppo",
-    "postNewBulletinLabel": "Pubblica un nuovo bollettino",
-    "titlePlaceholder": "titolo...",
-    "blocked": "Bloccato",
-    "search": "Ricerca...",
-    "copyBtn": "Copia",
-    "copiedClipboardNotification": "Copiato negli Appunti",
-    "newGroupBtn": "Crea un nuovo gruppo",
-    "invitationLabel": "Invito",
-    "serverInfo": "Informazioni sul server",
-    "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.",
-    "couldNotSendMsgError": "Impossibile inviare questo messaggio",
-    "acknowledgedLabel": "Riconosciuto",
-    "pendingLabel": "In corso",
-    "acceptGroupInviteLabel": "Vuoi accettare l'invito a",
-    "acceptGroupBtn": "Accetta",
-    "rejectGroupBtn": "Rifiuta",
-    "chatBtn": "Chat",
-    "listsBtn": "Liste",
-    "bulletinsBtn": "Bollettini",
-    "addressLabel": "Indirizzo",
-    "displayNameLabel": "Nome visualizzato",
-    "saveBtn": "Salva",
-    "password": "Password",
-    "error0ProfilesLoadedForPassword": "0 profili caricati con quella password",
-    "unlock": "Sblocca",
-    "addNewItem": "Aggiungi un nuovo elemento alla lista",
-    "todoPlaceholder": "Da fare...",
-    "serverSynced": "Sincronizzato",
-    "inviteToGroupLabel": "Invitare nel gruppo",
-    "inviteBtn": "Invitare",
-    "deleteBtn": "Elimina",
-    "update": "Aggiornamento",
-    "addProfileTitle": "Aggiungi nuovo profilo",
-    "profileName": "Nome visualizzato",
-    "defaultProfileName": "Alice",
-    "radioUsePassword": "Password",
-    "radioNoPassword": "Non criptato (senza password)",
-    "password1Label": "Password",
-    "password2Label": "Reinserire la password",
-    "passwordErrorEmpty": "La password non può essere vuota",
-    "passwordErrorMatch": "Le password non corrispondono",
-    "passwordChangeError": "Errore durante la modifica della password: password fornita rifiutata",
-    "deleteConfirmLabel": "Digita ELIMINA per confermare",
-    "deleteConfirmText": "ELIMINA",
-    "addNewProfileBtn": "Aggiungi nuovo profilo",
-    "enterProfilePassword": "Inserisci una password per visualizzare i tuoi profili",
-    "cwtchSettingsTitle": "Impostazioni di Cwtch",
-    "zoomLabel": "Zoom dell'interfaccia (influisce principalmente sulle dimensioni del testo e dei pulsanti)",
+    "localeEn": "Inglese",
     "settingLanguage": "Lingua",
-    "settingInterfaceZoom": "Livello di zoom",
-    "largeTextLabel": "Grande",
-    "settingTheme": "Tema",
-    "themeLight": "Chiaro",
-    "themeDark": "Scuro",
-    "defaultScalingText": "Testo di dimensioni predefinite (fattore di scala:",
-    "smallTextLabel": "Piccolo",
-    "loadingTor": "Caricamento di tor...",
-    "networkStatusDisconnected": "Disconnesso da Internet, controlla la tua connessione",
-    "networkStatusAttemptingTor": "Tentativo di connessione alla rete Tor",
-    "networkStatusOnline": "Online"
+    "zoomLabel": "Zoom dell'interfaccia (influisce principalmente sulle dimensioni del testo e dei pulsanti)",
+    "versionBuilddate": "Versione: %1 Costruito il: %2",
+    "cwtchSettingsTitle": "Impostazioni di Cwtch",
+    "unlock": "Sblocca",
+    "yourServers": "I tuoi server",
+    "yourProfiles": "I tuoi profili",
+    "error0ProfilesLoadedForPassword": "0 profili caricati con quella password",
+    "password": "Password",
+    "enterProfilePassword": "Inserisci una password per visualizzare i tuoi profili",
+    "addNewProfileBtn": "Aggiungi nuovo profilo",
+    "deleteConfirmText": "ELIMINA",
+    "deleteProfileConfirmBtn": "Elimina realmente il profilo",
+    "deleteConfirmLabel": "Digita ELIMINA per confermare",
+    "deleteProfileBtn": "Elimina profilo",
+    "passwordChangeError": "Errore durante la modifica della password: password fornita rifiutata",
+    "passwordErrorMatch": "Le password non corrispondono",
+    "saveProfileBtn": "Salva il profilo",
+    "createProfileBtn": "Crea un profilo",
+    "passwordErrorEmpty": "La password non può essere vuota",
+    "password2Label": "Reinserire la password",
+    "password1Label": "Password",
+    "currentPasswordLabel": "Password corrente",
+    "yourDisplayName": "Il tuo nome visualizzato",
+    "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",
+    "copiedToClipboardNotification": "Copiato negli Appunti",
+    "copyBtn": "Copia",
+    "editProfile": "Modifica profilo",
+    "newProfile": "Nuovo profilo",
+    "defaultProfileName": "Alice",
+    "profileName": "Nome visualizzato",
+    "editProfileTitle": "Modifica profilo",
+    "addProfileTitle": "Aggiungi nuovo profilo",
+    "deleteBtn": "Elimina",
+    "saveBtn": "Salva",
+    "displayNameLabel": "Nome visualizzato",
+    "addressLabel": "Indirizzo",
+    "puzzleGameBtn": "Gioco di puzzle",
+    "bulletinsBtn": "Bollettini",
+    "listsBtn": "Liste",
+    "chatBtn": "Chat",
+    "rejectGroupBtn": "Rifiuta",
+    "acceptGroupBtn": "Accetta",
+    "acceptGroupInviteLabel": "Vuoi accettare l'invito a",
+    "newGroupBtn": "Crea un nuovo gruppo",
+    "copiedClipboardNotification": "Copiato negli Appunti",
+    "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",
+    "searchList": "Cerca nella lista",
+    "update": "Aggiornamento",
+    "inviteBtn": "Invitare",
+    "inviteToGroupLabel": "Invitare nel gruppo",
+    "groupNameLabel": "Nome del gruppo",
+    "viewServerInfo": "Informazioni sul server",
+    "serverSynced": "Sincronizzato",
+    "serverConnectivityDisconnected": "Server disconnesso",
+    "serverConnectivityConnected": "Server connesso",
+    "serverInfo": "Informazioni sul server",
+    "invitationLabel": "Invito",
+    "serverLabel": "Server",
+    "search": "Ricerca...",
+    "cycleColoursDesktop": "Fare clic per scorrere i colori.\nCliccare con il tasto destro per resettare.",
+    "cycleColoursAndroid": "Fare clic per scorrere i colori.\nPressione lunga per resettare.",
+    "cycleMorphsDesktop": "Fare clic per scorrere i morph.\nCliccare con il tasto destro per resettare.",
+    "cycleMorphsAndroid": "Fare clic per scorrere i morph.\nPressione lunga per resettare.",
+    "cycleCatsDesktop": "Fare clic per scorrere le categorie.\nCliccare con il tasto destro per resettare.",
+    "cycleCatsAndroid": "Fare clic per scorrere le categorie.\nPressione lunga per resettare.",
+    "blocked": "Bloccato",
+    "titlePlaceholder": "titolo...",
+    "postNewBulletinLabel": "Pubblica un nuovo bollettino",
+    "newBulletinLabel": "Nuovo bollettino",
+    "joinGroup": "Unisciti al gruppo",
+    "createGroup": "Crea un gruppo",
+    "groupAddr": "Indirizzo",
+    "invitation": "Invito",
+    "server": "Server",
+    "groupName": "Nome del gruppo",
+    "peerName": "Nome",
+    "peerAddress": "Indirizzo",
+    "joinGroupTab": "Unisciti a un gruppo",
+    "createGroupTab": "Crea un gruppo",
+    "createGroupBtn": "Crea",
+    "defaultGroupName": "Gruppo fantastico",
+    "createGroupTitle": "Crea un gruppo"
 }

lib/l10n/intl_pl.arb

@@ -1,288 +1,255 @@
 {
     "@@locale": "pl",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Dodaj tego użytkownika do znajomych aby pobrać plik.",
-    "btnSendFile": "Wyślij plik",
-    "msgConfirmSend": "Na pewno chcesz wysłać ten plik?",
-    "msgFileTooBig": "Rozmiar pliku nie może przekraczać 10 GB",
-    "storageMigrationModalMessage": "Migrowanie profili do nowego formatu. To może chwilę potrwać...",
-    "loadingCwtch": "Ładowanie Cwtch...",
-    "themeColorLabel": "Motyw",
-    "themeNameNeon2": "Neon 2",
-    "themeNameNeon1": "Neon 1",
-    "themeNameMidnight": "Północ",
-    "themeNameMermaid": "Syrena",
-    "themeNamePumpkin": "Dynia",
-    "themeNameGhost": "Duch",
-    "themeNameVampire": "Wampir",
-    "themeNameWitch": "Czarownica",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Folder dla pobranych plików",
-    "settingImagePreviewsDescription": "Automatyczne pobieranie i podgląd obrazów. Pamiętaj, że podgląd obrazów jest potencjalną luką w zabezpieczeniach i nie należy używać tej eksperymentalnej funkcjonalności jeśli używasz Cwtch do komunikacji z niezaufanymi osobami. Zdjęcia profilowe są przewidziane na wersję Cwtch 1.6",
-    "settingImagePreviews": "Podgląd zdjęć i zdjęcia profilowe",
-    "experimentClickableLinksDescription": "Klikalne linki (eksperymentalne). Umożliwia klikanie na linki w wiadomościach, aby je otworzyć",
-    "enableExperimentClickableLinks": "Włącz klikalne linki",
-    "serverConnectionsLabel": "Połączenie",
-    "serverTotalMessagesLabel": "Wiadomości łącznie",
-    "serverMetricsLabel": "Statystyki serwera",
-    "manageKnownServersShort": "Serwery",
-    "manageKnownServersLong": "Zarządzaj znanymi serwerami",
-    "displayNameTooltip": "Wprowadź nazwę",
-    "manageKnownServersButton": "Zarządzaj znanymi serwerami",
-    "fieldDescriptionLabel": "Opis",
-    "groupsOnThisServerLabel": "Grupy na tym serwerze, których jesteś członkiem",
-    "importLocalServerButton": "Importuj %1",
-    "importLocalServerSelectText": "Wybierz lokalny serwer",
-    "importLocalServerLabel": "Importuj lokalnie hostowany serwer",
-    "titleManageServers": "Zarządzaj serwerami",
-    "leaveGroup": "Opuść grupę",
-    "yesLeave": "Opuść",
-    "newPassword": "Nowe hasło",
-    "accepted": "Zaakceptowano!",
-    "rejected": "Odrzucono!",
-    "sendAnInvitation": "You sent an invitation for: ",
-    "torVersion": "Wersja Tor",
-    "torStatus": "Status Tor",
-    "resetTor": "Reset",
-    "cancel": "Anuluj",
-    "sendMessage": "Wyślij wiadomość",
-    "sendInvite": "Wyślij zaproszenie do znajomych albo do grupy",
-    "deleteProfileSuccess": "Profil został usunięty",
-    "nickChangeSuccess": "Nazwa profilu została zmieniona",
-    "torNetworkStatus": "Status sieci Tor",
-    "debugLog": "Włącz zapisywanie logów konsoli",
-    "profileDeleteSuccess": "Profil został usunięty",
-    "malformedMessage": "Wiadomość uszkodzona",
-    "shutdownCwtchTooltip": "Zamknij Cwtch",
-    "shutdownCwtchDialogTitle": "Zamknąć Cwtch?",
-    "shutdownCwtchAction": "Zamknij Cwtch",
-    "tooltipShowPassword": "Pokaż hasło",
-    "tooltipHidePassword": "Ukryj hasło",
-    "notificationNewMessageFromPeer": "Nowa wiadomość od znajomego!",
-    "notificationNewMessageFromGroup": "Nowa wiadomość w grupie!",
-    "tooltipAcceptContactRequest": "Akceptuj zaproszenie do znajomych",
-    "tooltipRejectContactRequest": "Odrzuć zaproszenie do znajomych",
-    "tooltipReplyToThisMessage": "Odpowiedz na tę wiadomość",
-    "tooltipRemoveThisQuotedMessage": "Usuń cytowaną wiadomość.",
-    "settingUIColumnDouble12Ratio": "Podwójny (1:2)",
-    "settingUIColumnSingle": "Pojedynczy",
-    "settingUIColumnDouble14Ratio": "Podwójny (1:4)",
-    "settingUIColumnOptionSame": "Tak samo jak w przypadku trybu wertykalnego",
-    "contactGoto": "Przejdź do konwersacji z %1",
-    "addContact": "Dodaj znajomego",
-    "addContactConfirm": "Dodaj znajomego %1",
-    "placeholderEnterMessage": "Wpisz wiadomość...",
-    "blockedMessageMessage": "Ta wiadomość jest od użytkownika, który został przez Ciebie zablokowany",
-    "showMessageButton": "Pokaż wiadomość",
-    "addServerTitle": "Dodaj serwer",
-    "editServerTitle": "Edytuj serwer",
-    "serverAddress": "Adres serwera",
-    "serverDescriptionLabel": "Opis serwera",
-    "serverEnabled": "Serwer włączony",
-    "serverEnabledDescription": "Uruchom lub zatrzymaj serwer",
-    "serverAutostartLabel": "Autostart",
-    "saveServerButton": "Zapisz serwer",
-    "serversManagerTitleLong": "Serwery, które hostujesz",
-    "serversManagerTitleShort": "Serwery",
-    "addServerTooltip": "Dodaj nowy serwer",
-    "enterServerPassword": "Wprowadź hasło, aby odblokować serwer",
-    "settingServers": "Hostowanie serwerów",
-    "enterCurrentPasswordForDeleteServer": "Wprowadź aktualne hasło, aby usunąć ten serwer",
-    "newMessagesLabel": "Nowe wiadomości",
-    "localePl": "Polski",
-    "localeRU": "Rosyjski",
-    "copyAddress": "Skopiuj adres",
-    "deleteServerSuccess": "Usunięto serwer",
-    "deleteServerConfirmBtn": "Usuń",
-    "fileSavedTo": "Zapisano do",
-    "fileCheckingStatus": "Sprawdzanie statusu pobierania",
-    "verfiyResumeButton": "Zweryfikuj\/wznów",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
+    "newMessagesLabel": "New Messages",
+    "localeRU": "Russian",
     "copyServerKeys": "Kopiuj klucze",
-    "fileInterrupted": "Przerwano",
-    "encryptedServerDescription": "Zaszyfrowanie serwera hasłem chroni go przed dostępem innych osób korzystających z tego urządzenia.",
-    "plainServerDescription": "Zalecamy ustawienie hasła dla  Cwtch. Jeśli hasło nie zostanie ustawione, każdy z dostępem do tego urządzenia uzyska dostęp do tego serwera, w tym do wrażliwych kluczy kryptograficznych.",
-    "settingServersDescription": "Hostowanie serwerów (eksperymentalne) umożliwia tworzenie i zarządzanie serwerami Cwtch",
-    "unlockProfileTip": "Utwórz albo odblokuj profil aby rozpocząć!",
-    "unlockServerTip": "Utwórz albo odblokuj serwer aby rozpocząć!",
-    "serverAutostartDescription": "Decyduje, czy aplikacja automatycznie włączy serwer po uruchomieniu",
-    "serverDescriptionDescription": "Opis serwera widoczny tylko dla Ciebie",
-    "blockUnknownConnectionsEnabledDescription": "Ta konwersacja zostanie usunięta gdy zamkniesz Cwtch! Możesz włączyć zapisywanie wiadomości dla każdej konwersacji osobno w menu w prawym górnym rogu.",
-    "archiveConversation": "Zarchiwizuj tę rozmowę",
-    "streamerModeLabel": "Tryb streamera\/prezentacji",
-    "retrievingManifestMessage": "Pobieranie informacji o pliku...",
-    "openFolderButton": "Otwórz folder",
-    "downloadFileButton": "Pobierz",
-    "labelFilename": "Nazwa pliku",
-    "labelFilesize": "Rozmiar",
-    "messageEnableFileSharing": "Włącz udostępnianie plików (eksperymentalne) aby wyświetlić tę wiadomość",
-    "messageFileSent": "Plik został wysłany",
-    "messageFileOffered": "Znajomy chce wysłać Ci plik",
-    "tooltipSendFile": "Wyślij plik",
+    "verfiyResumeButton": "Zweryfikuj\/wznów",
+    "fileCheckingStatus": "Sprawdzanie stanu pobierania",
+    "fileInterrupted": "Przerwane",
+    "fileSavedTo": "Zapisano do",
+    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
+    "deleteServerConfirmBtn": "Naprawdę usuń serwer",
+    "deleteServerSuccess": "Pomyślnie usunięto serwer",
+    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
+    "copyAddress": "Skopiuj adres",
+    "settingServersDescription": "The hosting servers experiment enables hosting and managing Cwtch servers",
+    "settingServers": "Hosting Servers",
+    "enterServerPassword": "Enter password to unlock server",
+    "unlockProfileTip": "Please create or unlock a profile to begin!",
+    "unlockServerTip": "Please create or unlock a server to begin!",
+    "addServerTooltip": "Add new server",
+    "serversManagerTitleShort": "Servers",
+    "serversManagerTitleLong": "Servers You Host",
+    "saveServerButton": "Save Server",
+    "serverAutostartDescription": "Controls if the application will automatically launch the server on start",
+    "serverAutostartLabel": "Autostart",
+    "serverEnabledDescription": "Start or stop the server",
+    "serverEnabled": "Server Enabled",
+    "serverDescriptionDescription": "Your description of the server for personal management use only, will never be shared",
+    "serverDescriptionLabel": "Server Description",
+    "serverAddress": "Server Address",
+    "editServerTitle": "Edit Server",
+    "addServerTitle": "Add Server",
+    "titleManageProfilesShort": "Profile",
+    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
+    "descriptionFileSharing": "Eksperyment udostępniania plików pozwala na wysyłanie i odbieranie plików od kontaktów i grup Cwtch. Zauważ, że udostępnienie pliku grupie spowoduje, że członkowie tej grupy połączą się z Tobą bezpośrednio przez Cwtch, aby go pobrać.",
     "settingFileSharing": "Udostępnianie plików",
-    "descriptionFileSharing": "Udostępnianie plików (eksperymentalne) umożliwia wysyłanie i otrzymywanie plików od znajomych i grup. Pamiętaj, że udostępnienie pliku grupie spowoduje bezpośrednie połączenie się członków grupy z Tobą przez Cwtch w celu pobrania pliku.",
-    "titleManageProfilesShort": "Profil",
-    "descriptionStreamerMode": "Ukrywa wrażliwe elementy interfejsu, np. adresy profili i kontaktów, na potrzeby udostępniania swojego ekranu",
-    "plainProfileDescription": "Zalecamy ustawienie hasła dla profilu Cwtch. Jeśli hasło nie zostanie ustawione, każdy z dostępem do tego urządzenia uzyska dostęp do tego profilu, w tym do wiadomości, znajomych i wrażliwych kluczy kryptograficznych.",
-    "encryptedProfileDescription": "Zaszyfrowanie profilu hasłem chroni go przed dostępem innych osób korzystających z tego urządzenia",
-    "settingUIColumnLandscape": "Kolumny interfejsu w trybie horyzontalnym",
-    "settingUIColumnPortrait": "Kolumny interfejsu w trybie wertykalnym",
-    "groupInviteSettingsWarning": "Zaproszono Cię do grupy! Aby wyświetlić to zaproszenie, włącz Czaty Grupowe (eksperymentalne) w Ustawieniach",
-    "shutdownCwtchDialog": "Zamknąć Cwtch? Wszystkie połączenia zostaną zakończone, a aplikacja zostanie zamknięta.",
-    "addContactFirst": "Wybierz lub dodaj znajomego aby rozpocząć konwersację.",
-    "createProfileToBegin": "Utwórz albo odblokuj profil aby rozpocząć",
-    "addServerFirst": "Musisz dodać serwer, aby utworzyć grupę",
+    "tooltipSendFile": "Wyślij plik",
+    "messageFileOffered": "Kontakt proponuje wysłanie Ci pliku",
+    "messageFileSent": "Plik został wysłany",
+    "messageEnableFileSharing": "Włącz eksperyment udostępniania plików, aby wyświetlić tę wiadomość.",
+    "labelFilesize": "Rozmiar",
+    "labelFilename": "Nazwa pliku",
+    "downloadFileButton": "Pobierz",
+    "openFolderButton": "Otwórz folder",
+    "retrievingManifestMessage": "Pobieranie informacji o pliku...",
+    "streamerModeLabel": "Tryb streamera\/prezentacji",
+    "archiveConversation": "Zarchiwizuj tę rozmowę",
+    "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": "Połączenia od nieznanych kontaktów są blokowane. Można to zmienić w Ustawieniach",
+    "networkStatusConnecting": "Connecting to network and contacts...",
+    "showMessageButton": "Show Message",
+    "blockedMessageMessage": "This message is from a profile you have blocked.",
+    "placeholderEnterMessage": "Type a message...",
+    "plainProfileDescription": "We recommend that you protect your Cwtch profiles with a password. If you do not set a password on this profile then anyone who has access to this device may be able to access information about this profile, including contacts, messages and sensitive cryptographic keys.",
+    "encryptedProfileDescription": "Encrypting a profile with a password protects it from other people who may also use this device. Encrypted profiles cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
+    "addContactConfirm": "Add contact %1",
+    "addContact": "Add contact",
+    "contactGoto": "Go to conversation with %1",
+    "settingUIColumnOptionSame": "Same as portrait mode setting",
+    "settingUIColumnDouble14Ratio": "Double (1:4)",
+    "settingUIColumnDouble12Ratio": "Double (1:2)",
+    "settingUIColumnSingle": "Single",
+    "settingUIColumnLandscape": "UI Columns in Landscape Mode",
+    "settingUIColumnPortrait": "UI Columns in Portrait Mode",
+    "localePl": "Polish",
+    "tooltipRemoveThisQuotedMessage": "Remove quoted message.",
+    "tooltipReplyToThisMessage": "Reply to this message",
+    "tooltipRejectContactRequest": "Reject this contact request",
+    "tooltipAcceptContactRequest": "Accept this contact request.",
+    "notificationNewMessageFromGroup": "New message in a group!",
+    "notificationNewMessageFromPeer": "New message from a contact!",
+    "tooltipHidePassword": "Hide Password",
+    "tooltipShowPassword": "Show Password",
+    "serverNotSynced": "Syncing New Messages (This can take some time)...",
+    "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.",
+    "shutdownCwtchAction": "Shutdown Cwtch",
+    "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.",
+    "shutdownCwtchDialogTitle": "Shutdown Cwtch?",
+    "shutdownCwtchTooltip": "Shutdown Cwtch",
+    "malformedMessage": "Malformed message",
+    "profileDeleteSuccess": "Successfully deleted profile",
+    "debugLog": "Turn on console debug logging",
+    "torNetworkStatus": "Tor network status",
+    "addContactFirst": "Add or pick a contact to begin chatting.",
+    "createProfileToBegin": "Please create or unlock a profile to begin",
+    "nickChangeSuccess": "Profile nickname changed successfully",
+    "addServerFirst": "You need to add a server before you can create a group",
+    "deleteProfileSuccess": "Successfully deleted profile",
+    "sendInvite": "Send a contact or group invite",
+    "sendMessage": "Send Message",
+    "cancel": "Cancel",
+    "resetTor": "Reset",
+    "torStatus": "Tor Status",
+    "torVersion": "Tor Version",
+    "sendAnInvitation": "You sent an invitation for: ",
     "contactSuggestion": "This is a contact suggestion for: ",
-    "chatHistoryDefault": "Ta konwersacja zostanie usunięta gdy zamkniesz Cwtch! Możesz włączyć zapisywanie wiadomości dla każdej konwersacji osobno w menu w prawym górnym rogu.",
-    "reallyLeaveThisGroupPrompt": "Na pewno chcesz opuścić tę grupę? Wszystkie wiadomości i atrybuty zostaną usunięte.",
-    "inviteToGroup": "Zaproszono Cię do grupy:",
-    "dateNever": "Nigdy",
-    "dateLastYear": "Rok temu",
-    "dateYesterday": "Wczoraj",
-    "dateLastMonth": "Miesiąc temu",
-    "dateRightNow": "Teraz",
-    "successfullAddedContact": "Dodano znajomego ",
-    "descriptionBlockUnknownConnections": "Blokowanie połączeń od osób, które nie są na liście Twoich znajomych.",
-    "descriptionExperimentsGroups": "Czaty grupowe (eksperymentalne) łączą się z niezaufanymi serwerami, aby umożliwić komunikację grupową.",
-    "descriptionExperiments": "Funkcje eksperymentalne są opcjonalne. Dodają one funkcjonalności, które mogą być mniej prywatne niż domyślne konwersacje 1:1, np. czaty grupowe, integracja z botami, itp.",
-    "titleManageProfiles": "Zarządzaj Profilami",
-    "tooltipUnlockProfiles": "Wprowadź hasło, aby odblokować zaszyfrowane profile.",
-    "titleManageContacts": "Konwersacje",
-    "tooltipAddContact": "Dodaj znajomego lub grupę",
-    "tooltipOpenSettings": "Ustawienia",
-    "contactAlreadyExists": "Ten znajomy już istnieje",
+    "rejected": "Rejected!",
+    "accepted": "Accepted!",
+    "chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.",
+    "newPassword": "New Password",
+    "yesLeave": "Yes, Leave This Conversation",
+    "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
+    "leaveGroup": "Leave This Conversation",
+    "inviteToGroup": "You have been invited to join a group:",
+    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation",
+    "tooltipAddContact": "Add a new contact or conversation",
+    "titleManageContacts": "Conversations",
+    "titleManageServers": "Manage Servers",
+    "dateNever": "Never",
+    "dateLastYear": "Last Year",
+    "dateYesterday": "Yesterday",
+    "dateLastMonth": "Last Month",
+    "dateRightNow": "Right Now",
+    "successfullAddedContact": "Successfully added ",
+    "descriptionBlockUnknownConnections": "If turned on, this option will automatically close connections from Cwtch users that have not been added to your contact list.",
+    "descriptionExperimentsGroups": "The group experiment allows Cwtch to connect with untrusted server infrastructure to facilitate communication with more than one contact.",
+    "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.",
+    "titleManageProfiles": "Manage Cwtch Profiles",
+    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
+    "tooltipOpenSettings": "Open the settings pane",
     "invalidImportString": "Invalid import string",
-    "conversationSettings": "Ustawienia konwersacji",
-    "enterCurrentPasswordForDelete": "Aby usunąć ten profil, wprowadź hasło.",
-    "enableGroups": "Włącz czaty grupowe",
+    "contactAlreadyExists": "Contact Already Exists",
+    "conversationSettings": "Conversation Settings",
+    "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.",
+    "enableGroups": "Enable Group Chat",
+    "experimentsEnabled": "Enable Experiments",
     "localeIt": "Italiana",
     "localeEs": "Espanol",
-    "todoPlaceholder": "Do zdobienia...",
-    "addNewItem": "Dodaj do listy",
     "addListItem": "Add a New List Item",
-    "newConnectionPaneTitle": "Nowe połączenie",
-    "networkStatusOnline": "Połączono",
-    "networkStatusConnecting": "Łączenie z siecią i znajomymi...",
-    "networkStatusAttemptingTor": "Próba połączenia z siecią Tor",
-    "networkStatusDisconnected": "Rozłączono. Sprawdź połączenie z Internetem",
-    "viewGroupMembershipTooltip": "Wyświetl członków grupy",
-    "loadingTor": "Ładowanie Tor...",
-    "smallTextLabel": "Mały",
-    "defaultScalingText": "Domyślny rozmiar tekstu (skalowanie:",
-    "builddate": "Zbudowana: %2",
-    "version": "Wersja %1",
-    "versionTor": "Wersja %1 , wersja Tor %2",
-    "experimentsEnabled": "Włącz funkcje eksperymentalne",
-    "themeDark": "Ciemny",
-    "themeLight": "Jasny",
-    "settingTheme": "Motyw",
-    "largeTextLabel": "Duży",
-    "settingInterfaceZoom": "Przybliżenie",
+    "addNewItem": "Add a new item to the list",
+    "todoPlaceholder": "Todo...",
+    "newConnectionPaneTitle": "New Connection",
+    "networkStatusOnline": "Online",
+    "networkStatusAttemptingTor": "Attempting to connect to Tor network",
+    "networkStatusDisconnected": "Disconnected from the internet, check your connection",
+    "viewGroupMembershipTooltip": "View Group Membership",
+    "loadingTor": "Loading tor...",
+    "smallTextLabel": "Small",
+    "defaultScalingText": "Default size text (scale factor:",
+    "builddate": "Built on: %2",
+    "version": "Version %1",
+    "versionTor": "Version %1 with tor %2",
+    "themeDark": "Dark",
+    "themeLight": "Light",
+    "settingTheme": "Theme",
+    "largeTextLabel": "Large",
+    "settingInterfaceZoom": "Zoom level",
     "localeDe": "Deutsche",
     "localePt": "Portuguesa",
     "localeFr": "Frances",
     "localeEn": "English",
-    "settingLanguage": "Język",
-    "blockUnknownLabel": "Blokuj nieznajomych",
-    "zoomLabel": "Przybliżenie interfejsu (wpływa głównie na rozmiar tekstu i przycisków)",
-    "versionBuilddate": "Wersja: %1 Zbudowana: %2",
-    "cwtchSettingsTitle": "Ustawienia Cwtch",
-    "unlock": "Odblokuj",
-    "yourServers": "Twoje serwery",
-    "yourProfiles": "Twoje profile",
-    "error0ProfilesLoadedForPassword": "Znaleziono 0 profili z tym hasłem",
-    "password": "Hasło",
-    "enterProfilePassword": "Wprowadź hasło aby wyświetlić profile",
-    "addNewProfileBtn": "Dodaj",
-    "deleteConfirmText": "USUŃ",
-    "deleteProfileConfirmBtn": "Usuń",
-    "deleteConfirmLabel": "Wpisz USUŃ aby potwierdzić",
-    "deleteProfileBtn": "Usuń profil",
-    "passwordChangeError": "Zmiana hasła nie powiodła się: hasło niepoprawne",
-    "passwordErrorMatch": "Hasła nie są identyczne",
-    "saveProfileBtn": "Zapisz profil",
-    "createProfileBtn": "Utwórz profil",
-    "passwordErrorEmpty": "Hasło nie może być puste",
-    "password2Label": "Powtórz hasło",
-    "password1Label": "Hasło",
-    "currentPasswordLabel": "Obecne hasło",
-    "yourDisplayName": "Nazwa",
-    "profileOnionLabel": "Przekaż ten adres znajomym, z którymi chcesz się połączyć",
-    "noPasswordWarning": "Brak hasła do konta oznacza, że dane przechowywane na tym urządzeniu nie będą zaszyfrowane",
-    "radioNoPassword": "Niezaszyfrowany (brak hasła)",
-    "radioUsePassword": "Hasło",
-    "copiedToClipboardNotification": "Skopiowano do schowka",
-    "editProfile": "Edytuj profil",
-    "newProfile": "Nowy profil",
-    "defaultProfileName": "Nowy profil",
-    "profileName": "Nazwa",
-    "editProfileTitle": "Edytuj profil",
-    "addProfileTitle": "Dodaj nowy profil",
-    "deleteBtn": "Usuń",
-    "unblockBtn": "Odblokuj",
-    "dontSavePeerHistory": "Nie",
-    "savePeerHistoryDescription": "Zapisywanie wiadomości",
-    "savePeerHistory": "Tak",
-    "blockBtn": "Zablokuj",
-    "saveBtn": "Zapisz",
-    "displayNameLabel": "Nazwa",
-    "addressLabel": "Adresy",
-    "puzzleGameBtn": "Puzzle",
-    "bulletinsBtn": "Biuletyny",
-    "listsBtn": "Listy",
+    "settingLanguage": "Language",
+    "zoomLabel": "Interface zoom (mostly affects text and button sizes)",
+    "versionBuilddate": "Version: %1 Built on: %2",
+    "cwtchSettingsTitle": "Cwtch Settings",
+    "unlock": "Unlock",
+    "yourServers": "Your Servers",
+    "yourProfiles": "Your Profiles",
+    "error0ProfilesLoadedForPassword": "0 profiles loaded with that password",
+    "password": "Password",
+    "enterProfilePassword": "Enter a password to view your profiles",
+    "addNewProfileBtn": "Add new profile",
+    "deleteConfirmText": "DELETE",
+    "deleteProfileConfirmBtn": "Really Delete Profile",
+    "deleteConfirmLabel": "Type DELETE to confirm",
+    "deleteProfileBtn": "Delete Profile",
+    "passwordChangeError": "Error changing password: Supplied password rejected",
+    "passwordErrorMatch": "Passwords do not match",
+    "saveProfileBtn": "Save Profile",
+    "createProfileBtn": "Create Profile",
+    "passwordErrorEmpty": "Password cannot be empty",
+    "password2Label": "Reenter password",
+    "password1Label": "Password",
+    "currentPasswordLabel": "Current Password",
+    "yourDisplayName": "Your Display Name",
+    "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted",
+    "radioNoPassword": "Unencrypted (No password)",
+    "radioUsePassword": "Password",
+    "copiedToClipboardNotification": "Copied to Clipboard",
+    "copyBtn": "Copy",
+    "editProfile": "Edit Profille",
+    "newProfile": "New Profile",
+    "defaultProfileName": "Alice",
+    "profileName": "Display name",
+    "editProfileTitle": "Edit Profile",
+    "addProfileTitle": "Add new profile",
+    "deleteBtn": "Delete",
+    "saveBtn": "Save",
+    "displayNameLabel": "Display Name",
+    "addressLabel": "Address",
+    "puzzleGameBtn": "Puzzle Game",
+    "bulletinsBtn": "Bulletins",
+    "listsBtn": "Lists",
     "chatBtn": "Chat",
-    "rejectGroupBtn": "Odrzuć",
-    "acceptGroupBtn": "Akceptuj",
-    "acceptGroupInviteLabel": "Czy chcesz zaakceptować zaproszenie do grupy",
-    "newGroupBtn": "Utwórz nową grupę",
-    "copiedClipboardNotification": "Skopiowano do schowka",
-    "copyBtn": "Kopiuj",
-    "peerOfflineMessage": "Znajomy jest niedostępny, nie można dostarczyć wiadomości",
-    "peerBlockedMessage": "Użytkownik jest zablokowany",
-    "pendingLabel": "W toku",
-    "acknowledgedLabel": "OK",
-    "couldNotSendMsgError": "Wiadomość nie została wysłana",
-    "dmTooltip": "Kliknij, aby wysłać wiadomość",
-    "membershipDescription": "Lista użytkowników, którzy wysyłali wiadomości w tej grupie. Członkowie grupy, którzy nie wysyłali żadnych wiadomości nie są na tej liście.",
-    "addListItemBtn": "Dodaj",
-    "peerNotOnline": "Znajomy jest niedostępny. Nie można użyć aplikacji.",
+    "rejectGroupBtn": "Reject",
+    "acceptGroupBtn": "Accept",
+    "acceptGroupInviteLabel": "Do you want to accept the invitation to",
+    "newGroupBtn": "Create new group",
+    "copiedClipboardNotification": "Copied to clipboard",
+    "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",
     "searchList": "Search List",
-    "update": "Zaktualizuj",
-    "inviteBtn": "Zaproś",
-    "inviteToGroupLabel": "Zaproś do grupy",
-    "groupNameLabel": "Nazwa grupy",
-    "viewServerInfo": "Informacje o serwerze",
-    "serverNotSynced": "Synchronizacja wiadomości (to może chwilę potrwać)...",
-    "serverSynced": "Zsynchronizowano",
-    "serverConnectivityDisconnected": "Brak połączenia z serwerem",
-    "serverConnectivityConnected": "Połączono z serwerem",
-    "serverInfo": "Informacje o serwerze",
-    "invitationLabel": "Zaproszenie",
-    "serverLabel": "Serwer",
-    "search": "Szukaj...",
+    "update": "Update",
+    "inviteBtn": "Invite",
+    "inviteToGroupLabel": "Invite to group",
+    "groupNameLabel": "Group name",
+    "viewServerInfo": "Server Info",
+    "serverSynced": "Synced",
+    "serverConnectivityDisconnected": "Server Disconnected",
+    "serverConnectivityConnected": "Server Connected",
+    "serverInfo": "Server Information",
+    "invitationLabel": "Invitation",
+    "serverLabel": "Server",
+    "search": "Search...",
     "cycleColoursDesktop": "Click to cycle colours.\nRight-click to reset.",
     "cycleColoursAndroid": "Click to cycle colours.\nLong-press to reset.",
     "cycleMorphsDesktop": "Click to cycle morphs.\nRight-click to reset.",
     "cycleMorphsAndroid": "Click to cycle morphs.\nLong-press to reset.",
     "cycleCatsDesktop": "Click to cycle category.\nRight-click to reset.",
     "cycleCatsAndroid": "Click to cycle category.\nLong-press to reset.",
-    "blocked": "Zablokowany",
-    "pasteAddressToAddContact": "Wklej adres Cwtch znajomego, zaproszenie do grupy albo pęk kluczy",
-    "titlePlaceholder": "Tytuł...",
-    "postNewBulletinLabel": "Opublikuj nowy biuletyn",
-    "newBulletinLabel": "Nowy biuletyn",
-    "joinGroup": "Dołącz do grupy",
-    "createGroup": "Utwórz grupę",
-    "addPeer": "Dodaj znajomego",
-    "groupAddr": "Adres",
-    "invitation": "Zaproszenie",
-    "server": "Serwer",
-    "groupName": "Nazwa grupy",
-    "peerName": "Nazwa",
-    "peerAddress": "Adres",
-    "joinGroupTab": "Dołącz do grupy",
-    "createGroupTab": "Utwórz grupę",
-    "addPeerTab": "Dodaj znajomego",
-    "createGroupBtn": "Utwórz",
-    "defaultGroupName": "Nowa grupa",
-    "createGroupTitle": "Utwórz grupę"
-}
+    "blocked": "Blocked",
+    "titlePlaceholder": "title...",
+    "postNewBulletinLabel": "Post new bulletin",
+    "newBulletinLabel": "New Bulletin",
+    "joinGroup": "Join group",
+    "createGroup": "Create group",
+    "groupAddr": "Address",
+    "invitation": "Invitation",
+    "server": "Server",
+    "groupName": "Group name",
+    "peerName": "Name",
+    "peerAddress": "Address",
+    "joinGroupTab": "Join a group",
+    "createGroupTab": "Create a group",
+    "createGroupBtn": "Create",
+    "defaultGroupName": "Awesome Group",
+    "createGroupTitle": "Create Group"
+}

lib/l10n/intl_pt.arb

@@ -1,39 +1,6 @@
 {
     "@@locale": "pt",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "btnSendFile": "Send File",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "loadingCwtch": "Loading Cwtch...",
-    "themeColorLabel": "Color Theme",
-    "themeNameNeon2": "Neon2",
-    "themeNameNeon1": "Neon1",
-    "themeNameMidnight": "Midnight",
-    "themeNameMermaid": "Mermaid",
-    "themeNamePumpkin": "Pumpkin",
-    "themeNameGhost": "Ghost",
-    "themeNameVampire": "Vampire",
-    "themeNameWitch": "Witch",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Download Folder",
-    "settingImagePreviewsDescription": "Images will be downloaded and previewed automatically. Please note that image previews can often lead to security vulnerabilities, and you should not enable this Experiment if you use Cwtch with untrusted contacts. Profile pictures are planned for Cwtch 1.6.",
-    "settingImagePreviews": "Image Previews and Profile Pictures",
-    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
-    "enableExperimentClickableLinks": "Enable Clickable Links",
-    "serverConnectionsLabel": "Connection",
-    "serverTotalMessagesLabel": "Total Messages",
-    "serverMetricsLabel": "Server Metrics",
-    "manageKnownServersShort": "Servers",
-    "manageKnownServersLong": "Manage Known Servers",
-    "displayNameTooltip": "Please enter a display name",
-    "manageKnownServersButton": "Manage Known Servers",
-    "fieldDescriptionLabel": "Description",
-    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
-    "importLocalServerButton": "Import %1",
-    "importLocalServerSelectText": "Select Local Server",
-    "importLocalServerLabel": "Import a locally hosted server",
+    "@@last_modified": "2021-11-11T01:02:08+01:00",
     "newMessagesLabel": "New Messages",
     "localeRU": "Russian",
     "copyServerKeys": "Copy keys",
@@ -41,8 +8,8 @@
     "fileCheckingStatus": "Checking download status",
     "fileInterrupted": "Interrupted",
     "fileSavedTo": "Saved to",
-    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
     "deleteServerConfirmBtn": "Really delete server",
     "deleteServerSuccess": "Successfully deleted server",
     "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
@@ -66,6 +33,7 @@
     "editServerTitle": "Edit Server",
     "addServerTitle": "Add Server",
     "titleManageProfilesShort": "Profiles",
+    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "descriptionFileSharing": "The file sharing experiment allows you to send and receive files from Cwtch contacts and groups. Note that sharing a file with a group will result in members of that group connecting with you directly over Cwtch to download it.",
     "settingFileSharing": "File Sharing",
     "tooltipSendFile": "Send File",
@@ -77,10 +45,22 @@
     "downloadFileButton": "Download",
     "openFolderButton": "Open Folder",
     "retrievingManifestMessage": "Retrieving file information...",
-    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
+    "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...",
@@ -104,6 +84,7 @@
     "notificationNewMessageFromPeer": "New message from a contact!",
     "tooltipHidePassword": "Hide Password",
     "tooltipShowPassword": "Show Password",
+    "serverNotSynced": "Syncing New Messages (This can take some time)...",
     "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.",
     "shutdownCwtchAction": "Shutdown Cwtch",
     "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.",
@@ -134,6 +115,9 @@
     "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
     "leaveGroup": "Leave This Conversation",
     "inviteToGroup": "You have been invited to join a group:",
+    "pasteAddressToAddContact": "… cole um endereço aqui para adicionar um contato…",
+    "tooltipAddContact": "Add a new contact or conversation",
+    "titleManageContacts": "Conversations",
     "titleManageServers": "Manage Servers",
     "dateNever": "Never",
     "dateLastYear": "Last Year",
@@ -146,22 +130,20 @@
     "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.",
     "titleManageProfiles": "Manage Cwtch Profiles",
     "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
-    "titleManageContacts": "Conversations",
-    "tooltipAddContact": "Add a new contact or conversation",
     "tooltipOpenSettings": "Open the settings pane",
-    "contactAlreadyExists": "Contact Already Exists",
     "invalidImportString": "Invalid import string",
+    "contactAlreadyExists": "Contact Already Exists",
     "conversationSettings": "Conversation Settings",
     "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.",
     "enableGroups": "Enable Group Chat",
+    "experimentsEnabled": "Enable Experiments",
     "localeIt": "Italiana",
     "localeEs": "Espanol",
-    "todoPlaceholder": "Afazer…",
-    "addNewItem": "Adicionar novo item à lista",
     "addListItem": "Adicionar Item à Lista",
+    "addNewItem": "Adicionar novo item à lista",
+    "todoPlaceholder": "Afazer…",
     "newConnectionPaneTitle": "New Connection",
     "networkStatusOnline": "Online",
-    "networkStatusConnecting": "Connecting to network and contacts...",
     "networkStatusAttemptingTor": "Attempting to connect to Tor network",
     "networkStatusDisconnected": "Disconnected from the internet, check your connection",
     "viewGroupMembershipTooltip": "View Group Membership",
@@ -171,7 +153,6 @@
     "builddate": "Built on: %2",
     "version": "Version %1",
     "versionTor": "Version %1 with tor %2",
-    "experimentsEnabled": "Enable Experiments",
     "themeDark": "Dark",
     "themeLight": "Light",
     "settingTheme": "Theme",
@@ -182,7 +163,6 @@
     "localeFr": "Frances",
     "localeEn": "English",
     "settingLanguage": "Language",
-    "blockUnknownLabel": "Block Unknown Contacts",
     "zoomLabel": "Zoom da interface (afeta principalmente tamanho de texto e botões)",
     "versionBuilddate": "Version: %1 Built on: %2",
     "cwtchSettingsTitle": "Configurações do Cwtch",
@@ -206,11 +186,11 @@
     "password1Label": "Password",
     "currentPasswordLabel": "Current Password",
     "yourDisplayName": "Your Display Name",
-    "profileOnionLabel": "Send this address to contacts 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",
     "copiedToClipboardNotification": "Copiado",
+    "copyBtn": "Copiar",
     "editProfile": "Edit Profille",
     "newProfile": "New Profile",
     "defaultProfileName": "Alice",
@@ -218,11 +198,6 @@
     "editProfileTitle": "Edit Profile",
     "addProfileTitle": "Add new profile",
     "deleteBtn": "Deletar",
-    "unblockBtn": "Unblock Contact",
-    "dontSavePeerHistory": "Delete History",
-    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
-    "savePeerHistory": "Save History",
-    "blockBtn": "Block Contact",
     "saveBtn": "Salvar",
     "displayNameLabel": "Nome de Exibição",
     "addressLabel": "Endereço",
@@ -235,23 +210,18 @@
     "acceptGroupInviteLabel": "Você quer aceitar o convite para",
     "newGroupBtn": "Criar novo grupo",
     "copiedClipboardNotification": "Copiado",
-    "copyBtn": "Copiar",
-    "peerOfflineMessage": "Contact is offline, messages can't be delivered right now",
-    "peerBlockedMessage": "Contact 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": "Contact is offline. Applications cannot be used right now.",
     "searchList": "Search List",
     "update": "Update",
     "inviteBtn": "Convidar",
     "inviteToGroupLabel": "Convidar ao grupo",
     "groupNameLabel": "Nome do grupo",
     "viewServerInfo": "Server Info",
-    "serverNotSynced": "Syncing New Messages (This can take some time)...",
     "serverSynced": "Synced",
     "serverConnectivityDisconnected": "Server Disconnected",
     "serverConnectivityConnected": "Server Connected",
@@ -266,13 +236,11 @@
     "cycleCatsDesktop": "Click to cycle category.\nRight-click to reset.",
     "cycleCatsAndroid": "Click to cycle category.\nLong-press to reset.",
     "blocked": "Blocked",
-    "pasteAddressToAddContact": "… cole um endereço aqui para adicionar um contato…",
     "titlePlaceholder": "título…",
     "postNewBulletinLabel": "Postar novo boletim",
     "newBulletinLabel": "Novo Boletim",
     "joinGroup": "Join group",
     "createGroup": "Create group",
-    "addPeer": "Add Contact",
     "groupAddr": "Address",
     "invitation": "Invitation",
     "server": "Server",
@@ -281,7 +249,6 @@
     "peerAddress": "Address",
     "joinGroupTab": "Join a group",
     "createGroupTab": "Create a group",
-    "addPeerTab": "Add a contact",
     "createGroupBtn": "Criar",
     "defaultGroupName": "Grupo incrível",
     "createGroupTitle": "Criar Grupo"

lib/l10n/intl_ru.arb

@@ -1,59 +1,14 @@
 {
     "@@locale": "ru",
-    "@@last_modified": "2021-12-20T09:20:03+01:00",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "btnSendFile": "Send File",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "loadingCwtch": "Loading Cwtch...",
-    "themeColorLabel": "Тема",
-    "themeNameNeon2": "Неон2",
-    "themeNameNeon1": "Неон1",
-    "themeNameMidnight": "Полночь",
-    "themeNameMermaid": "Русалка",
-    "themeNamePumpkin": "Тыква",
-    "themeNameGhost": "Призрак",
-    "themeNameVampire": "Вампир",
-    "themeNameWitch": "Ведьма",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Скачать папку",
-    "settingImagePreviewsDescription": "Автоматическая загрузка изображений. Обратите внимание, что предварительный просмотр изображений часто может использоваться для взлома или деаномизации. Не используйте данную функцию если Вы контактируете с ненадежными контактами. Аватары профиля запланированы для версии Cwtch 1.6.",
-    "settingImagePreviews": "Предпросмотр изображений и фотографий профиля",
-    "experimentClickableLinksDescription": "Экспериментальная функция которая позволяет нажимать на URL адреса в сообщениях",
-    "enableExperimentClickableLinks": "Включить кликабельные ссылки",
-    "serverConnectionsLabel": "Соединение",
-    "serverTotalMessagesLabel": "Всего сообщений",
-    "serverMetricsLabel": "Показатели сервера",
-    "manageKnownServersShort": "Серверы",
-    "manageKnownServersLong": "Управление серверами",
-    "displayNameTooltip": "Введите отображаемое имя",
-    "manageKnownServersButton": "Управление серверами",
-    "fieldDescriptionLabel": "Описание",
-    "groupsOnThisServerLabel": "Группы, в которых я нахожусь, размещены на этом сервере",
-    "importLocalServerButton": "Импорт %1",
-    "importLocalServerSelectText": "Выбрать локальный сервер",
-    "importLocalServerLabel": "Импортировать локальный сервер",
-    "newMessagesLabel": "Новое сообщение",
-    "localeRU": "Русский",
-    "profileOnionLabel": "Send this address to contacts you want to connect with",
-    "savePeerHistory": "Хранить историю",
-    "saveBtn": "Сохранить",
-    "networkStatusOnline": "В сети",
-    "copiedToClipboardNotification": "Скопировано в буфер обмена",
-    "defaultProfileName": "Алиса",
-    "deleteBtn": "Удалить",
-    "bulletinsBtn": "Бюллетень",
-    "groupNameLabel": "Имя группы",
-    "serverLabel": "Сервер",
-    "copyBtn": "Копировать",
+    "@@last_modified": "2021-11-10T18:47:30+01:00",
+    "localeRU": "Russian",
     "copyServerKeys": "Копировать ключи",
     "verfiyResumeButton": "Проверить\/продолжить",
     "fileCheckingStatus": "Проверка статуса загрузки",
     "fileInterrupted": "Прервано",
     "fileSavedTo": "Сохранить в",
-    "encryptedServerDescription": "Шифрование сервера паролем защитит его от других людей у которых может оказаться доступ к этому устройству, включая Onion адрес сервера. Зашифрованный сервер нельзя расшифровать, пока не будет введен правильный пароль разблокировки.",
     "plainServerDescription": "Мы настоятельно рекомендуем защитить свой сервер Cwtch паролем. Если Вы этого не сделаете, то любой у кого окажется доступ к серверу, сможет получить доступ к информации на этом сервере включая конфиденциальные криптографические ключи.",
+    "encryptedServerDescription": "Шифрование сервера паролем защитит его от других людей у которых может оказаться доступ к этому устройству, включая Onion адрес сервера. Зашифрованный сервер нельзя расшифровать, пока не будет введен правильный пароль разблокировки.",
     "deleteServerConfirmBtn": "Точно удалить сервер?",
     "deleteServerSuccess": "Сервер успешно удален",
     "enterCurrentPasswordForDeleteServer": "Пожалуйста, введите пароль сервера, чтобы удалить его",
@@ -77,6 +32,7 @@
     "editServerTitle": "Изменить сервер",
     "addServerTitle": "Добавить сервер",
     "titleManageProfilesShort": "Профили",
+    "descriptionStreamerMode": "При включении этого параметра, внешний вид некоторых элементов становится более приватным, скрывая длинные Onion адреса и адреса контактов, оставляя только заданные имена",
     "descriptionFileSharing": "Данная функция позволяет обмениваться файлами напрямую с контактами и группами в Cwtch. Отправляемый файл будет напрямую скачиваться с вашего устройства через Cwtch.",
     "settingFileSharing": "Передача файлов",
     "tooltipSendFile": "Отправить файл",
@@ -88,10 +44,22 @@
     "downloadFileButton": "Загрузить",
     "openFolderButton": "Открыть папку",
     "retrievingManifestMessage": "Получение информации о файле...",
-    "descriptionStreamerMode": "При включении этого параметра, внешний вид некоторых элементов становится более приватным, скрывая длинные Onion адреса и адреса контактов, оставляя только заданные имена",
     "streamerModeLabel": "Режим презентации",
     "archiveConversation": "Отправить чат в архив",
+    "profileOnionLabel": "Send this address to contacts you want to connect with",
+    "addPeerTab": "Добавить контакт",
+    "addPeer": "Добавить контакт",
+    "peerNotOnline": "Контакт не в сети. Вы не можете связаться с ним пока он не появиться в сети.",
+    "peerBlockedMessage": "Контакт заблокирован",
+    "peerOfflineMessage": "Контакт не в сети, сообщения не могут быть отправлены",
+    "blockBtn": "Заблокировать контакт",
+    "savePeerHistory": "Хранить исторую",
+    "savePeerHistoryDescription": "Определяет политуку хранения или удаления переписки с данным контактом.",
+    "dontSavePeerHistory": "Удалить историю",
+    "unblockBtn": "Разблокировать контакт",
+    "blockUnknownLabel": "Блокировать неизвестные контакты",
     "blockUnknownConnectionsEnabledDescription": "Соединения от неизвестных контактов блокируются. Данный параметр можно изменить в настройках",
+    "networkStatusConnecting": "Подключение к сети и контактам...",
     "showMessageButton": "Показать сообщения",
     "blockedMessageMessage": "Это сообщение из заблокированного вами профиля.",
     "placeholderEnterMessage": "Написать сообщение...",
@@ -115,6 +83,7 @@
     "notificationNewMessageFromPeer": "Новое сообщение от контакта!",
     "tooltipHidePassword": "Скрыть пароль",
     "tooltipShowPassword": "Показать пароль",
+    "serverNotSynced": "Синхронизация новых сообщений (это может занять некоторое время)...",
     "groupInviteSettingsWarning": "Вас пригласили присоединиться к группе! Пожалуйста, включите экспериментальную функцию групповые чаты в Настройках, чтобы просмотреть это приглашение.",
     "shutdownCwtchAction": "Выключить Cwtch",
     "shutdownCwtchDialog": "Вы уверены, что хотите выключить Cwtch? Это приведет к закрытию всех подключений и выходу из приложения.",
@@ -145,6 +114,9 @@
     "reallyLeaveThisGroupPrompt": "Вы уверены, что хотите закончить этот разговор? Все сообщения будут удалены.",
     "leaveGroup": "Да, оставить этот чат",
     "inviteToGroup": "Вас пригласили присоединиться к группе:",
+    "pasteAddressToAddContact": "Вставьте адрес cwtch, приглашение или пакет ключей здесь, чтобы добавить их в контакты",
+    "tooltipAddContact": "Добавление нового контакта или разговора",
+    "titleManageContacts": "Разговоры",
     "titleManageServers": "Управление серверами",
     "dateNever": "Никогда",
     "dateLastYear": "Прошлый год",
@@ -157,21 +129,20 @@
     "descriptionExperiments": "Экспериментальные функции Cwtch это необязательные дополнительные функции, которые добавляют некоторые возможности, но не имеют такой же устойчивости к метаданным как если бы вы общались через традиционный част 1 на 1..",
     "titleManageProfiles": "Управление профилями Cwtch",
     "tooltipUnlockProfiles": "Разблокировать зашифрованные профили, введя их пароль.",
-    "titleManageContacts": "Разговоры",
-    "tooltipAddContact": "Добавление нового контакта или разговора",
     "tooltipOpenSettings": "Откройте панель настроек",
-    "contactAlreadyExists": "Контакт уже существует",
     "invalidImportString": "Недействительная строка импорта",
+    "contactAlreadyExists": "Контакт уже существует",
     "conversationSettings": "Настройки чата",
     "enterCurrentPasswordForDelete": "Пожалуйста, введите текущий пароль, чтобы удалить этот профиль.",
     "enableGroups": "Включить Групповые чаты",
+    "experimentsEnabled": "Включить Экспериментальные функции",
     "localeIt": "Итальянский",
     "localeEs": "Испанский",
-    "todoPlaceholder": "Выполняю...",
-    "addNewItem": "Добавить новый элемент в список",
     "addListItem": "Добавить новый элемент",
+    "addNewItem": "Добавить новый элемент в список",
+    "todoPlaceholder": "Выполняю...",
     "newConnectionPaneTitle": "Новое соединение",
-    "networkStatusConnecting": "Подключение к сети и контактам...",
+    "networkStatusOnline": "Online",
     "networkStatusAttemptingTor": "Попытка подключиться к сети Tor",
     "networkStatusDisconnected": "Нет сети. Проверьте подключение к интернету",
     "viewGroupMembershipTooltip": "Просмотр членства в группе",
@@ -181,7 +152,6 @@
     "builddate": "Построен на: %2",
     "version": "Версия %1",
     "versionTor": "Версия %1 c tor %2",
-    "experimentsEnabled": "Включить Экспериментальные функции",
     "themeDark": "Темная",
     "themeLight": "Светлая",
     "settingTheme": "Тема",
@@ -192,7 +162,6 @@
     "localeFr": "Французский",
     "localeEn": "Английский",
     "settingLanguage": "Язык",
-    "blockUnknownLabel": "Блокировать неизвестные контакты",
     "zoomLabel": "Масштаб интерфейса (в основном влияет на размеры текста и кнопок)",
     "versionBuilddate": "Версия: %1 Сборка от: %2",
     "cwtchSettingsTitle": "Настройки Cwtch",
@@ -219,18 +188,20 @@
     "noPasswordWarning": "Отсутствие пароля в этой учетной записи означает, что все данные, хранящиеся локально, не будут зашифрованы",
     "radioNoPassword": "Незашифрованный (без пароля)",
     "radioUsePassword": "Пароль",
+    "copiedToClipboardNotification": "Copied to Clipboard",
+    "copyBtn": "Copy",
     "editProfile": "Изменить профиль",
     "newProfile": "Новый профиль",
+    "defaultProfileName": "Alice",
     "profileName": "Отображаемое имя",
     "editProfileTitle": "Изменить профиль",
     "addProfileTitle": "Добавить новый профиль",
-    "unblockBtn": "Разблокировать контакт",
-    "dontSavePeerHistory": "Удалить историю",
-    "savePeerHistoryDescription": "Определяет политуку хранения или удаления переписки с данным контактом.",
-    "blockBtn": "Заблокировать контакт",
+    "deleteBtn": "Delete",
+    "saveBtn": "Save",
     "displayNameLabel": "Отображаемое имя",
     "addressLabel": "Адрес",
     "puzzleGameBtn": "Puzzle Game",
+    "bulletinsBtn": "Bulletins",
     "listsBtn": "Списки",
     "chatBtn": "Чат",
     "rejectGroupBtn": "Отклонить",
@@ -238,26 +209,24 @@
     "acceptGroupInviteLabel": "Хотите принять приглашение в",
     "newGroupBtn": "Создать новую группу",
     "copiedClipboardNotification": "Скопировано в буфер обмена",
-    "peerOfflineMessage": "Контакт не в сети, сообщения не могут быть отправлены",
-    "peerBlockedMessage": "Контакт заблокирован",
     "pendingLabel": "Ожидаемый",
     "acknowledgedLabel": "Отправлено",
     "couldNotSendMsgError": "Не удалось отправить это сообщение",
     "dmTooltip": "Нажмите, чтобы перейти в DM",
     "membershipDescription": "Ниже приведен список пользователей, отправивших сообщения группе. Этот список может не отражать всех пользователей, имеющих доступ к группе.",
     "addListItemBtn": "Добавить элемент",
-    "peerNotOnline": "Контакт не в сети. Вы не можете связаться с ним пока он не появиться в сети.",
     "searchList": "Список поиска",
     "update": "Обновить",
     "inviteBtn": "Пригласить",
     "inviteToGroupLabel": "Пригласить в группу",
+    "groupNameLabel": "Group name",
     "viewServerInfo": "Информация о сервере",
-    "serverNotSynced": "Синхронизация новых сообщений (это может занять некоторое время)...",
     "serverSynced": "Синхронизировано",
     "serverConnectivityDisconnected": "Сервер отключен",
     "serverConnectivityConnected": "Сервер подключен",
     "serverInfo": "Информация о сервере",
     "invitationLabel": "Приглашение",
+    "serverLabel": "Server",
     "search": "Поиск...",
     "cycleColoursDesktop": "Нажмите, чтобы переключать цвета.\nПравый клик чтобы сбросить.",
     "cycleColoursAndroid": "Нажмите, чтобы переключать цвета.\nНажмите и удерживайте, чтобы сбросить.",
@@ -266,13 +235,11 @@
     "cycleCatsDesktop": "Нажмите, чтобы просмотреть категории.\nПравый клик чтобы сбросить.",
     "cycleCatsAndroid": "Нажмите, чтобы просмотреть категории.\nНажмите и удерживайте, чтобы сбросить.",
     "blocked": "Заблокировано",
-    "pasteAddressToAddContact": "Вставьте адрес cwtch, приглашение или пакет ключей здесь, чтобы добавить их в контакты",
     "titlePlaceholder": "заговолок...",
     "postNewBulletinLabel": "Опубликовать новый бюллетень",
     "newBulletinLabel": "Новый бюллетень",
     "joinGroup": "Вступить в группу",
     "createGroup": "Создать группу",
-    "addPeer": "Добавить контакт",
     "groupAddr": "Адрес",
     "invitation": "Приглашение",
     "server": "Сервер",
@@ -281,7 +248,6 @@
     "peerAddress": "Адрес",
     "joinGroupTab": "Присоединиться к группе",
     "createGroupTab": "Создать группу",
-    "addPeerTab": "Добавить контакт",
     "createGroupBtn": "Создать",
     "defaultGroupName": "Замечательная группа",
     "createGroupTitle": "Создать группу"

lib/main.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:cwtch/config.dart';
 import 'package:cwtch/notification_manager.dart';
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:cwtch/views/messageview.dart';
+import 'package:cwtch/widgets/rightshiftfixer.dart';
 import 'package:flutter/foundation.dart';
 import 'package:cwtch/cwtch/ffi.dart';
 import 'package:cwtch/cwtch/gomobile.dart';
@@ -10,6 +10,7 @@ import 'package:flutter/material.dart';
 import 'package:cwtch/errorHandler.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/torstatus.dart';
+import 'package:cwtch/views/triplecolview.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'cwtch/cwtch.dart';
@@ -20,10 +21,10 @@ import 'models/servers.dart';
 import 'views/profilemgrview.dart';
 import 'views/splashView.dart';
 import 'dart:io' show Platform, exit;
-import 'themes/opaque.dart';
+import 'opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var globalSettings = Settings(Locale("en", ''), CwtchDark());
+var globalSettings = Settings(Locale("en", ''), OpaqueDark());
 var globalErrorHandler = ErrorHandler();
 var globalTorStatus = TorStatus();
 var globalAppState = AppState();
@@ -108,7 +109,7 @@ class FlwtchState extends State<Flwtch> {
             supportedLocales: AppLocalizations.supportedLocales,
             title: 'Cwtch',
             theme: mkThemeData(settings),
-            home: (!appState.cwtchInit || appState.modalState != ModalState.none) ?  SplashView() : ProfileMgrView(),
+            home: appState.cwtchInit == true ? ShiftRightFixer(child: ProfileMgrView()) : SplashView(),
           ),
         );
       },

lib/main_test.dart

@@ -5,7 +5,7 @@ import 'package:cwtch/errorHandler.dart';
 import 'package:cwtch/settings.dart';
 import 'licenses.dart';
 import 'main.dart';
-import 'themes/opaque.dart';
+import 'opaque.dart';
 
 import 'dart:convert';
 import 'dart:io';
@@ -14,7 +14,7 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:glob/glob.dart';
 
-var globalSettings = Settings(Locale("en", ''), CwtchDark());
+var globalSettings = Settings(Locale("en", ''), OpaqueDark());
 var globalErrorHandler = ErrorHandler();
 
 void main() {

lib/model.dart

@@ -1,7 +1,5 @@
 import 'dart:convert';
 
-import 'package:cwtch/config.dart';
-import 'package:cwtch/models/message.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cwtch/models/profileservers.dart';
@@ -26,14 +24,8 @@ class ChatMessage {
       };
 }
 
-enum ModalState {
-  none,
-  storageMigration
-}
-
 class AppState extends ChangeNotifier {
   bool cwtchInit = false;
-  ModalState modalState = ModalState.none;
   bool cwtchIsClosing = false;
   String appError = "";
   String? _selectedProfile;
@@ -53,11 +45,6 @@ class AppState extends ChangeNotifier {
     notifyListeners();
   }
 
-  void SetModalState(ModalState newState) {
-    modalState = newState;
-    notifyListeners();
-  }
-
   String? get selectedProfile => _selectedProfile;
   set selectedProfile(String? newVal) {
     this._selectedProfile = newVal;
@@ -131,7 +118,6 @@ class ProfileListState extends ChangeNotifier {
 }
 
 class ContactListState extends ChangeNotifier {
-  ProfileServerListState? servers;
   List<ContactInfoState> _contacts = [];
   String _filter = "";
   int get num => _contacts.length;
@@ -143,10 +129,6 @@ class ContactListState extends ChangeNotifier {
     notifyListeners();
   }
 
-  void connectServers(ProfileServerListState servers) {
-    this.servers = servers;
-  }
-
   List<ContactInfoState> filteredList() {
     if (!isFiltered) return contacts;
     return _contacts.where((ContactInfoState c) => c.onion.toLowerCase().startsWith(_filter) || (c.nickname.toLowerCase().contains(_filter))).toList();
@@ -154,22 +136,11 @@ class ContactListState extends ChangeNotifier {
 
   void addAll(Iterable<ContactInfoState> newContacts) {
     _contacts.addAll(newContacts);
-    servers?.clearGroups();
-    _contacts.forEach((contact) {
-      if (contact.isGroup) {
-        servers?.addGroup(contact);
-      }
-    });
-    resort();
     notifyListeners();
   }
 
   void add(ContactInfoState newContact) {
     _contacts.add(newContact);
-    if (newContact.isGroup) {
-      servers?.addGroup(newContact);
-    }
-    resort();
     notifyListeners();
   }
 
@@ -177,18 +148,12 @@ class ContactListState extends ChangeNotifier {
     _contacts.sort((ContactInfoState a, ContactInfoState b) {
       // return -1 = a first in list
       // return 1 = b first in list
-
       // blocked contacts last
       if (a.isBlocked == true && b.isBlocked != true) return 1;
       if (a.isBlocked != true && b.isBlocked == true) return -1;
       // archive is next...
       if (!a.isArchived && b.isArchived) return -1;
       if (a.isArchived && !b.isArchived) return 1;
-
-      // unapproved top
-      if (a.isInvitation && !b.isInvitation) return -1;
-      if (!a.isInvitation && b.isInvitation) return 1;
-
       // special sorting for contacts with no messages in either history
       if (a.lastMessageTime.millisecondsSinceEpoch == 0 && b.lastMessageTime.millisecondsSinceEpoch == 0) {
         // online contacts first
@@ -246,8 +211,8 @@ class ContactListState extends ChangeNotifier {
 }
 
 class ProfileInfoState extends ChangeNotifier {
-  ProfileServerListState _servers = ProfileServerListState();
   ContactListState _contacts = ContactListState();
+  ProfileServerListState _servers = ProfileServerListState();
   final String onion;
   String _nickname = "";
   String _imagePath = "";
@@ -275,11 +240,7 @@ class ProfileInfoState extends ChangeNotifier {
     this._online = online;
     this._encrypted = encrypted;
 
-    _contacts.connectServers(this._servers);
-
     if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
-      this.replaceServers(serversJson);
-
       List<dynamic> contacts = jsonDecode(contactsJson);
       this._contacts.addAll(contacts.map((contact) {
         return ContactInfoState(this.onion, contact["identifier"], contact["onion"],
@@ -301,6 +262,8 @@ class ProfileInfoState extends ChangeNotifier {
         this._contacts.updateLastMessageTime(this._contacts._contacts.first.identifier, this._contacts._contacts.first.lastMessageTime);
       }
     }
+
+    this.replaceServers(serversJson);
   }
 
   // Parse out the server list json into our server info state struct...
@@ -309,22 +272,15 @@ class ProfileInfoState extends ChangeNotifier {
       List<dynamic> servers = jsonDecode(serversJson);
       this._servers.replace(servers.map((server) {
         // TODO Keys...
-        return RemoteServerInfoState(onion: server["onion"], identifier: server["identifier"], description: server["description"], status: server["status"]);
+        return RemoteServerInfoState(onion: server["onion"], status: server["status"]);
       }));
-
-      this._contacts.contacts.forEach((contact) {
-        if (contact.isGroup) {
-          _servers.addGroup(contact);
-        }
-      });
-
       notifyListeners();
     }
   }
 
   //
   void updateServerStatusCache(String server, String status) {
-    this._servers.updateServerState(server, status);
+    this._servers.updateServerCache(server, status);
     notifyListeners();
   }
 
@@ -414,9 +370,12 @@ class ProfileInfoState extends ChangeNotifier {
 
   void downloadUpdate(String fileKey, int progress, int numChunks) {
     if (!downloadActive(fileKey)) {
-      this._downloads[fileKey] = FileDownloadProgress(numChunks, DateTime.now());
       if (progress < 0) {
+        this._downloads[fileKey] = FileDownloadProgress(numChunks, DateTime.now());
         this._downloads[fileKey]!.interrupted = true;
+        notifyListeners();
+      } else {
+        print("error: received progress for unknown download " + fileKey);
       }
     } else {
       if (this._downloads[fileKey]!.interrupted) {
@@ -424,16 +383,17 @@ class ProfileInfoState extends ChangeNotifier {
       }
       this._downloads[fileKey]!.chunksDownloaded = progress;
       this._downloads[fileKey]!.chunksTotal = numChunks;
+      notifyListeners();
     }
-    notifyListeners();
   }
 
   void downloadMarkManifest(String fileKey) {
     if (!downloadActive(fileKey)) {
-      this._downloads[fileKey] = FileDownloadProgress(1, DateTime.now());
+      print("error: received download completion notice for unknown download " + fileKey);
+    } else {
+      this._downloads[fileKey]!.gotManifest = true;
+      notifyListeners();
     }
-    this._downloads[fileKey]!.gotManifest = true;
-    notifyListeners();
   }
 
   void downloadMarkFinished(String fileKey, String finalPath) {
@@ -443,17 +403,10 @@ class ProfileInfoState extends ChangeNotifier {
       // so setting numChunks correctly shouldn't matter
       this.downloadInit(fileKey, 1);
     }
-    // only update if different
-    if (!this._downloads[fileKey]!.complete) {
-      this._downloads[fileKey]!.timeEnd = DateTime.now();
-      this._downloads[fileKey]!.downloadedTo = finalPath;
-      this._downloads[fileKey]!.complete = true;
-      notifyListeners();
-    }
-  }
-
-  bool downloadKnown(String fileKey) {
-    return this._downloads.containsKey(fileKey);
+    this._downloads[fileKey]!.timeEnd = DateTime.now();
+    this._downloads[fileKey]!.downloadedTo = finalPath;
+    this._downloads[fileKey]!.complete = true;
+    notifyListeners();
   }
 
   bool downloadActive(String fileKey) {
@@ -547,12 +500,6 @@ ContactAuthorization stringToContactAuthorization(String authStr) {
   }
 }
 
-class MessageCache {
-  final MessageMetadata metadata;
-  final String wrapper;
-  MessageCache(this.metadata, this.wrapper);
-}
-
 class ContactInfoState extends ChangeNotifier {
   final String profileOnion;
   final int identifier;
@@ -567,7 +514,6 @@ class ContactInfoState extends ChangeNotifier {
   late int _totalMessages = 0;
   late DateTime _lastMessageTime;
   late Map<String, GlobalKey<MessageRowState>> keys;
-  late List<MessageCache?> messageCache;
   int _newMarker = 0;
   DateTime _newMarkerClearAt = DateTime.now();
 
@@ -599,7 +545,6 @@ class ContactInfoState extends ChangeNotifier {
     this._lastMessageTime = lastMessageTime == null ? DateTime.fromMillisecondsSinceEpoch(0) : lastMessageTime;
     this._server = server;
     this._archived = archived;
-    this.messageCache = List.empty(growable: true);
     keys = Map<String, GlobalKey<MessageRowState>>();
   }
 
@@ -676,7 +621,7 @@ class ContactInfoState extends ChangeNotifier {
   set newMarker(int newVal) {
     // only unreadMessages++ can set newMarker = 1;
     // avoids drawing a marker when the convo is already open
-    if (newVal >= 1) {
+    if (newVal > 1) {
       this._newMarker = newVal;
       notifyListeners();
     }
@@ -712,37 +657,11 @@ class ContactInfoState extends ChangeNotifier {
     }
   }
 
-  GlobalKey<MessageRowState> getMessageKey(int conversation, int message) {
-    String index = "c: " + conversation.toString() + " m:" + message.toString();
+  GlobalKey<MessageRowState> getMessageKey(String index) {
     if (keys[index] == null) {
       keys[index] = GlobalKey<MessageRowState>();
     }
     GlobalKey<MessageRowState> ret = keys[index]!;
     return ret;
   }
-
-  GlobalKey<MessageRowState>? getMessageKeyOrFail(int conversation, int message) {
-    String index = "c: " + conversation.toString() + " m:" + message.toString();
-
-    if (keys[index] == null) {
-      return null;
-    }
-    GlobalKey<MessageRowState> ret = keys[index]!;
-    return ret;
-  }
-
-  void updateMessageCache(int conversation, int messageID, DateTime timestamp, String senderHandle, String senderImage, bool isAuto, String data) {
-    this.messageCache.insert(0, MessageCache(MessageMetadata(profileOnion, conversation, messageID, timestamp, senderHandle, senderImage, "", {}, false, false, isAuto), data));
-    this.totalMessages += 1;
-  }
-
-  void bumpMessageCache() {
-    this.messageCache.insert(0, null);
-    this.totalMessages += 1;
-  }
-
-  void ackCache(int messageID) {
-    this.messageCache.firstWhere((element) => element?.metadata.messageID == messageID)?.metadata.ackd = true;
-    notifyListeners();
-  }
 }

lib/models/message.dart

@@ -28,47 +28,11 @@ const GroupConversationHandleLength = 32;
 
 abstract class Message {
   MessageMetadata getMetadata();
-  Widget getWidget(BuildContext context, Key key);
+  Widget getWidget(BuildContext context);
   Widget getPreviewWidget(BuildContext context);
 }
 
-Message compileOverlay(MessageMetadata metadata, String messageData) {
-  try {
-    dynamic message = jsonDecode(messageData);
-    var content = message['d'] as dynamic;
-    var overlay = int.parse(message['o'].toString());
-
-    switch (overlay) {
-      case TextMessageOverlay:
-        return TextMessage(metadata, content);
-      case SuggestContactOverlay:
-      case InviteGroupOverlay:
-        return InviteMessage(overlay, metadata, content);
-      case QuotedMessageOverlay:
-        return QuotedMessage(metadata, content);
-      case FileShareOverlay:
-        return FileMessage(metadata, content);
-      default:
-        // Metadata is valid, content is not..
-        return MalformedMessage(metadata);
-    }
-  } catch (e) {
-    return MalformedMessage(metadata);
-  }
-}
-
 Future<Message> messageHandler(BuildContext context, String profileOnion, int conversationIdentifier, int index, {bool byID = false}) {
-  try {
-    var cache = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(conversationIdentifier)?.messageCache;
-    if (cache != null && cache.length > index) {
-      if (cache[index] != null) {
-        return Future.value(compileOverlay(cache[index]!.metadata, cache[index]!.wrapper));
-      }
-    }
-  } catch (e) {
-    // provider check failed...make an expensive call...
-  }
-
   try {
     Future<dynamic> rawMessageEnvelopeFuture;
 
@@ -79,7 +43,7 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
     }
 
     return rawMessageEnvelopeFuture.then((dynamic rawMessageEnvelope) {
-      var metadata = MessageMetadata(profileOnion, conversationIdentifier, index, DateTime.now(), "", "", "", <String, String>{}, false, true, false);
+      var metadata = MessageMetadata(profileOnion, conversationIdentifier, index, -1, DateTime.now(), "", "", null, 0, false, true);
       try {
         dynamic messageWrapper = jsonDecode(rawMessageEnvelope);
         // There are 2 conditions in which this error condition can be met:
@@ -94,7 +58,7 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
         if (messageWrapper['Message'] == null || messageWrapper['Message'] == '' || messageWrapper['Message'] == '{}') {
           return Future.delayed(Duration(seconds: 2), () {
             print("Tail recursive call to messageHandler called. This should be a rare event. If you see multiples of this log over a short period of time please log it as a bug.");
-            return messageHandler(context, profileOnion, conversationIdentifier, -1, byID: byID).then((value) => value);
+            return messageHandler(context, profileOnion, conversationIdentifier, index, byID: byID).then((value) => value);
           });
         }
 
@@ -103,20 +67,37 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
         var timestamp = DateTime.tryParse(messageWrapper['Timestamp'])!;
         var senderHandle = messageWrapper['PeerID'];
         var senderImage = messageWrapper['ContactImage'];
-        var attributes = messageWrapper['Attributes'];
+        var flags = int.parse(messageWrapper['Flags'].toString());
         var ackd = messageWrapper['Acknowledged'];
         var error = messageWrapper['Error'] != null;
         var signature = messageWrapper['Signature'];
-        metadata = MessageMetadata(profileOnion, conversationIdentifier, messageID, timestamp, senderHandle, senderImage, signature, attributes, ackd, error, false);
+        metadata = MessageMetadata(profileOnion, conversationIdentifier, index, messageID, timestamp, senderHandle, senderImage, signature, flags, ackd, error);
 
-        return compileOverlay(metadata, messageWrapper['Message']);
+        dynamic message = jsonDecode(messageWrapper['Message']);
+        var content = message['d'] as dynamic;
+        var overlay = int.parse(message['o'].toString());
+
+        switch (overlay) {
+          case TextMessageOverlay:
+            return TextMessage(metadata, content);
+          case SuggestContactOverlay:
+          case InviteGroupOverlay:
+            return InviteMessage(overlay, metadata, content);
+          case QuotedMessageOverlay:
+            return QuotedMessage(metadata, content);
+          case FileShareOverlay:
+            return FileMessage(metadata, content);
+          default:
+            // Metadata is valid, content is not..
+            return MalformedMessage(metadata);
+        }
       } catch (e) {
         EnvironmentConfig.debugLog("an error! " + e.toString());
         return MalformedMessage(metadata);
       }
     });
   } catch (e) {
-    return Future.value(MalformedMessage(MessageMetadata(profileOnion, conversationIdentifier, -1, DateTime.now(), "", "", "", <String, String>{}, false, true, false)));
+    return Future.value(MalformedMessage(MessageMetadata(profileOnion, conversationIdentifier, index, -1, DateTime.now(), "", "", null, 0, false, true)));
   }
 }
 
@@ -124,19 +105,23 @@ class MessageMetadata extends ChangeNotifier {
   // meta-metadata
   final String profileOnion;
   final int conversationIdentifier;
+  final int messageIndex;
   final int messageID;
 
   final DateTime timestamp;
   final String senderHandle;
   final String? senderImage;
-  final dynamic _attributes;
+  int _flags;
   bool _ackd;
   bool _error;
-  final bool isAuto;
 
   final String? signature;
 
-  dynamic get attributes => this._attributes;
+  int get flags => this._flags;
+  set flags(int newVal) {
+    this._flags = newVal;
+    notifyListeners();
+  }
 
   bool get ackd => this._ackd;
   set ackd(bool newVal) {
@@ -151,5 +136,5 @@ class MessageMetadata extends ChangeNotifier {
   }
 
   MessageMetadata(
-      this.profileOnion, this.conversationIdentifier, this.messageID, this.timestamp, this.senderHandle, this.senderImage, this.signature, this._attributes, this._ackd, this._error, this.isAuto);
+      this.profileOnion, this.conversationIdentifier, this.messageIndex, this.messageID, this.timestamp, this.senderHandle, this.senderImage, this.signature, this._flags, this._ackd, this._error);
 }

lib/models/messagecache.dart

@@ -0,0 +1,26 @@
+import 'dart:collection';
+
+import 'package:cwtch/widgets/messagerow.dart';
+import 'package:flutter/material.dart';
+
+int MinCacheSize = 20;
+
+class MessageCache extends ChangeNotifier {
+  final String profile;
+
+  Queue<MessageRowState> cacheByIndex = Queue();
+  Map<int, MessageRowState> cacheById = Map();
+
+  MessageCache(this.profile) {}
+
+  // So we internall need to fetch by N (new libcwtch API)
+  // then double store by index and id to support both calls
+  // monitor activeConversation for unlimited growth and when
+  // change to not active convo, trigger a shrink
+  // bonus: dont prune cache by id messages refed in core list
+
+  GetMessageByIndex(conversationIdentifier, index);
+
+  GetMessageById(conversationIdentifier, index);
+
+}

lib/models/messages/filemessage.dart

@@ -7,7 +7,6 @@ import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
-import '../../main.dart';
 import '../../model.dart';
 
 class FileMessage extends Message {
@@ -18,10 +17,11 @@ class FileMessage extends Message {
   FileMessage(this.metadata, this.content);
 
   @override
-  Widget getWidget(BuildContext context, Key key) {
+  Widget getWidget(BuildContext context) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
           dynamic shareObj = jsonDecode(this.content);
           if (shareObj == null) {
             return MessageRow(MalformedBubble());
@@ -30,19 +30,12 @@ class FileMessage extends Message {
           String rootHash = shareObj['h'] as String;
           String nonce = shareObj['n'] as String;
           int fileSize = shareObj['s'] as int;
-          String fileKey = rootHash + "." + nonce;
-
-          if (metadata.attributes["file-downloaded"] == "true") {
-            if (!Provider.of<ProfileInfoState>(context).downloadKnown(fileKey)) {
-              Provider.of<FlwtchState>(context, listen: false).cwtch.CheckDownloadStatus(Provider.of<ProfileInfoState>(context, listen: false).onion, fileKey);
-            }
-          }
 
           if (!validHash(rootHash, nonce)) {
             return MessageRow(MalformedBubble());
           }
 
-          return MessageRow(FileBubble(nameSuggestion, rootHash, nonce, fileSize, isAuto: metadata.isAuto), key: key);
+          return MessageRow(FileBubble(nameSuggestion, rootHash, nonce, fileSize), key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx));
         });
   }
 
@@ -62,16 +55,13 @@ class FileMessage extends Message {
           if (!validHash(rootHash, nonce)) {
             return MessageRow(MalformedBubble());
           }
-          return Container(
-              alignment: Alignment.center,
-              child: FileBubble(
-                nameSuggestion,
-                rootHash,
-                nonce,
-                fileSize,
-                isAuto: metadata.isAuto,
-                interactive: false,
-              ));
+          return FileBubble(
+            nameSuggestion,
+            rootHash,
+            nonce,
+            fileSize,
+            interactive: false,
+          );
         });
   }
 

lib/models/messages/invitemessage.dart

@@ -17,10 +17,11 @@ class InviteMessage extends Message {
   InviteMessage(this.overlay, this.metadata, this.content);
 
   @override
-  Widget getWidget(BuildContext context, Key key) {
+  Widget getWidget(BuildContext context) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
           String inviteTarget;
           String inviteNick;
           String invite = this.content;
@@ -39,7 +40,7 @@ class InviteMessage extends Message {
               return MessageRow(MalformedBubble());
             }
           }
-          return MessageRow(InvitationBubble(overlay, inviteTarget, inviteNick, invite), key: key);
+          return MessageRow(InvitationBubble(overlay, inviteTarget, inviteNick, invite), key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx));
         });
   }
 

lib/models/messages/malformedmessage.dart

@@ -9,11 +9,11 @@ class MalformedMessage extends Message {
   MalformedMessage(this.metadata);
 
   @override
-  Widget getWidget(BuildContext context, Key key) {
+  Widget getWidget(BuildContext context) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (context, child) {
-          return MessageRow(MalformedBubble(), key: key);
+          return MessageRow(MalformedBubble());
         });
   }
 

lib/models/messages/quotedmessage.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/messages/malformedmessage.dart';
-import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:cwtch/widgets/quotedmessage.dart';
 import 'package:flutter/widgets.dart';
@@ -52,7 +51,7 @@ class QuotedMessage extends Message {
             dynamic message = jsonDecode(this.content);
             return Text(message["body"]);
           } catch (e) {
-            return MalformedBubble();
+            return MalformedMessage(this.metadata).getWidget(context);
           }
         });
   }
@@ -63,15 +62,16 @@ class QuotedMessage extends Message {
   }
 
   @override
-  Widget getWidget(BuildContext context, Key key) {
+  Widget getWidget(BuildContext context) {
     try {
       dynamic message = jsonDecode(this.content);
 
       if (message["body"] == null || message["quotedHash"] == null) {
-        return MalformedBubble();
+        return MalformedMessage(this.metadata).getWidget(context);
       }
 
       var quotedMessagePotentials = Provider.of<FlwtchState>(context).cwtch.GetMessageByContentHash(metadata.profileOnion, metadata.conversationIdentifier, message["quotedHash"]);
+      int messageIndex = metadata.messageIndex;
       Future<LocallyIndexedMessage?> quotedMessage = quotedMessagePotentials.then((matchingMessages) {
         if (matchingMessages == "[]") {
           return null;
@@ -81,7 +81,9 @@ class QuotedMessage extends Message {
         // message
         try {
           var list = (jsonDecode(matchingMessages) as List<dynamic>).map((data) => LocallyIndexedMessage.fromJson(data)).toList();
-          LocallyIndexedMessage candidate = list.reversed.first;
+          LocallyIndexedMessage candidate = list.reversed.firstWhere((element) => messageIndex < element.index, orElse: () {
+            return list.firstWhere((element) => messageIndex > element.index);
+          });
           return candidate;
         } catch (e) {
           // Malformed Message will be returned...
@@ -92,17 +94,18 @@ class QuotedMessage extends Message {
       return ChangeNotifierProvider.value(
           value: this.metadata,
           builder: (bcontext, child) {
+            String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
             return MessageRow(
                 QuotedMessageBubble(message["body"], quotedMessage.then((LocallyIndexedMessage? localIndex) {
                   if (localIndex != null) {
-                    return messageHandler(bcontext, metadata.profileOnion, metadata.conversationIdentifier, localIndex.index);
+                    return messageHandler(context, metadata.profileOnion, metadata.conversationIdentifier, localIndex.index);
                   }
                   return MalformedMessage(this.metadata);
                 })),
-                key: key);
+                key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx));
           });
     } catch (e) {
-      return MalformedBubble();
+      return MalformedMessage(this.metadata).getWidget(context);
     }
   }
 }

lib/models/messages/textmessage.dart

@@ -1,8 +1,5 @@
 import 'package:cwtch/models/message.dart';
-import 'package:cwtch/models/messages/malformedmessage.dart';
-import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messagebubble.dart';
-import 'package:cwtch/widgets/messageloadingbubble.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -31,14 +28,12 @@ class TextMessage extends Message {
   }
 
   @override
-  Widget getWidget(BuildContext context, Key key) {
+  Widget getWidget(BuildContext context) {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
-          return MessageRow(
-            MessageBubble(this.content),
-            key: key,
-          );
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
+          return MessageRow(MessageBubble(this.content), key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx));
         });
   }
 }

lib/models/profileservers.dart

@@ -1,4 +1,3 @@
-import 'package:cwtch/model.dart';
 import 'package:flutter/material.dart';
 
 class ProfileServerListState extends ChangeNotifier {
@@ -7,7 +6,6 @@ class ProfileServerListState extends ChangeNotifier {
   void replace(Iterable<RemoteServerInfoState> newServers) {
     _servers.clear();
     _servers.addAll(newServers);
-    resort();
     notifyListeners();
   }
 
@@ -16,78 +14,23 @@ class ProfileServerListState extends ChangeNotifier {
     return idx >= 0 ? _servers[idx] : null;
   }
 
-  void updateServerState(String onion, String status) {
+  void updateServerCache(String onion, String status) {
     int idx = _servers.indexWhere((element) => element.onion == onion);
     if (idx >= 0) {
-      _servers[idx].status = status;
+      _servers[idx] = RemoteServerInfoState(onion: onion, status: status);
     } else {
       print("Tried to update server cache without a starting state...this is probably an error");
     }
-    resort();
     notifyListeners();
   }
 
-  void resort() {
-    _servers.sort((RemoteServerInfoState a, RemoteServerInfoState b) {
-      // return -1 = a first in list
-      // return 1 = b first in list
-
-      // online v offline
-      if (a.status == "Synced" && b.status != "Synced") {
-        return -1;
-      } else if (a.status != "Synced" && b.status == "Synced") {
-        return 1;
-      }
-
-      // num of groups
-      if (a.groups.length > b.groups.length) {
-        return -1;
-      } else if (b.groups.length > a.groups.length) {
-        return 1;
-      }
-
-      return 0;
-    });
-  }
-
-  void clearGroups() {
-    _servers.map((server) => server.clearGroups());
-  }
-
-  void addGroup(ContactInfoState group) {
-    int idx = _servers.indexWhere((element) => element.onion == group.server);
-    if (idx >= 0) {
-      _servers[idx].addGroup(group);
-    }
-  }
-
   List<RemoteServerInfoState> get servers => _servers.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
 
 }
 
 class RemoteServerInfoState extends ChangeNotifier {
   final String onion;
-  final int identifier;
-  String status;
-  String description;
-  List<ContactInfoState> _groups = [];
-
-  RemoteServerInfoState({required this.onion, required this.identifier, required this.description, required this.status});
-
-  void updateDescription(String newDescription) {
-    this.description = newDescription;
-    notifyListeners();
-  }
-
-  void clearGroups() {
-    _groups = [];
-  }
-
-  void addGroup(ContactInfoState group) {
-    _groups.add(group);
-    notifyListeners();
-  }
-
-  List<ContactInfoState> get groups => _groups.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
+  final String status;
 
+  RemoteServerInfoState({required this.onion, required this.status});
 }

lib/models/servers.dart

@@ -39,34 +39,11 @@ class ServerListState extends ChangeNotifier {
     notifyListeners();
   }
 
-  void updateServerStats(String onion, int newTotalMessages, int newConnections) {
-    var server = getServer(onion);
-    if (server != null) {
-      server.setStats(newTotalMessages, newConnections);
-      resort();
-      notifyListeners();
-    }
-  }
-
   void delete(String onion) {
     _servers.removeWhere((element) => element.onion == onion);
     notifyListeners();
   }
 
-  void resort() {
-    _servers.sort((ServerInfoState a, ServerInfoState b) {
-      // return -1 = a first in list
-      // return 1 = b first in list
-      if (a.totalMessages > b.totalMessages) {
-        return -1;
-      } else if (b.totalMessages > a.totalMessages) {
-        return 1;
-      }
-
-      return 0;
-    });
-  }
-
   List<ServerInfoState> get servers => _servers.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
 
 }
@@ -78,8 +55,6 @@ class ServerInfoState extends ChangeNotifier {
   bool running;
   bool autoStart;
   bool isEncrypted;
-  int totalMessages = 0;
-  int connections = 0;
 
   ServerInfoState({required this.onion, required this.serverBundle, required this.running, required this.description, required this.autoStart, required this.isEncrypted});
 
@@ -97,10 +72,4 @@ class ServerInfoState extends ChangeNotifier {
     description = val;
     notifyListeners();
   }
-
-  void setStats(int newTotalMessages, int newConnections) {
-    totalMessages = newTotalMessages;
-    connections = newConnections;
-    notifyListeners();
-  }
 }

lib/settings.dart

@@ -2,17 +2,15 @@ import 'dart:collection';
 import 'dart:ui';
 import 'dart:core';
 
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
-import 'themes/opaque.dart';
+import 'opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 const TapirGroupsExperiment = "tapir-groups-experiment";
 const ServerManagementExperiment = "servers-experiment";
 const FileSharingExperiment = "filesharing";
-const ImagePreviewsExperiment = "filesharing-images";
 const ClickableLinksExperiment = "clickable-links";
 
 enum DualpaneMode {
@@ -37,10 +35,16 @@ class Settings extends ChangeNotifier {
 
   bool blockUnknownConnections = false;
   bool streamerMode = false;
-  String _downloadPath = "";
 
-  void setTheme(String themeId, String mode) {
-    theme = getTheme(themeId, mode);
+  /// Set the dark theme.
+  void setDark() {
+    theme = OpaqueDark();
+    notifyListeners();
+  }
+
+  /// Set the Light theme.
+  void setLight() {
+    theme = OpaqueLight();
     notifyListeners();
   }
 
@@ -65,7 +69,11 @@ class Settings extends ChangeNotifier {
   /// be sent to the function and new settings will be instantiated based on the contents.
   handleUpdate(dynamic settings) {
     // Set Theme and notify listeners
-    this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark);
+    if (settings["Theme"] == "light") {
+      this.setLight();
+    } else {
+      this.setDark();
+    }
 
     // Set Locale and notify listeners
     switchLocale(Locale(settings["Locale"]));
@@ -83,9 +91,6 @@ class Settings extends ChangeNotifier {
     _uiColumnModePortrait = uiColumnModeFromString(settings["UIColumnModePortrait"]);
     _uiColumnModeLandscape = uiColumnModeFromString(settings["UIColumnModeLandscape"]);
 
-    // auto-download folder
-    _downloadPath = settings["DownloadPath"] ?? "";
-
     // Push the experimental settings to Consumers of Settings
     notifyListeners();
   }
@@ -218,36 +223,17 @@ class Settings extends ChangeNotifier {
     }
   }
 
-  // checks experiment settings and file extension for image previews
-  // (ignores file size; if the user manually accepts the file, assume it's okay to preview)
-  bool shouldPreview(String path) {
-    var lpath = path.toLowerCase();
-    return isExperimentEnabled(ImagePreviewsExperiment) && (
-        lpath.endsWith(".jpg") ||
-        lpath.endsWith(".jpeg") ||
-        lpath.endsWith(".png") ||
-        lpath.endsWith(".gif") ||
-        lpath.endsWith(".webp") ||
-        lpath.endsWith(".bmp")
-    );
-  }
-
-  String get downloadPath => _downloadPath;
-  set downloadPath(String newval) {
-    _downloadPath = newval;
-    notifyListeners();
-  }
-
   /// Construct a default settings object.
   Settings(this.locale, this.theme);
 
   /// Convert this Settings object to a JSON representation for serialization on the
   /// event bus.
   dynamic asJson() {
+    var themeString = theme.identifier();
+
     return {
       "Locale": this.locale.languageCode,
-      "Theme": theme.theme,
-      "ThemeMode": theme.mode,
+      "Theme": themeString,
       "PreviousPid": -1,
       "BlockUnknownConnections": blockUnknownConnections,
       "StreamerMode": streamerMode,
@@ -257,7 +243,6 @@ class Settings extends ChangeNotifier {
       "FirstTime": false,
       "UIColumnModePortrait": uiColumnModePortrait.toString(),
       "UIColumnModeLandscape": uiColumnModeLandscape.toString(),
-      "DownloadPath": _downloadPath,
     };
   }
 }

lib/themes/cwtch.dart

@@ -1,123 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const cwtch_theme = "cwtch";
-
-final Color darkGreyPurple = Color(0xFF281831);
-final Color deepPurple = Color(0xFF422850);
-final Color mauvePurple = Color(0xFF8E64A5);
-final Color whiteishPurple = Color(0xFFE3DFE4);
-final Color lightGrey = Color(0xFF9E9E9E);
-final Color softGreen = Color(0xFFA0FFB0);
-final Color softRed = Color(0xFFFFA0B0);
-
-final Color whitePurple = Color(0xFFFFFDFF);
-final Color softPurple = Color(0xFFFDF3FC);
-final Color purple = Color(0xFFDFB9DE);
-final Color brightPurple = Color(0xFFD1B0E0); // not in new: portrait badge color
-final Color darkPurple = Color(0xFF350052);
-final Color greyPurple = Color(0xFF775F84); // not in new: portrait borders
-final Color pink = Color(0xFFE85DA1); // not in new: active button color
-final Color hotPink = Color(0xFFD20070); // Color(0xFFD01972);
-final Color softGrey = Color(0xFFB3B6B3); // not in new theme: blocked
-
-OpaqueThemeType GetCwtchTheme(String mode) {
-  if (mode == mode_dark) {
-    return CwtchDark();
-  } else {
-    return CwtchLight();
-  }
-}
-
-class CwtchDark extends OpaqueThemeType {
-  static final Color background = darkGreyPurple;
-  static final Color header = darkGreyPurple;
-  static final Color userBubble = mauvePurple;
-  static final Color peerBubble = deepPurple;
-  static final Color font = whiteishPurple;
-  static final Color settings = whiteishPurple;
-  static final Color accent = hotPink;
-
-  get theme => cwtch_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get backgroundHilightElementColor => deepPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get sendHintTextColor => mauvePurple;
-  get hilightElementColor => purple;
-  get defaultButtonColor => accent; //hotPink;
-  get defaultButtonTextColor => whiteishPurple;
-  get defaultButtonDisabledColor => lightGrey;
-  get defaultButtonDisabledTextColor => darkGreyPurple;
-  get textfieldBackgroundColor => deepPurple;
-  get textfieldBorderColor => deepPurple;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get textfieldErrorColor => hotPink;
-  get scrollbarDefaultColor => purple;
-  get portraitBackgroundColor => deepPurple;
-  get portraitOnlineBorderColor => whiteishPurple;
-  get portraitOfflineBorderColor => purple;
-  get portraitBlockedBorderColor => lightGrey;
-  get portraitBlockedTextColor => lightGrey;
-  get portraitContactBadgeColor => hotPink;
-  get portraitContactBadgeTextColor => whiteishPurple;
-  get portraitProfileBadgeColor => mauvePurple;
-  get portraitProfileBadgeTextColor => darkGreyPurple;
-  get dropShadowColor => mauvePurple;
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class CwtchLight extends OpaqueThemeType {
-  static final Color background = whitePurple;
-  static final Color header = softPurple;
-  static final Color userBubble = purple;
-  static final Color peerBubble = softPurple;
-  static final Color font = darkPurple;
-  static final Color settings = darkPurple;
-  static final Color accent = hotPink;
-
-  get theme => cwtch_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get backgroundHilightElementColor => softPurple;
-  get mainTextColor => settings;
-  get sendHintTextColor => purple;
-  get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable
-  get defaultButtonColor => accent; // hotPink;
-  get defaultButtonTextColor => whitePurple; // ?
-  get defaultButtonDisabledColor => softGrey;
-  get textfieldBackgroundColor => purple;
-  get textfieldBorderColor => purple;
-  get textfieldHintColor => font; //TODO pick
-  get textfieldErrorColor => hotPink;
-  get scrollbarDefaultColor => accent;
-  get portraitBackgroundColor => softPurple;
-  get portraitOnlineBorderColor => greyPurple;
-  get portraitOfflineBorderColor => greyPurple;
-  get portraitBlockedBorderColor => softGrey;
-  get portraitBlockedTextColor => softGrey;
-  get portraitContactBadgeColor => accent;
-  get portraitContactBadgeTextColor => whitePurple;
-  get portraitProfileBadgeColor => brightPurple;
-  get portraitProfileBadgeTextColor => whitePurple;
-  get dropShadowColor => purple;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/ghost.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const ghost_theme = "ghost";
-
-OpaqueThemeType GetGhostTheme(String mode) {
-  if (mode == mode_dark) {
-    return GhostDark();
-  } else {
-    return GhostLight();
-  }
-}
-
-class GhostDark extends CwtchDark {
-  static final Color background = Color(0xFF0D0D1F);
-  static final Color header = Color(0xFF0D0D1F);
-  static final Color userBubble = Color(0xFF1A237E);
-  static final Color peerBubble = Color(0xFF000051);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFDFFFD);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => ghost_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class GhostLight extends CwtchLight {
-  static final Color background = Color(0xFFFDFDFF);
-  static final Color header = Color(0xFFAAB6FE);
-  static final Color userBubble = Color(0xFFAAB6FE);
-  static final Color peerBubble = Color(0xFFE8EAF6);
-  static final Color font = Color(0xFF0D0D1F);
-  static final Color settings = Color(0xFF0D0D1F);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => ghost_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/mermaid.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const mermaid_theme = "mermaid";
-
-OpaqueThemeType GetMermaidTheme(String mode) {
-  if (mode == mode_dark) {
-    return MermaidDark();
-  } else {
-    return MermaidLight();
-  }
-}
-
-class MermaidDark extends CwtchDark {
-  static final Color background = Color(0xFF102426);
-  static final Color header = Color(0xFF102426);
-  static final Color userBubble = Color(0xFF00838F);
-  static final Color peerBubble = Color(0xFF00363A);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFF7FCFD);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => mermaid_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class MermaidLight extends CwtchLight {
-  static final Color background = Color(0xFFF7FCFD);
-  static final Color header = Color(0xFF56C8D8);
-  static final Color userBubble = Color(0xFF56C8D8);
-  static final Color peerBubble = Color(0xFFB2EBF2);
-  static final Color font = Color(0xFF102426);
-  static final Color settings = Color(0xFF102426);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => mermaid_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/midnight.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const midnight_theme = "midnight";
-
-OpaqueThemeType GetMidnightTheme(String mode) {
-  if (mode == mode_dark) {
-    return MidnightDark();
-  } else {
-    return MidnightLight();
-  }
-}
-
-class MidnightDark extends CwtchDark {
-  static final Color background = Color(0xFF1B1B1B);
-  static final Color header = Color(0xFF1B1B1B);
-  static final Color userBubble = Color(0xFF373737);
-  static final Color peerBubble = Color(0xFF494949);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFFFDFF);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => midnight_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class MidnightLight extends CwtchLight {
-  static final Color background = Color(0xFFFFFDFF);
-  static final Color header = Color(0xFFE0E0E0);
-  static final Color userBubble = Color(0xFFE0E0E0);
-  static final Color peerBubble = Color(0xFFBABDBE);
-  static final Color font = Color(0xFF1B1B1B);
-  static final Color settings = Color(0xFF1B1B1B);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => midnight_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/neon1.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const neon1_theme = "neon1";
-
-OpaqueThemeType GetNeon1Theme(String mode) {
-  if (mode == mode_dark) {
-    return Neon1Dark();
-  } else {
-    return Neon1Light();
-  }
-}
-
-class Neon1Dark extends CwtchDark {
-  static final Color background = Color(0xFF290826);
-  static final Color header = Color(0xFF290826);
-  static final Color userBubble = Color(0xFFD20070);
-  static final Color peerBubble = Color(0xFF26A9A4);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFFFDFF);
-  static final Color accent = Color(0xFFA604FE);
-
-  get theme => neon1_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class Neon1Light extends CwtchLight {
-  static final Color background = Color(0xFFFFFDFF);
-  static final Color header = Color(0xFFFF94C2);
-  static final Color userBubble = Color(0xFFFF94C2);
-  static final Color peerBubble = Color(0xFFE7F6F6);
-  static final Color font = Color(0xFF290826);
-  static final Color settings = Color(0xFF290826);
-  static final Color accent = Color(0xFFA604FE);
-
-  get theme => neon1_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/neon2.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const neon2_theme = "neon2";
-
-OpaqueThemeType GetNeon2Theme(String mode) {
-  if (mode == mode_dark) {
-    return Neon2Dark();
-  } else {
-    return Neon2Light();
-  }
-}
-
-class Neon2Dark extends CwtchDark {
-  static final Color background = Color(0xFF290826);
-  static final Color header = Color(0xFF290826);
-  static final Color userBubble = Color(0xFFA604FE);
-  static final Color peerBubble = Color(0xFF03AD00);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFFFDFF);
-  static final Color accent = Color(0xFFA604FE);
-
-  get theme => neon2_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class Neon2Light extends CwtchLight {
-  static final Color background = Color(0xFFFFFDFF);
-  static final Color header = Color(0xFFD8C7E1);
-  static final Color userBubble = Color(0xFFD8C7E1);
-  static final Color peerBubble = Color(0xFF80E27E);
-  static final Color font = Color(0xFF290826);
-  static final Color settings = Color(0xFF290826);
-  static final Color accent = Color(0xFFA604FE);
-
-  get theme => neon2_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/opaque.dart

@@ -1,203 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:cwtch/themes/mermaid.dart';
-import 'package:cwtch/themes/neon1.dart';
-import 'package:cwtch/themes/pumpkin.dart';
-import 'package:cwtch/themes/vampire.dart';
-import 'package:cwtch/themes/witch.dart';
-import 'package:flutter/material.dart';
-import 'package:cwtch/settings.dart';
-
-import 'ghost.dart';
-import 'midnight.dart';
-import 'neon2.dart';
-
-const mode_light = "light";
-const mode_dark = "dark";
-
-final themes = {
-  cwtch_theme: {mode_light: CwtchLight(), mode_dark: CwtchDark()},
-  ghost_theme: {mode_light: GhostLight(), mode_dark: GhostDark()},
-  mermaid_theme: {mode_light: MermaidLight(), mode_dark: MermaidDark()},
-  midnight_theme: {mode_light: MidnightLight(), mode_dark: MidnightDark()},
-  neon1_theme: {mode_light: Neon1Light(), mode_dark: Neon1Dark()},
-  neon2_theme: {mode_light: Neon2Light(), mode_dark: Neon2Dark()},
-  pumpkin_theme: {mode_light: PumpkinLight(), mode_dark: PumpkinDark()},
-  witch_theme: {mode_light: WitchLight(), mode_dark: WitchDark()},
-  vampire_theme: {mode_light: VampireLight(), mode_dark: VampireDark()},
-};
-
-OpaqueThemeType getTheme(String themeId, String mode) {
-  if (themeId == "") {
-    themeId = cwtch_theme;
-  }
-  if (themeId == mode_light) {
-    themeId = cwtch_theme;
-    mode = mode_light;
-  }
-  if (themeId == mode_dark) {
-    themeId = cwtch_theme;
-    mode = mode_dark;
-  }
-
-  var theme = themes[themeId]?[mode];
-  return theme ?? CwtchDark();
-}
-
-Color lighten(Color color, [double amount = 0.15]) {
-  final hsl = HSLColor.fromColor(color);
-  final hslLight = hsl.withLightness((hsl.lightness + amount).clamp(0.0, 1.0));
-
-  return hslLight.toColor();
-}
-
-Color darken(Color color, [double amount = 0.15]) {
-  final hsl = HSLColor.fromColor(color);
-  final hslDarken = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
-
-  return hslDarken.toColor();
-}
-
-abstract class OpaqueThemeType {
-  static final Color red = Color(0xFFFF0000);
-
-  get theme => "dummy";
-  get mode => mode_light;
-
-  // Main screen background color (message pane, item rows)
-  get backgroundMainColor => red;
-
-  // pane colors (settings)
-  get backgroundPaneColor => red;
-
-  get topbarColor => red;
-
-  get mainTextColor => red;
-
-  // pressed row, offline heart
-  get hilightElementColor => red;
-  // Selected Row
-  get backgroundHilightElementColor => red;
-  // Faded text color for suggestions in textfields
-  // Todo: implement way more places
-  get sendHintTextColor => red;
-
-  get defaultButtonColor => red;
-  get defaultButtonActiveColor => /*mode == mode_light ? darken(defaultButtonColor) :*/ lighten(defaultButtonColor);
-  get defaultButtonTextColor => red;
-  get defaultButtonDisabledColor => red;
-  get textfieldBackgroundColor => red;
-  get textfieldBorderColor => red;
-  get textfieldHintColor => red;
-  get textfieldErrorColor => red;
-  get scrollbarDefaultColor => red;
-  get portraitBackgroundColor => red;
-  get portraitOnlineBorderColor => red;
-  get portraitOfflineBorderColor => red;
-  get portraitBlockedBorderColor => red;
-  get portraitBlockedTextColor => red;
-  get portraitContactBadgeColor => red;
-  get portraitContactBadgeTextColor => red;
-  get portraitProfileBadgeColor => red;
-  get portraitProfileBadgeTextColor => red;
-
-  // dropshaddpow
-  // todo: probably should not be reply icon color in messagerow
-  get dropShadowColor => red;
-
-  get toolbarIconColor => red;
-  get messageFromMeBackgroundColor => red;
-  get messageFromMeTextColor => red;
-  get messageFromOtherBackgroundColor => red;
-  get messageFromOtherTextColor => red;
-
-  // Sizes
-
-  double contactOnionTextSize() {
-    return 18;
-  }
-}
-
-ThemeData mkThemeData(Settings opaque) {
-  return ThemeData(
-    visualDensity: VisualDensity.adaptivePlatformDensity,
-    primarySwatch: Colors.red,
-    primaryIconTheme: IconThemeData(
-      color: opaque.current().mainTextColor,
-    ),
-    primaryColor: opaque.current().backgroundMainColor,
-    canvasColor: opaque.current().backgroundPaneColor,
-    backgroundColor: opaque.current().backgroundMainColor,
-    highlightColor: opaque.current().hilightElementColor,
-    iconTheme: IconThemeData(
-      color: opaque.current().toolbarIconColor,
-    ),
-    cardColor: opaque.current().backgroundMainColor,
-    appBarTheme: AppBarTheme(
-        backgroundColor: opaque.current().topbarColor,
-        iconTheme: IconThemeData(
-          color: opaque.current().mainTextColor,
-        ),
-        titleTextStyle: TextStyle(
-          color: opaque.current().mainTextColor,
-        ),
-        actionsIconTheme: IconThemeData(
-          color: opaque.current().mainTextColor,
-        )),
-    //bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor),  // Can't determine current use
-    textButtonTheme: TextButtonThemeData(
-      style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor),
-          foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor),
-          overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor),
-          padding: MaterialStateProperty.all(EdgeInsets.all(20))),
-    ),
-    hintColor: opaque.current().textfieldHintColor,
-    elevatedButtonTheme: ElevatedButtonThemeData(
-      style: ButtonStyle(
-        backgroundColor: MaterialStateProperty.resolveWith((states) => states.contains(MaterialState.disabled) ? opaque.current().defaultButtonDisabledColor : opaque.current().defaultButtonColor),
-        foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor),
-        overlayColor: MaterialStateProperty.resolveWith((states) => (states.contains(MaterialState.pressed) && states.contains(MaterialState.hovered))
-            ? opaque.current().defaultButtonActiveColor
-            : states.contains(MaterialState.disabled)
-                ? opaque.current().defaultButtonDisabledColor
-                : null),
-        enableFeedback: true,
-        splashFactory: InkRipple.splashFactory,
-        padding: MaterialStateProperty.all(EdgeInsets.all(20)),
-        shape: MaterialStateProperty.all(RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(18.0),
-        )),
-      ),
-    ),
-    scrollbarTheme: ScrollbarThemeData(isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor)),
-    tabBarTheme: TabBarTheme(indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor))),
-    dialogTheme: DialogTheme(
-        backgroundColor: opaque.current().backgroundPaneColor, titleTextStyle: TextStyle(color: opaque.current().mainTextColor), contentTextStyle: TextStyle(color: opaque.current().mainTextColor)),
-    textTheme: TextTheme(
-        headline1: TextStyle(color: opaque.current().mainTextColor),
-        headline2: TextStyle(color: opaque.current().mainTextColor),
-        headline3: TextStyle(color: opaque.current().mainTextColor),
-        headline4: TextStyle(color: opaque.current().mainTextColor),
-        headline5: TextStyle(color: opaque.current().mainTextColor),
-        headline6: TextStyle(color: opaque.current().mainTextColor),
-        bodyText1: TextStyle(color: opaque.current().mainTextColor),
-        bodyText2: TextStyle(color: opaque.current().mainTextColor),
-        subtitle1: TextStyle(color: opaque.current().mainTextColor),
-        subtitle2: TextStyle(color: opaque.current().mainTextColor),
-        caption: TextStyle(color: opaque.current().mainTextColor),
-        button: TextStyle(color: opaque.current().mainTextColor),
-        overline: TextStyle(color: opaque.current().mainTextColor)),
-    switchTheme: SwitchThemeData(
-      overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor),
-      thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor),
-      trackColor: MaterialStateProperty.all(opaque.current().dropShadowColor),
-    ),
-    floatingActionButtonTheme: FloatingActionButtonThemeData(
-        backgroundColor: opaque.current().defaultButtonColor, hoverColor: opaque.current().defaultButtonActiveColor, enableFeedback: true, splashColor: opaque.current().defaultButtonActiveColor),
-    textSelectionTheme: TextSelectionThemeData(
-        cursorColor: opaque.current().defaultButtonActiveColor, selectionColor: opaque.current().defaultButtonActiveColor, selectionHandleColor: opaque.current().defaultButtonActiveColor),
-  );
-}

lib/themes/pumpkin.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const pumpkin_theme = "pumpkin";
-
-OpaqueThemeType GetPumpkinTheme(String mode) {
-  if (mode == mode_dark) {
-    return PumpkinDark();
-  } else {
-    return PumpkinLight();
-  }
-}
-
-class PumpkinDark extends CwtchDark {
-  static final Color background = Color(0xFF281831);
-  static final Color header = Color(0xFF281831);
-  static final Color userBubble = Color(0xFFB53D00);
-  static final Color peerBubble = Color(0xFF422850);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFFFBF6);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => pumpkin_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class PumpkinLight extends CwtchLight {
-  static final Color background = Color(0xFFFFFBF6);
-  static final Color header = Color(0xFFFF9800);
-  static final Color userBubble = Color(0xFFFF9800);
-  static final Color peerBubble = Color(0xFFD8C7E1);
-  static final Color font = Color(0xFF281831);
-  static final Color settings = Color(0xFF281831);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => pumpkin_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/vampire.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const vampire_theme = "vampire";
-
-OpaqueThemeType GetVampireTheme(String mode) {
-  if (mode == mode_dark) {
-    return VampireDark();
-  } else {
-    return VampireLight();
-  }
-}
-
-class VampireDark extends CwtchDark {
-  static final Color background = Color(0xFF281831);
-  static final Color header = Color(0xFF281831);
-  static final Color userBubble = Color(0xFF9A1218);
-  static final Color peerBubble = Color(0xFF422850);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFDFFFD);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => vampire_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class VampireLight extends CwtchLight {
-  static final Color background = Color(0xFFFFFDFD);
-  static final Color header = Color(0xFFD8C7E1);
-  static final Color userBubble = Color(0xFFD8C7E1);
-  static final Color peerBubble = Color(0xFFFFEBEE);
-  static final Color font = Color(0xFF281831);
-  static final Color settings = Color(0xFF281831);
-  static final Color accent = Color(0xFF8E64A5);
-
-  get theme => vampire_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/themes/witch.dart

@@ -1,69 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const witch_theme = "witch";
-
-OpaqueThemeType GetWitchTheme(String mode) {
-  if (mode == mode_dark) {
-    return WitchDark();
-  } else {
-    return WitchLight();
-  }
-}
-
-class WitchDark extends CwtchDark {
-  static final Color background = Color(0xFF0E1E0E);
-  static final Color header = Color(0xFF0E1E0E);
-  static final Color userBubble = Color(0xFF1B5E20);
-  static final Color peerBubble = Color(0xFF003300);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFDFFFD);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => witch_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-}
-
-class WitchLight extends CwtchLight {
-  static final Color background = Color(0xFFFDFFFD);
-  static final Color header = Color(0xFF80E27E);
-  static final Color userBubble = Color(0xFF80E27E);
-  static final Color peerBubble = Color(0xFFE8F5E9);
-  static final Color font = Color(0xFF0E1E0E);
-  static final Color settings = Color(0xFF0E1E0E);
-  static final Color accent = Color(0xFFD20070);
-
-  get theme => witch_theme;
-  get mode => mode_light;
-
-  get backgroundMainColor => background; //whitePurple;
-  get backgroundPaneColor => background; //whitePurple;
-  get topbarColor => header; //softPurple;
-  get mainTextColor => settings;
-  get defaultButtonColor => accent; // hotPink;
-  get textfieldHintColor => font; //TODO pick
-  get scrollbarDefaultColor => accent;
-  get portraitContactBadgeColor => accent;
-  get toolbarIconColor => settings; //darkPurple;
-  get messageFromMeBackgroundColor => userBubble; //brightPurple;
-  get messageFromMeTextColor => font; //mainTextColor;
-  get messageFromOtherBackgroundColor => peerBubble; //purple;
-  get messageFromOtherTextColor => font; //darkPurple;
-}

lib/torstatus.dart

@@ -18,9 +18,6 @@ class TorStatus extends ChangeNotifier {
 
     progress = new_progress;
     status = new_status;
-    if (new_progress != 100) {
-      status = "$new_progress% - $new_status";
-    }
 
     notifyListeners();
   }

lib/views/addcontactview.dart

@@ -52,26 +52,22 @@ class _AddContactViewState extends State<AddContactView> {
 
     /// We display a different number of tabs depending on the experiment setup
     bool groupsEnabled = Provider.of<Settings>(context).isExperimentEnabled(TapirGroupsExperiment);
-    return Scrollbar(
-        isAlwaysShown: true,
-        child: SingleChildScrollView(
-            clipBehavior: Clip.antiAlias,
-            child: Consumer<ErrorHandler>(builder: (context, globalErrorHandler, child) {
-              return DefaultTabController(
-                  length: groupsEnabled ? 2 : 1,
-                  child: Column(children: [
-                    (groupsEnabled ? getTabBarWithGroups() : getTabBarWithAddPeerOnly()),
-                    Expanded(
-                        child: TabBarView(
-                      children: (groupsEnabled
-                          ? [
-                              addPeerTab(),
-                              addGroupTab(),
-                            ]
-                          : [addPeerTab()]),
-                    )),
-                  ]));
-            })));
+    return Consumer<ErrorHandler>(builder: (context, globalErrorHandler, child) {
+      return DefaultTabController(
+          length: groupsEnabled ? 2 : 1,
+          child: Column(children: [
+            (groupsEnabled ? getTabBarWithGroups() : getTabBarWithAddPeerOnly()),
+            Expanded(
+                child: TabBarView(
+              children: (groupsEnabled
+                  ? [
+                      addPeerTab(),
+                      addGroupTab(),
+                    ]
+                  : [addPeerTab()]),
+            )),
+          ]));
+    });
   }
 
   void _copyOnion() {
@@ -167,7 +163,7 @@ class _AddContactViewState extends State<AddContactView> {
                     }
                   });
                 },
-                hintText: '',
+                labelText: '',
               )
             ])));
   }
@@ -201,15 +197,11 @@ class _AddContactViewState extends State<AddContactView> {
                     },
                     isExpanded: true, // magic property
                     value: server,
-                    items: Provider.of<ProfileInfoState>(context)
-                        .serverList
-                        .servers
-                        .where((serverInfo) => serverInfo.status == "Synced")
-                        .map<DropdownMenuItem<String>>((RemoteServerInfoState serverInfo) {
+                    items: Provider.of<ProfileInfoState>(context).serverList.servers.map<DropdownMenuItem<String>>((RemoteServerInfoState serverInfo) {
                       return DropdownMenuItem<String>(
                         value: serverInfo.onion,
                         child: Text(
-                          serverInfo.description,
+                          serverInfo.onion,
                           overflow: TextOverflow.ellipsis,
                         ),
                       );
@@ -223,7 +215,7 @@ class _AddContactViewState extends State<AddContactView> {
                 ),
                 CwtchTextField(
                   controller: ctrlrGroupName,
-                  hintText: AppLocalizations.of(context)!.groupNameLabel,
+                  labelText: AppLocalizations.of(context)!.groupNameLabel,
                   onChanged: (newValue) {},
                   validator: (value) {},
                 ),

lib/views/addeditprofileview.dart

@@ -1,8 +1,6 @@
 import 'dart:convert';
-import 'dart:io';
 import 'dart:math';
 
-import 'package:cwtch/config.dart';
 import 'package:cwtch/cwtch/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -18,7 +16,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../cwtch_icons_icons.dart';
 import '../errorHandler.dart';
 import '../main.dart';
-import '../themes/opaque.dart';
+import '../opaque.dart';
 import '../settings.dart';
 
 class AddEditProfileView extends StatefulWidget {
@@ -93,7 +91,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                       imagePath: Provider.of<ProfileInfoState>(context).imagePath,
                                       diameter: 120,
                                       maskOut: false,
-                                      border: theme.theme.portraitOnlineBorderColor,
+                                      border: theme.theme.portraitOnlineBorderColor(),
                                       badgeTextColor: Colors.red,
                                       badgeColor: Colors.red,
                                     )
@@ -106,10 +104,11 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                 CwtchTextField(
                                   controller: ctrlrNick,
                                   autofocus: false,
-                                  hintText: AppLocalizations.of(context)!.yourDisplayName,
+                                  labelText: AppLocalizations.of(context)!.yourDisplayName,
                                   validator: (value) {
                                     if (value.isEmpty) {
-                                      return AppLocalizations.of(context)!.displayNameTooltip;
+                                      // TODO l10n ize
+                                      return "Please enter a display name";
                                     }
                                     return null;
                                   },
@@ -147,13 +146,13 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                   child: Column(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
                                     Checkbox(
                                       value: usePassword,
-                                      fillColor: MaterialStateProperty.all(theme.current().defaultButtonColor),
-                                      activeColor: theme.current().defaultButtonActiveColor,
+                                      fillColor: MaterialStateProperty.all(theme.current().defaultButtonColor()),
+                                      activeColor: theme.current().defaultButtonActiveColor(),
                                       onChanged: _handleSwitchPassword,
                                     ),
                                     Text(
                                       AppLocalizations.of(context)!.radioUsePassword,
-                                      style: TextStyle(color: theme.current().mainTextColor),
+                                      style: TextStyle(color: theme.current().mainTextColor()),
                                     ),
                                     SizedBox(
                                       height: 20,
@@ -280,7 +279,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
     // TODO Toast
   }
 
-  void _createPressed() async {
+  void _createPressed() {
     // This will run all the validations in the form including
     // checking that display name is not empty, and an actual check that the passwords
     // match (and are provided if the user has requested an encrypted profile).
@@ -303,31 +302,17 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
         } else {
           // At this points passwords have been validated to be the same and not empty
           // Update both password and name, even if name hasn't been changed...
-          var profile = Provider.of<ProfileInfoState>(context, listen: false).onion;
           Provider.of<ProfileInfoState>(context, listen: false).nickname = ctrlrNick.value.text;
-          Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(profile, "profile.name", ctrlrNick.value.text);
-          Provider.of<FlwtchState>(context, listen: false).cwtch.ChangePassword(profile, ctrlrOldPass.text, ctrlrPass.text, ctrlrPass2.text);
+          Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "profile.name", ctrlrNick.value.text);
+          final updatePasswordEvent = {
+            "EventType": "ChangePassword",
+            "Data": {"Password": ctrlrOldPass.text, "NewPassword": ctrlrPass.text}
+          };
+          final updatePasswordEventJson = jsonEncode(updatePasswordEvent);
 
-          EnvironmentConfig.debugLog("waiting for change password response");
-          Future.delayed(const Duration(milliseconds: 500), () {
-            if (globalErrorHandler.changePasswordError) {
-              // TODO: This isn't ideal, but because onChange can be fired during this future check
-              // and because the context can change after being popped we have this kind of double assertion...
-              // There is probably a better pattern to handle this...
-              if (AppLocalizations.of(context) != null) {
-                final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.passwordChangeError));
-                ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                return;
-              }
-            }
-          }).whenComplete(() {
-            if (globalErrorHandler.explicitChangePasswordSuccess) {
-              final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.newPassword));
-              ScaffoldMessenger.of(context).showSnackBar(snackBar);
-              Navigator.pop(context);
-              return; // otherwise round and round we go...
-            }
-          });
+          Provider.of<FlwtchState>(context, listen: false).cwtch.SendProfileEvent(Provider.of<ProfileInfoState>(context, listen: false).onion, updatePasswordEventJson);
+
+          Navigator.of(context).pop();
         }
       }
     }

lib/views/addeditservers.dart

@@ -33,6 +33,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
   final ctrlrOnion = TextEditingController(text: "");
 
   late bool usePassword;
+  //late bool deleted;
 
   @override
   void initState() {
@@ -80,16 +81,22 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                     child: Form(
                         key: _formKey,
                         child: Container(
-                            margin: EdgeInsets.fromLTRB(30, 5, 30, 10),
-                            padding: EdgeInsets.fromLTRB(20, 5, 20, 10),
+                            margin: EdgeInsets.fromLTRB(30, 0, 30, 10),
+                            padding: EdgeInsets.fromLTRB(20, 0, 20, 10),
                             child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch, children: [
                               // Onion
                               Visibility(
                                   visible: serverInfoState.onion.isNotEmpty,
-                                  child: Column(
-                                      mainAxisAlignment: MainAxisAlignment.start,
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [CwtchLabel(label: AppLocalizations.of(context)!.serverAddress), SelectableText(serverInfoState.onion)])),
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    CwtchLabel(label: AppLocalizations.of(context)!.serverAddress),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    SelectableText(serverInfoState.onion)
+                                  ])),
 
                               // Description
                               Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -103,7 +110,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                                 ),
                                 CwtchTextField(
                                   controller: ctrlrDesc,
-                                  hintText: AppLocalizations.of(context)!.fieldDescriptionLabel,
+                                  labelText: "Description",
                                   autofocus: false,
                                 )
                               ]),
@@ -116,7 +123,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                               Visibility(
                                   visible: serverInfoState.onion.isNotEmpty,
                                   child: SwitchListTile(
-                                    title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: settings.current().mainTextColor)),
+                                    title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: settings.current().mainTextColor())),
                                     subtitle: Text(AppLocalizations.of(context)!.serverEnabledDescription),
                                     value: serverInfoState.running,
                                     onChanged: (bool value) {
@@ -127,14 +134,14 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                                         Provider.of<FlwtchState>(context, listen: false).cwtch.StopServer(serverInfoState.onion);
                                       }
                                     },
-                                    activeTrackColor: settings.theme.defaultButtonColor,
-                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                    secondary: Icon(CwtchIcons.negative_heart_24px, color: settings.current().mainTextColor),
+                                    activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                    secondary: Icon(CwtchIcons.negative_heart_24px, color: settings.current().mainTextColor()),
                                   )),
 
                               // Auto start
                               SwitchListTile(
-                                title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: settings.current().mainTextColor)),
+                                title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: settings.current().mainTextColor())),
                                 subtitle: Text(AppLocalizations.of(context)!.serverAutostartDescription),
                                 value: serverInfoState.autoStart,
                                 onChanged: (bool value) {
@@ -144,33 +151,11 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                                     Provider.of<FlwtchState>(context, listen: false).cwtch.SetServerAttribute(serverInfoState.onion, "autostart", value ? "true" : "false");
                                   }
                                 },
-                                activeTrackColor: settings.theme.defaultButtonColor,
-                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                secondary: Icon(CwtchIcons.favorite_24dp, color: settings.current().mainTextColor),
+                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                secondary: Icon(CwtchIcons.favorite_24dp, color: settings.current().mainTextColor()),
                               ),
 
-                              // metrics
-                              Visibility(
-                                  visible: serverInfoState.onion.isNotEmpty && serverInfoState.running,
-                                  child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                                    SizedBox(
-                                      height: 20,
-                                    ),
-                                    Text(AppLocalizations.of(context)!.serverMetricsLabel, style: Provider.of<FlwtchState>(context).biggerFont),
-                                    Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-                                      Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                                        Text(AppLocalizations.of(context)!.serverTotalMessagesLabel),
-                                      ]),
-                                      Text(serverInfoState.totalMessages.toString())
-                                    ]),
-                                    Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-                                      Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                                        Text(AppLocalizations.of(context)!.serverConnectionsLabel),
-                                      ]),
-                                      Text(serverInfoState.connections.toString())
-                                    ]),
-                                  ])),
-
                               // ***** Password *****
 
                               // use password toggle
@@ -182,13 +167,13 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                                     ),
                                     Checkbox(
                                       value: usePassword,
-                                      fillColor: MaterialStateProperty.all(settings.current().defaultButtonColor),
-                                      activeColor: settings.current().defaultButtonActiveColor,
+                                      fillColor: MaterialStateProperty.all(settings.current().defaultButtonColor()),
+                                      activeColor: settings.current().defaultButtonActiveColor(),
                                       onChanged: _handleSwitchPassword,
                                     ),
                                     Text(
                                       AppLocalizations.of(context)!.radioUsePassword,
-                                      style: TextStyle(color: settings.current().mainTextColor),
+                                      style: TextStyle(color: settings.current().mainTextColor()),
                                     ),
                                     SizedBox(
                                       height: 20,

lib/views/contactsview.dart

@@ -1,5 +1,4 @@
 import 'package:cwtch/cwtch_icons_icons.dart';
-import 'package:cwtch/views/profileserversview.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/views/torstatusview.dart';
 import 'package:cwtch/widgets/contactrow.dart';
@@ -78,7 +77,7 @@ class _ContactsViewState extends State<ContactsView> {
             ProfileImage(
               imagePath: Provider.of<ProfileInfoState>(context).imagePath,
               diameter: 42,
-              border: Provider.of<Settings>(context).current().portraitOnlineBorderColor,
+              border: Provider.of<Settings>(context).current().portraitOnlineBorderColor(),
               badgeTextColor: Colors.red,
               badgeColor: Colors.red,
             ),
@@ -87,7 +86,7 @@ class _ContactsViewState extends State<ContactsView> {
             ),
             Expanded(
                 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))),
+                    overflow: TextOverflow.ellipsis, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor()))),
           ])),
           actions: getActions(context),
         ),
@@ -113,15 +112,7 @@ class _ContactsViewState extends State<ContactsView> {
           Clipboard.setData(new ClipboardData(text: Provider.of<ProfileInfoState>(context, listen: false).onion));
         }));
 
-    // Manage known Servers
-    if (Provider.of<Settings>(context, listen: false).isExperimentEnabled(TapirGroupsExperiment) || Provider.of<Settings>(context, listen: false).isExperimentEnabled(ServerManagementExperiment)) {
-      actions.add(IconButton(
-          icon: Icon(CwtchIcons.dns_24px),
-          tooltip: AppLocalizations.of(context)!.manageKnownServersButton,
-          onPressed: () {
-            _pushServers();
-          }));
-    }
+    // TODO servers
 
     // Search contacts
     actions.add(IconButton(
@@ -139,7 +130,7 @@ class _ContactsViewState extends State<ContactsView> {
   Widget _buildFilterable() {
     Widget txtfield = CwtchTextField(
       controller: ctrlrFilter,
-      hintText: AppLocalizations.of(context)!.search,
+      labelText: AppLocalizations.of(context)!.search,
       onChanged: (newVal) {
         Provider.of<ContactListState>(context, listen: false).filter = newVal;
       },
@@ -171,13 +162,12 @@ class _ContactsViewState extends State<ContactsView> {
     ));
   }
 
-  void _pushServers() {
-    var profile = Provider.of<ProfileInfoState>(context);
+  void _pushTorStatus() {
     Navigator.of(context).push(MaterialPageRoute<void>(
       builder: (BuildContext context) {
         return MultiProvider(
-          providers: [ChangeNotifierProvider(create: (context) => profile), Provider.value(value: Provider.of<FlwtchState>(context))],
-          child: ProfileServersView(),
+          providers: [Provider.value(value: Provider.of<FlwtchState>(context))],
+          child: TorStatusView(),
         );
       },
     ));

lib/views/doublecolview.dart

@@ -29,12 +29,7 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
         Flexible(
           flex: cols[1],
           child: flwtch.selectedConversation == null
-              ? Container(
-                  color: Provider.of<Settings>(context).theme.backgroundMainColor,
-                  child: Card(
-                      margin: EdgeInsets.all(0.0),
-                      shape: new RoundedRectangleBorder(side: new BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonColor, width: 4.0), borderRadius: BorderRadius.circular(4.0)),
-                      child: Center(child: Text(AppLocalizations.of(context)!.addContactFirst))))
+              ? Card(child: Center(child: Text(AppLocalizations.of(context)!.addContactFirst)))
               : //dev
               MultiProvider(providers: [
                   ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),

lib/views/globalsettingsview.dart

@@ -2,17 +2,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/servers.dart';
-import 'package:cwtch/widgets/folderpicker.dart';
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:cwtch/themes/ghost.dart';
-import 'package:cwtch/themes/mermaid.dart';
-import 'package:cwtch/themes/midnight.dart';
-import 'package:cwtch/themes/neon1.dart';
-import 'package:cwtch/themes/neon2.dart';
-import 'package:cwtch/themes/opaque.dart';
-import 'package:cwtch/themes/pumpkin.dart';
-import 'package:cwtch/themes/vampire.dart';
-import 'package:cwtch/themes/witch.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/settings.dart';
@@ -47,7 +36,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
   Widget _buildSettingsList() {
     return Consumer<Settings>(builder: (context, settings, child) {
       return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
-        var appIcon = Icon(Icons.info, color: settings.current().mainTextColor);
+        var appIcon = Icon(Icons.info, color: settings.current().mainTextColor());
         return Scrollbar(
             isAlwaysShown: true,
             child: SingleChildScrollView(
@@ -58,8 +47,8 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                     ),
                     child: Column(children: [
                       ListTile(
-                          title: Text(AppLocalizations.of(context)!.settingLanguage, style: TextStyle(color: settings.current().mainTextColor)),
-                          leading: Icon(CwtchIcons.change_language, color: settings.current().mainTextColor),
+                          title: Text(AppLocalizations.of(context)!.settingLanguage, style: TextStyle(color: settings.current().mainTextColor())),
+                          leading: Icon(CwtchIcons.change_language, color: settings.current().mainTextColor()),
                           trailing: DropdownButton(
                               value: Provider.of<Settings>(context).locale.languageCode,
                               onChanged: (String? newValue) {
@@ -75,43 +64,25 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                 );
                               }).toList())),
                       SwitchListTile(
-                        title: Text(AppLocalizations.of(context)!.settingTheme, style: TextStyle(color: settings.current().mainTextColor)),
-                        value: settings.current().mode == mode_light,
+                        title: Text(AppLocalizations.of(context)!.settingTheme, style: TextStyle(color: settings.current().mainTextColor())),
+                        value: settings.current().identifier() == "light",
                         onChanged: (bool value) {
                           if (value) {
-                            settings.setTheme(settings.theme.theme, mode_light);
+                            settings.setLight();
                           } else {
-                            settings.setTheme(settings.theme.theme, mode_dark);
+                            settings.setDark();
                           }
 
                           // Save Settings...
                           saveSettings(context);
                         },
-                        activeTrackColor: settings.theme.defaultButtonColor,
-                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                        secondary: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor),
+                        activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                        secondary: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor()),
                       ),
                       ListTile(
-                        title: Text(AppLocalizations.of(context)!.themeColorLabel),
-                        trailing: DropdownButton<String>(
-                            value: Provider.of<Settings>(context).theme.theme,
-                            onChanged: (String? newValue) {
-                              setState(() {
-                                settings.setTheme(newValue!, settings.theme.mode);
-                                saveSettings(context);
-                              });
-                            },
-                            items: themes.keys.map<DropdownMenuItem<String>>((String themeId) {
-                              return DropdownMenuItem<String>(
-                                value: themeId,
-                                child: Text(getThemeName(context, themeId)),
-                              );
-                            }).toList()),
-                        leading: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor),
-                      ),
-                      ListTile(
-                          title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor)),
-                          leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
+                          title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor())),
+                          leading: Icon(Icons.table_chart, color: settings.current().mainTextColor()),
                           trailing: DropdownButton(
                               value: settings.uiColumnModePortrait.toString(),
                               onChanged: (String? newValue) {
@@ -129,9 +100,9 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                             AppLocalizations.of(context)!.settingUIColumnLandscape,
                             textWidthBasis: TextWidthBasis.longestLine,
                             softWrap: true,
-                            style: TextStyle(color: settings.current().mainTextColor),
+                            style: TextStyle(color: settings.current().mainTextColor()),
                           ),
-                          leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
+                          leading: Icon(Icons.table_chart, color: settings.current().mainTextColor()),
                           trailing: Container(
                               width: 200.0,
                               child: DropdownButton(
@@ -151,7 +122,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                     );
                                   }).toList()))),
                       SwitchListTile(
-                        title: Text(AppLocalizations.of(context)!.blockUnknownLabel, style: TextStyle(color: settings.current().mainTextColor)),
+                        title: Text(AppLocalizations.of(context)!.blockUnknownLabel, style: TextStyle(color: settings.current().mainTextColor())),
                         subtitle: Text(AppLocalizations.of(context)!.descriptionBlockUnknownConnections),
                         value: settings.blockUnknownConnections,
                         onChanged: (bool value) {
@@ -164,12 +135,12 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           // Save Settings...
                           saveSettings(context);
                         },
-                        activeTrackColor: settings.theme.defaultButtonColor,
-                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                        secondary: Icon(CwtchIcons.block_unknown, color: settings.current().mainTextColor),
+                        activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                        secondary: Icon(CwtchIcons.block_unknown, color: settings.current().mainTextColor()),
                       ),
                       SwitchListTile(
-                        title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
+                        title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor())),
                         subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
                         value: settings.streamerMode,
                         onChanged: (bool value) {
@@ -177,12 +148,12 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           // Save Settings...
                           saveSettings(context);
                         },
-                        activeTrackColor: settings.theme.defaultButtonColor,
-                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                        secondary: Icon(CwtchIcons.streamer_bunnymask, color: settings.current().mainTextColor),
+                        activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                        secondary: Icon(CwtchIcons.streamer_bunnymask, color: settings.current().mainTextColor()),
                       ),
                       SwitchListTile(
-                        title: Text(AppLocalizations.of(context)!.experimentsEnabled, style: TextStyle(color: settings.current().mainTextColor)),
+                        title: Text(AppLocalizations.of(context)!.experimentsEnabled, style: TextStyle(color: settings.current().mainTextColor())),
                         subtitle: Text(AppLocalizations.of(context)!.descriptionExperiments),
                         value: settings.experimentsEnabled,
                         onChanged: (bool value) {
@@ -194,16 +165,16 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           // Save Settings...
                           saveSettings(context);
                         },
-                        activeTrackColor: settings.theme.defaultButtonColor,
-                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                        secondary: Icon(CwtchIcons.enable_experiments, color: settings.current().mainTextColor),
+                        activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                        inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                        secondary: Icon(CwtchIcons.enable_experiments, color: settings.current().mainTextColor()),
                       ),
                       Visibility(
                           visible: settings.experimentsEnabled,
                           child: Column(
                             children: [
                               SwitchListTile(
-                                title: Text(AppLocalizations.of(context)!.enableGroups, style: TextStyle(color: settings.current().mainTextColor)),
+                                title: Text(AppLocalizations.of(context)!.enableGroups, style: TextStyle(color: settings.current().mainTextColor())),
                                 subtitle: Text(AppLocalizations.of(context)!.descriptionExperimentsGroups),
                                 value: settings.isExperimentEnabled(TapirGroupsExperiment),
                                 onChanged: (bool value) {
@@ -215,14 +186,14 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                   // Save Settings...
                                   saveSettings(context);
                                 },
-                                activeTrackColor: settings.theme.defaultButtonColor,
-                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                secondary: Icon(CwtchIcons.enable_groups, color: settings.current().mainTextColor),
+                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                secondary: Icon(CwtchIcons.enable_groups, color: settings.current().mainTextColor()),
                               ),
                               Visibility(
                                   visible: !Platform.isAndroid && !Platform.isIOS,
                                   child: SwitchListTile(
-                                    title: Text(AppLocalizations.of(context)!.settingServers, style: TextStyle(color: settings.current().mainTextColor)),
+                                    title: Text(AppLocalizations.of(context)!.settingServers, style: TextStyle(color: settings.current().mainTextColor())),
                                     subtitle: Text(AppLocalizations.of(context)!.settingServersDescription),
                                     value: settings.isExperimentEnabled(ServerManagementExperiment),
                                     onChanged: (bool value) {
@@ -235,12 +206,12 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                       // Save Settings...
                                       saveSettings(context);
                                     },
-                                    activeTrackColor: settings.theme.defaultButtonColor,
-                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                    secondary: Icon(CwtchIcons.dns_24px, color: settings.current().mainTextColor),
+                                    activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                    secondary: Icon(CwtchIcons.dns_24px, color: settings.current().mainTextColor()),
                                   )),
                               SwitchListTile(
-                                title: Text(AppLocalizations.of(context)!.settingFileSharing, style: TextStyle(color: settings.current().mainTextColor)),
+                                title: Text(AppLocalizations.of(context)!.settingFileSharing, style: TextStyle(color: settings.current().mainTextColor())),
                                 subtitle: Text(AppLocalizations.of(context)!.descriptionFileSharing),
                                 value: settings.isExperimentEnabled(FileSharingExperiment),
                                 onChanged: (bool value) {
@@ -251,58 +222,25 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                   }
                                   saveSettings(context);
                                 },
-                                activeTrackColor: settings.theme.defaultButtonColor,
-                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
+                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor()),
                               ),
-                              Visibility(
-                                visible: settings.isExperimentEnabled(FileSharingExperiment),
-                                child: Column(children: [
-                                  SwitchListTile(
-                                    title: Text(AppLocalizations.of(context)!.settingImagePreviews, style: TextStyle(color: settings.current().mainTextColor)),
-                                    subtitle: Text(AppLocalizations.of(context)!.settingImagePreviewsDescription),
-                                    value: settings.isExperimentEnabled(ImagePreviewsExperiment),
-                                    onChanged: (bool value) {
-                                      if (value) {
-                                        settings.enableExperiment(ImagePreviewsExperiment);
-                                        settings.downloadPath = Provider.of<FlwtchState>(context, listen: false).cwtch.defaultDownloadPath();
-                                      } else {
-                                        settings.disableExperiment(ImagePreviewsExperiment);
-                                      }
-                                      saveSettings(context);
-                                    },
-                                    activeTrackColor: settings.theme.defaultButtonActiveColor,
-                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                    secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
-                                  ),
-                                  Visibility(
-                                    visible: settings.isExperimentEnabled(ImagePreviewsExperiment) && !Platform.isAndroid,
-                                    child: CwtchFolderPicker(
-                                      label: AppLocalizations.of(context)!.settingDownloadFolder,
-                                      initialValue: settings.downloadPath,
-                                      onSave: (newVal) {
-                                        settings.downloadPath = newVal;
-                                        saveSettings(context);
-                                      },
-                                    ),
-                                  ),
-                                  SwitchListTile(
-                                    title: Text(AppLocalizations.of(context)!.enableExperimentClickableLinks, style: TextStyle(color: settings.current().mainTextColor)),
-                                    subtitle: Text(AppLocalizations.of(context)!.experimentClickableLinksDescription),
-                                    value: settings.isExperimentEnabled(ClickableLinksExperiment),
-                                    onChanged: (bool value) {
-                                      if (value) {
-                                        settings.enableExperiment(ClickableLinksExperiment);
-                                      } else {
-                                        settings.disableExperiment(ClickableLinksExperiment);
-                                      }
-                                      saveSettings(context);
-                                    },
-                                    activeTrackColor: settings.theme.defaultButtonActiveColor,
-                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                                    secondary: Icon(Icons.link, color: settings.current().mainTextColor),
-                                  ),
-                                ]),
+                              SwitchListTile(
+                                title: Text("Enable Clickable Links", style: TextStyle(color: settings.current().mainTextColor())),
+                                subtitle: Text("The clickable links experiment allows you to click on URLs shared in messages."),
+                                value: settings.isExperimentEnabled(ClickableLinksExperiment),
+                                onChanged: (bool value) {
+                                  if (value) {
+                                    settings.enableExperiment(ClickableLinksExperiment);
+                                  } else {
+                                    settings.disableExperiment(ClickableLinksExperiment);
+                                  }
+                                  saveSettings(context);
+                                },
+                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                secondary: Icon(Icons.link, color: settings.current().mainTextColor()),
                               ),
                             ],
                           )),
@@ -313,8 +251,8 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           applicationLegalese: '\u{a9} 2021 Open Privacy Research Society',
                           aboutBoxChildren: <Widget>[
                             Padding(
-                              padding: EdgeInsets.fromLTRB(24.0 + 10.0 + (appIcon.size ?? 24.0), 16.0, 0.0, 0.0),
-                              // About has 24 padding (ln 389) and there appears to be another 10 of padding in the widget
+                              padding: EdgeInsets.fromLTRB(
+                                  24.0 + 10.0 + (appIcon.size ?? 24.0), 16.0, 0.0, 0.0), // About has 24 padding (ln 389) and there appears to be another 10 of padding in the widget
                               child: SelectableText(AppLocalizations.of(context)!.versionBuilddate.replaceAll("%1", EnvironmentConfig.BUILD_VER).replaceAll("%2", EnvironmentConfig.BUILD_DATE)),
                             )
                           ]),
@@ -362,31 +300,6 @@ String getLanguageFull(context, String languageCode) {
   return languageCode;
 }
 
-/// Since we don't seem to able to dynamically pull translations, this function maps themes to their names
-String getThemeName(context, String theme) {
-  switch (theme) {
-    case cwtch_theme:
-      return AppLocalizations.of(context)!.themeNameCwtch;
-    case ghost_theme:
-      return AppLocalizations.of(context)!.themeNameGhost;
-    case mermaid_theme:
-      return AppLocalizations.of(context)!.themeNameMermaid;
-    case midnight_theme:
-      return AppLocalizations.of(context)!.themeNameMidnight;
-    case neon1_theme:
-      return AppLocalizations.of(context)!.themeNameNeon1;
-    case neon2_theme:
-      return AppLocalizations.of(context)!.themeNameNeon2;
-    case pumpkin_theme:
-      return AppLocalizations.of(context)!.themeNamePumpkin;
-    case vampire_theme:
-      return AppLocalizations.of(context)!.themeNameVampire;
-    case witch_theme:
-      return AppLocalizations.of(context)!.themeNameWitch;
-  }
-  return theme;
-}
-
 /// Send an UpdateGlobalSettings to the Event Bus
 saveSettings(context) {
   var settings = Provider.of<Settings>(context, listen: false);

lib/views/groupsettingsview.dart

@@ -101,7 +101,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
                             ),
                             CwtchTextField(
                               controller: ctrlrGroupAddr,
-                              hintText: '',
+                              labelText: '',
                               validator: (value) {},
                             )
                           ]),
@@ -116,7 +116,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
                             CwtchTextField(
                               controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).server),
                               validator: (value) {},
-                              hintText: '',
+                              labelText: '',
                             )
                           ]),
 
@@ -195,11 +195,10 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
       child: Text(AppLocalizations.of(context)!.yesLeave),
       onPressed: () {
         var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-        var identifier = Provider.of<ContactInfoState>(context, listen: false).identifier;
+        var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
         // locally update cache...
         Provider.of<ContactInfoState>(context, listen: false).isArchived = true;
-        Provider.of<ProfileInfoState>(context, listen: false).contactList.removeContact(identifier);
-        Provider.of<FlwtchState>(context, listen: false).cwtch.DeleteContact(profileOnion, identifier);
+        Provider.of<FlwtchState>(context, listen: false).cwtch.DeleteContact(profileOnion, handle);
         Future.delayed(Duration(milliseconds: 500), () {
           Provider.of<AppState>(context, listen: false).selectedConversation = null;
           Navigator.of(context).popUntil((route) => route.settings.name == "conversations"); // dismiss dialog

lib/views/messageview.dart

@@ -1,11 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:crypto/crypto.dart';
-import 'package:cwtch/config.dart';
 import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/messages/quotedmessage.dart';
-import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messageloadingbubble.dart';
 import 'package:cwtch/widgets/profileimage.dart';
 
@@ -38,7 +36,6 @@ class _MessageViewState extends State<MessageView> {
   int selectedContact = -1;
   ItemPositionsListener scrollListener = ItemPositionsListener.create();
   ItemScrollController scrollController = ItemScrollController();
-  File? imagePreview;
 
   @override
   void initState() {
@@ -87,7 +84,7 @@ class _MessageViewState extends State<MessageView> {
         appBarButtons.add(IconButton(
           icon: Icon(Icons.attach_file, size: 24),
           tooltip: AppLocalizations.of(context)!.tooltipSendFile,
-          onPressed: (){_showFilePicker(context);},
+          onPressed: _showFilePicker,
         ));
       }
       appBarButtons.add(IconButton(
@@ -106,7 +103,6 @@ class _MessageViewState extends State<MessageView> {
     return WillPopScope(
         onWillPop: _onWillPop,
         child: Scaffold(
-          backgroundColor: Provider.of<Settings>(context).theme.backgroundMainColor,
           floatingActionButton: appState.unreadMessagesBelow
               ? FloatingActionButton(
                   child: Icon(Icons.arrow_downward),
@@ -123,7 +119,7 @@ class _MessageViewState extends State<MessageView> {
               ProfileImage(
                 imagePath: Provider.of<ContactInfoState>(context).imagePath,
                 diameter: 42,
-                border: Provider.of<Settings>(context).current().portraitOnlineBorderColor,
+                border: Provider.of<Settings>(context).current().portraitOnlineBorderColor(),
                 badgeTextColor: Colors.red,
                 badgeColor: Colors.red,
               ),
@@ -217,7 +213,7 @@ class _MessageViewState extends State<MessageView> {
     ctrlrCompose.clear();
     focusNode.requestFocus();
     Future.delayed(const Duration(milliseconds: 80), () {
-      Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(Provider.of<ContactInfoState>(context, listen: false).identifier)?.bumpMessageCache();
+      Provider.of<ContactInfoState>(context, listen: false).totalMessages++;
       Provider.of<ContactInfoState>(context, listen: false).newMarker++;
       // Resort the contact list...
       Provider.of<ProfileInfoState>(context, listen: false).contactList.updateLastMessageTime(Provider.of<ContactInfoState>(context, listen: false).identifier, DateTime.now());
@@ -228,7 +224,7 @@ class _MessageViewState extends State<MessageView> {
     bool isOffline = Provider.of<ContactInfoState>(context).isOnline() == false;
 
     var composeBox = Container(
-      color: Provider.of<Settings>(context).theme.backgroundMainColor,
+      color: Provider.of<Settings>(context).theme.backgroundMainColor(),
       padding: EdgeInsets.all(2),
       margin: EdgeInsets.all(2),
       height: 100,
@@ -236,7 +232,7 @@ class _MessageViewState extends State<MessageView> {
         children: <Widget>[
           Expanded(
               child: Container(
-                  decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),
+                  decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
                   child: RawKeyboardListener(
                       focusNode: FocusNode(),
                       onKey: handleKeyPress,
@@ -256,12 +252,12 @@ class _MessageViewState extends State<MessageView> {
                             enabled: !isOffline,
                             decoration: InputDecoration(
                                 hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
-                                hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.sendHintTextColor),
+                                hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
                                 enabledBorder: InputBorder.none,
                                 focusedBorder: InputBorder.none,
                                 enabled: true,
                                 suffixIcon: ElevatedButton(
-                                  child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.defaultButtonTextColor),
+                                  child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.defaultButtonTextColor()),
                                   onPressed: isOffline ? null : _sendMessage,
                                 ))),
                       )))),
@@ -281,8 +277,8 @@ class _MessageViewState extends State<MessageView> {
                 margin: EdgeInsets.all(5),
                 padding: EdgeInsets.all(5),
                 color: message.getMetadata().senderHandle != Provider.of<AppState>(context).selectedProfile
-                    ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor
-                    : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
+                    ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor()
+                    : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
                 child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                   Stack(children: [
                     Align(
@@ -316,7 +312,7 @@ class _MessageViewState extends State<MessageView> {
       children = [composeBox];
     }
 
-    return Container(color: Provider.of<Settings>(context).theme.backgroundMainColor, child: Column(mainAxisSize: MainAxisSize.min, children: children));
+    return Column(mainAxisSize: MainAxisSize.min, children: children);
   }
 
   // Send the message if enter is pressed without the shift key...
@@ -357,7 +353,7 @@ class _MessageViewState extends State<MessageView> {
                               return contact.onion != Provider.of<ContactInfoState>(context).onion;
                             }, onChanged: (newVal) {
                               setState(() {
-                                this.selectedContact = Provider.of<ProfileInfoState>(context, listen: false).contactList.findContact(newVal)!.identifier;
+                                this.selectedContact = newVal;
                               });
                             })),
                         SizedBox(
@@ -366,7 +362,7 @@ class _MessageViewState extends State<MessageView> {
                         ElevatedButton(
                           child: Text(AppLocalizations.of(bcontext)!.inviteBtn, semanticsLabel: AppLocalizations.of(bcontext)!.inviteBtn),
                           onPressed: () {
-                            if (this.selectedContact != -1) {
+                            if (this.selectedContact != "") {
                               this._sendInvitation();
                             }
                             Navigator.pop(bcontext);
@@ -378,8 +374,7 @@ class _MessageViewState extends State<MessageView> {
         });
   }
 
-  void _showFilePicker(BuildContext ctx) async {
-    imagePreview = null;
+  void _showFilePicker() async {
     FilePickerResult? result = await FilePicker.platform.pickFiles();
     if (result != null) {
       File file = File(result.files.first.path);
@@ -387,73 +382,11 @@ class _MessageViewState extends State<MessageView> {
       // a manifest (see : https://git.openprivacy.ca/cwtch.im/cwtch/src/branch/master/protocol/files/manifest.go#L25)
       if (file.lengthSync() <= 10737418240) {
         print("Sending " + file.path);
-        _confirmFileSend(ctx, file.path);
+        _sendFile(file.path);
       } else {
-        final snackBar = SnackBar(
-          content: Text(AppLocalizations.of(context)!.msgFileTooBig),
-          duration: Duration(seconds: 4),
-        );
-        ScaffoldMessenger.of(ctx).showSnackBar(snackBar);
+        print("file size cannot exceed 10 gigabytes");
+        //todo: toast error
       }
     }
   }
-
-  void _confirmFileSend(BuildContext ctx, String path) async {
-    showModalBottomSheet<void>(
-        context: ctx,
-        builder: (BuildContext bcontext) {
-          var showPreview = false;
-          if (Provider.of<Settings>(context, listen: false).shouldPreview(path)) {
-            showPreview = true;
-            if (imagePreview == null) {
-              imagePreview = new File(path);
-            }
-          }
-          return Container(
-              height: 300, // bespoke value courtesy of the [TextField] docs
-              child: Center(
-                child: Padding(
-                    padding: EdgeInsets.all(10.0),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      mainAxisSize: MainAxisSize.min,
-                      children: <Widget>[
-                        Text(AppLocalizations.of(context)!.msgConfirmSend + " $path?"),
-                        SizedBox(
-                          height: 20,
-                        ),
-                        Visibility(visible: showPreview, child: showPreview ? Image.file(
-                          imagePreview!,
-                          cacheHeight: 150, // limit the amount of space the image can decode too, we keep this high-ish to allow quality previews...
-                          filterQuality: FilterQuality.medium,
-                          fit: BoxFit.fill,
-                          alignment: Alignment.center,
-                          height: 150,
-                          isAntiAlias: false,
-                          errorBuilder: (context, error, stackTrace) {
-                            return MalformedBubble();
-                          },
-                        ) : Container()),
-                        Visibility(visible: showPreview, child: SizedBox(height: 10,)),
-                        Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-                          ElevatedButton(
-                            child: Text(AppLocalizations.of(context)!.cancel, semanticsLabel: AppLocalizations.of(context)!.cancel),
-                            onPressed: () {
-                              Navigator.pop(bcontext);
-                            },
-                          ),
-                          SizedBox(width: 20,),
-                          ElevatedButton(
-                            child: Text(AppLocalizations.of(context)!.btnSendFile, semanticsLabel: AppLocalizations.of(context)!.btnSendFile),
-                            onPressed: () {
-                              _sendFile(path);
-                              Navigator.pop(bcontext);
-                            },
-                          ),
-                        ]),
-                      ],
-                    )),
-              ));
-        });
-  }
 }

lib/views/peersettingsview.dart

@@ -105,7 +105,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                               height: 20,
                             ),
                             SwitchListTile(
-                              title: Text(AppLocalizations.of(context)!.blockBtn, style: TextStyle(color: settings.current().mainTextColor)),
+                              title: Text(AppLocalizations.of(context)!.blockBtn, style: TextStyle(color: settings.current().mainTextColor())),
                               value: Provider.of<ContactInfoState>(context).isBlocked,
                               onChanged: (bool blocked) {
                                 // Save local blocked status
@@ -137,14 +137,14 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                   Provider.of<FlwtchState>(context, listen: false).cwtch.SendProfileEvent(profileOnion, setPeerAttributeJson);
                                 }
                               },
-                              activeTrackColor: settings.theme.defaultButtonColor,
-                              inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
-                              secondary: Icon(CwtchIcons.block_peer, color: settings.current().mainTextColor),
+                              activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                              inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                              secondary: Icon(CwtchIcons.block_peer, color: settings.current().mainTextColor()),
                             ),
                             ListTile(
-                                title: Text(AppLocalizations.of(context)!.savePeerHistory, style: TextStyle(color: settings.current().mainTextColor)),
+                                title: Text(AppLocalizations.of(context)!.savePeerHistory, style: TextStyle(color: settings.current().mainTextColor())),
                                 subtitle: Text(AppLocalizations.of(context)!.savePeerHistoryDescription),
-                                leading: Icon(CwtchIcons.peer_history, color: settings.current().mainTextColor),
+                                leading: Icon(CwtchIcons.peer_history, color: settings.current().mainTextColor()),
                                 trailing: DropdownButton(
                                     value: Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory"
                                         ? AppLocalizations.of(context)!.dontSavePeerHistory

lib/views/profilemgrview.dart

@@ -46,20 +46,20 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
             return Provider.of<AppState>(context, listen: false).cwtchIsClosing;
           },
           child: Scaffold(
-            backgroundColor: settings.theme.backgroundMainColor,
+            backgroundColor: settings.theme.backgroundMainColor(),
             appBar: AppBar(
               title: Row(children: [
                 Icon(
                   CwtchIcons.cwtch_knott,
                   size: 36,
-                  color: settings.theme.mainTextColor,
+                  color: settings.theme.mainTextColor(),
                 ),
                 SizedBox(
                   width: 10,
                 ),
                 Expanded(
                     child: Text(MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.titleManageProfiles : AppLocalizations.of(context)!.titleManageProfilesShort,
-                        style: TextStyle(color: settings.current().mainTextColor)))
+                        style: TextStyle(color: settings.current().mainTextColor())))
               ]),
               actions: getActions(),
             ),
@@ -93,7 +93,7 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
     // Unlock Profiles
     actions.add(IconButton(
       icon: Icon(CwtchIcons.lock_open_24px),
-      color: Provider.of<ProfileListState>(context).profiles.isEmpty ? Provider.of<Settings>(context).theme.defaultButtonColor : Provider.of<Settings>(context).theme.mainTextColor,
+      color: Provider.of<ProfileListState>(context).profiles.isEmpty ? Provider.of<Settings>(context).theme.defaultButtonColor() : Provider.of<Settings>(context).theme.mainTextColor(),
       tooltip: AppLocalizations.of(context)!.tooltipUnlockProfiles,
       onPressed: _modalUnlockProfiles,
     ));

lib/views/profileserversview.dart

@@ -1,136 +0,0 @@
-import 'package:cwtch/models/profileservers.dart';
-import 'package:cwtch/models/servers.dart';
-import 'package:cwtch/widgets/remoteserverrow.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:provider/provider.dart';
-
-import '../cwtch_icons_icons.dart';
-import '../main.dart';
-import '../model.dart';
-import '../settings.dart';
-
-class ProfileServersView extends StatefulWidget {
-  @override
-  _ProfileServersView createState() => _ProfileServersView();
-}
-
-class _ProfileServersView extends State<ProfileServersView> {
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var knownServers = Provider.of<ProfileInfoState>(context).serverList.servers.map<String>((RemoteServerInfoState remoteServer) {
-      return remoteServer.onion + ".onion";
-    }).toSet();
-    var importServerList = Provider.of<ServerListState>(context).servers.where((server) => !knownServers.contains(server.onion)).map<DropdownMenuItem<String>>((ServerInfoState serverInfo) {
-      return DropdownMenuItem<String>(
-        value: serverInfo.onion,
-        child: Text(
-          serverInfo.description.isNotEmpty ? serverInfo.description : serverInfo.onion,
-          overflow: TextOverflow.ellipsis,
-        ),
-      );
-    }).toList();
-
-    importServerList.insert(0, DropdownMenuItem<String>(value: "", child: Text(AppLocalizations.of(context)!.importLocalServerSelectText)));
-
-    return Scaffold(
-        appBar: AppBar(
-          title: Text(MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.manageKnownServersLong : AppLocalizations.of(context)!.manageKnownServersShort),
-        ),
-        body: Consumer<ProfileInfoState>(
-          builder: (context, profile, child) {
-            ProfileServerListState servers = profile.serverList;
-            final tiles = servers.servers.map(
-              (RemoteServerInfoState server) {
-                return ChangeNotifierProvider<RemoteServerInfoState>.value(
-                  value: server,
-                  builder: (context, child) => RepaintBoundary(child: RemoteServerRow()),
-                );
-              },
-            );
-
-            final divided = ListTile.divideTiles(
-              context: context,
-              tiles: tiles,
-            ).toList();
-
-            final importCard = Card(
-                child: ListTile(
-                    title: Text(AppLocalizations.of(context)!.importLocalServerLabel),
-                    leading: Icon(CwtchIcons.add_circle_24px, color: Provider.of<Settings>(context).current().mainTextColor),
-                    trailing: DropdownButton(
-                      onChanged: (String? importServer) {
-                        if (importServer!.isNotEmpty) {
-                          var server = Provider.of<ServerListState>(context).getServer(importServer)!;
-                          showImportConfirm(context, profile.onion, server.onion, server.description, server.serverBundle);
-                        }
-                      },
-                      value: "",
-                      items: importServerList,
-                    )));
-
-            return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
-              return Scrollbar(
-                  isAlwaysShown: true,
-                  child: SingleChildScrollView(
-                      clipBehavior: Clip.antiAlias,
-                      child: Container(
-                          margin: EdgeInsets.fromLTRB(5, 0, 5, 10),
-                          padding: EdgeInsets.fromLTRB(5, 0, 5, 10),
-                          child: Column(children: [if (importServerList.length > 1) importCard, Column(children: divided)]))));
-            });
-
-            return ListView(children: divided);
-          },
-        ));
-  }
-
-  showImportConfirm(BuildContext context, String profileHandle, String serverHandle, String serverDesc, String bundle) {
-    var serverLabel = serverDesc.isNotEmpty ? serverDesc : serverHandle;
-    serverHandle = serverHandle.substring(0, serverHandle.length - 6); // remove '.onion'
-    // set up the buttons
-    Widget cancelButton = ElevatedButton(
-      child: Text(AppLocalizations.of(context)!.cancel),
-      onPressed: () {
-        Navigator.of(context).pop(); // dismiss dialog
-      },
-    );
-    Widget continueButton = ElevatedButton(
-        child: Text(AppLocalizations.of(context)!.importLocalServerButton.replaceAll("%1", serverLabel)),
-        onPressed: () {
-          Provider.of<FlwtchState>(context, listen: false).cwtch.ImportBundle(profileHandle, bundle);
-          // Wait 500ms and hope the server is imported and add it's description in the UI and as an attribute
-          Future.delayed(const Duration(milliseconds: 500), () {
-            var profile = Provider.of<ProfileInfoState>(context);
-            if (profile.serverList.getServer(serverHandle) != null) {
-              profile.serverList.getServer(serverHandle)?.updateDescription(serverDesc);
-
-              Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profile.onion, profile.serverList.getServer(serverHandle)!.identifier, "server.description", serverDesc);
-            }
-          });
-          Navigator.of(context).pop();
-        });
-
-    // set up the AlertDialog
-    AlertDialog alert = AlertDialog(
-      title: Text(AppLocalizations.of(context)!.importLocalServerButton.replaceAll("%1", serverLabel)),
-      actions: [
-        cancelButton,
-        continueButton,
-      ],
-    );
-
-    // show the dialog
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return alert;
-      },
-    );
-  }
-}

lib/views/remoteserverview.dart

@@ -1,146 +0,0 @@
-import 'dart:convert';
-import 'package:cwtch/cwtch/cwtch.dart';
-import 'package:cwtch/cwtch_icons_icons.dart';
-import 'package:cwtch/models/profileservers.dart';
-import 'package:cwtch/models/servers.dart';
-import 'package:cwtch/widgets/buttontextfield.dart';
-import 'package:cwtch/widgets/contactrow.dart';
-import 'package:cwtch/widgets/cwtchlabel.dart';
-import 'package:cwtch/widgets/passwordfield.dart';
-import 'package:cwtch/widgets/textfield.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:flutter/material.dart';
-import 'package:cwtch/settings.dart';
-import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-
-import '../errorHandler.dart';
-import '../main.dart';
-import '../config.dart';
-import '../model.dart';
-
-/// Pane to add or edit a server
-class RemoteServerView extends StatefulWidget {
-  const RemoteServerView();
-
-  @override
-  _RemoteServerViewState createState() => _RemoteServerViewState();
-}
-
-class _RemoteServerViewState extends State<RemoteServerView> {
-  final _formKey = GlobalKey<FormState>();
-
-  final ctrlrDesc = TextEditingController(text: "");
-
-  @override
-  void initState() {
-    super.initState();
-    var serverInfoState = Provider.of<RemoteServerInfoState>(context, listen: false);
-    if (serverInfoState.description.isNotEmpty) {
-      ctrlrDesc.text = serverInfoState.description;
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer3<ProfileInfoState, RemoteServerInfoState, Settings>(builder: (context, profile, serverInfoState, settings, child) {
-      return Scaffold(
-          appBar: AppBar(title: Text(ctrlrDesc.text.isNotEmpty ? ctrlrDesc.text : serverInfoState.onion)),
-          body: Container(
-              margin: EdgeInsets.fromLTRB(30, 0, 30, 10),
-              padding: EdgeInsets.fromLTRB(20, 0, 20, 10),
-              child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-                SizedBox(
-                  height: 20,
-                ),
-                CwtchLabel(label: AppLocalizations.of(context)!.serverAddress),
-                SizedBox(
-                  height: 20,
-                ),
-                SelectableText(serverInfoState.onion),
-
-                // Description
-                SizedBox(
-                  height: 20,
-                ),
-                CwtchLabel(label: AppLocalizations.of(context)!.serverDescriptionLabel),
-                Text(AppLocalizations.of(context)!.serverDescriptionDescription),
-                SizedBox(
-                  height: 20,
-                ),
-                CwtchButtonTextField(
-                  controller: ctrlrDesc,
-                  readonly: false,
-                  tooltip: AppLocalizations.of(context)!.saveBtn,
-                  labelText: AppLocalizations.of(context)!.fieldDescriptionLabel,
-                  icon: Icon(Icons.save),
-                  onPressed: () {
-                    Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profile.onion, serverInfoState.identifier, "server.description", ctrlrDesc.text);
-                    serverInfoState.updateDescription(ctrlrDesc.text);
-                  },
-                ),
-
-                SizedBox(
-                  height: 20,
-                ),
-
-                Padding(
-                  padding: EdgeInsets.all(8),
-                  child: Text(AppLocalizations.of(context)!.groupsOnThisServerLabel),
-                ),
-                Expanded(child: _buildGroupsList(serverInfoState))
-              ])));
-    });
-  }
-
-  Widget _buildGroupsList(RemoteServerInfoState serverInfoState) {
-    final tiles = serverInfoState.groups.map(
-      (ContactInfoState group) {
-        return ChangeNotifierProvider<ContactInfoState>.value(
-          value: group,
-          builder: (context, child) => RepaintBoundary(child: _buildGroupRow(group)), // ServerRow()),
-        );
-      },
-    );
-
-    final divided = ListTile.divideTiles(
-      context: context,
-      tiles: tiles,
-    ).toList();
-
-    var size = MediaQuery.of(context).size;
-
-    int cols = ((size.width - 50) / 500).ceil();
-    final double itemHeight = 60; // magic arbitary
-    final double itemWidth = (size.width - 50 /* magic padding guess */) / cols;
-
-    return GridView.count(crossAxisCount: cols, childAspectRatio: (itemWidth / itemHeight), children: divided);
-  }
-
-  Widget _buildGroupRow(ContactInfoState group) {
-    return Padding(
-        padding: const EdgeInsets.all(6.0), //border size
-        child: Column(children: [
-          Text(
-            group.nickname,
-            style: Provider.of<FlwtchState>(context).biggerFont.apply(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
-            softWrap: true,
-            overflow: TextOverflow.ellipsis,
-          ),
-          Visibility(
-              visible: !Provider.of<Settings>(context).streamerMode,
-              child: ExcludeSemantics(
-                  child: Text(
-                group.onion,
-                softWrap: true,
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
-              )))
-        ]));
-  }
-}

lib/views/serversview.dart

@@ -30,7 +30,6 @@ class _ServersView extends State<ServersView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Provider.of<Settings>(context, listen: false).theme.backgroundMainColor,
         appBar: AppBar(
           title: Text(MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.serversManagerTitleLong : AppLocalizations.of(context)!.serversManagerTitleShort),
           actions: getActions(),
@@ -78,7 +77,7 @@ class _ServersView extends State<ServersView> {
     // Unlock Profiles
     actions.add(IconButton(
       icon: Icon(CwtchIcons.lock_open_24px),
-      color: Provider.of<ServerListState>(context).servers.isEmpty ? Provider.of<Settings>(context).theme.defaultButtonColor : Provider.of<Settings>(context).theme.mainTextColor,
+      color: Provider.of<ServerListState>(context).servers.isEmpty ? Provider.of<Settings>(context).theme.defaultButtonColor() : Provider.of<Settings>(context).theme.mainTextColor(),
       tooltip: AppLocalizations.of(context)!.tooltipUnlockProfiles,
       onPressed: _modalUnlockServers,
     ));

lib/views/splashView.dart

@@ -1,17 +1,11 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../model.dart';
 import '../settings.dart';
 
-class SplashView extends StatefulWidget {
-  @override
-  _SplashViewState createState() => _SplashViewState();
-}
-
-class _SplashViewState extends State<SplashView> {
+class SplashView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Consumer<AppState>(
@@ -31,24 +25,11 @@ class _SplashViewState extends State<SplashView> {
                   isAntiAlias: true,
                 ),
                 Padding(
-                    padding: const EdgeInsets.all(20.0),
-                    child: Column(children: [
-                      Padding(
-                          padding: EdgeInsets.all(6.0),
-                          child: Text(
-                              appState.appError != ""
-                                  ? appState.appError
-                                  : appState.modalState == ModalState.none
-                                      ? AppLocalizations.of(context)!.loadingCwtch
-                                      : AppLocalizations.of(context)!.storageMigrationModalMessage,
-                              style: TextStyle(
-                                  fontSize: 16.0, color: appState.appError == "" ? Provider.of<Settings>(context).theme.mainTextColor : Provider.of<Settings>(context).theme.textfieldErrorColor))),
-                      Visibility(
-                          visible: appState.modalState == ModalState.storageMigration,
-                          child: LinearProgressIndicator(
-                            color: Provider.of<Settings>(context).theme.defaultButtonActiveColor,
-                          ))
-                    ])),
+                  padding: const EdgeInsets.all(20.0),
+                  child: Text(appState.appError == "" ? "Loading Cwtch..." : appState.appError,
+                      style: TextStyle(
+                          fontSize: 16.0, color: appState.appError == "" ? Provider.of<Settings>(context).theme.mainTextColor() : Provider.of<Settings>(context).theme.textfieldErrorColor())),
+                ),
                 Image(image: AssetImage("assets/Open_Privacy_Logo_lightoutline.png")),
               ])),
             ));

lib/views/triplecolview.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:cwtch/views/profilemgrview.dart';
+import 'package:provider/provider.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../main.dart';
+import '../model.dart';
+import '../settings.dart';
+import 'contactsview.dart';
+import 'messageview.dart';
+
+// currently unused but maybe one day?
+class TripleColumnView extends StatefulWidget {
+  @override
+  _TripleColumnViewState createState() => _TripleColumnViewState();
+}
+
+class _TripleColumnViewState extends State<TripleColumnView> {
+  @override
+  Widget build(BuildContext context) {
+    var appState = Provider.of<AppState>(context);
+    var settings = Provider.of<Settings>(context);
+    var columns = settings.uiColumns(appState.isLandscape(context));
+
+    return Flex(direction: Axis.horizontal, children: <Widget>[
+      Flexible(
+        flex: columns[0],
+        child: ProfileMgrView(),
+      ),
+      Flexible(
+        flex: columns[1],
+        child: appState.selectedProfile == null ? Center(child: Text(AppLocalizations.of(context)!.createProfileToBegin)) : ContactsView(), //dev
+      ),
+      Flexible(
+        flex: columns[2],
+        child: appState.selectedConversation == null
+            ? Center(child: Text(AppLocalizations.of(context)!.addContactFirst))
+            : //dev
+            Container(child: MessageView()),
+      ),
+    ]);
+  }
+}

lib/widgets/buttontextfield.dart

@@ -5,13 +5,12 @@ import 'package:provider/provider.dart';
 // Provides a styled Text Field for use in Form Widgets.
 // Callers must provide a text controller, label helper text and a validator.
 class CwtchButtonTextField extends StatefulWidget {
-  CwtchButtonTextField({required this.controller, required this.onPressed, required this.icon, required this.tooltip, this.readonly = true, this.labelText});
+  CwtchButtonTextField({required this.controller, required this.onPressed, required this.icon, required this.tooltip, this.readonly = true});
   final TextEditingController controller;
   final Function()? onPressed;
   final Icon icon;
   final String tooltip;
   final bool readonly;
-  String? labelText;
 
   @override
   _CwtchButtonTextFieldState createState() => _CwtchButtonTextFieldState();
@@ -40,31 +39,29 @@ class _CwtchButtonTextFieldState extends State<CwtchButtonTextField> {
         focusNode: _focusNode,
         enableIMEPersonalizedLearning: false,
         decoration: InputDecoration(
-            labelText: widget.labelText,
-            labelStyle: TextStyle(color: theme.current().mainTextColor, backgroundColor: theme.current().textfieldBackgroundColor),
             suffixIcon: IconButton(
               onPressed: widget.onPressed,
               icon: widget.icon,
               padding: EdgeInsets.fromLTRB(0.0, 4.0, 2.0, 2.0),
               tooltip: widget.tooltip,
               enableFeedback: true,
-              color: theme.current().mainTextColor,
-              highlightColor: theme.current().defaultButtonColor,
-              focusColor: theme.current().defaultButtonActiveColor,
-              splashColor: theme.current().defaultButtonActiveColor,
+              color: theme.current().mainTextColor(),
+              highlightColor: theme.current().defaultButtonColor(),
+              focusColor: theme.current().defaultButtonActiveColor(),
+              splashColor: theme.current().defaultButtonActiveColor(),
             ),
             floatingLabelBehavior: FloatingLabelBehavior.never,
             filled: true,
-            fillColor: theme.current().textfieldBackgroundColor,
-            focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0)),
-            focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
-            errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
+            fillColor: theme.current().textfieldBackgroundColor(),
+            focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0)),
+            focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
+            errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
             errorStyle: TextStyle(
-              color: theme.current().textfieldErrorColor,
+              color: theme.current().textfieldErrorColor(),
               fontWeight: FontWeight.bold,
             ),
             contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
-            enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0))),
+            enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0))),
       );
     });
   }

lib/widgets/contactrow.dart

@@ -23,7 +23,7 @@ class _ContactRowState extends State<ContactRow> {
     var contact = Provider.of<ContactInfoState>(context);
     return Card(
         clipBehavior: Clip.antiAlias,
-        color: Provider.of<AppState>(context).selectedConversation == contact.identifier ? Provider.of<Settings>(context).theme.backgroundHilightElementColor : null,
+        color: Provider.of<AppState>(context).selectedConversation == contact.onion ? Provider.of<Settings>(context).theme.backgroundHilightElementColor() : null,
         borderOnForeground: false,
         margin: EdgeInsets.all(0.0),
         child: InkWell(
@@ -32,16 +32,16 @@ class _ContactRowState extends State<ContactRow> {
               padding: const EdgeInsets.all(6.0), //border size
               child: ProfileImage(
                   badgeCount: contact.unreadMessages,
-                  badgeColor: Provider.of<Settings>(context).theme.portraitContactBadgeColor,
-                  badgeTextColor: Provider.of<Settings>(context).theme.portraitContactBadgeTextColor,
+                  badgeColor: Provider.of<Settings>(context).theme.portraitContactBadgeColor(),
+                  badgeTextColor: Provider.of<Settings>(context).theme.portraitContactBadgeTextColor(),
                   diameter: 64.0,
                   imagePath: contact.imagePath,
                   maskOut: !contact.isOnline(),
                   border: contact.isOnline()
-                      ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor
+                      ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor()
                       : contact.isBlocked
-                          ? Provider.of<Settings>(context).theme.portraitBlockedBorderColor
-                          : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
+                          ? Provider.of<Settings>(context).theme.portraitBlockedBorderColor()
+                          : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
             ),
             Expanded(
                 child: Padding(
@@ -55,20 +55,20 @@ class _ContactRowState extends State<ContactRow> {
                           style: TextStyle(
                               fontSize: Provider.of<Settings>(context).theme.contactOnionTextSize(),
                               color: contact.isBlocked
-                                  ? Provider.of<Settings>(context).theme.portraitBlockedTextColor
-                                  : Provider.of<Settings>(context).theme.mainTextColor), //Provider.of<FlwtchState>(context).biggerFont,
+                                  ? Provider.of<Settings>(context).theme.portraitBlockedTextColor()
+                                  : Provider.of<Settings>(context).theme.mainTextColor()), //Provider.of<FlwtchState>(context).biggerFont,
                           softWrap: true,
                           overflow: TextOverflow.visible,
                         ),
                         Visibility(
                             visible: contact.isGroup && contact.status == "Authenticated",
                             child: LinearProgressIndicator(
-                              color: Provider.of<Settings>(context).theme.defaultButtonActiveColor,
+                              color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
                             )),
                         Visibility(
                           visible: !Provider.of<Settings>(context).streamerMode,
                           child: Text(contact.onion,
-                              style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor)),
+                              style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor() : Provider.of<Settings>(context).theme.mainTextColor())),
                         )
                       ],
                     ))),
@@ -81,7 +81,7 @@ class _ContactRowState extends State<ContactRow> {
                         iconSize: 16,
                         icon: Icon(
                           Icons.favorite,
-                          color: Provider.of<Settings>(context).theme.mainTextColor,
+                          color: Provider.of<Settings>(context).theme.mainTextColor(),
                         ),
                         tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest,
                         onPressed: _btnApprove,
@@ -89,7 +89,7 @@ class _ContactRowState extends State<ContactRow> {
                       IconButton(
                         padding: EdgeInsets.zero,
                         iconSize: 16,
-                        icon: Icon(Icons.delete, color: Provider.of<Settings>(context).theme.mainTextColor),
+                        icon: Icon(Icons.delete, color: Provider.of<Settings>(context).theme.mainTextColor()),
                         tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest,
                         onPressed: _btnReject,
                       )
@@ -98,7 +98,7 @@ class _ContactRowState extends State<ContactRow> {
                       ? IconButton(
                           padding: EdgeInsets.zero,
                           iconSize: 16,
-                          icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
+                          icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor()),
                           onPressed: () {},
                         )
                       : Text(dateToNiceString(contact.lastMessageTime))),
@@ -111,8 +111,6 @@ class _ContactRowState extends State<ContactRow> {
   }
 
   void _btnApprove() {
-    // Update the UI
-    Provider.of<ContactInfoState>(context, listen: false).authorization = ContactAuthorization.approved;
     Provider.of<FlwtchState>(context, listen: false)
         .cwtch
         .AcceptContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier);
@@ -121,7 +119,7 @@ class _ContactRowState extends State<ContactRow> {
   void _btnReject() {
     ContactInfoState contact = Provider.of<ContactInfoState>(context, listen: false);
     if (contact.isGroup == true) {
-      // FIXME This flow is incrorect. Groups never just show up on the contact list anymore
+      Provider.of<FlwtchState>(context, listen: false).cwtch.RejectInvite(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.identifier);
       Provider.of<ProfileInfoState>(context, listen: false).removeContact(contact.onion);
     } else {
       Provider.of<FlwtchState>(context, listen: false).cwtch.BlockContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.identifier);

lib/widgets/cwtchlabel.dart

@@ -18,7 +18,7 @@ class _CwtchLabelState extends State<CwtchLabel> {
     return Consumer<Settings>(builder: (context, theme, child) {
       return Text(
         widget.label,
-        style: TextStyle(fontSize: 20, color: theme.current().mainTextColor),
+        style: TextStyle(fontSize: 20, color: theme.current().mainTextColor()),
       );
     });
   }

lib/widgets/filebubble.dart

@@ -1,8 +1,6 @@
 import 'dart:io';
 
-import 'package:cwtch/config.dart';
 import 'package:cwtch/models/message.dart';
-import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:file_picker_desktop/file_picker_desktop.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -23,9 +21,8 @@ class FileBubble extends StatefulWidget {
   final String nonce;
   final int fileSize;
   final bool interactive;
-  final bool isAuto;
 
-  FileBubble(this.nameSuggestion, this.rootHash, this.nonce, this.fileSize, {this.isAuto = false, this.interactive = true});
+  FileBubble(this.nameSuggestion, this.rootHash, this.nonce, this.fileSize, {this.interactive = true});
 
   @override
   FileBubbleState createState() => FileBubbleState();
@@ -36,8 +33,6 @@ class FileBubble extends StatefulWidget {
 }
 
 class FileBubbleState extends State<FileBubble> {
-  File? myFile;
-
   @override
   void initState() {
     super.initState();
@@ -45,150 +40,105 @@ class FileBubbleState extends State<FileBubble> {
 
   @override
   Widget build(BuildContext context) {
-    var fromMe = Provider.of<MessageMetadata>(context, listen: false).senderHandle == Provider.of<ProfileInfoState>(context).onion;
-    var flagStarted = Provider.of<MessageMetadata>(context).attributes["file-downloaded"] == "true";
+    var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
+    var flagStarted = Provider.of<MessageMetadata>(context).flags & 0x02 > 0;
     var borderRadiousEh = 15.0;
-    var showFileSharing = Provider.of<Settings>(context, listen: false).isExperimentEnabled(FileSharingExperiment);
+    var showFileSharing = Provider.of<Settings>(context).isExperimentEnabled(FileSharingExperiment);
     var prettyDate = DateFormat.yMd(Platform.localeName).add_jm().format(Provider.of<MessageMetadata>(context).timestamp);
-    var downloadComplete = Provider.of<ProfileInfoState>(context).downloadComplete(widget.fileKey());
-    var downloadInterrupted = Provider.of<ProfileInfoState>(context).downloadInterrupted(widget.fileKey());
-
-    var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey());
-    if (downloadComplete) {
-      var lpath = path!.toLowerCase();
-      if (lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp")) {
-        if (myFile == null) {
-          setState(() {
-            myFile = new File(path);
-          });
-        }
-      }
-    }
-
-    var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
-    var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
 
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
-    var senderIsContact = false;
     if (!fromMe) {
       ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
-        senderIsContact = true;
       } else {
         senderDisplayStr = Provider.of<MessageMetadata>(context).senderHandle;
       }
     }
-    return LayoutBuilder(builder: (bcontext, constraints) {
-      var wdgSender = Visibility(
-          visible: widget.interactive,
-          child: SelectableText(senderDisplayStr + '\u202F',
-              style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor)));
-      var isPreview = false;
-      var wdgMessage = !showFileSharing
-          ? Text(AppLocalizations.of(context)!.messageEnableFileSharing)
-          : fromMe
-              ? senderFileChrome(AppLocalizations.of(context)!.messageFileSent, widget.nameSuggestion, widget.rootHash, widget.fileSize)
-              : (fileChrome(AppLocalizations.of(context)!.messageFileOffered + ":", widget.nameSuggestion, widget.rootHash, widget.fileSize,
-                  Provider.of<ProfileInfoState>(context).downloadSpeed(widget.fileKey())));
-      Widget wdgDecorations;
 
-      if (!showFileSharing) {
-        wdgDecorations = Text('\u202F');
-      } else if (fromMe) {
-        wdgDecorations = Visibility(
-            visible: widget.interactive,
-            child: MessageBubbleDecoration(ackd: Provider.of<MessageMetadata>(context).ackd, errored: Provider.of<MessageMetadata>(context).error, fromMe: fromMe, prettyDate: prettyDate));
-      } else if (downloadComplete) {
-        // in this case, whatever marked download.complete would have also set the path
-        if (Provider.of<Settings>(context).shouldPreview(path!)) {
-          isPreview = true;
-          wdgDecorations = Center(
-              child: MouseRegion(
-                  cursor: SystemMouseCursors.click,
-                  child: GestureDetector(
-                    child: Padding(
-                        padding: EdgeInsets.all(1.0),
-                        child: Image.file(
-                          myFile!,
-                          cacheWidth: 2048,
-                          // limit the amount of space the image can decode too, we keep this high-ish to allow quality previews...
-                          filterQuality: FilterQuality.medium,
-                          fit: BoxFit.scaleDown,
-                          alignment: Alignment.center,
-                          height: MediaQuery.of(bcontext).size.height * 0.30,
-                          isAntiAlias: false,
-                          errorBuilder: (context, error, stackTrace) {
-                            return MalformedBubble();
-                          },
-                        )),
-                    onTap: () {
-                      pop(bcontext, myFile!, wdgMessage);
-                    },
-                  )));
-        } else {
-          wdgDecorations = Visibility(visible: widget.interactive, child: Text(AppLocalizations.of(context)!.fileSavedTo + ': ' + path + '\u202F'));
-        }
-      } else if (downloadActive) {
-        if (!downloadGotManifest) {
-          wdgDecorations = Visibility(visible: widget.interactive, child: Text(AppLocalizations.of(context)!.retrievingManifestMessage + '\u202F'));
-        } else {
-          wdgDecorations = Visibility(
-              visible: widget.interactive,
-              child: LinearProgressIndicator(
-                value: Provider.of<ProfileInfoState>(context).downloadProgress(widget.fileKey()),
-                color: Provider.of<Settings>(context).theme.defaultButtonActiveColor,
-              ));
-        }
-      } else if (flagStarted) {
-        // in this case, the download was done in a previous application launch,
-        // so we probably have to request an info lookup
-        if (!downloadInterrupted) {
-          wdgDecorations = Text(AppLocalizations.of(context)!.fileCheckingStatus + '...' + '\u202F');
-        } else {
-          var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey()) ?? "";
-          wdgDecorations = Visibility(
-              visible: widget.interactive,
-              child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                Text(AppLocalizations.of(context)!.fileInterrupted + ': ' + path + '\u202F'),
-                ElevatedButton(onPressed: _btnResume, child: Text(AppLocalizations.of(context)!.verfiyResumeButton))
-              ]));
-        }
-      } else if (!senderIsContact) {
-        wdgDecorations = Text(AppLocalizations.of(context)!.msgAddToAccept);
-      } else if (!widget.isAuto) {
-        wdgDecorations = Visibility(
-            visible: widget.interactive,
-            child: Center(
-                widthFactor: 1,
-                child: Wrap(children: [
-                  Padding(padding: EdgeInsets.all(5), child: ElevatedButton(child: Text(AppLocalizations.of(context)!.downloadFileButton + '\u202F'), onPressed: _btnAccept)),
-                ])));
+    var wdgSender = Center(
+        widthFactor: 1,
+        child: SelectableText(senderDisplayStr + '\u202F',
+            style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor())));
+
+    var wdgMessage = !showFileSharing
+        ? Text(AppLocalizations.of(context)!.messageEnableFileSharing)
+        : fromMe
+            ? senderFileChrome(AppLocalizations.of(context)!.messageFileSent, widget.nameSuggestion, widget.rootHash, widget.fileSize)
+            : (fileChrome(AppLocalizations.of(context)!.messageFileOffered + ":", widget.nameSuggestion, widget.rootHash, widget.fileSize,
+                Provider.of<ProfileInfoState>(context).downloadSpeed(widget.fileKey())));
+    Widget wdgDecorations;
+    if (!showFileSharing) {
+      wdgDecorations = Text('\u202F');
+    } else if (fromMe) {
+      wdgDecorations = MessageBubbleDecoration(ackd: Provider.of<MessageMetadata>(context).ackd, errored: Provider.of<MessageMetadata>(context).error, fromMe: fromMe, prettyDate: prettyDate);
+    } else if (Provider.of<ProfileInfoState>(context).downloadComplete(widget.fileKey())) {
+      // in this case, whatever marked download.complete would have also set the path
+      var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey())!;
+      wdgDecorations = Text(AppLocalizations.of(context)!.fileSavedTo + ': ' + path + '\u202F');
+    } else if (Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey())) {
+      if (!Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey())) {
+        wdgDecorations = Text(AppLocalizations.of(context)!.retrievingManifestMessage + '\u202F');
       } else {
-        wdgDecorations = Container();
+        wdgDecorations = LinearProgressIndicator(
+          value: Provider.of<ProfileInfoState>(context).downloadProgress(widget.fileKey()),
+          color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
+        );
       }
+    } else if (flagStarted) {
+      // in this case, the download was done in a previous application launch,
+      // so we probably have to request an info lookup
+      if (!Provider.of<ProfileInfoState>(context).downloadInterrupted(widget.fileKey())) {
+        wdgDecorations = Text(AppLocalizations.of(context)!.fileCheckingStatus + '...' + '\u202F');
+        Provider.of<FlwtchState>(context, listen: false).cwtch.CheckDownloadStatus(Provider.of<ProfileInfoState>(context, listen: false).onion, widget.fileKey());
+      } else {
+        var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey()) ?? "";
+        wdgDecorations = Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+          Text(AppLocalizations.of(context)!.fileInterrupted + ': ' + path + '\u202F'),
+          ElevatedButton(onPressed: _btnResume, child: Text(AppLocalizations.of(context)!.verfiyResumeButton))
+        ]);
+      }
+    } else {
+      wdgDecorations = Center(
+          widthFactor: 1,
+          child: Wrap(children: [
+            Padding(padding: EdgeInsets.all(5), child: ElevatedButton(child: Text(AppLocalizations.of(context)!.downloadFileButton + '\u202F'), onPressed: _btnAccept)),
+          ]));
+    }
 
-      return Container(
-          constraints: constraints,
-          decoration: BoxDecoration(
-            color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor,
-            border: Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor, width: 1),
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(borderRadiousEh),
-              topRight: Radius.circular(borderRadiousEh),
-              bottomLeft: fromMe ? Radius.circular(borderRadiousEh) : Radius.zero,
-              bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
-            ),
-          ),
-          child: Padding(
-            padding: EdgeInsets.all(9.0),
-            child: Column(
-                crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: fromMe ? [wdgMessage, Visibility(visible: widget.interactive, child: wdgDecorations)] : [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations]),
-          ));
+    return LayoutBuilder(builder: (context, constraints) {
+      //print(constraints.toString()+", "+constraints.maxWidth.toString());
+      return Center(
+          widthFactor: 1.0,
+          child: Container(
+              decoration: BoxDecoration(
+                color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor(),
+                border:
+                    Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor(), width: 1),
+                borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(borderRadiousEh),
+                  topRight: Radius.circular(borderRadiousEh),
+                  bottomLeft: fromMe ? Radius.circular(borderRadiousEh) : Radius.zero,
+                  bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
+                ),
+              ),
+              child: Center(
+                  widthFactor: 1.0,
+                  child: Padding(
+                      padding: EdgeInsets.all(9.0),
+                      child: Wrap(alignment: WrapAlignment.start, children: [
+                        Center(
+                          widthFactor: 1.0,
+                          child: Column(
+                              crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                              mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
+                              mainAxisSize: MainAxisSize.min,
+                              children: fromMe
+                                  ? [wdgMessage, Visibility(visible: widget.interactive, child: wdgDecorations)]
+                                  : [wdgSender, wdgMessage, Visibility(visible: widget.interactive, child: wdgDecorations)]),
+                        )
+                      ])))));
     });
   }
 
@@ -196,13 +146,14 @@ class FileBubbleState extends State<FileBubble> {
     String? selectedFileName;
     File? file;
     var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
-    var conversation = Provider.of<ContactInfoState>(context, listen: false).identifier;
-    var idx = Provider.of<MessageMetadata>(context, listen: false).messageID;
+    var handle = Provider.of<MessageMetadata>(context, listen: false).senderHandle;
+    var contact = Provider.of<ContactInfoState>(context, listen: false).onion;
+    var idx = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
 
     if (Platform.isAndroid) {
       Provider.of<ProfileInfoState>(context, listen: false).downloadInit(widget.fileKey(), (widget.fileSize / 4096).ceil());
-      Provider.of<FlwtchState>(context, listen: false).cwtch.SetMessageAttribute(profileOnion, conversation, 0, idx, "file-downloaded", "true");
-      //Provider.of<MessageMetadata>(context, listen: false).attributes |= 0x02;
+      //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
+      Provider.of<MessageMetadata>(context, listen: false).flags |= 0x02;
       ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         Provider.of<FlwtchState>(context, listen: false).cwtch.CreateDownloadableFile(profileOnion, contact.identifier, widget.nameSuggestion, widget.fileKey());
@@ -214,12 +165,12 @@ class FileBubbleState extends State<FileBubble> {
         );
         if (selectedFileName != null) {
           file = File(selectedFileName);
-          EnvironmentConfig.debugLog("saving to " + file.path);
+          print("saving to " + file.path);
           var manifestPath = file.path + ".manifest";
           Provider.of<ProfileInfoState>(context, listen: false).downloadInit(widget.fileKey(), (widget.fileSize / 4096).ceil());
-          Provider.of<FlwtchState>(context, listen: false).cwtch.SetMessageAttribute(profileOnion, conversation, 0, idx, "file-downloaded", "true");
-          //Provider.of<MessageMetadata>(context, listen: false).flags |= 0x02;
-          ContactInfoState? contact = Provider.of<ProfileInfoState>(context, listen: false).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
+          //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
+          Provider.of<MessageMetadata>(context, listen: false).flags |= 0x02;
+          ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
           if (contact != null) {
             Provider.of<FlwtchState>(context, listen: false).cwtch.DownloadFile(profileOnion, contact.identifier, file.path, manifestPath, widget.fileKey());
           }
@@ -245,7 +196,7 @@ class FileBubbleState extends State<FileBubble> {
           SelectableText(
             chrome + '\u202F',
             style: TextStyle(
-              color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+              color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
             ),
             textAlign: TextAlign.left,
             maxLines: 2,
@@ -254,7 +205,7 @@ class FileBubbleState extends State<FileBubble> {
           SelectableText(
             fileName + '\u202F',
             style: TextStyle(
-              color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+              color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
               fontWeight: FontWeight.bold,
               overflow: TextOverflow.ellipsis,
             ),
@@ -265,7 +216,7 @@ class FileBubbleState extends State<FileBubble> {
           SelectableText(
             prettyBytes(fileSize) + '\u202F' + '\n',
             style: TextStyle(
-              color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+              color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
             ),
             textAlign: TextAlign.left,
             maxLines: 2,
@@ -274,7 +225,7 @@ class FileBubbleState extends State<FileBubble> {
         subtitle: SelectableText(
           'sha512: ' + rootHash + '\u202F',
           style: TextStyle(
-            color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+            color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
             fontSize: 10,
             fontFamily: "monospace",
           ),
@@ -282,7 +233,7 @@ class FileBubbleState extends State<FileBubble> {
           maxLines: 4,
           textWidthBasis: TextWidthBasis.parent,
         ),
-        leading: Icon(Icons.attach_file, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor));
+        leading: Icon(Icons.attach_file, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor()));
   }
 
   // Construct an file chrome
@@ -293,7 +244,7 @@ class FileBubbleState extends State<FileBubble> {
         SelectableText(
           chrome + '\u202F',
           style: TextStyle(
-            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
           ),
           textAlign: TextAlign.left,
           maxLines: 2,
@@ -302,7 +253,7 @@ class FileBubbleState extends State<FileBubble> {
         SelectableText(
           fileName + '\u202F',
           style: TextStyle(
-            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
             fontWeight: FontWeight.bold,
             overflow: TextOverflow.ellipsis,
           ),
@@ -313,7 +264,7 @@ class FileBubbleState extends State<FileBubble> {
         SelectableText(
           AppLocalizations.of(context)!.labelFilesize + ': ' + prettyBytes(fileSize) + '\u202F' + '\n',
           style: TextStyle(
-            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+            color: Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
           ),
           textAlign: TextAlign.left,
           maxLines: 2,
@@ -322,7 +273,7 @@ class FileBubbleState extends State<FileBubble> {
       subtitle: SelectableText(
         'sha512: ' + rootHash + '\u202F',
         style: TextStyle(
-          color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+          color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
           fontSize: 10,
           fontFamily: "monospace",
         ),
@@ -330,13 +281,13 @@ class FileBubbleState extends State<FileBubble> {
         maxLines: 4,
         textWidthBasis: TextWidthBasis.parent,
       ),
-      leading: Icon(Icons.attach_file, size: 32, color: Provider.of<Settings>(context).theme.messageFromOtherTextColor),
+      leading: Icon(Icons.attach_file, size: 32, color: Provider.of<Settings>(context).theme.messageFromOtherTextColor()),
       trailing: Visibility(
           visible: speed != "0 B/s",
           child: SelectableText(
             speed + '\u202F',
             style: TextStyle(
-              color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+              color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
             ),
             textAlign: TextAlign.left,
             maxLines: 1,
@@ -344,43 +295,4 @@ class FileBubbleState extends State<FileBubble> {
           )),
     );
   }
-
-  void pop(context, File myFile, Widget meta) async {
-    await showDialog(
-        context: context,
-        builder: (_) => Dialog(
-            alignment: Alignment.center,
-            child: Container(
-              padding: EdgeInsets.all(10),
-              child: Column(children: [
-                ListTile(
-                    title: meta,
-                    trailing: IconButton(
-                        icon: Icon(Icons.close),
-                        color: Provider.of<Settings>(context, listen: false).theme.toolbarIconColor,
-                        iconSize: 32,
-                        onPressed: () {
-                          Navigator.pop(context, true);
-                        })),
-                Image.file(
-                  myFile,
-                  cacheWidth: (MediaQuery.of(context).size.width * 0.6).floor(),
-                  width: (MediaQuery.of(context).size.width * 0.6),
-                  height: (MediaQuery.of(context).size.height * 0.6),
-                  fit: BoxFit.scaleDown,
-                ),
-                SizedBox(
-                  height: 20,
-                ),
-                Visibility(visible: !Platform.isAndroid, child: Text(myFile.path, textAlign: TextAlign.center)),
-                Visibility(visible: Platform.isAndroid, child: IconButton(icon: Icon(Icons.arrow_downward), onPressed: androidExport)),
-              ]),
-            )));
-  }
-
-  void androidExport() async {
-    if (myFile != null) {
-      Provider.of<FlwtchState>(context, listen: false).cwtch.ExportPreviewedFile(myFile!.path, widget.nameSuggestion);
-    }
-  }
 }

lib/widgets/folderpicker.dart

@@ -1,67 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'dart:io';
-
-import 'package:file_picker_desktop/file_picker_desktop.dart';
-import 'buttontextfield.dart';
-import 'cwtchlabel.dart';
-
-class CwtchFolderPicker extends StatefulWidget {
-  final String label;
-  final String initialValue;
-  final Function(String)? onSave;
-  const CwtchFolderPicker({Key? key, this.label = "", this.initialValue = "", this.onSave}) : super(key: key);
-
-  @override
-  _CwtchFolderPickerState createState() => _CwtchFolderPickerState();
-}
-
-class _CwtchFolderPickerState extends State<CwtchFolderPicker> {
-  final TextEditingController ctrlrVal = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-    ctrlrVal.text = widget.initialValue;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-        margin: EdgeInsets.all(10),
-        padding: EdgeInsets.all(2),
-        child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-          CwtchLabel(label: widget.label),
-          SizedBox(
-            height: 20,
-          ),
-          CwtchButtonTextField(
-            controller: ctrlrVal,
-            readonly: Platform.isAndroid,
-            onPressed: () async {
-              if (Platform.isAndroid) {
-                return;
-              }
-
-              try {
-                var selectedDirectory = await getDirectoryPath();
-                if (selectedDirectory != null) {
-                  //File directory = File(selectedDirectory);
-                  selectedDirectory += "/";
-                  ctrlrVal.text = selectedDirectory;
-                  if (widget.onSave != null) {
-                    widget.onSave!(selectedDirectory);
-                  }
-                } else {
-                  // User canceled the picker
-                }
-              } catch (e) {
-                print(e);
-              }
-            },
-            icon: Icon(Icons.folder),
-            tooltip: "Browse", //todo: l18n
-          )
-        ]));
-  }
-}

lib/widgets/invitationbubble.dart

@@ -39,7 +39,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
     isAccepted = Provider.of<ProfileInfoState>(context).contactList.findContact(widget.inviteTarget) != null;
     var borderRadiousEh = 15.0;
     var showGroupInvite = Provider.of<Settings>(context).isExperimentEnabled(TapirGroupsExperiment);
-    rejected = Provider.of<MessageMetadata>(context).attributes["rejected-invite"] == "true";
+    rejected = Provider.of<MessageMetadata>(context).flags & 0x01 == 0x01;
     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...
@@ -56,7 +56,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
     var wdgSender = Center(
         widthFactor: 1,
         child: SelectableText(senderDisplayStr + '\u202F',
-            style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor)));
+            style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor())));
 
     // If we receive an invite for ourselves, treat it as a bug. The UI no longer allows this so it could have only come from
     // some kind of malfeasance.
@@ -96,8 +96,9 @@ class InvitationBubbleState extends State<InvitationBubble> {
           widthFactor: 1.0,
           child: Container(
               decoration: BoxDecoration(
-                color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor,
-                border: Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor, width: 1),
+                color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor(),
+                border:
+                    Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor(), width: 1),
                 borderRadius: BorderRadius.only(
                   topLeft: Radius.circular(borderRadiousEh),
                   topRight: Radius.circular(borderRadiousEh),
@@ -127,10 +128,10 @@ class InvitationBubbleState extends State<InvitationBubble> {
   void _btnReject() {
     setState(() {
       var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
-      var conversation = Provider.of<ContactInfoState>(context, listen: false).identifier;
-      var idx = Provider.of<MessageMetadata>(context, listen: false).messageID;
-      Provider.of<FlwtchState>(context, listen: false).cwtch.SetMessageAttribute(profileOnion, conversation, 0, idx, "rejected-invite", "true");
-      //Provider.of<MessageMetadata>(context, listen: false).flags |= 0x01;
+      var contact = Provider.of<ContactInfoState>(context, listen: false).onion;
+      var idx = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
+      //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x01);
+      Provider.of<MessageMetadata>(context, listen: false).flags |= 0x01;
     });
   }
 
@@ -148,7 +149,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
       SelectableText(
         chrome + '\u202F',
         style: TextStyle(
-          color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+          color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
         ),
         textAlign: TextAlign.left,
         maxLines: 2,
@@ -157,7 +158,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
       SelectableText(
         targetName + '\u202F',
         style: TextStyle(
-          color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
+          color: Provider.of<Settings>(context).theme.messageFromMeTextColor(),
         ),
         textAlign: TextAlign.left,
         maxLines: 2,
@@ -172,7 +173,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
       SelectableText(
         chrome + '\u202F',
         style: TextStyle(
-          color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+          color: Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
         ),
         textAlign: TextAlign.left,
         textWidthBasis: TextWidthBasis.longestLine,
@@ -180,7 +181,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
       ),
       SelectableText(
         targetName + '\u202F',
-        style: TextStyle(color: Provider.of<Settings>(context).theme.messageFromOtherTextColor),
+        style: TextStyle(color: Provider.of<Settings>(context).theme.messageFromOtherTextColor()),
         textAlign: TextAlign.left,
         maxLines: 2,
         textWidthBasis: TextWidthBasis.longestLine,

lib/widgets/messagebubble.dart

@@ -48,7 +48,7 @@ class MessageBubbleState extends State<MessageBubble> {
       }
     }
     var wdgSender = SelectableText(senderDisplayStr,
-        style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor));
+        style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
 
     var wdgMessage;
 
@@ -58,7 +58,7 @@ class MessageBubbleState extends State<MessageBubble> {
         //key: Key(myKey),
         focusNode: _focus,
         style: TextStyle(
-          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
         ),
         textAlign: TextAlign.left,
         textWidthBasis: TextWidthBasis.longestLine,
@@ -67,7 +67,7 @@ class MessageBubbleState extends State<MessageBubble> {
       wdgMessage = SelectableLinkify(
         text: widget.content + '\u202F',
         // TODO: onOpen breaks the "selectable" functionality. Maybe something to do with gesture handler?
-        options: LinkifyOptions(humanize: false, removeWww: false, looseUrl: true, defaultToHttps: true),
+        options: LinkifyOptions(humanize: false),
         linkifiers: [UrlLinkifier()],
         onOpen: (link) {
           _modalOpenLink(context, link);
@@ -75,10 +75,10 @@ class MessageBubbleState extends State<MessageBubble> {
         //key: Key(myKey),
         focusNode: _focus,
         style: TextStyle(
-          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
         ),
         linkStyle: TextStyle(
-          color: Provider.of<Settings>(context).current().mainTextColor,
+          color: Provider.of<Settings>(context).current().mainTextColor(),
         ),
         textAlign: TextAlign.left,
         textWidthBasis: TextWidthBasis.longestLine,
@@ -95,11 +95,13 @@ class MessageBubbleState extends State<MessageBubble> {
           child: Container(
               child: Container(
                   decoration: BoxDecoration(
-                    color: error ? malformedColor : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor),
+                    color: error
+                        ? malformedColor
+                        : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor()),
                     border: Border.all(
                         color: error
                             ? malformedColor
-                            : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor),
+                            : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor()),
                         width: 1),
                     borderRadius: BorderRadius.only(
                       topLeft: Radius.circular(borderRadiousEh),
@@ -157,7 +159,6 @@ class MessageBubbleState extends State<MessageBubble> {
                               onPressed: () async {
                                 if (await canLaunch(link.url)) {
                                   await launch(link.url);
-                                  Navigator.pop(bcontext);
                                 } else {
                                   throw 'Could not launch $link';
                                 }

lib/widgets/messagebubbledecorations.dart

@@ -25,7 +25,8 @@ class _MessageBubbleDecoration extends State<MessageBubbleDecoration> {
           mainAxisSize: MainAxisSize.min,
           children: [
             Text(widget.prettyDate,
-                style: TextStyle(fontSize: 9.0, color: widget.fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor),
+                style:
+                    TextStyle(fontSize: 9.0, color: widget.fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()),
                 textAlign: widget.fromMe ? TextAlign.right : TextAlign.left),
             !widget.fromMe
                 ? SizedBox(width: 1, height: 1)
@@ -34,14 +35,14 @@ class _MessageBubbleDecoration extends State<MessageBubbleDecoration> {
                     child: widget.ackd == true
                         ? Tooltip(
                             message: AppLocalizations.of(context)!.acknowledgedLabel,
-                            child: Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor, size: 16))
+                            child: Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 16))
                         : (widget.errored == true
                             ? Tooltip(
                                 message: AppLocalizations.of(context)!.couldNotSendMsgError,
-                                child: Icon(Icons.error_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor, size: 16))
+                                child: Icon(Icons.error_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 16))
                             : Tooltip(
                                 message: AppLocalizations.of(context)!.pendingLabel,
-                                child: Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor, size: 16))))
+                                child: Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 16))))
           ],
         ));
   }

lib/widgets/messagelist.dart

@@ -35,66 +35,65 @@ class _MessageListState extends State<MessageList> {
 
     return RepaintBoundary(
         child: Container(
-            color: Provider.of<Settings>(context).theme.backgroundMainColor,
             child: Column(children: [
-              Visibility(
-                  visible: showMessageWarning,
-                  child: Container(
-                      padding: EdgeInsets.all(5.0),
-                      color: Provider.of<Settings>(context).theme.defaultButtonActiveColor,
-                      child: DefaultTextStyle(
-                        style: TextStyle(color: Provider.of<Settings>(context).theme.defaultButtonTextColor),
-                        child: showSyncing
-                            ? Text(AppLocalizations.of(context)!.serverNotSynced, textAlign: TextAlign.center)
-                            : showOfflineWarning
-                                ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage,
-                                    textAlign: TextAlign.center)
-                                // Only show the ephemeral status for peer conversations, not for groups...
-                                : (showEphemeralWarning
-                                    ? Text(AppLocalizations.of(context)!.chatHistoryDefault, textAlign: TextAlign.center)
-                                    :
-                                    // We are not allowed to put null here, so put an empty text widget
-                                    Text("")),
-                      ))),
-              Expanded(
-                  child: Container(
-                      // Only show broken heart is the contact is offline...
-                      decoration: BoxDecoration(
-                          image: Provider.of<ContactInfoState>(outerContext).isOnline()
-                              ? null
-                              : DecorationImage(
-                                  fit: BoxFit.scaleDown,
-                                  alignment: Alignment.center,
-                                  image: AssetImage("assets/core/negative_heart_512px.png"),
-                                  colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementColor, BlendMode.srcIn))),
-                      // Don't load messages for syncing server...
-                      child: loadMessages
-                          ? ScrollablePositionedList.builder(
-                              itemPositionsListener: widget.scrollListener,
-                              itemScrollController: widget.scrollController,
-                              initialScrollIndex: initi > 4 ? initi - 4 : 0,
-                              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) {
-                                var profileOnion = Provider.of<ProfileInfoState>(outerContext, listen: false).onion;
-                                var contactHandle = Provider.of<ContactInfoState>(outerContext, listen: false).identifier;
-                                var messageIndex = index;
+      Visibility(
+          visible: showMessageWarning,
+          child: Container(
+              padding: EdgeInsets.all(5.0),
+              color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
+              child: DefaultTextStyle(
+                style: TextStyle(color: Provider.of<Settings>(context).theme.defaultButtonTextColor()),
+                child: showSyncing
+                    ? Text(AppLocalizations.of(context)!.serverNotSynced, textAlign: TextAlign.center)
+                    : showOfflineWarning
+                        ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage,
+                            textAlign: TextAlign.center)
+                        // Only show the ephemeral status for peer conversations, not for groups...
+                        : (showEphemeralWarning
+                            ? Text(AppLocalizations.of(context)!.chatHistoryDefault, textAlign: TextAlign.center)
+                            :
+                            // We are not allowed to put null here, so put an empty text widget
+                            Text("")),
+              ))),
+      Expanded(
+          child: Container(
+              // Only show broken heart is the contact is offline...
+              decoration: BoxDecoration(
+                  image: Provider.of<ContactInfoState>(outerContext).isOnline()
+                      ? null
+                      : DecorationImage(
+                          fit: BoxFit.scaleDown,
+                          alignment: Alignment.center,
+                          image: AssetImage("assets/core/negative_heart_512px.png"),
+                          colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementTextColor(), BlendMode.srcIn))),
+              // Don't load messages for syncing server...
+              child: loadMessages
+                  ? ScrollablePositionedList.builder(
+                      itemPositionsListener: widget.scrollListener,
+                      itemScrollController: widget.scrollController,
+                      initialScrollIndex: initi > 4 ? initi - 4 : 0,
+                      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) {
+                        var profileOnion = Provider.of<ProfileInfoState>(outerContext, listen: false).onion;
+                        var contactHandle = Provider.of<ContactInfoState>(outerContext, listen: false).identifier;
+                        var messageIndex = index;
 
-                                return FutureBuilder(
-                                  future: messageHandler(outerContext, profileOnion, contactHandle, messageIndex),
-                                  builder: (context, snapshot) {
-                                    if (snapshot.hasData) {
-                                      var message = snapshot.data as Message;
-                                      var key = Provider.of<ContactInfoState>(outerContext, listen: false).getMessageKey(contactHandle, message.getMetadata().messageID);
-                                      return message.getWidget(context, key);
-                                    } else {
-                                      return MessageLoadingBubble();
-                                    }
-                                  },
-                                );
-                              },
-                            )
-                          : null))
-            ])));
+                        return FutureBuilder(
+                          future: messageHandler(outerContext, profileOnion, contactHandle, messageIndex),
+                          builder: (context, snapshot) {
+                            if (snapshot.hasData) {
+                              var message = snapshot.data as Message;
+                              // Already includes MessageRow,,
+                              return message.getWidget(context);
+                            } else {
+                              return Text(''); //MessageLoadingBubble();
+                            }
+                          },
+                        );
+                      },
+                    )
+                  : null))
+    ])));
   }
 }

lib/widgets/messageloadingbubble.dart

@@ -1,4 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../model.dart';
+import 'package:intl/intl.dart';
+
+import '../settings.dart';
 
 class MessageLoadingBubble extends StatefulWidget {
   @override

lib/widgets/messagerow.dart

@@ -15,7 +15,6 @@ import '../settings.dart';
 
 class MessageRow extends StatefulWidget {
   final Widget child;
-
   MessageRow(this.child, {Key? key}) : super(key: key);
 
   @override
@@ -29,12 +28,9 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
   late Alignment _dragAlignment = Alignment.center;
   Alignment _dragAffinity = Alignment.center;
 
-  late int index;
-
   @override
   void initState() {
     super.initState();
-    index = Provider.of<MessageMetadata>(context, listen: false).messageID;
     _controller = AnimationController(vsync: this);
     _controller.addListener(() {
       setState(() {
@@ -45,9 +41,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
 
   @override
   void dispose() {
-    if (_controller != null) {
-      _controller.dispose();
-    }
+    _controller.dispose();
     super.dispose();
   }
 
@@ -56,7 +50,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
     var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
     var isContact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle) != null;
     var isBlocked = isContact ? Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle)!.isBlocked : false;
-    var actualMessage = Flexible(flex: Platform.isAndroid ? 10 : 3, fit: FlexFit.loose, child: widget.child);
+    var actualMessage = Flexible(flex: 3, fit: FlexFit.loose, child: widget.child);
 
     _dragAffinity = fromMe ? Alignment.centerRight : Alignment.centerLeft;
 
@@ -74,22 +68,19 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
       }
     }
 
-    Widget wdgIcons = Platform.isAndroid
-        ? SizedBox.shrink()
-        : Visibility(
-            visible: Provider.of<AppState>(context).hoveredIndex == Provider.of<MessageMetadata>(context).messageID,
-            maintainSize: true,
-            maintainAnimation: true,
-            maintainState: true,
-            maintainInteractivity: false,
-            child: IconButton(
-                tooltip: AppLocalizations.of(context)!.tooltipReplyToThisMessage,
-                onPressed: () {
-                  Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageID;
-                },
-                icon: Icon(Icons.reply, color: Provider.of<Settings>(context).theme.dropShadowColor)));
-
-    Widget wdgSpacer = Flexible(flex: 1, child: SizedBox(width: Platform.isAndroid ? 20 : 60, height: 10));
+    Widget wdgIcons = Visibility(
+        visible: Provider.of<AppState>(context).hoveredIndex == Provider.of<MessageMetadata>(context).messageIndex,
+        maintainSize: true,
+        maintainAnimation: true,
+        maintainState: true,
+        maintainInteractivity: false,
+        child: IconButton(
+            tooltip: AppLocalizations.of(context)!.tooltipReplyToThisMessage,
+            onPressed: () {
+              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageID;
+            },
+            icon: Icon(Icons.reply, color: Provider.of<Settings>(context).theme.dropShadowColor())));
+    Widget wdgSpacer = Flexible(child: SizedBox(width: 60, height: 10));
     var widgetRow = <Widget>[];
 
     if (fromMe) {
@@ -99,7 +90,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
         actualMessage,
       ];
     } else if (isBlocked && !showBlockedMessage) {
-      Color blockedMessageBackground = Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor;
+      Color blockedMessageBackground = Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor();
       Widget wdgPortrait = Padding(padding: EdgeInsets.all(4.0), child: Icon(CwtchIcons.account_blocked));
       widgetRow = <Widget>[
         wdgPortrait,
@@ -121,7 +112,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
                     AppLocalizations.of(context)!.blockedMessageMessage,
                     //key: Key(myKey),
                     style: TextStyle(
-                      color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+                      color: Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
                     ),
                     textAlign: TextAlign.center,
                     textWidthBasis: TextWidthBasis.longestLine,
@@ -155,9 +146,8 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
                 diameter: 48.0,
                 imagePath: Provider.of<MessageMetadata>(context).senderImage ?? contact.imagePath,
                 //maskOut: contact.status != "Authenticated",
-                border: contact.status == "Authenticated" ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
-                badgeTextColor: Colors.red,
-                badgeColor: Colors.red,
+                border: contact.status == "Authenticated" ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(),
+                badgeTextColor: Colors.red, badgeColor: Colors.red,
                 tooltip: isContact ? AppLocalizations.of(context)!.contactGoto.replaceFirst("%1", senderDisplayStr) : AppLocalizations.of(context)!.addContact,
               )));
 
@@ -173,7 +163,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
         // For desktop...
         onHover: (event) {
           setState(() {
-            Provider.of<AppState>(context, listen: false).hoveredIndex = Provider.of<MessageMetadata>(context, listen: false).messageID;
+            Provider.of<AppState>(context, listen: false).hoveredIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
           });
         },
         onExit: (event) {
@@ -208,9 +198,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
                       children: widgetRow,
                     )))));
     var mark = Provider.of<ContactInfoState>(context).newMarker;
-    if (mark > 0 &&
-        Provider.of<ContactInfoState>(context).messageCache.length > mark &&
-        Provider.of<ContactInfoState>(context).messageCache[mark - 1]?.metadata.messageID == Provider.of<MessageMetadata>(context).messageID) {
+    if (mark > 0 && mark == Provider.of<MessageMetadata>(context).messageIndex + 1) {
       return Column(crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [Align(alignment: Alignment.center, child: _bubbleNew()), mr]);
     } else {
       return mr;
@@ -220,8 +208,8 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
   Widget _bubbleNew() {
     return Container(
         decoration: BoxDecoration(
-          color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
-          border: Border.all(color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor, width: 1),
+          color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
+          border: Border.all(color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(), width: 1),
           borderRadius: BorderRadius.only(
             topLeft: Radius.circular(8),
             topRight: Radius.circular(8),
@@ -257,17 +245,12 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
   }
 
   void _btnGoto() {
-    var id = Provider.of<ProfileInfoState>(context, listen: false).contactList.findContact(Provider.of<MessageMetadata>(context, listen: false).senderHandle)?.identifier;
-    if (id == null) {
-      // Can't happen
-    } else {
-      selectConversation(context, id);
-    }
+    selectConversation(context, Provider.of<MessageMetadata>(context, listen: false).conversationIdentifier);
   }
 
   void _btnAdd() {
     var sender = Provider.of<MessageMetadata>(context, listen: false).senderHandle;
-    if (sender == "") {
+    if (sender == null || sender == "") {
       print("sender not yet loaded");
       return;
     }

lib/widgets/passwordfield.dart

@@ -53,21 +53,21 @@ class _CwtchTextFieldState extends State<CwtchPasswordField> {
             },
             icon: Icon((obscureText ? CwtchIcons.eye_closed : CwtchIcons.eye_open), semanticLabel: label),
             tooltip: label,
-            color: theme.current().mainTextColor,
-            highlightColor: theme.current().defaultButtonColor,
-            focusColor: theme.current().defaultButtonActiveColor,
-            splashColor: theme.current().defaultButtonActiveColor,
+            color: theme.current().mainTextColor(),
+            highlightColor: theme.current().defaultButtonColor(),
+            focusColor: theme.current().defaultButtonActiveColor(),
+            splashColor: theme.current().defaultButtonActiveColor(),
           ),
           errorStyle: TextStyle(
-            color: theme.current().textfieldErrorColor,
+            color: theme.current().textfieldErrorColor(),
             fontWeight: FontWeight.bold,
           ),
-          focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0)),
-          focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
-          errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
+          focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0)),
+          focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
+          errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
           filled: true,
-          fillColor: theme.current().textfieldBackgroundColor,
-          enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0)),
+          fillColor: theme.current().textfieldBackgroundColor(),
+          enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0)),
         ),
       );
     });

lib/widgets/profileimage.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:cwtch/themes/opaque.dart';
+import 'package:cwtch/opaque.dart';
 import 'package:provider/provider.dart';
 
 import '../settings.dart';
@@ -28,11 +28,11 @@ class _ProfileImageState extends State<ProfileImage> {
       filterQuality: FilterQuality.medium,
       // We need some theme specific blending here...we might want to consider making this a theme level attribute
       colorBlendMode: !widget.maskOut
-          ? Provider.of<Settings>(context).theme.mode == mode_dark
+          ? Provider.of<Settings>(context).theme.identifier() == "dark"
               ? BlendMode.softLight
               : BlendMode.darken
           : BlendMode.srcOut,
-      color: Provider.of<Settings>(context).theme.portraitBackgroundColor,
+      color: Provider.of<Settings>(context).theme.backgroundHilightElementColor(),
       isAntiAlias: true,
       width: widget.diameter,
       height: widget.diameter,

lib/widgets/profilerow.dart

@@ -32,11 +32,11 @@ class _ProfileRowState extends State<ProfileRow> {
                   padding: const EdgeInsets.all(6.0), //border size
                   child: ProfileImage(
                       badgeCount: 0,
-                      badgeColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
-                      badgeTextColor: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor,
+                      badgeColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor(),
+                      badgeTextColor: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor(),
                       diameter: 64.0,
                       imagePath: profile.imagePath,
-                      border: profile.isOnline ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor)),
+                      border: profile.isOnline ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor())),
               Expanded(
                   child: Column(
                 children: [
@@ -60,7 +60,7 @@ class _ProfileRowState extends State<ProfileRow> {
               IconButton(
                 enableFeedback: true,
                 tooltip: AppLocalizations.of(context)!.editProfile + " " + profile.nickname,
-                icon: Icon(Icons.create, color: Provider.of<Settings>(context).current().mainTextColor),
+                icon: Icon(Icons.create, color: Provider.of<Settings>(context).current().mainTextColor()),
                 onPressed: () {
                   _pushEditProfile(onion: profile.onion, displayName: profile.nickname, profileImage: profile.imagePath, encrypted: profile.isEncrypted);
                 },
@@ -102,7 +102,7 @@ class _ProfileRowState extends State<ProfileRow> {
   }
 
   void _pushEditProfile({onion: "", displayName: "", profileImage: "", encrypted: true}) {
-    Provider.of<ErrorHandler>(context, listen: false).reset();
+    Provider.of<ErrorHandler>(context).reset();
     Navigator.of(context).push(MaterialPageRoute<void>(
       builder: (BuildContext context) {
         return MultiProvider(

lib/widgets/quotedmessage.dart

@@ -42,13 +42,13 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
       }
     }
     var wdgSender = SelectableText(senderDisplayStr,
-        style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor));
+        style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
 
     var wdgMessage = SelectableText(
       widget.body + '\u202F',
       focusNode: _focus,
       style: TextStyle(
-        color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor,
+        color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
       ),
       textAlign: TextAlign.left,
       textWidthBasis: TextWidthBasis.longestLine,
@@ -61,11 +61,11 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
           try {
             var qMessage = (snapshot.data! as Message);
             // Swap the background color for quoted tweets..
-            var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor : Provider.of<Settings>(context).theme.messageFromMeTextColor;
+            var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor() : Provider.of<Settings>(context).theme.messageFromMeTextColor();
             return Container(
                 margin: EdgeInsets.all(5),
                 padding: EdgeInsets.all(5),
-                color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
+                color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor() : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
                 child: Wrap(runAlignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly, runSpacing: 1.0, crossAxisAlignment: WrapCrossAlignment.center, children: [
                   Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(10.0), child: Icon(Icons.reply, size: 32, color: qTextColor))),
                   Center(widthFactor: 1.0, child: DefaultTextStyle(child: qMessage.getPreviewWidget(context), style: TextStyle(color: qTextColor)))
@@ -90,11 +90,13 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
           child: Container(
               child: Container(
                   decoration: BoxDecoration(
-                    color: error ? malformedColor : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor),
+                    color: error
+                        ? malformedColor
+                        : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor()),
                     border: Border.all(
                         color: error
                             ? malformedColor
-                            : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor),
+                            : (fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor() : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor()),
                         width: 1),
                     borderRadius: BorderRadius.only(
                       topLeft: Radius.circular(borderRadiousEh),

lib/widgets/remoteserverrow.dart

@@ -1,74 +0,0 @@
-import 'package:cwtch/main.dart';
-import 'package:cwtch/models/profileservers.dart';
-import 'package:cwtch/models/servers.dart';
-import 'package:cwtch/views/addeditservers.dart';
-import 'package:cwtch/views/remoteserverview.dart';
-import 'package:cwtch/widgets/profileimage.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-
-import '../cwtch_icons_icons.dart';
-import '../errorHandler.dart';
-import '../model.dart';
-import '../settings.dart';
-
-class RemoteServerRow extends StatefulWidget {
-  @override
-  _RemoteServerRowState createState() => _RemoteServerRowState();
-}
-
-class _RemoteServerRowState extends State<RemoteServerRow> {
-  @override
-  Widget build(BuildContext context) {
-    var server = Provider.of<RemoteServerInfoState>(context);
-    var description = server.description.isNotEmpty ? server.description : server.onion;
-    var running = server.status == "Synced";
-    return Consumer<ProfileInfoState>(builder: (context, profile, child) {
-      return Card(
-          clipBehavior: Clip.antiAlias,
-          margin: EdgeInsets.all(0.0),
-          child: InkWell(
-              child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-                Padding(
-                    padding: const EdgeInsets.all(6.0), //border size
-                    child: Icon(CwtchIcons.dns_24px,
-                        color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor, size: 64)),
-                Expanded(
-                    child: Column(
-                  children: [
-                    Text(
-                      description,
-                      semanticsLabel: description,
-                      style: Provider.of<FlwtchState>(context)
-                          .biggerFont
-                          .apply(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
-                      softWrap: true,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    Visibility(
-                        visible: !Provider.of<Settings>(context).streamerMode,
-                        child: ExcludeSemantics(
-                            child: Text(
-                          server.onion,
-                          softWrap: true,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
-                        )))
-                  ],
-                )),
-              ]),
-              onTap: () {
-                Navigator.of(context).push(MaterialPageRoute<void>(
-                    settings: RouteSettings(name: "remoteserverview"),
-                    builder: (BuildContext context) {
-                      return MultiProvider(
-                        providers: [Provider.value(value: profile), ChangeNotifierProvider(create: (context) => server), Provider.value(value: Provider.of<FlwtchState>(context))],
-                        child: RemoteServerView(),
-                      );
-                    }));
-              }));
-    });
-  }
-}

lib/widgets/rightshiftfixer.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+// From https://github.com/flutter/flutter/issues/75675#issuecomment-846601115
+// necessary to fix bug in flutter engine on Windows.
+// todo: hopefully we can remove this soon
+class ShiftRightFixer extends StatefulWidget {
+  ShiftRightFixer({required this.child});
+  final Widget child;
+  @override
+  State<StatefulWidget> createState() => _ShiftRightFixerState();
+}
+
+class _ShiftRightFixerState extends State<ShiftRightFixer> {
+  final FocusNode focus = FocusNode(skipTraversal: true, canRequestFocus: false);
+  @override
+  Widget build(BuildContext context) {
+    return Focus(
+      focusNode: focus,
+      onKey: (_, RawKeyEvent event) {
+        return event.physicalKey == PhysicalKeyboardKey.shiftRight ? KeyEventResult.handled : KeyEventResult.ignored;
+      },
+      child: widget.child,
+    );
+  }
+}

lib/widgets/serverrow.dart

@@ -26,57 +26,54 @@ class _ServerRowState extends State<ServerRow> {
         margin: EdgeInsets.all(0.0),
         child: InkWell(
             child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-              Padding(
-                  padding: const EdgeInsets.all(6.0), //border size
-                  child: Icon(CwtchIcons.dns_24px,
-                      color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor, size: 64)),
-              Expanded(
-                  child: Column(
-                children: [
-                  Text(
-                    server.description,
-                    semanticsLabel: server.description,
-                    style: Provider.of<FlwtchState>(context)
-                        .biggerFont
-                        .apply(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
+          Padding(
+              padding: const EdgeInsets.all(6.0), //border size
+              child: Icon(CwtchIcons.dns_24px,
+                  color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(), size: 64)),
+          Expanded(
+              child: Column(
+            children: [
+              Text(
+                server.description,
+                semanticsLabel: server.description,
+                style: Provider.of<FlwtchState>(context)
+                    .biggerFont
+                    .apply(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                softWrap: true,
+                overflow: TextOverflow.ellipsis,
+              ),
+              Visibility(
+                  visible: !Provider.of<Settings>(context).streamerMode,
+                  child: ExcludeSemantics(
+                      child: Text(
+                    server.onion,
                     softWrap: true,
                     overflow: TextOverflow.ellipsis,
-                  ),
-                  Visibility(
-                      visible: !Provider.of<Settings>(context).streamerMode,
-                      child: ExcludeSemantics(
-                          child: Text(
-                        server.onion,
-                        softWrap: true,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
-                      )))
-                ],
-              )),
+                    style: TextStyle(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                  )))
+            ],
+          )),
 
-              // Copy server button
-              IconButton(
-                enableFeedback: true,
-                tooltip: AppLocalizations.of(context)!.copyServerKeys,
-                icon: Icon(CwtchIcons.address_copy_2, color: Provider.of<Settings>(context).current().mainTextColor),
-                onPressed: () {
-                  Clipboard.setData(new ClipboardData(text: server.serverBundle));
-                },
-              ),
+          // Copy server button
+          IconButton(
+            enableFeedback: true,
+            tooltip: AppLocalizations.of(context)!.copyServerKeys,
+            icon: Icon(CwtchIcons.address_copy_2, color: Provider.of<Settings>(context).current().mainTextColor()),
+            onPressed: () {
+              Clipboard.setData(new ClipboardData(text: server.serverBundle));
+            },
+          ),
 
-              // Edit button
-              IconButton(
-                enableFeedback: true,
-                tooltip: AppLocalizations.of(context)!.editServerTitle,
-                icon: Icon(Icons.create, color: Provider.of<Settings>(context).current().mainTextColor),
-                onPressed: () {
-                  _pushEditServer(server);
-                },
-              )
-            ]),
-            onTap: () {
+          // Edit button
+          IconButton(
+            enableFeedback: true,
+            tooltip: AppLocalizations.of(context)!.editServerTitle,
+            icon: Icon(Icons.create, color: Provider.of<Settings>(context).current().mainTextColor()),
+            onPressed: () {
               _pushEditServer(server);
-            }));
+            },
+          )
+        ])));
   }
 
   void _pushEditServer(ServerInfoState server) {

lib/widgets/textfield.dart

@@ -7,9 +7,9 @@ doNothing(String x) {}
 // Provides a styled Text Field for use in Form Widgets.
 // Callers must provide a text controller, label helper text and a validator.
 class CwtchTextField extends StatefulWidget {
-  CwtchTextField({required this.controller, required this.hintText, this.validator, this.autofocus = false, this.onChanged = doNothing});
+  CwtchTextField({required this.controller, required this.labelText, this.validator, this.autofocus = false, this.onChanged = doNothing});
   final TextEditingController controller;
-  final String hintText;
+  final String labelText;
   final FormFieldValidator? validator;
   final Function(String) onChanged;
   final bool autofocus;
@@ -42,19 +42,20 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
         enableIMEPersonalizedLearning: false,
         focusNode: _focusNode,
         decoration: InputDecoration(
-            hintText: widget.hintText,
+            labelText: widget.labelText,
+            labelStyle: TextStyle(color: theme.current().mainTextColor(), backgroundColor: theme.current().textfieldBackgroundColor()),
             floatingLabelBehavior: FloatingLabelBehavior.never,
             filled: true,
-            focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0)),
-            focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
-            errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
+            focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0)),
+            focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
+            errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor(), width: 3.0)),
             errorStyle: TextStyle(
-              color: theme.current().textfieldErrorColor,
+              color: theme.current().textfieldErrorColor(),
               fontWeight: FontWeight.bold,
             ),
-            fillColor: theme.current().textfieldBackgroundColor,
+            fillColor: theme.current().textfieldBackgroundColor(),
             contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
-            enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0))),
+            enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor(), width: 3.0))),
       );
     });
   }

lib/widgets/tor_icon.dart

@@ -19,7 +19,7 @@ class _TorIconState extends State<TorIcon> {
     return RepaintBoundary(
         child: Icon(
       Provider.of<TorStatus>(context).progress == 0 ? CwtchIcons.onion_off : (Provider.of<TorStatus>(context).progress == 100 ? CwtchIcons.onion_on : CwtchIcons.onion_waiting),
-      color: Provider.of<Settings>(context).theme.mainTextColor,
+      color: Provider.of<Settings>(context).theme.mainTextColor(),
       semanticLabel: Provider.of<TorStatus>(context).progress == 100
           ? AppLocalizations.of(context)!.networkStatusOnline
           : (Provider.of<TorStatus>(context).progress == 0 ? AppLocalizations.of(context)!.networkStatusDisconnected : AppLocalizations.of(context)!.networkStatusAttemptingTor),

linux/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
-  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  url_launcher_linux
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

pubspec.lock

@@ -473,7 +473,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.5.0+23
+version: 1.4.0+22
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

regenerate_opaque_theme.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+themes="/home/erinn/go/src/git.openprivacy.ca/openprivacy/opaque/theme"
+outfile="./lib/opaque.dart"
+
+if [ -e "$outfile" ]; then
+  mv "$outfile" "${outfile}.bak"
+fi
+
+echo "// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT BY HAND AS CHANGES WILL BE OVERRIDDEN." > "$outfile"
+echo "// TO EDIT THE THEME, SEE https://git.openprivacy.ca/openprivacy/opaque/" >> "$outfile"
+echo "// FOR HOW THIS FILE IS GENERATED, SEE ../regenerate_opaque_theme.sh" >> "$outfile"
+
+sed 's/import QtQuick 2\.0//g' "${themes}/ThemeType.qml"  | \
+  sed "s/QtObject ./import 'dart:ui\';\nimport 'dart:core';\nabstract class OpaqueThemeType {\n    static final Color red = Color(0xFFFF0000);/g" | \
+  sed 's/\(property color\|var\)/Color/g' | \
+  sed 's/\(:\| =\) ".*"/(){return red;}/g' >> "$outfile"
+
+echo -e "\n\n" >> "$outfile"
+
+sed 's/ThemeType/class CwtchDark extends OpaqueThemeType/g' "${themes}/CwtchDark.qml" | \
+  sed 's/readonly property color \(.*\): "#\(\w*\)"/static final Color \1 = Color(0xFF\2);/g' | \
+  sed 's/\(\w*\): \(\w*\)/Color \1() { return \2; }/g' >> "$outfile"
+
+echo -e "\n\n" >> "$outfile"
+
+sed 's/ThemeType/class CwtchLight extends OpaqueThemeType/g' "${themes}/CwtchLight.qml" | \
+  sed 's/readonly property color \(.*\): "#\(\w*\)"/static final Color \1 = Color(0xFF\2);/g' | \
+  sed 's/\(\w*\): \(\w*\)/Color \1() { return \2; }/g' >> "$outfile"
+
+echo -e "\n\n" >> "$outfile"
+
+sed 's/\(pragma Singleton\|import QtQuick 2\.0\)//g' "${themes}/Theme.qml" | \
+  sed 's|//.*$||g' | \
+  sed 's/theme\./current./g' | \
+  sed 's/property color/property Color/g' | \
+  sed 's/readonly property Color \(.*\): \([a-zA-Z0-9._]*\)/Color \1() { return \2(); }/g' | \
+  #to preserve int values: #static int \1() { return \2; }/g' | \
+  sed 's/readonly property int \(.*\): \(.*\)/int \1() { return \2; }/g' | \
+  sed 's/readonly property variant \([a-zA-Z0-9._]*\): \(.*\)$/var \1 = \2;/g' | \
+  sed 's/color/Color/g' | \
+  sed 's/: \(.+\)/ = \1;/g' | \
+  sed 's/property ThemeType \(\w*\): \(.*\)../static final OpaqueThemeType \1 = \2();/g' | \
+  sed 's/final OpaqueThemeType theme = .*$/Opaque current() { return dark; }/' | \
+  sed 's/^.*themeScaleNew.*$/int scale = 2;\n    static final String gcdOS = "linux";/g' | \
+  sed 's/gcd.os/gcdOS/g' | \
+  sed 's/return \([a-zA-Z]\+\) ;/return \1();/g' | \
+  sed 's/return \([a-zA-Z]\+\) + \([a-zA-Z]\+\);/return \1() + \2();/g' | \
+  sed 's/Item/class Opaque extends OpaqueThemeType/' | \
+  sed 's/current\./current()./g' >> "$outfile"

test/buttontextfield_test.dart

@@ -5,9 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
-import 'package:cwtch/themes/opaque.dart';
+import 'package:cwtch/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/buttontextfield.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -15,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
-var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {

test/cwtchlabel_test.dart

@@ -5,9 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
-import 'package:cwtch/themes/opaque.dart';
+import 'package:cwtch/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/cwtchlabel.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -15,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
-var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {

test/profileimage_test.dart

@@ -5,9 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
-import 'package:cwtch/themes/opaque.dart';
+import 'package:cwtch/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/profileimage.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -15,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
-var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {
@@ -34,10 +33,10 @@ void main() {
 
     Widget testWidget = ProfileImage(
       imagePath: "profiles/001-centaur.png",
-      badgeTextColor: settingsEnglishDark.theme.portraitProfileBadgeTextColor,
-      badgeColor: settingsEnglishDark.theme.portraitProfileBadgeColor,
+      badgeTextColor: settingsEnglishDark.theme.portraitProfileBadgeTextColor(),
+      badgeColor: settingsEnglishDark.theme.portraitProfileBadgeColor(),
       maskOut: false,
-      border: settingsEnglishDark.theme.portraitOfflineBorderColor,
+      border: settingsEnglishDark.theme.portraitOfflineBorderColor(),
       diameter: 64.0,
       badgeCount: 10,
     );

test/textfield_test.dart

@@ -6,8 +6,7 @@
 // tree, read text, and verify that the values of widget properties are correct.
 
 import 'package:flutter/material.dart';
-import 'package:cwtch/themes/opaque.dart';
-import 'package:cwtch/themes/cwtch.dart';
+import 'package:cwtch/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/textfield.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -15,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
-var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {
@@ -28,7 +27,7 @@ void main() {
     tester.binding.window.physicalSizeTestValue = Size(800, 300);
     final TextEditingController ctrlr1 = TextEditingController();
 
-    Widget testWidget = CwtchTextField(controller: ctrlr1, validator: (value) {  }, hintText: '',);
+    Widget testWidget = CwtchTextField(controller: ctrlr1, validator: (value) {  }, labelText: '',);
 
     Widget testHarness = MultiProvider(
       providers:[getSettingsEnglishDark()],
@@ -70,7 +69,7 @@ void main() {
 
     Widget testWidget = CwtchTextField(
       controller: ctrlr1,
-      hintText: strLabel1,
+      labelText: strLabel1,
       validator: (value) {
         if (value == null || value == "") return strFail1;
         final number = num.tryParse(value);

windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  UrlLauncherWindowsRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  url_launcher_windows
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

windows/nsis/cwtch-installer.nsi

@@ -65,11 +65,6 @@ ShowInstDetails show
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
 ; Languages --------------------------------
 
 !insertmacro MUI_LANGUAGE "English"
@@ -86,20 +81,12 @@ Section
         FILE /r "..\..\build\windows\runner\Release\"
     #FILESLISTEND
 
-    CreateDirectory "$SMPROGRAMS\Cwtch"
 
     # create a shortcut in the start menu programs directory
+    CreateDirectory "$SMPROGRAMS\Cwtch"
     CreateShortcut "$SMPROGRAMS\Cwtch\Cwtch.lnk" "$INSTDIR\cwtch.exe" "" "$INSTDIR\cwtch.ico"
 
     ;Store installation folder
     WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR
 
-    WriteUninstaller "$INSTDIR\uninstall.exe"
-
 SectionEnd
-
-Section "Uninstall"
-    RMDir /r /REBOOTOK "$INSTDIR"
-
-    DeleteRegKey /ifempty HKCU "Software\Cwtch\installLocation"
-SectionEnd