Merge branch 'trunk' into nima/clickable-links

.drone.yml

@@ -117,7 +117,7 @@ steps:
       - echo $BUILDFILES_KEY > ~/id_rsab64
       - base64 -d ~/id_rsab64 > ~/id_rsa
       - chmod 400 ~/id_rsa
-      - export DIR=flwtch-`cat VERSION`-`cat BUILDDATE`
+      - export DIR=flwtch-`cat BUILDDATE`-`cat VERSION`
       - mv deploy $DIR
       - cp -r coverage/html $DIR/coverage-tests
       - cp -r test/failures $DIR/test-failures || true
@@ -125,7 +125,6 @@ steps:
       - find . -type f -exec sha256sum {} \; > ./../sha256s.txt
       - mv ./../sha256s.txt .
       - cd ..
-      # TODO: do deployment once files actaully compile
       - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
 
   - name: notify-email
@@ -238,7 +237,7 @@ steps:
       - $Env:zipsha = $Env:zip + '.sha512'
       - $Env:msix = 'cwtch-install-' + $Env:version + '.msix'
       - $Env:msixsha = $Env:msix + '.sha512'
-      - $Env:buildname = 'flwtch-win-' + $Env:version + '-' + $Env:builddate
+      - $Env:buildname = 'flwtch-win-' + $Env:builddate + '-' + $Env:version
       - $Env:builddir = $Env:buildname
       - echo $Env:pfx > codesign.pfx.b64
       - certutil -decode codesign.pfx.b64 codesign.pfx
@@ -276,3 +275,86 @@ trigger:
   event:
     - push
     - pull_request
+
+---
+kind: pipeline
+type: exec
+name: macos
+
+platform:
+  os: darwin
+  arch: amd64
+
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    environment:
+      buildbot_key_b64:
+        from_secret: buildbot_key_b64
+    commands:
+      - mkdir ~/.ssh
+      - echo $buildbot_key_b64 > ~/.ssh/id_rsa.b64
+      - base64 -d ~/.ssh/id_rsa.b64 > ~/.ssh/id_rsa
+      - chmod 400 ~/.ssh/id_rsa
+      # force by pass of ssh host key check, less secure
+      - ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
+      - git init
+      - git config core.sshCommand 'ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa'
+      - git remote add origin gogs@git.openprivacy.ca:$DRONE_REPO.git
+      - git pull origin trunk
+      - git fetch --tags
+      - git checkout $DRONE_COMMIT
+      # use Drone ssh var instead of hardcode to allow forks to build (gogs@git.openprivacy.ca:cwtch.im/cwtch-ui.git)
+      #- git clone gogs@git.openprivacy.ca:$DRONE_REPO.git .
+      #- git checkout $DRONE_COMMIT
+
+  - name: fetch
+    commands:
+      - ./fetch-tor-macos.sh
+      - echo `git describe --tags --abbrev=1` > VERSION
+      - echo `date +%G-%m-%d-%H-%M` > BUILDDATE
+      - export PATH=$PATH:/Users/Dan/development/flutter/bin
+      - flutter pub get
+      - mkdir deploy
+      - ./fetch-libcwtch-go-macos.sh
+      - gem install --user-install cocoapods
+
+  - name: build-macos
+    commands:
+      - export PATH=$PATH:/Users/Dan/development/flutter/bin
+      - export GEM_HOME=$HOME/.gem
+      - export PATH=$GEM_HOME/ruby/2.6.0/bin:$PATH
+      - flutter config --enable-macos-desktop
+      - flutter build macos --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat BUILDDATE`
+      - export PATH=$PATH:/usr/local/bin #create-dmg
+      - macos/package-release.sh
+      - mkdir -p deploy
+      - mv Cwtch.dmg deploy
+
+  - name: deploy-buildfiles
+    environment:
+      BUILDFILES_KEY:
+        from_secret: buildfiles_key
+    when:
+      event: push
+      status: [ success ]
+    commands:
+      - echo $BUILDFILES_KEY > ~/id_rsab64
+      - base64 -d ~/id_rsab64 > ~/id_rsa
+      - chmod 400 ~/id_rsa
+      - export DIR=flwtch-macos-`cat BUILDDATE`-`cat VERSION`
+      - mv deploy $DIR
+      - cd $DIR
+      - find . -type f -exec shasum -a 512 {} \; > ./../sha512s.txt
+      - mv ./../sha512s.txt .
+      - cd ..
+      - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/
+
+trigger:
+  #repo: cwtch.im/cwtch-ui # allow forks to build?
+  branch: trunk
+  event:
+    - push
+    - pull_request

LIBCWTCH-GO-MACOS.version

@@ -0,0 +1 @@
+2021-11-05-20-13-v1.4.1

LIBCWTCH-GO.version

@@ -1 +1 @@
-v1.3.0-3-gfcc9d71-2021-09-30-23-09
+2021-11-06-00-13-v1.4.1

README.md

@@ -44,6 +44,7 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 - run `flutter config --enable-linux-desktop` if you've never done so before
 - optional: launch cwtch-ui directly by running `flutter run -d linux`
 - to build cwtch-ui, run `flutter build linux`
+- 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)
@@ -60,9 +61,11 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 
 ### Building on MacOS
 
-- Navigate to https://git.openprivacy.ca/cwtch.im/libcwtch-go/releases and download the latest libCwtch.dylib into this folder
-- Download and install Tor Browser (it's currently the only way to get tor for macos)
+- Cocaopods is required, you may need to `gem install cocaopods -v 1.9.3`
+- 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 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

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

@@ -112,24 +112,26 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                             if (dlID == null) {
                                 dlID = 0;
                             }
-                            val channelId =
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                        createDownloadNotificationChannel(fileKey, fileKey)
-                                    } else {
-                                        // If earlier version channel ID is not used
-                                        // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                                        ""
-                                    };
-                            val newNotification = NotificationCompat.Builder(applicationContext, channelId)
-                                    .setOngoing(true)
-                                    .setContentTitle("Downloading")//todo: translate
-                                    .setContentText(title)
-                                    .setSmallIcon(android.R.drawable.stat_sys_download)
-                                    .setProgress(progressMax, progress, false)
-                                    .setSound(null)
-                                    //.setSilent(true)
-                                    .build();
-                            notificationManager.notify(dlID, newNotification);
+                            if (progress >= 0) {
+                                val channelId =
+                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                            createDownloadNotificationChannel(fileKey, fileKey)
+                                        } else {
+                                            // If earlier version channel ID is not used
+                                            // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                                            ""
+                                        };
+                                val newNotification = NotificationCompat.Builder(applicationContext, channelId)
+                                        .setOngoing(true)
+                                        .setContentTitle("Downloading")//todo: translate
+                                        .setContentText(title)
+                                        .setSmallIcon(android.R.drawable.stat_sys_download)
+                                        .setProgress(progressMax, progress, false)
+                                        .setSound(null)
+                                        //.setSilent(true)
+                                        .build();
+                                notificationManager.notify(dlID, newNotification);
+                            }
                         } catch (e: Exception) {
                             Log.i("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
                         }
@@ -241,6 +243,12 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val fileKey = (a.get("fileKey") as? String) ?: ""
                 Cwtch.checkDownloadStatus(profile, fileKey)
             }
+            "VerifyOrResumeDownload" -> {
+                val profile = (a.get("ProfileOnion") as? String) ?: ""
+                val handle = (a.get("handle") as? String) ?: ""
+                val fileKey = (a.get("fileKey") as? String) ?: ""
+                Cwtch.verifyOrResumeDownload(profile, handle, fileKey)
+            }
             "SendProfileEvent" -> {
                 val onion = (a.get("onion") as? String) ?: ""
                 val jsonEvent = (a.get("jsonEvent") as? String) ?: ""
@@ -291,10 +299,61 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 val groupHandle = (a.get("groupHandle") as? String) ?: ""
                 Cwtch.rejectInvite(profile, groupHandle)
             }
+            "SetProfileAttribute" -> {
+                val profile = (a.get("ProfileOnion") as? String) ?: ""
+                val key = (a.get("Key") as? String) ?: ""
+                val v = (a.get("Val") as? String) ?: ""
+                Cwtch.setProfileAttribute(profile, key, v)
+            }
+            "SetContactAttribute" -> {
+                val profile = (a.get("ProfileOnion") as? String) ?: ""
+                val contact = (a.get("Contact") as? String) ?: ""
+                val key = (a.get("Key") as? String) ?: ""
+                val v = (a.get("Val") as? String) ?: ""
+                Cwtch.setContactAttribute(profile, contact, key, v)
+            }
             "Shutdown" -> {
                 Cwtch.shutdownCwtch();
                 return Result.success()
             }
+            "LoadServers" -> {
+                val password = (a.get("Password") as? String) ?: ""
+                Cwtch.loadServers(password)
+            }
+            "CreateServer" -> {
+                val password = (a.get("Password") as? String) ?: ""
+                val desc = (a.get("Description") as? String) ?: ""
+                val autostart = (a.get("Autostart") as? Boolean) ?: false
+                Cwtch.createServer(password, desc, autostart)
+            }
+            "DeleteServer" -> {
+                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
+                val password = (a.get("Password") as? String) ?: ""
+                Cwtch.deleteServer(serverOnion, password)
+            }
+            "LaunchServers" -> {
+                Cwtch.launchServers()
+            }
+            "LaunchServer" -> {
+                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
+                Cwtch.launchServer(serverOnion)
+            }
+            "StopServer" -> {
+                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
+                Cwtch.stopServer(serverOnion)
+            }
+            "StopServers" -> {
+                Cwtch.stopServers()
+            }
+            "DestroyServers" -> {
+                Cwtch.destroyServers()
+            }
+            "SetServerAttribute" -> {
+                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
+                val key = (a.get("Key") as? String) ?: ""
+                val v = (a.get("Val") as? String) ?: ""
+                Cwtch.setServerAttribute(serverOnion, key, v)
+            }
             else -> return Result.failure()
         }
         return Result.success()

fetch-libcwtch-go-macos.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+VERSION=`cat LIBCWTCH-GO-MACOS.version`
+echo $VERSION
+
+curl https://build.openprivacy.ca/files/libCwtch-go-macos-$VERSION/libCwtch.dylib --output libCwtch.dylib

fetch-libcwtch-go.sh

@@ -5,5 +5,3 @@ echo $VERSION
 
 wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/cwtch.aar -O android/cwtch/cwtch.aar
 wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.so -O linux/libCwtch.so
-
-# wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.dll -O windows/libCwtch.dll

fetch-tor-macos.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd macos
+curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-macos-0.4.6.7.tar.gz --output tor.tar.gz
+tar -xzf tor.tar.gz
+chmod a+x Tor/tor.real
+cd ..

lib/cwtch/cwtch.dart

@@ -1,5 +1,9 @@
 import 'package:flutter/src/services/text_input.dart';
 
+// To handle profiles that are "unencrypted" (i.e don't require a password to open) we currently create a profile with a defacto, hardcoded password.
+// Details: https://docs.openprivacy.ca/cwtch-security-handbook/profile_encryption_and_storage.html
+const DefaultPassword = "be gay do crime";
+
 abstract class Cwtch {
   // ignore: non_constant_identifier_names
   Future<void> Start();
@@ -48,6 +52,8 @@ abstract class Cwtch {
   void CreateDownloadableFile(String profile, String 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, String handle, String filekey);
 
   // ignore: non_constant_identifier_names
   void ArchiveConversation(String profile, String handle);
@@ -63,6 +69,29 @@ abstract class Cwtch {
   void SetGroupAttribute(String profile, String groupHandle, String key, String value);
   // ignore: non_constant_identifier_names
   void RejectInvite(String profileOnion, String groupHandle);
+  // ignore: non_constant_identifier_names
+  void SetProfileAttribute(String profile, String key, String val);
+  // ignore: non_constant_identifier_names
+  void SetContactAttribute(String profile, String contact, String key, String val);
+
+  // ignore: non_constant_identifier_names
+  void LoadServers(String password);
+  // ignore: non_constant_identifier_names
+  void CreateServer(String password, String description, bool autostart);
+  // ignore: non_constant_identifier_names
+  void DeleteServer(String serverOnion, String password);
+  // ignore: non_constant_identifier_names
+  void LaunchServers();
+  // ignore: non_constant_identifier_names
+  void LaunchServer(String serverOnion);
+  // ignore: non_constant_identifier_names
+  void StopServer(String serverOnion);
+  // ignore: non_constant_identifier_names
+  void StopServers();
+  // ignore: non_constant_identifier_names
+  void DestroyServers();
+  // ignore: non_constant_identifier_names
+  void SetServerAttribute(String serverOnion, String key, String val);
 
   // ignore: non_constant_identifier_names
   void Shutdown();

lib/cwtch/cwtchNotifier.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:cwtch/models/message.dart';
+import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/servers.dart';
 import 'package:cwtch/notification_manager.dart';
 import 'package:provider/provider.dart';
@@ -20,14 +21,16 @@ class CwtchNotifier {
   late TorStatus torStatus;
   late NotificationsManager notificationManager;
   late AppState appState;
+  late ServerListState serverListState;
 
-  CwtchNotifier(ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN) {
+  CwtchNotifier(ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN, ServerListState serverListStateCN) {
     profileCN = pcn;
     settings = settingsCN;
     error = errorCN;
     torStatus = torStatusCN;
     notificationManager = notificationManagerP;
     appState = appStateCN;
+    serverListState = serverListStateCN;
   }
 
   void handleMessage(String type, dynamic data) {
@@ -59,11 +62,28 @@ class CwtchNotifier {
               lastMessageTime: DateTime.now(), //show at the top of the contact list even if no messages yet
             ));
         break;
+      case "NewServer":
+        EnvironmentConfig.debugLog("NewServer $data");
+        serverListState.add(
+            data["Onion"],
+            data["ServerBundle"],
+            data["Running"] == "true",
+            data["Description"],
+            data["Autostart"] == "true",
+            data["StorageType"] == "storage-password");
+        break;
+      case "ServerIntentUpdate":
+        EnvironmentConfig.debugLog("ServerIntentUpdate $data");
+        var server = serverListState.getServer(data["Identity"]);
+        if (server != null) {
+          server.setRunning(data["Intent"] == "running");
+        }
+        break;
       case "GroupCreated":
 
         // Retrieve Server Status from Cache...
         String status = "";
-        ServerInfoState? serverInfoState = profileCN.getProfile(data["ProfileOnion"])?.serverList.getServer(data["GroupServer"]);
+        RemoteServerInfoState? serverInfoState = profileCN.getProfile(data["ProfileOnion"])?.serverList.getServer(data["GroupServer"]);
         if (serverInfoState != null) {
           status = serverInfoState.status;
         }
@@ -84,6 +104,12 @@ class CwtchNotifier {
         // todo standarize
         error.handleUpdate("deleteprofile.success");
         break;
+      case "ServerDeleted":
+        error.handleUpdate("deletedserver." + data["Status"]);
+        if (data["Status"] == "success") {
+          serverListState.delete(data["Identity"]);
+        }
+        break;
       case "DeleteContact":
         profileCN.getProfile(data["ProfileOnion"])?.contactList.removeContact(data["RemotePeer"]);
         break;
@@ -145,24 +171,32 @@ class CwtchNotifier {
         break;
       case "NewMessageFromGroup":
         if (data["ProfileOnion"] != data["RemotePeer"]) {
-          //if not currently open
-          if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != data["GroupID"]) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.unreadMessages++;
+          var idx = int.parse(data["Index"]);
+          var currentTotal = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.totalMessages;
+
+          // 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(data["GroupID"])!.totalMessages = idx + 1;
+
+            //if not currently open
+            if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != data["GroupID"]) {
+              profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.unreadMessages++;
+            }
+
+            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
+            // These can obviously be very different for legitimate reasons.
+            // We also maintain a relative hash-link through PreviousMessageSignature which is the ground truth for
+            // order.
+            // In the future we will want to combine these 3 ordering mechanisms into a cohesive view of the timeline
+            // For now we perform some minimal checks on the sent timestamp to use to provide a useful ordering for honest contacts
+            // and ensure that malicious contacts in groups can only set this timestamp to a value within the range of `last seen message time`
+            // and `local now`.
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], timestampSent.toLocal());
+            notificationManager.notify("New Message From Group!");
           }
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.totalMessages++;
-          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
-          // These can obviously be very different for legitimate reasons.
-          // We also maintain a relative hash-link through PreviousMessageSignature which is the ground truth for
-          // order.
-          // In the future we will want to combine these 3 ordering mechanisms into a cohesive view of the timeline
-          // For now we perform some minimal checks on the sent timestamp to use to provide a useful ordering for honest contacts
-          // and ensure that malicious contacts in groups can only set this timestamp to a value within the range of `last seen message time`
-          // and `local now`.
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], timestampSent.toLocal());
-          notificationManager.notify("New Message From Group!");
         } else {
           // from me (already displayed - do not update counter)
           var idx = data["Signature"];
@@ -180,7 +214,10 @@ class CwtchNotifier {
       case "MessageCounterResync":
         var contactHandle = data["RemotePeer"];
         if (contactHandle == null || contactHandle == "") contactHandle = data["GroupID"];
-        profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages = int.parse(data["Data"]);
+        var total = int.parse(data["Data"]);
+        if (total != profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages) {
+          profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages = total;
+        }
         break;
       case "SendMessageToPeerError":
         // Ignore
@@ -252,7 +289,7 @@ class CwtchNotifier {
 
           // Retrieve Server Status from Cache...
           String status = "";
-          ServerInfoState? serverInfoState = profileCN.getProfile(data["ProfileOnion"])!.serverList.getServer(groupInvite["ServerHost"]);
+          RemoteServerInfoState? serverInfoState = profileCN.getProfile(data["ProfileOnion"])!.serverList.getServer(groupInvite["ServerHost"]);
           if (serverInfoState != null) {
             status = serverInfoState.status;
           }
@@ -316,7 +353,7 @@ class CwtchNotifier {
         }
         break;
       case "NewRetValMessageFromPeer":
-        if (data["Path"] == "name") {
+        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"];
@@ -329,7 +366,12 @@ class CwtchNotifier {
         profileCN.getProfile(data["ProfileOnion"])?.downloadMarkManifest(data["FileKey"]);
         break;
       case "FileDownloadProgressUpdate":
-        profileCN.getProfile(data["ProfileOnion"])?.downloadUpdate(data["FileKey"], int.parse(data["Progress"]));
+        var progress = int.parse(data["Progress"]);
+        profileCN.getProfile(data["ProfileOnion"])?.downloadUpdate(data["FileKey"], progress, int.parse(data["FileSizeInChunks"]));
+        // progress == -1 is a "download was interrupted" message and should contain a path
+        if (progress < 0) {
+          profileCN.getProfile(data["ProfileOnion"])?.downloadSetPath(data["FileKey"], data["FilePath"]);
+        }
         break;
       case "FileDownloaded":
         profileCN.getProfile(data["ProfileOnion"])?.downloadMarkFinished(data["FileKey"], data["FilePath"]);

lib/cwtch/ffi.dart

@@ -42,6 +42,9 @@ typedef VoidFromStringStringStringStringStringFn = void Function(Pointer<Utf8>,
 typedef void_from_string_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int64, Int64);
 typedef VoidFromStringStringIntIntFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int, int);
 
+typedef void_from_string_string_byte_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int8);
+typedef VoidFromStringStringByteFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int);
+
 typedef string_to_void_function = Void Function(Pointer<Utf8> str, Int32 length);
 typedef StringFn = void Function(Pointer<Utf8> dir, int);
 
@@ -410,6 +413,22 @@ class CwtchFfi implements Cwtch {
     malloc.free(u2);
   }
 
+  @override
+  // ignore: non_constant_identifier_names
+  void VerifyOrResumeDownload(String profileOnion, String contactHandle, String filekey) {
+    var fn = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_VerifyOrResumeDownload");
+    // ignore: non_constant_identifier_names
+    final VerifyOrResumeDownload = fn.asFunction<VoidFromStringStringStringFn>();
+    final u1 = profileOnion.toNativeUtf8();
+    final u2 = contactHandle.toNativeUtf8();
+    final u3 = filekey.toNativeUtf8();
+    VerifyOrResumeDownload(u1, u1.length, u2, u2.length, u3, u3.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
+  }
+
+
   @override
   // ignore: non_constant_identifier_names
   void ResetTor() {
@@ -530,6 +549,139 @@ class CwtchFfi implements Cwtch {
     malloc.free(u2);
   }
 
+  @override
+  // ignore: non_constant_identifier_names
+  void SetProfileAttribute(String profile, String key, String val) {
+    var setProfileAttribute = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_SetProfileAttribute");
+    // ignore: non_constant_identifier_names
+    final SetProfileAttribute = setProfileAttribute.asFunction<VoidFromStringStringStringFn>();
+    final u1 = profile.toNativeUtf8();
+    final u2 = key.toNativeUtf8();
+    final u3 = key.toNativeUtf8();
+    SetProfileAttribute(u1, u1.length, u2, u2.length, u3, u3.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void SetContactAttribute(String profile, String contact, String key, String val) {
+    var setContactAttribute = library.lookup<NativeFunction<void_from_string_string_string_string_function>>("c_SetContactAttribute");
+    // ignore: non_constant_identifier_names
+    final SetContactAttribute = setContactAttribute.asFunction<VoidFromStringStringStringStringFn>();
+    final u1 = profile.toNativeUtf8();
+    final u2 = contact.toNativeUtf8();
+    final u3 = key.toNativeUtf8();
+    final u4 = key.toNativeUtf8();
+    SetContactAttribute(u1, u1.length, u2, u2.length, u3, u3.length, u4, u4.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
+    malloc.free(u4);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LoadServers(String password) {
+    var loadServers = library.lookup<NativeFunction<string_to_void_function>>("c_LoadServers");
+    // ignore: non_constant_identifier_names
+    final LoadServers = loadServers.asFunction<StringFn>();
+    final u1 = password.toNativeUtf8();
+    LoadServers(u1, u1.length);
+    malloc.free(u1);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void CreateServer(String password, String description, bool autostart) {
+    var createServer = library.lookup<NativeFunction<void_from_string_string_byte_function>>("c_CreateServer");
+    // ignore: non_constant_identifier_names
+    final CreateServer = createServer.asFunction<VoidFromStringStringByteFn>();
+    final u1 = password.toNativeUtf8();
+    final u2 = description.toNativeUtf8();
+    CreateServer(u1, u1.length, u2, u2.length, autostart ? 1 : 0);
+    malloc.free(u1);
+    malloc.free(u2);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void DeleteServer(String serverOnion, String password) {
+    var deleteServer = library.lookup<NativeFunction<string_string_to_void_function>>("c_DeleteServer");
+    // ignore: non_constant_identifier_names
+    final DeleteServer = deleteServer.asFunction<VoidFromStringStringFn>();
+    final u1 = serverOnion.toNativeUtf8();
+    final u2 = password.toNativeUtf8();
+    DeleteServer(u1, u1.length, u2, u2.length);
+    malloc.free(u1);
+    malloc.free(u2);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LaunchServers() {
+    var launchServers = library.lookup<NativeFunction<Void Function()>>("c_LaunchServers");
+    // ignore: non_constant_identifier_names
+    final LaunchServers = launchServers.asFunction<void Function()>();
+    LaunchServers();
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LaunchServer(String serverOnion) {
+    var launchServer = library.lookup<NativeFunction<string_to_void_function>>("c_LaunchServer");
+    // ignore: non_constant_identifier_names
+    final LaunchServer = launchServer.asFunction<StringFn>();
+    final u1 = serverOnion.toNativeUtf8();
+    LaunchServer(u1, u1.length);
+    malloc.free(u1);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void StopServer(String serverOnion) {
+    var shutdownServer = library.lookup<NativeFunction<string_to_void_function>>("c_StopServer");
+    // ignore: non_constant_identifier_names
+    final ShutdownServer = shutdownServer.asFunction<StringFn>();
+    final u1 = serverOnion.toNativeUtf8();
+    ShutdownServer(u1, u1.length);
+    malloc.free(u1);
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void StopServers() {
+    var shutdownServers = library.lookup<NativeFunction<Void Function()>>("c_StopServers");
+    // ignore: non_constant_identifier_names
+    final ShutdownServers = shutdownServers.asFunction<void Function()>();
+    ShutdownServers();
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void DestroyServers() {
+    var destroyServers = library.lookup<NativeFunction<Void Function()>>("c_DestroyServers");
+    // ignore: non_constant_identifier_names
+    final DestroyServers = destroyServers.asFunction<void Function()>();
+    DestroyServers();
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void SetServerAttribute(String serverOnion, String key, String val) {
+    var setServerAttribute = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_SetServerAttribute");
+    // ignore: non_constant_identifier_names
+    final SetServerAttribute = setServerAttribute.asFunction<VoidFromStringStringStringFn>();
+    final u1 = serverOnion.toNativeUtf8();
+    final u2 = key.toNativeUtf8();
+    final u3 = val.toNativeUtf8();
+    SetServerAttribute(u1, u1.length, u2, u2.length, u3, u3.length);
+    malloc.free(u1);
+    malloc.free(u2);
+    malloc.free(u3);
+  }
+
   @override
   // ignore: non_constant_identifier_names
   Future<void> Shutdown() async {

lib/cwtch/gomobile.dart

@@ -154,6 +154,12 @@ class CwtchGomobile implements Cwtch {
     cwtchPlatform.invokeMethod("CheckDownloadStatus", {"ProfileOnion": profileOnion, "fileKey": fileKey});
   }
 
+  @override
+  // ignore: non_constant_identifier_names
+  void VerifyOrResumeDownload(String profileOnion, String contactHandle, String filekey) {
+    cwtchPlatform.invokeMethod("VerifyOrResumeDownload", {"ProfileOnion": profileOnion, "handle": contactHandle, "filekey": filekey});
+  }
+
   @override
   // ignore: non_constant_identifier_names
   void ResetTor() {
@@ -202,6 +208,72 @@ class CwtchGomobile implements Cwtch {
   }
 
   @override
+  // ignore: non_constant_identifier_names
+  void SetProfileAttribute(String profile, String key, String val) {
+    cwtchPlatform.invokeMethod("SetProfileAttribute", {"ProfileOnion": profile, "Key": key, "Val": val});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void SetContactAttribute(String profile, String contact, String key, String val) {
+    cwtchPlatform.invokeMethod("SetContactAttribute", {"ProfileOnion": profile, "Contact": contact, "Key": key, "Val": val});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LoadServers(String password) {
+    cwtchPlatform.invokeMethod("LoadServers", {"Password": password});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void CreateServer(String password, String description, bool autostart) {
+    cwtchPlatform.invokeMethod("CreateServer", {"Password": password, "Description": description, "Autostart": autostart});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void DeleteServer(String serverOnion, String password) {
+    cwtchPlatform.invokeMethod("DeleteServer", {"ServerOnion": serverOnion, "Password": password});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LaunchServers() {
+    cwtchPlatform.invokeMethod("LaunchServers", {});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void LaunchServer(String serverOnion) {
+    cwtchPlatform.invokeMethod("LaunchServer", {"ServerOnion": serverOnion});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void StopServer(String serverOnion) {
+    cwtchPlatform.invokeMethod("StopServer", {"ServerOnion": serverOnion});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void StopServers() {
+    cwtchPlatform.invokeMethod("StopServers", {});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void DestroyServers() {
+    cwtchPlatform.invokeMethod("DestroyServers", {});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  void SetServerAttribute(String serverOnion, String key, String val) {
+    cwtchPlatform.invokeMethod("SetServerAttribute", {"ServerOnion": serverOnion, "Key": key, "Val": val});
+  }
+
+    @override
   Future<void> Shutdown() async {
     print("gomobile.dart Shutdown");
     cwtchPlatform.invokeMethod("Shutdown", {});

lib/errorHandler.dart

@@ -21,6 +21,27 @@ class ErrorHandler extends ChangeNotifier {
   bool deleteProfileError = false;
   bool deleteProfileSuccess = false;
 
+  static const String deletedServerErrorPrefix = "deletedserver";
+  bool deletedServerError = false;
+  bool deletedServerSuccess = false;
+
+  reset() {
+    invalidImportStringError = false;
+    contactAlreadyExistsError = false;
+    explicitAddContactSuccess = false;
+
+    importBundleError = false;
+    importBundleSuccess = false;
+
+    deleteProfileError = false;
+    deleteProfileSuccess = false;
+
+    deletedServerError = false;
+    deletedServerSuccess = false;
+
+    notifyListeners();
+  }
+
   /// Called by the event bus.
   handleUpdate(String error) {
     var parts = error.split(".");
@@ -37,6 +58,8 @@ class ErrorHandler extends ChangeNotifier {
       case deleteProfileErrorPrefix:
         handleDeleteProfileError(errorType);
         break;
+      case deletedServerErrorPrefix:
+        handleDeletedServerError(errorType);
     }
 
     notifyListeners();
@@ -91,4 +114,19 @@ class ErrorHandler extends ChangeNotifier {
         break;
     }
   }
+
+  handleDeletedServerError(String errorType) {
+    // reset
+    deletedServerError = false;
+    deletedServerSuccess = false;
+
+    switch (errorType) {
+      case successErrorType:
+        deletedServerSuccess = true;
+        break;
+      default:
+        deletedServerError = true;
+        break;
+    }
+  }
 }

lib/l10n/intl_de.arb

@@ -1,6 +1,37 @@
 {
     "@@locale": "de",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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": "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",
@@ -9,10 +40,9 @@
     "messageEnableFileSharing": "Enable the file sharing experiment to view this message.",
     "labelFilesize": "Size",
     "labelFilename": "Filename",
-    "downloadFileButton": "Download",
+    "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 onions",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
     "profileOnionLabel": "Senden Sie diese Adresse an Peers, mit denen Sie sich verbinden möchten",

lib/l10n/intl_en.arb

@@ -1,6 +1,37 @@
 {
     "@@locale": "en",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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": "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",
@@ -12,7 +43,6 @@
     "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 onions",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
     "profileOnionLabel": "Send this address to people you want to connect with",

lib/l10n/intl_es.arb

@@ -1,6 +1,37 @@
 {
     "@@locale": "es",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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": "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",
@@ -12,7 +43,6 @@
     "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 onions",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
     "profileOnionLabel": "Envía esta dirección a los contactos con los que quieras conectarte",

lib/l10n/intl_fr.arb

@@ -1,18 +1,48 @@
 {
     "@@locale": "fr",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
-    "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",
-    "messageFileOffered": "Contact is offering to send you a 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...",
-    "descriptionStreamerMode": "Si elle est activée, cette option donne un rendu visuel plus privé à l'application pour la diffusion ou la présentation, par exemple en masquant les profils et les contacts.",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "copyServerKeys": "Copy keys",
+    "verfiyResumeButton": "Vérifier\/reprendre",
+    "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.",
+    "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.",
+    "deleteServerConfirmBtn": "Supprimer vraiment le serveur",
+    "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é",
+    "serverDescriptionDescription": "Votre description du serveur est à des fins de gestion personnelle uniquement, elle ne sera jamais partagée.",
+    "serverDescriptionLabel": "Description du serveur",
+    "serverAddress": "Adresse du serveur",
+    "editServerTitle": "Modifier le 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.",
+    "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",
+    "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",
+    "openFolderButton": "Ouvrir le dossier",
+    "retrievingManifestMessage": "Récupération des informations sur le fichier...",
     "streamerModeLabel": "Mode Streamer\/Présentation",
     "archiveConversation": "Archiver cette conversation",
     "profileOnionLabel": "Envoyez cette adresse aux personnes avec lesquelles vous souhaitez entrer en contact.",

lib/l10n/intl_it.arb

@@ -1,10 +1,41 @@
 {
     "@@locale": "it",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
-    "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",
-    "messageFileOffered": "Contact is offering to send you a file",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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",
@@ -12,7 +43,6 @@
     "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 onions",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
     "profileOnionLabel": "Inviare questo indirizzo ai peer con cui si desidera connettersi",

lib/l10n/intl_pl.arb

@@ -1,20 +1,50 @@
 {
     "@@locale": "pl",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
-    "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",
-    "messageFileOffered": "Contact is offering to send you a 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...",
-    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
-    "streamerModeLabel": "Streamer\/Presentation Mode",
-    "archiveConversation": "Archive this Conversation",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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": "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",
+    "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",
@@ -27,7 +57,7 @@
     "dontSavePeerHistory": "Delete History",
     "unblockBtn": "Unblock Contact",
     "blockUnknownLabel": "Block Unknown Contacts",
-    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "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.",

lib/l10n/intl_pt.arb

@@ -1,6 +1,37 @@
 {
     "@@locale": "pt",
-    "@@last_modified": "2021-09-21T23:09:19+02:00",
+    "@@last_modified": "2021-11-05T21:38:20+01:00",
+    "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": "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",
@@ -12,7 +43,6 @@
     "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 onions",
     "streamerModeLabel": "Streamer\/Presentation Mode",
     "archiveConversation": "Archive this Conversation",
     "profileOnionLabel": "Send this address to contacts you want to connect with",

lib/main.dart

@@ -17,6 +17,7 @@ import 'cwtch/cwtch.dart';
 import 'cwtch/cwtchNotifier.dart';
 import 'licenses.dart';
 import 'model.dart';
+import 'models/servers.dart';
 import 'views/profilemgrview.dart';
 import 'views/splashView.dart';
 import 'dart:io' show Platform, exit;
@@ -27,6 +28,7 @@ var globalSettings = Settings(Locale("en", ''), OpaqueDark());
 var globalErrorHandler = ErrorHandler();
 var globalTorStatus = TorStatus();
 var globalAppState = AppState();
+var globalServersList = ServerListState();
 
 void main() {
   print("Cwtch version: ${EnvironmentConfig.BUILD_VER} built on: ${EnvironmentConfig.BUILD_DATE}");
@@ -62,13 +64,13 @@ class FlwtchState extends State<Flwtch> {
     shutdownMethodChannel.setMethodCallHandler(modalShutdown);
     print("initState: creating cwtchnotifier, ffi");
     if (Platform.isAndroid) {
-      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, NullNotificationsManager(), globalAppState);
+      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, NullNotificationsManager(), globalAppState, globalServersList);
       cwtch = CwtchGomobile(cwtchNotifier);
     } else if (Platform.isLinux) {
-      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(), globalAppState);
+      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(), globalAppState, globalServersList);
       cwtch = CwtchFfi(cwtchNotifier);
     } else {
-      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, NullNotificationsManager(), globalAppState);
+      var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, NullNotificationsManager(), globalAppState, globalServersList);
       cwtch = CwtchFfi(cwtchNotifier);
     }
     print("initState: invoking cwtch.Start()");
@@ -82,6 +84,7 @@ class FlwtchState extends State<Flwtch> {
   ChangeNotifierProvider<AppState> getAppStateProvider() => ChangeNotifierProvider.value(value: globalAppState);
   Provider<FlwtchState> getFlwtchStateProvider() => Provider<FlwtchState>(create: (_) => this);
   ChangeNotifierProvider<ProfileListState> getProfileListProvider() => ChangeNotifierProvider(create: (context) => profs);
+  ChangeNotifierProvider<ServerListState> getServerListStateProvider() => ChangeNotifierProvider.value(value: globalServersList);
 
   @override
   Widget build(BuildContext context) {
@@ -94,6 +97,7 @@ class FlwtchState extends State<Flwtch> {
         getErrorHandlerProvider(),
         getTorStatusProvider(),
         getAppStateProvider(),
+        getServerListStateProvider(),
       ],
       builder: (context, widget) {
         return Consumer2<Settings, AppState>(

lib/model.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:cwtch/models/servers.dart';
+import 'package:cwtch/models/profileservers.dart';
 
 ////////////////////
 ///   UI State   ///
@@ -207,7 +207,7 @@ class ContactListState extends ChangeNotifier {
 
 class ProfileInfoState extends ChangeNotifier {
   ContactListState _contacts = ContactListState();
-  ServerListState _servers = ServerListState();
+  ProfileServerListState _servers = ProfileServerListState();
   final String onion;
   String _nickname = "";
   String _imagePath = "";
@@ -267,7 +267,7 @@ class ProfileInfoState extends ChangeNotifier {
       List<dynamic> servers = jsonDecode(serversJson);
       this._servers.replace(servers.map((server) {
         // TODO Keys...
-        return ServerInfoState(onion: server["onion"], status: server["status"]);
+        return RemoteServerInfoState(onion: server["onion"], status: server["status"]);
       }));
       notifyListeners();
     }
@@ -316,7 +316,7 @@ class ProfileInfoState extends ChangeNotifier {
   }
 
   ContactListState get contactList => this._contacts;
-  ServerListState get serverList => this._servers;
+  ProfileServerListState get serverList => this._servers;
 
   @override
   void dispose() {
@@ -362,11 +362,21 @@ class ProfileInfoState extends ChangeNotifier {
     this._downloads[fileKey] = FileDownloadProgress(numChunks, DateTime.now());
   }
 
-  void downloadUpdate(String fileKey, int progress) {
+  void downloadUpdate(String fileKey, int progress, int numChunks) {
     if (!downloadActive(fileKey)) {
-      print("error: received progress for unknown download " + fileKey);
+      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) {
+        this._downloads[fileKey]!.interrupted = false;
+      }
       this._downloads[fileKey]!.chunksDownloaded = progress;
+      this._downloads[fileKey]!.chunksTotal = numChunks;
       notifyListeners();
     }
   }
@@ -394,7 +404,7 @@ class ProfileInfoState extends ChangeNotifier {
   }
 
   bool downloadActive(String fileKey) {
-    return this._downloads.containsKey(fileKey);
+    return this._downloads.containsKey(fileKey) && !this._downloads[fileKey]!.interrupted;
   }
 
   bool downloadGotManifest(String fileKey) {
@@ -405,10 +415,27 @@ class ProfileInfoState extends ChangeNotifier {
     return this._downloads.containsKey(fileKey) && this._downloads[fileKey]!.complete;
   }
 
+  bool downloadInterrupted(String fileKey) {
+    return this._downloads.containsKey(fileKey) && this._downloads[fileKey]!.interrupted;
+  }
+
+  void downloadMarkResumed(String fileKey) {
+    if (this._downloads.containsKey(fileKey)) {
+      this._downloads[fileKey]!.interrupted = false;
+    }
+  }
+
   double downloadProgress(String fileKey) {
     return this._downloads.containsKey(fileKey) ? this._downloads[fileKey]!.progress() : 0.0;
   }
 
+  // used for loading interrupted download info; use downloadMarkFinished for successful downloads
+  void downloadSetPath(String fileKey, String path) {
+    if (this._downloads.containsKey(fileKey)) {
+      this._downloads[fileKey]!.downloadedTo = path;
+    }
+  }
+
   String? downloadFinalPath(String fileKey) {
     return this._downloads.containsKey(fileKey) ? this._downloads[fileKey]!.downloadedTo : null;
   }
@@ -431,6 +458,7 @@ class FileDownloadProgress {
   int chunksTotal = 1;
   bool complete = false;
   bool gotManifest = false;
+  bool interrupted = false;
   String? downloadedTo;
   DateTime? timeStart;
   DateTime? timeEnd;

lib/models/messages/filemessage.dart

@@ -12,6 +12,7 @@ import '../../model.dart';
 class FileMessage extends Message {
   final MessageMetadata metadata;
   final String content;
+  final RegExp nonHex = RegExp(r'[^a-f0-9]');
 
   FileMessage(this.metadata, this.content);