Merge pull request #398 from twonlyapp/dev

- Improved: Show input indicator in the chat overview as well 
- Improved: Username change error handling
- Fix: Phantom push notification 
- Fix: Start in chat, if configured
- Fix: Smaller UI fixes

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.6
+
+- Improved: Show input indicator in the chat overview as well 
+- Improved: Username change error handling
+- Fix: Phantom push notification 
+- Fix: Start in chat, if configured
+- Fix: Smaller UI fixes
+
 ## 0.1.5
 
 - Fix: Reupload of media files was not working properly

lib/main.dart

@@ -1,8 +1,10 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
@@ -33,9 +35,20 @@ void main() async {
   globalApplicationSupportDirectory =
       (await getApplicationSupportDirectory()).path;
 
+  initLogger();
   await initFCMService();
 
-  final user = await getUser();
+  var user = await getUser();
+
+  if (Platform.isIOS && user != null) {
+    final db = File('$globalApplicationSupportDirectory/twonly.sqlite');
+    if (!db.existsSync()) {
+      Log.error('[twonly] IOS: App was removed and then reinstalled again...');
+      await const FlutterSecureStorage().deleteAll();
+      user = await getUser();
+    }
+  }
+
   if (user != null) {
     gUser = user;
 
@@ -57,8 +70,6 @@ void main() async {
     await deleteLocalUserData();
   }
 
-  initLogger();
-
   final settingsController = SettingsChangeProvider();
 
   await settingsController.loadSettings();

lib/src/database/daos/mediafiles.dao.dart

@@ -24,13 +24,13 @@ class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
         );
       }
 
-      final rowId = await into(
+      await into(mediaFiles).insertOnConflictUpdate(insertMediaFile);
-        mediaFiles,
+
-      ).insertOnConflictUpdate(insertMediaFile);
+      final mediaId = insertMediaFile.mediaId.value;
 
       return await (select(
         mediaFiles,
-      )..where((t) => t.rowId.equals(rowId))).getSingle();
+      )..where((t) => t.mediaId.equals(mediaId))).getSingle();
     } catch (e) {
       Log.error('Could not insert media file: $e');
       return null;

lib/src/database/daos/messages.dao.dart

@@ -64,18 +64,41 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
     return query.map((row) => row.readTable(messages)).watch();
   }
 
-  Stream<Message?> watchLastMessage(String groupId) {
+  Future<Stream<Message?>> watchLastMessage(String groupId) async {
+    final group = await twonlyDB.groupsDao.getGroup(groupId);
+    final deletionTime = clock.now().subtract(
+      Duration(
+        milliseconds: group!.deleteMessagesAfterMilliseconds,
+      ),
+    );
     return (select(messages)
-          ..where((t) => t.groupId.equals(groupId))
+          ..where(
+            (t) =>
+                t.groupId.equals(groupId) &
+                // messages in groups will only be removed in case all members have received it...
+                // so ensuring that this message is not shown in the messages anymore
+                (t.openedAt.isBiggerThanValue(deletionTime) |
+                    t.openedAt.isNull()),
+          )
           ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
           ..limit(1))
         .watchSingleOrNull();
   }
 
-  Stream<List<Message>> watchByGroupId(String groupId) {
+  Future<Stream<List<Message>>> watchByGroupId(String groupId) async {
+    final group = await twonlyDB.groupsDao.getGroup(groupId);
+    final deletionTime = clock.now().subtract(
+      Duration(
+        milliseconds: group!.deleteMessagesAfterMilliseconds,
+      ),
+    );
     return ((select(messages)..where(
             (t) =>
                 t.groupId.equals(groupId) &
+                // messages in groups will only be removed in case all members have received it...
+                // so ensuring that this message is not shown in the messages anymore
+                (t.openedAt.isBiggerThanValue(deletionTime) |
+                    t.openedAt.isNull()) &
                 (t.isDeletedFromSender.equals(true) |
                     (t.type.equals(MessageType.text.name).not() |
                         t.type.equals(MessageType.media.name).not()) |
@@ -127,7 +150,8 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
                 (m.mediaStored.equals(true) &
                         m.isDeletedFromSender.equals(true) |
                     m.mediaStored.equals(false)) &
-                (m.openedAt.isSmallerThanValue(deletionTime) |
+                // Only remove the message when ALL members have seen it. Otherwise the receipt will also be deleted which could cause issues in case a member opens the image later..
+                (m.openedByAll.isSmallerThanValue(deletionTime) |
                     (m.isDeletedFromSender.equals(true) &
                         m.createdAt.isSmallerThanValue(deletionTime))),
           ))

lib/src/providers/purchases.provider.dart

@@ -70,11 +70,11 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
     };
     final response = await iapConnection.queryProductDetails(ids);
     if (response.notFoundIDs.isNotEmpty) {
-      Log.error(response.notFoundIDs);
+      Log.warn(response.notFoundIDs);
     }
     products = response.productDetails.map(PurchasableProduct.new).toList();
     if (products.isEmpty) {
-      Log.error('Could not load any products from the store!');
+      Log.warn('Could not load any products from the store!');
     }
     storeState = StoreState.available;
     notifyListeners();

lib/src/services/api/client2client/media.c2c.dart

@@ -117,8 +117,8 @@ Future<void> handleMedia(
     }
   }
 
-  late MediaFile? mediaFile;
+  MediaFile? mediaFile;
-  late Message? message;
+  Message? message;
 
   await twonlyDB.transaction(() async {
     mediaFile = await twonlyDB.mediaFilesDao.insertOrUpdateMedia(
@@ -163,7 +163,7 @@ Future<void> handleMedia(
     );
   });
 
-  if (message != null) {
+  if (message != null && mediaFile != null) {
     await twonlyDB.groupsDao.increaseLastMessageExchange(
       groupId,
       fromTimestamp(media.timestamp),
@@ -176,6 +176,10 @@ Future<void> handleMedia(
     );
 
     unawaited(startDownloadMedia(mediaFile!, false));
+  } else {
+    Log.error(
+      'Could not insert new message as both the message and mediaFile are empty.',
+    );
   }
 }
 

lib/src/services/api/mediafiles/upload.service.dart

@@ -102,6 +102,12 @@ Future<void> reuploadMediaFiles() async {
             .getMessageById(messageId)
             .getSingleOrNull();
         if (message == null || message.mediaId == null) {
+          // The message or media file does not exists any more, so delete the receipt...
+          if (message != null) {
+            // The media file of the message does not exist anymore. Removing it...
+            await twonlyDB.messagesDao.deleteMessagesById(messageId);
+          }
+          await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
           Log.error(
             'Message not found for reupload of the receipt (${message == null} - ${message?.mediaId}).',
           );

lib/src/services/api/messages.dart

@@ -102,21 +102,23 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
       message.encryptedContent,
     );
 
-    final pushNotification = await getPushNotificationFromEncryptedContent(
+    Log.info('Uploading $receiptId.');
-      receipt.contactId,
-      receipt.messageId,
-      encryptedContent,
-    );
-
-    Log.info('Uploading $receiptId. (${pushNotification?.kind})');
 
     Uint8List? pushData;
-    if (pushNotification != null && receipt.retryCount <= 1) {
+    if (receipt.retryCount == 0) {
-      // Only show the push notification the first two time.
+      final pushNotification = await getPushNotificationFromEncryptedContent(
-      pushData = await encryptPushNotification(
         receipt.contactId,
-        pushNotification,
+        receipt.messageId,
+        encryptedContent,
       );
+
+      if (pushNotification != null) {
+        // Only show the push notification the first two time.
+        pushData = await encryptPushNotification(
+          receipt.contactId,
+          pushNotification,
+        );
+      }
     }
 
     if (message.type == pb.Message_Type.TEST_NOTIFICATION) {

lib/src/services/notifications/background.notifications.dart

@@ -214,6 +214,8 @@ Future<void> showLocalPushNotification(
           pushNotification.kind == PushKind.reactionToText ||
           pushNotification.kind == PushKind.reactionToAudio)) {
     payload = Routes.chatsMessages(groupId);
+  } else {
+    payload = Routes.chats;
   }
 
   await flutterLocalNotificationsPlugin.show(

lib/src/views/chats/chat_list_components/group_list_item.dart

@@ -13,6 +13,7 @@ import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/api/mediafiles/download.service.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/views/chats/chat_list_components/last_message_time.dart';
+import 'package:twonly/src/views/chats/chat_list_components/typing_indicator_subtitle.dart';
 import 'package:twonly/src/views/chats/chat_messages_components/message_send_state_icon.dart';
 import 'package:twonly/src/views/components/avatar_icon.component.dart';
 import 'package:twonly/src/views/components/flame.dart';
@@ -63,9 +64,10 @@ class _UserListItem extends State<GroupListItem> {
   }
 
   Future<void> initStreams() async {
-    _lastMessageStream = twonlyDB.messagesDao
+    _lastMessageStream =
-        .watchLastMessage(widget.group.groupId)
+        (await twonlyDB.messagesDao.watchLastMessage(
-        .listen((update) {
+          widget.group.groupId,
+        )).listen((update) {
           protectUpdateState.protect(() async {
             await updateState(update, _messagesNotOpened);
           });
@@ -227,6 +229,7 @@ class _UserListItem extends State<GroupListItem> {
             VerifiedShield(
               group: widget.group,
               showOnlyIfVerified: true,
+              clickable: false,
               size: 12,
             ),
           ],
@@ -249,6 +252,9 @@ class _UserListItem extends State<GroupListItem> {
                     )
             : Row(
                 children: [
+                  TypingIndicatorSubtitle(
+                    groupId: widget.group.groupId,
+                  ),
                   MessageSendStateIcon(
                     _previewMessages,
                     _previewMediaFiles,

lib/src/views/chats/chat_list_components/typing_indicator_subtitle.dart

@@ -0,0 +1,77 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/views/chats/chat_messages_components/typing_indicator.dart';
+
+class TypingIndicatorSubtitle extends StatefulWidget {
+  const TypingIndicatorSubtitle({required this.groupId, super.key});
+
+  final String groupId;
+
+  @override
+  State<TypingIndicatorSubtitle> createState() =>
+      _TypingIndicatorSubtitleState();
+}
+
+class _TypingIndicatorSubtitleState extends State<TypingIndicatorSubtitle> {
+  List<GroupMember> _groupMembers = [];
+
+  late StreamSubscription<List<(Contact, GroupMember)>> membersSub;
+
+  late Timer _periodicUpdate;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _periodicUpdate = Timer.periodic(const Duration(seconds: 1), (_) {
+      filterOpenUsers(_groupMembers);
+    });
+
+    final membersStream = twonlyDB.groupsDao.watchGroupMembers(
+      widget.groupId,
+    );
+    membersSub = membersStream.listen((update) {
+      filterOpenUsers(update.map((m) => m.$2).toList());
+    });
+  }
+
+  void filterOpenUsers(List<GroupMember> input) {
+    if (mounted) {
+      setState(() {
+        _groupMembers = input.where(isTyping).toList();
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    membersSub.cancel();
+    _periodicUpdate.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_groupMembers.isEmpty) return Container();
+    return Padding(
+      padding: const EdgeInsets.only(right: 5),
+      child: Container(
+        padding: const EdgeInsets.symmetric(vertical: 3),
+        decoration: BoxDecoration(
+          color: getMessageColor(true),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Transform.scale(
+          scale: 0.6,
+          child: const AnimatedTypingDots(
+            isTyping: true,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/views/chats/chat_messages.view.dart

@@ -107,7 +107,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
       });
     });
 
-    final msgStream = twonlyDB.messagesDao.watchByGroupId(widget.groupId);
+    final msgStream = await twonlyDB.messagesDao.watchByGroupId(widget.groupId);
     messageSub = msgStream.listen((update) async {
       allMessages = update;
       await protectMessageUpdating.protect(() async {

lib/src/views/chats/chat_messages_components/typing_indicator.dart

@@ -9,6 +9,28 @@ import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/views/chats/chat_messages.view.dart';
 import 'package:twonly/src/views/components/avatar_icon.component.dart';
 
+bool isTyping(GroupMember member) {
+  return member.lastTypeIndicator != null &&
+      clock
+              .now()
+              .difference(
+                member.lastTypeIndicator!,
+              )
+              .inSeconds <=
+          2;
+}
+
+bool hasChatOpen(GroupMember member) {
+  return member.lastChatOpened != null &&
+      clock
+              .now()
+              .difference(
+                member.lastChatOpened!,
+              )
+              .inSeconds <=
+          6;
+}
+
 class TypingIndicator extends StatefulWidget {
   const TypingIndicator({required this.group, super.key});
 
@@ -18,10 +40,8 @@ class TypingIndicator extends StatefulWidget {
   State<TypingIndicator> createState() => _TypingIndicatorState();
 }
 
-class _TypingIndicatorState extends State<TypingIndicator>
+class _TypingIndicatorState extends State<TypingIndicator> {
-    with SingleTickerProviderStateMixin {
   late AnimationController _controller;
-  late List<Animation<double>> _animations;
 
   List<GroupMember> _groupMembers = [];
 
@@ -43,7 +63,90 @@ class _TypingIndicatorState extends State<TypingIndicator>
     membersSub = membersStream.listen((update) {
       filterOpenUsers(update.map((m) => m.$2).toList());
     });
+  }
 
+  void filterOpenUsers(List<GroupMember> input) {
+    if (mounted) {
+      setState(() {
+        _groupMembers = input.where(hasChatOpen).toList();
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    membersSub.cancel();
+    _periodicUpdate.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_groupMembers.isEmpty) return Container();
+
+    return Align(
+      alignment: Alignment.centerLeft,
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Column(
+          children: _groupMembers
+              .map(
+                (member) => Padding(
+                  key: Key('typing_indicator_${member.contactId}'),
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      if (!widget.group.isDirectChat)
+                        GestureDetector(
+                          onTap: () => context.push(
+                            Routes.profileContact(member.contactId),
+                          ),
+                          child: AvatarIcon(
+                            contactId: member.contactId,
+                            fontSize: 12,
+                          ),
+                        ),
+                      Container(
+                        padding: const EdgeInsets.all(8),
+                        decoration: BoxDecoration(
+                          color: getMessageColor(true),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: AnimatedTypingDots(
+                          isTyping: isTyping(member),
+                        ),
+                      ),
+                      Expanded(child: Container()),
+                    ],
+                  ),
+                ),
+              )
+              .toList(),
+        ),
+      ),
+    );
+  }
+}
+
+class AnimatedTypingDots extends StatefulWidget {
+  const AnimatedTypingDots({required this.isTyping, super.key});
+
+  final bool isTyping;
+
+  @override
+  State<AnimatedTypingDots> createState() => _AnimatedTypingDotsState();
+}
+
+class _AnimatedTypingDotsState extends State<AnimatedTypingDots>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+
+  late List<Animation<double>> _animations;
+
+  @override
+  void initState() {
     _controller = AnimationController(
       duration: const Duration(milliseconds: 1000),
       vsync: this,
@@ -77,93 +180,18 @@ class _TypingIndicatorState extends State<TypingIndicator>
         ),
       );
     });
-  }
+    super.initState();
-
-  void filterOpenUsers(List<GroupMember> input) {
-    setState(() {
-      _groupMembers = input.where(hasChatOpen).toList();
-    });
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    membersSub.cancel();
-    _periodicUpdate.cancel();
-    super.dispose();
-  }
-
-  bool isTyping(GroupMember member) {
-    return member.lastTypeIndicator != null &&
-        clock
-                .now()
-                .difference(
-                  member.lastTypeIndicator!,
-                )
-                .inSeconds <=
-            2;
-  }
-
-  bool hasChatOpen(GroupMember member) {
-    return member.lastChatOpened != null &&
-        clock
-                .now()
-                .difference(
-                  member.lastChatOpened!,
-                )
-                .inSeconds <=
-            6;
   }
 
   @override
   Widget build(BuildContext context) {
-    if (_groupMembers.isEmpty) return Container();
+    return Row(
-
+      mainAxisSize: MainAxisSize.min,
-    return Align(
+      children: List.generate(
-      alignment: Alignment.centerLeft,
+        3,
-      child: Padding(
+        (index) => _AnimatedDot(
-        padding: const EdgeInsets.all(12),
+          isTyping: widget.isTyping,
-        child: Column(
+          animation: _animations[index],
-          children: _groupMembers
-              .map(
-                (member) => Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 8),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      if (!widget.group.isDirectChat)
-                        GestureDetector(
-                          onTap: () => context.push(
-                            Routes.profileContact(member.contactId),
-                          ),
-                          child: AvatarIcon(
-                            contactId: member.contactId,
-                            fontSize: 12,
-                          ),
-                        ),
-                      Container(
-                        padding: const EdgeInsets.all(8),
-                        decoration: BoxDecoration(
-                          color: getMessageColor(true),
-                          borderRadius: BorderRadius.circular(12),
-                        ),
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: List.generate(
-                            3,
-                            (index) => _AnimatedDot(
-                              isTyping: isTyping(member),
-                              animation: _animations[index],
-                            ),
-                          ),
-                        ),
-                      ),
-                      Expanded(child: Container()),
-                    ],
-                  ),
-                ),
-              )
-              .toList(),
         ),
       ),
     );

lib/src/views/components/verified_shield.dart

@@ -13,12 +13,14 @@ class VerifiedShield extends StatefulWidget {
     super.key,
     this.size = 15,
     this.showOnlyIfVerified = false,
+    this.clickable = true,
   });
   final Group? group;
   final Contact? contact;
   final double size;
 
   final bool showOnlyIfVerified;
+  final bool clickable;
 
   @override
   State<VerifiedShield> createState() => _VerifiedShieldState();
@@ -61,7 +63,7 @@ class _VerifiedShieldState extends State<VerifiedShield> {
   Widget build(BuildContext context) {
     if (!isVerified && widget.showOnlyIfVerified) return Container();
     return GestureDetector(
-      onTap: (contact == null)
+      onTap: (contact == null || !widget.clickable)
           ? null
           : () => context.push(Routes.settingsHelpFaqVerifyBadge),
       child: ColoredBox(

lib/src/views/home.view.dart

@@ -49,11 +49,11 @@ class Shade extends StatelessWidget {
 }
 
 class HomeViewState extends State<HomeView> {
-  int activePageIdx = 0;
+  int _activePageIdx = 1;
 
   final MainCameraController _mainCameraController = MainCameraController();
 
-  final PageController homeViewPageController = PageController(initialPage: 1);
+  final PageController _homeViewPageController = PageController(initialPage: 1);
   late StreamSubscription<List<SharedFile>> _intentStreamSub;
   late StreamSubscription<Uri> _deepLinkSub;
 
@@ -67,10 +67,10 @@ class HomeViewState extends State<HomeView> {
   bool onPageView(ScrollNotification notification) {
     disableCameraTimer?.cancel();
     if (notification.depth == 0 && notification is ScrollUpdateNotification) {
-      final page = homeViewPageController.page ?? 0;
+      final page = _homeViewPageController.page ?? 0;
       lastChange = page;
       setState(() {
-        offsetFromOne = 1.0 - (homeViewPageController.page ?? 0);
+        offsetFromOne = 1.0 - (_homeViewPageController.page ?? 0);
         offsetRatio = offsetFromOne.abs();
       });
     }
@@ -100,17 +100,17 @@ class HomeViewState extends State<HomeView> {
     _mainCameraController.setState = () {
       if (mounted) setState(() {});
     };
-    activePageIdx = widget.initialPage;
 
     globalUpdateOfHomeViewPageIndex = (index) {
-      homeViewPageController.jumpToPage(index);
+      _homeViewPageController.jumpToPage(index);
       setState(() {
-        activePageIdx = index;
+        _activePageIdx = index;
       });
     };
     selectNotificationStream.stream.listen((response) async {
       if (response.payload != null &&
-          response.payload!.startsWith(Routes.chats)) {
+          response.payload!.startsWith(Routes.chats) &&
+          response.payload! != Routes.chats) {
         await routerProvider.push(response.payload!);
       }
       globalUpdateOfHomeViewPageIndex(0);
@@ -134,6 +134,11 @@ class HomeViewState extends State<HomeView> {
       context,
       _mainCameraController.setSharedLinkForPreview,
     );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (widget.initialPage == 0) {
+        globalUpdateOfHomeViewPageIndex(0);
+      }
+    });
   }
 
   @override
@@ -196,10 +201,10 @@ class HomeViewState extends State<HomeView> {
               onNotification: onPageView,
               child: Positioned.fill(
                 child: PageView(
-                  controller: homeViewPageController,
+                  controller: _homeViewPageController,
                   onPageChanged: (index) {
                     setState(() {
-                      activePageIdx = index;
+                      _activePageIdx = index;
                     });
                   },
                   children: [
@@ -222,7 +227,7 @@ class HomeViewState extends State<HomeView> {
                 child: CameraPreviewControllerView(
                   mainController: _mainCameraController,
                   isVisible:
-                      ((1 - (offsetRatio * 4) % 1) == 1) && activePageIdx == 1,
+                      ((1 - (offsetRatio * 4) % 1) == 1) && _activePageIdx == 1,
                 ),
               ),
             ),
@@ -253,15 +258,15 @@ class HomeViewState extends State<HomeView> {
           ),
         ],
         onTap: (index) async {
-          activePageIdx = index;
+          _activePageIdx = index;
-          await homeViewPageController.animateToPage(
+          await _homeViewPageController.animateToPage(
             index,
             duration: const Duration(milliseconds: 100),
             curve: Curves.bounceIn,
           );
           if (mounted) setState(() {});
         },
-        currentIndex: activePageIdx,
+        currentIndex: _activePageIdx,
       ),
     );
   }

lib/src/views/settings/profile/profile.view.dart

@@ -57,14 +57,28 @@ class _ProfileViewState extends State<ProfileView> {
   }
 
   Future<void> _updateUsername(String username) async {
-    final result = await apiService.changeUsername(username);
+    var filteredUsername = username.replaceAll(
+      RegExp('[^a-zA-Z0-9._]'),
+      '',
+    );
+
+    if (filteredUsername.length > 12) {
+      filteredUsername = filteredUsername.substring(0, 12);
+    }
+
+    final result = await apiService.changeUsername(filteredUsername);
     if (result.isError) {
       if (!mounted) return;
 
-      if (result.error == ErrorCode.UsernameAlreadyTaken) {
+      if (result.error == ErrorCode.UsernameAlreadyTaken ||
+          result.error == ErrorCode.UsernameNotValid) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(context.lang.errorUsernameAlreadyTaken),
+            content: Text(
+              result.error == ErrorCode.UsernameAlreadyTaken
+                  ? context.lang.errorUsernameAlreadyTaken
+                  : context.lang.errorUsernameNotValid,
+            ),
             duration: const Duration(seconds: 3),
           ),
         );

pubspec.yaml

@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.1.5+105
+version: 0.1.6+106
 
 environment:
   sdk: ^3.11.0