Merge pull request 'Upgrade Cwtch, Minor Formatting, Fix StopFileShare' (#716) from stable-blockers into trunk

Reviewed-on: #716
Reviewed-by: Dan Ballard <dan@openprivacy.ca>

LIBCWTCH-GO.version

@@ -1 +1 @@
-2023-08-22-14-06-v0.0.6
+2023-08-31-11-56-v0.0.6-2-gf32ad74

integration_test/features/04_profile_mgmt/01_create_delete.feature

@@ -74,7 +74,7 @@ Feature: Basic Profile Management
         When I tap the "IconButton" widget with tooltip "Edit Profile Alice (Encrypted)"
         Then I expect the text 'Display Name' to be present
         Then I fill the "displayNameFormElement" field with "Carol (Encrypted)"
-        And I tap the "button" widget with label "Save Profile"
+        And I tap the widget that contains the text "Save Profile"
         And I wait until the widget with type 'ProfileMgrView' is present
         Then I expect a "ProfileRow" widget with text "Carol (Encrypted)"
 
@@ -90,7 +90,7 @@ Feature: Basic Profile Management
          When I tap the "IconButton" widget with tooltip "Edit Profile Carol (Encrypted)"
          Then I expect the text 'Display Name' to be present
          Then I fill the "currentPasswordFormElement" field with "password1"
-         When I tap the button that contains the text "Delete"
+         And I tap the widget that contains the text "Delete"
          Then I wait for 2 seconds
          When I tap the "button" widget with label "Really Delete Profile"
          And I wait until the widget with type 'ProfileMgrView' is present

lib/cwtch/ffi.dart

@@ -892,7 +892,7 @@ class CwtchFfi implements Cwtch {
 
   @override
   void StopSharing(String profile, String filekey) {
-    var stopSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_StopSharing");
+    var stopSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_StopFileShare");
     // ignore: non_constant_identifier_names
     final StopSharing = stopSharingC.asFunction<VoidFromStringStringFn>();
     final utf8profile = profile.toNativeUtf8();
@@ -924,9 +924,6 @@ class CwtchFfi implements Cwtch {
     malloc.free(u1);
   }
 
-
-
-
   @override
   bool IsServersCompiled() {
     return library.providesSymbol("c_LoadServers");

lib/cwtch/gomobile.dart

@@ -365,7 +365,6 @@ class CwtchGomobile implements Cwtch {
     cwtchPlatform.invokeMethod("DeleteServerInfo", {"ProfileOnion": profile, "handle": handle});
   }
 
-
   @override
   void UpdateSettings(String json) {
     cwtchPlatform.invokeMethod("UpdateSettings", {"json": json});

lib/models/profile.dart

@@ -68,7 +68,6 @@ class ProfileInfoState extends ChangeNotifier {
       this._contacts.addAll(contacts.map((contact) {
         this._unreadMessages += contact["numUnread"] as int;
 
-
         return ContactInfoState(this.onion, contact["identifier"], contact["onion"],
             nickname: contact["name"],
             localNickname: contact["attributes"]?["local.profile.name"] ?? "", // contact may not have a local name

lib/settings.dart

@@ -134,7 +134,7 @@ class Settings extends ChangeNotifier {
     // Decide whether to enable Experiments
     var fontScale = settings["FontScaling"];
     if (fontScale == null) {
-        fontScale = 1.0;
+      fontScale = 1.0;
     }
     _fontScaling = double.parse(fontScale.toString()).clamp(0.5, 2.0);
 

lib/views/filesharingview.dart

@@ -51,7 +51,9 @@ class _FileSharingViewState extends State<FileSharingView> {
               semanticChildCount: sharedFiles.length,
               itemBuilder: (context, index) {
                 String filekey = sharedFiles[index]["FileKey"];
-                EnvironmentConfig.debugLog("$sharedFiles " + sharedFiles[index].toString());
+                // This makes the UI *very* slow when enabled. But can be useful for debugging
+                // Uncomment if necessary.
+                // EnvironmentConfig.debugLog("$sharedFiles " + sharedFiles[index].toString());
                 return SwitchListTile(
                     title: Text(sharedFiles[index]["Path"]),
                     subtitle: Text(sharedFiles[index]["DateShared"]),

lib/views/peersettingsview.dart

@@ -217,12 +217,12 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                 subtitle: Text(AppLocalizations.of(context)!.savePeerHistoryDescription),
                                 leading: Icon(CwtchIcons.peer_history, color: settings.current().mainTextColor),
                                 trailing: DropdownButton(
-                                    value: (Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" ||
+                                    value:
-                                        Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
+                                        (Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" || Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
-                                        ? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
+                                            ? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
-                                        : (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
+                                            : (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
-                                            ? AppLocalizations.of(context)!.savePeerHistory
+                                                ? AppLocalizations.of(context)!.savePeerHistory
-                                            : AppLocalizations.of(context)!.dontSavePeerHistory),
+                                                : AppLocalizations.of(context)!.dontSavePeerHistory),
                                     onChanged: (newValue) {
                                       setState(() {
                                         // Set whether or not to dave the Contact History...
@@ -234,7 +234,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                         const HistoryDefault = "HistoryDefault";
 
                                         // NOTE: .savePeerHistory is used to show ephemeral warnings so it's state is important to update.
-                                        if(newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
+                                        if (newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
                                           Provider.of<ContactInfoState>(context, listen: false).savePeerHistory = HistoryDefault;
                                           Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, identifier, SaveHistoryKey, HistoryDefault);
                                         } else if (newValue == AppLocalizations.of(context)!.savePeerHistory) {
@@ -246,7 +246,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                         }
                                       });
                                     },
-                                    items: [AppLocalizations.of(context)!.conversationNotificationPolicyDefault, AppLocalizations.of(context)!.savePeerHistory, AppLocalizations.of(context)!.dontSavePeerHistory].map<DropdownMenuItem<String>>((String value) {
+                                    items: [
+                                      AppLocalizations.of(context)!.conversationNotificationPolicyDefault,
+                                      AppLocalizations.of(context)!.savePeerHistory,
+                                      AppLocalizations.of(context)!.dontSavePeerHistory
+                                    ].map<DropdownMenuItem<String>>((String value) {
                                       return DropdownMenuItem<String>(
                                         value: value,
                                         child: Text(value, style: settings.scaleFonts(defaultDropDownMenuItemTextStyle)),

lib/views/remoteserverview.dart

@@ -97,9 +97,11 @@ class _RemoteServerViewState extends State<RemoteServerView> {
                   Tooltip(
                       message: serverInfoState.groups.isNotEmpty ? AppLocalizations.of(context)!.cannotDeleteServerIfActiveGroups : AppLocalizations.of(context)!.leaveConversation,
                       child: ElevatedButton.icon(
-                        onPressed: serverInfoState.groups.isNotEmpty ? null :  () {
+                        onPressed: serverInfoState.groups.isNotEmpty
-                          showAlertDialog(context);
+                            ? null
-                        },
+                            : () {
+                                showAlertDialog(context);
+                              },
                         icon: Icon(CwtchIcons.leave_group),
                         label: Text(
                           AppLocalizations.of(context)!.deleteBtn,
@@ -112,7 +114,6 @@ class _RemoteServerViewState extends State<RemoteServerView> {
                   child: Text(AppLocalizations.of(context)!.groupsOnThisServerLabel),
                 ),
                 Expanded(child: _buildGroupsList(serverInfoState)),
-
               ])));
     });
   }

lib/widgets/messagelist.dart

@@ -38,7 +38,7 @@ class _MessageListState extends State<MessageList> {
     //bool isGroupAndSynced = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status == "Synced";
     //bool isGroupAndNotAuthenticated = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status != "Authenticated";
 
-    bool preserveHistoryByDefault = Provider.of<Settings>(context, listen:false).preserveHistoryByDefault;
+    bool preserveHistoryByDefault = Provider.of<Settings>(context, listen: false).preserveHistoryByDefault;
     bool showEphemeralWarning = (isP2P && (!preserveHistoryByDefault && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory"));
     bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
     bool showSyncing = isGroupAndSyncing;