fix possible message missing due to top channel start block.

Dandelight · Oct 23, 2022 · 09bcbfd · 09bcbfd
1 parent 16ea786
commit 09bcbfd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/android/app/src/main/kotlin/com/privoce/vocechat_client/MainActivity.kt b/android/app/src/main/kotlin/com/privoce/vocechat_client/MainActivity.kt
@@ -25,8 +25,8 @@ class MainActivity : FlutterFragmentActivity() {
     private val CHANNEL = "clipboard/image"
 
 
-    override fun configureFlutterEngdine(@NonNull flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
+    // override fun configureFlutterEngdine(@NonNull flutterEngine: FlutterEngine) {
+    //     super.configureFlutterEngine(flutterEngine)
         // MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler {
         //     if (call.method == "getBatteryLevel") {
         //         val batteryLevel = getBatteryLevel()
@@ -40,7 +40,7 @@ class MainActivity : FlutterFragmentActivity() {
         //         result.notImplemented()
         //     }
         // }
-    }
+    // }
 
     // private fun getBatteryLevel(): Int {
     //     val batteryLevel: Int

diff --git a/lib/ui/chats/chat/chat_page.dart b/lib/ui/chats/chat/chat_page.dart
@@ -163,6 +163,9 @@ class _ChatPageState extends State<ChatPage> {
 
   @override
   Widget build(BuildContext context) {
+    for (final each in _uiMsgList) {
+      print(each.chatMsgM.values);
+    }
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: ChatBar(
@@ -533,20 +536,13 @@ class _ChatPageState extends State<ChatPage> {
         break;
     }
 
-    sortUiMsgList();
-
     _uiMsgList.sort((a, b) => b.chatMsgM.mid.compareTo(a.chatMsgM.mid));
 
     if (mounted) {
       setState(() {});
     }
   }
 
-  void sortUiMsgList() {
-    // sort success messages by mid (from server);
-    // sort remaining local unsuccessful messages by timestamps.
-  }
-
   Future<void> _onReaction(ReactionTypes type, int mid,
       [ChatMsgM? chatMsgM]) async {
     switch (type) {
@@ -965,13 +961,14 @@ class _ChatPageState extends State<ChatPage> {
         itemCount: _uiMsgList.length + 1,
         itemBuilder: (context, index) {
           // If reaches very top, show channel start widget.
-          if (index == widget.msgCount) {
-            if (widget._isGroup) {
-              return ChannelStart(widget.groupInfoNotifier!);
-            } else {
-              return SizedBox.shrink();
-            }
-          } else if (index == _uiMsgList.length) {
+          // if (index == widget.msgCount) {
+          //   if (widget._isGroup) {
+          //     return ChannelStart(widget.groupInfoNotifier!);
+          //   } else {
+          //     return SizedBox.shrink();
+          //   }
+          // } else
+          if (index == _uiMsgList.length) {
             if (_isLoadingHistory) {
               return SizedBox(
                   height: 20,
@@ -982,6 +979,7 @@ class _ChatPageState extends State<ChatPage> {
             }
           } else {
             UiMsg uiMsg = _uiMsgList[index];
+
             final userInfoM =
                 _userInfoMMap[uiMsg.chatMsgM.fromUid] ?? UserInfoM.deleted();
             final isSelf = userInfoM.uid == App.app.userDb!.uid;

diff --git a/lib/ui/chats/chat/input_field/app_text_selection_controls.dart b/lib/ui/chats/chat/input_field/app_text_selection_controls.dart
@@ -17,10 +17,6 @@ class AppTextSelectionControls extends CupertinoTextSelectionControls {
   int? uid;
   int? gid;
 
-  static const double _kToolbarContentDistanceBelow = 10.0;
-  static const double _kToolbarContentDistance = 8.0;
-
-  // Function(ImageProvider) callback;
   AppTextSelectionControls();
 
   @override