bug fixes

Author: Wahid Nasri

android/app/build/intermediates/flutter/debug/flutter_assets/kernel_blob.bin

@@ -40,8 +40,14 @@ class MqttChatEventsSender extends ChatEventsSender {
   }
 
   @override
-  void respondToInvitation(String sednderId, bool accept) {
-    // TODO: implement respondToInvitation
+  void respondToInvitation(String invitationId, String senderId, bool accept) {
+    InvitationMessage invitationMessage = InvitationMessage(
+        id: invitationId,
+        type: accept ? MessageType.EventInvitationResponseAccept : MessageType.EventInvitationResponseReject,
+        invitationMessageType: InvitationMessageType.REQUEST_RESPONSE,
+        sendTime: DateTime.now().millisecondsSinceEpoch);
+
+    clientHandler.sendPayload(invitationMessage.toJson().toString(), "personalevents/" + senderId);
   }
 
   @override

android/app/build/intermediates/flutter/debug/flutter_build.d

@@ -31,8 +31,8 @@ class MqttClient extends ClientHandler {
     _client = MqttServerClient.withPort(
         Platform.operatingSystem.toLowerCase() == 'windows'
             ? 'localhost'
-            : '172.16.14.99',
-        //: '192.168.100.11',
+            //: '172.16.14.99',
+        : '192.168.100.11',
         cid,
         1883);
     // _client = MqttServerClient.withPort('broker.emqx.io', resource, 1883
@@ -195,6 +195,9 @@ class MqttClient extends ClientHandler {
   void joinMyEvents(String myId) {
     _client!.subscribe(TopicsNamesGenerator.getPersonalEventsForBareId(myId),
         MqttQos.atLeastOnce);
+
+    _client!.subscribe(TopicsNamesGenerator.getArchivesRoomsTopic(myId), MqttQos.atLeastOnce);
+    _client!.subscribe(TopicsNamesGenerator.getArchivesMessagesTopic(myId), MqttQos.atLeastOnce);
   }
 
   @override

android/app/build/intermediates/merged_assets/debug/out/flutter_assets/kernel_blob.bin

@@ -10,5 +10,5 @@ abstract class ChatEventsSender {
   }
 
   void sendInvitation(String username, String? invitationId);
-  void respondToInvitation(String sednderId, bool accept);
+  void respondToInvitation(String invitationId, String senderId, bool accept);
 }

android/app/build/outputs/apk/debug/app-debug.apk

@@ -45,7 +45,8 @@ class BaseMessage {
 
   bool isInvitationEvent() {
     return type == MessageType.EventInvitationRequest ||
-        type == MessageType.EventInvitationResponse;
+        type == MessageType.EventInvitationResponseAccept ||
+        type == MessageType.EventInvitationResponseReject;
   }
 
   bool isChatMarkerEvent() {

lib/MqttImpl/MqttChatEventsSender.dart

@@ -8,7 +8,8 @@ enum MessageType {
   ChatContact,
 
   EventInvitationRequest,
-  EventInvitationResponse,
+  EventInvitationResponseAccept,
+  EventInvitationResponseReject,
 
   Presence,
 

lib/MqttImpl/MqttClient.dart

@@ -1,5 +1,6 @@
 import 'package:flutter_mqtt/abstraction/models/enums/ChatMarker.dart';
 import 'package:flutter_mqtt/abstraction/models/enums/InvitationMessageType.dart';
+import 'package:flutter_mqtt/abstraction/models/enums/MessageType.dart';
 import 'package:flutter_mqtt/db/appdata/ContactsHandler.dart';
 import 'package:flutter_mqtt/db/appdata/InvitationsHandler.dart';
 import 'package:flutter_mqtt/db/appdata/MessageHandler.dart';
@@ -73,16 +74,28 @@ class AppData {
         .invitationHandler
         .newInvitationsStream()
         .listen((invitation) {
-      MyDatabase.instance()!
-          .invitationDao
-          .addInvitation(invitation.toDbInvitation());
+          if(invitation.type == MessageType.EventInvitationRequest) {
+            //new invitation request
+            MyDatabase.instance()!
+                .invitationDao
+                .addInvitation(invitation.toDbInvitation());
+          }
+          if(invitation.type == MessageType.EventInvitationResponseAccept || invitation.type == MessageType.EventInvitationResponseReject) {
+            //responded to invitation, update the local record and wait the server to sync the new contact (if accepted)
+            invitationsHandler.updateInvitationStatus(invitation.id, invitation.type == MessageType.EventInvitationResponseAccept ? "accepted" : "rejected");
+          }
     });
 
     ChatApp.instance()!
         .invitationHandler
         .invitationUpdatesStream()
         .listen((invitation) {
-      if (invitation.invitationMessageType == InvitationMessageType.INFO) {}
+      if (invitation.invitationMessageType == InvitationMessageType.INFO) {
+        invitationsHandler.updateInvitationStatus(invitation.id, "confirmed");
+      }
+      else if (invitation.invitationMessageType == InvitationMessageType.ERROR) {
+        invitationsHandler.deleteInvitation(invitation.id);
+      }
     });
   }
 
@@ -99,5 +112,6 @@ class AppData {
     await usersHandler.deleteAll();
     await messagesHandler.deleteAll();
     await contactsHandler.deleteAll();
+    invitationsHandler.deleteAll();
   }
 }

lib/abstraction/ChatEventsSender.dart

@@ -8,4 +8,28 @@ class InvitationsHandler {
   Stream<int> getInvitationsCount() {
     return getInvitations().map((event) => event.length);
   }
+
+  Future addInvitationRequest(String id) async {
+    var user = await MyDatabase.instance()!.userDao.getUser();
+    if (user == null) {
+      return;
+    }
+    DbInvitation invitation = DbInvitation(
+        id: id,
+        fromId: user.id,
+        sendTime: DateTime.now().millisecondsSinceEpoch,
+        fromName: user.firstName + " " + user.lastName,
+        incoming: false,
+        status: "sent");
+    await MyDatabase.instance()!.invitationDao.addInvitation(invitation);
+  }
+  Future updateInvitationStatus(String id, String status){
+    return MyDatabase.instance()!.invitationDao.updateInvitationStatus(id, status);
+  }
+  void deleteInvitation(String id){
+    MyDatabase.instance()!.invitationDao.deleteInvitation(id);
+  }
+  void deleteAll(){
+    MyDatabase.instance()!.invitationDao.deleteAllInvitations();
+  }
 }

lib/abstraction/models/BaseMessage.dart

@@ -43,6 +43,8 @@ extension InvitationConversions on InvitationMessage {
         fromId: fromId!,
         fromName: fromName,
         fromAvatar: fromAvatar,
-        sendTime: sendTime);
+        sendTime: sendTime,
+        incoming: true,
+        status: "confirmed");
   }
 }

lib/abstraction/models/enums/MessageType.dart

@@ -15,4 +15,18 @@ class InvitationDao extends DatabaseAccessor<MyDatabase>
   Stream<List<DbInvitation>> getAllInvitations() {
     return select(invitations).watch();
   }
+
+  Future<int> updateInvitationStatus(String id, String status) {
+    return (update(invitations)..where((t) => t.id.equals(id))).write(
+      InvitationsCompanion(
+        status: Value(status),
+      ),
+    );
+  }
+  void deleteInvitation(String id){
+    (delete(invitations)..where((tbl) => tbl.id.equals(id))).go();
+  }
+  void deleteAllInvitations(){
+    (delete(invitations)).go();
+  }
 }