delete contact requested users and improve logging

lib/src/localization/app_de.arb

@@ -65,6 +65,7 @@
     "chatListViewSendFirstTwonly": "Sende dein erstes twonly!",
     "chatListDetailInput": "Nachricht eingeben",
     "userDeletedAccount": "Der Nutzer hat sein Konto gelöscht.",
+    "contextMenuUserProfile": "Userprofil",
     "contextMenuVerifyUser": "Verifizieren",
     "@contextMenuVerifyUser": {},
     "contextMenuArchiveUser": "Archivieren",

lib/src/localization/app_en.arb

@@ -116,6 +116,7 @@
   "chatListDetailInput": "Type a message",
   "@chatListDetailInput": {},
   "userDeletedAccount": "The user has deleted its account.",
+  "contextMenuUserProfile": "User profile",
   "contextMenuVerifyUser": "Verify",
   "@contextMenuVerifyUser": {},
   "contextMenuArchiveUser": "Archive",

lib/src/localization/generated/app_localizations.dart

@@ -452,6 +452,12 @@ abstract class AppLocalizations {
   /// **'The user has deleted its account.'**
   String get userDeletedAccount;
 
+  /// No description provided for @contextMenuUserProfile.
+  ///
+  /// In en, this message translates to:
+  /// **'User profile'**
+  String get contextMenuUserProfile;
+
   /// No description provided for @contextMenuVerifyUser.
   ///
   /// In en, this message translates to:

lib/src/localization/generated/app_localizations_de.dart

@@ -206,6 +206,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get userDeletedAccount => 'Der Nutzer hat sein Konto gelöscht.';
 
+  @override
+  String get contextMenuUserProfile => 'Userprofil';
+
   @override
   String get contextMenuVerifyUser => 'Verifizieren';
 

lib/src/localization/generated/app_localizations_en.dart

@@ -204,6 +204,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get userDeletedAccount => 'The user has deleted its account.';
 
+  @override
+  String get contextMenuUserProfile => 'User profile';
+
   @override
   String get contextMenuVerifyUser => 'Verify';
 

lib/src/services/api/media_send.dart

@@ -94,9 +94,11 @@ Future<bool> checkForFailedUploads() async {
       mediaUploadIds.add(message.mediaUploadId!);
     }
   }
-  Log.error(
+  if (messages.isNotEmpty) {
-    "Got ${messages.length} messages (${mediaUploadIds.length} media upload files) that are not correctly uploaded. Trying from scratch again.",
+    Log.error(
-  );
+      "Got ${messages.length} messages (${mediaUploadIds.length} media upload files) that are not correctly uploaded. Trying from scratch again.",
+    );
+  }
   return mediaUploadIds.isNotEmpty; // return true if there are affected
 }
 

lib/src/services/api/server_messages.dart

@@ -54,7 +54,6 @@ Future handleServerMessage(server.ServerToClient msg) async {
 Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
   MessageJson? message = await signalDecryptMessage(fromUserId, body);
   if (message == null) {
-    Log.info("Got invalid cipher text from $fromUserId. Deleting it.");
     // Message is not valid, so server can delete it
     var ok = client.Response_Ok()..none = true;
     return client.Response()..ok = ok;

lib/src/services/signal/encryption.signal.dart

@@ -116,6 +116,10 @@ Future<MessageJson?> signalDecryptMessage(int source, Uint8List msg) async {
     }
     return MessageJson.fromJson(
         jsonDecode(utf8.decode(gzip.decode(plaintext))));
+  } on InvalidKeyIdException catch (_) {
+    return null; // got the same message again
+  } on DuplicateMessageException catch (_) {
+    return null; // to the same message again
   } catch (e) {
     Log.error(e.toString());
     return null;

lib/src/views/components/user_context_menu.dart

@@ -6,14 +6,18 @@ import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/views/contact/contact.view.dart';
 import 'package:twonly/src/views/contact/contact_verify.view.dart';
 
 class UserContextMenu extends StatefulWidget {
   final Widget child;
   final Contact contact;
 
-  const UserContextMenu(
+  const UserContextMenu({
-      {super.key, required this.contact, required this.child});
+    super.key,
+    required this.contact,
+    required this.child,
+  });
 
   @override
   State<UserContextMenu> createState() => _UserContextMenuState();
@@ -96,6 +100,67 @@ class _UserContextMenuState extends State<UserContextMenu> {
   }
 }
 
+class UserContextMenuBlocked extends StatefulWidget {
+  final Widget child;
+  final Contact contact;
+
+  const UserContextMenuBlocked({
+    super.key,
+    required this.contact,
+    required this.child,
+  });
+
+  @override
+  State<UserContextMenuBlocked> createState() => _UserContextMenuBlocked();
+}
+
+class _UserContextMenuBlocked extends State<UserContextMenuBlocked> {
+  @override
+  Widget build(BuildContext context) {
+    return PieMenu(
+      onPressed: () => (),
+      actions: [
+        if (!widget.contact.archived)
+          PieAction(
+            tooltip: Text(context.lang.contextMenuArchiveUser),
+            onSelect: () async {
+              final update = ContactsCompanion(archived: Value(true));
+              if (context.mounted) {
+                await twonlyDB.contactsDao
+                    .updateContact(widget.contact.userId, update);
+              }
+            },
+            child: FaIcon(FontAwesomeIcons.boxArchive),
+          ),
+        if (widget.contact.archived)
+          PieAction(
+            tooltip: Text(context.lang.contextMenuUndoArchiveUser),
+            onSelect: () async {
+              final update = ContactsCompanion(archived: Value(false));
+              if (context.mounted) {
+                await twonlyDB.contactsDao
+                    .updateContact(widget.contact.userId, update);
+              }
+            },
+            child: FaIcon(FontAwesomeIcons.boxOpen),
+          ),
+        PieAction(
+          tooltip: Text(context.lang.contextMenuUserProfile),
+          onSelect: () {
+            Navigator.push(context, MaterialPageRoute(
+              builder: (context) {
+                return ContactView(widget.contact.userId);
+              },
+            ));
+          },
+          child: const FaIcon(FontAwesomeIcons.user),
+        ),
+      ],
+      child: widget.child,
+    );
+  }
+}
+
 PieTheme getPieCanvasTheme(BuildContext context) {
   return PieTheme(
     brightness: Theme.of(context).brightness,

lib/src/views/settings/privacy_view_block.users.dart

@@ -1,10 +1,12 @@
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
+import 'package:pie_menu/pie_menu.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/views/components/initialsavatar.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/views/components/user_context_menu.dart';
 
 class PrivacyViewBlockUsers extends StatefulWidget {
   const PrivacyViewBlockUsers({super.key});
@@ -35,49 +37,52 @@ class _PrivacyViewBlockUsers extends State<PrivacyViewBlockUsers> {
       appBar: AppBar(
         title: Text(context.lang.settingsPrivacyBlockUsers),
       ),
-      body: Padding(
+      body: PieCanvas(
-        padding: EdgeInsets.only(bottom: 20, left: 10, top: 20, right: 10),
+        theme: getPieCanvasTheme(context),
-        child: Column(
+        child: Padding(
-          children: [
+          padding: EdgeInsets.only(bottom: 20, left: 10, top: 20, right: 10),
-            Padding(
+          child: Column(
-              padding: EdgeInsets.symmetric(horizontal: 10),
+            children: [
-              child: TextField(
+              Padding(
-                onChanged: (value) => setState(() {
+                padding: EdgeInsets.symmetric(horizontal: 10),
-                  filter = value;
+                child: TextField(
-                }),
+                  onChanged: (value) => setState(() {
-                decoration: getInputDecoration(
+                    filter = value;
-                  context,
+                  }),
-                  context.lang.searchUsernameInput,
+                  decoration: getInputDecoration(
+                    context,
+                    context.lang.searchUsernameInput,
+                  ),
                 ),
               ),
-            ),
+              const SizedBox(height: 20),
-            const SizedBox(height: 20),
+              Text(
-            Text(
+                context.lang.settingsPrivacyBlockUsersDesc,
-              context.lang.settingsPrivacyBlockUsersDesc,
+                textAlign: TextAlign.center,
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(height: 30),
-            Expanded(
-              child: StreamBuilder(
-                stream: allUsers,
-                builder: (context, snapshot) {
-                  if (!snapshot.hasData) {
-                    return Container();
-                  }
-
-                  final filteredContacts = snapshot.data!.where((contact) {
-                    return getContactDisplayName(contact)
-                        .toLowerCase()
-                        .contains(filter.toLowerCase());
-                  }).toList();
-
-                  return UserList(
-                    List.from(filteredContacts),
-                  );
-                },
               ),
-            )
+              const SizedBox(height: 30),
-          ],
+              Expanded(
+                child: StreamBuilder(
+                  stream: allUsers,
+                  builder: (context, snapshot) {
+                    if (!snapshot.hasData) {
+                      return Container();
+                    }
+
+                    final filteredContacts = snapshot.data!.where((contact) {
+                      return getContactDisplayName(contact)
+                          .toLowerCase()
+                          .contains(filter.toLowerCase());
+                    }).toList();
+
+                    return UserList(
+                      List.from(filteredContacts),
+                    );
+                  },
+                ),
+              )
+            ],
+          ),
         ),
       ),
     );
@@ -106,20 +111,23 @@ class UserList extends StatelessWidget {
       itemCount: users.length,
       itemBuilder: (BuildContext context, int i) {
         Contact user = users[i];
-        return ListTile(
+        return UserContextMenuBlocked(
-          title: Row(children: [
+          contact: user,
-            Text(getContactDisplayName(user)),
+          child: ListTile(
-          ]),
+            title: Row(children: [
-          leading: ContactAvatar(contact: user, fontSize: 15),
+              Text(getContactDisplayName(user)),
-          trailing: Checkbox(
+            ]),
-            value: user.blocked,
+            leading: ContactAvatar(contact: user, fontSize: 15),
-            onChanged: (bool? value) {
+            trailing: Checkbox(
-              block(context, user.userId, value);
+              value: user.blocked,
+              onChanged: (bool? value) {
+                block(context, user.userId, value);
+              },
+            ),
+            onTap: () {
+              block(context, user.userId, !user.blocked);
             },
           ),
-          onTap: () {
-            block(context, user.userId, !user.blocked);
-          },
         );
       },
     );