From 13a7f60d675c94527ca9d24488389ad74823fe9d Mon Sep 17 00:00:00 2001
From: "Aamir.Muhammad" <aamir.muhammad@cloudsolutions.com.sa>
Date: Mon, 5 Dec 2022 11:59:23 +0300
Subject: [PATCH] Chat Fixes & User Chat Counter

---
 lib/classes/encryption.dart           | 16 +++++++---------
 lib/provider/chat_provider_model.dart |  4 +---
 lib/ui/chat/chat_detailed_screen.dart |  1 -
 lib/ui/chat/chat_home.dart            |  4 +++-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/classes/encryption.dart b/lib/classes/encryption.dart
index f26c92b..a4ab6be 100644
--- a/lib/classes/encryption.dart
+++ b/lib/classes/encryption.dart
@@ -2,27 +2,25 @@ import 'dart:convert';
 
 import 'package:flutter/services.dart';
 
-class Encryption {
-  static final Encryption _instance = Encryption._internal();
+class EmailImageEncryption {
+  static final EmailImageEncryption _instance = EmailImageEncryption._internal();
   static const MethodChannel _channel = MethodChannel('flutter_des');
   static const key = "PeShVmYp";
   static const iv = "j70IbWYn";
 
-  Encryption._internal();
+  EmailImageEncryption._internal();
 
-  factory Encryption() => _instance;
+  factory EmailImageEncryption() => _instance;
 
   Future<String> encrypt({required String val}) async {
     Uint8List? crypt = await _channel.invokeMethod('encrypt', [val, key, iv]);
-    String data = base64Encode(crypt!.toList());
-    print("Base64Enc: " + data);
-    return data;
+    String enc = base64Encode(crypt!.toList());
+    return enc;
   }
 
   Future<String> decrypt({required String encodedVal}) async {
-    var deco = base64Decode(encodedVal);
+    Uint8List deco = base64Decode(encodedVal);
     String? decCrypt = await _channel.invokeMethod('decrypt', [deco, key, iv]);
-    print("Base64ToStringDec: " + decCrypt!);
     return decCrypt!;
   }
 }
diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart
index c56241f..535dc2e 100644
--- a/lib/provider/chat_provider_model.dart
+++ b/lib/provider/chat_provider_model.dart
@@ -460,7 +460,6 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       print("Normal Attachment Msg");
       Utils.showLoading(context);
       dynamic value = await uploadAttachments(AppState().chatDetails!.response!.id.toString(), selectedFile);
-      logger.d(value);
       String? ext = getFileExtension(selectedFile.path);
       Utils.hideLoading(context);
       sendChatToServer(
@@ -703,8 +702,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
   void getUserImages() async {
     List<String> emails = [];
     for (ChatUser element in searchedChats!) {
-      var encMail = await Encryption().encrypt(val: element.email!);
-      emails.add(encMail);
+      emails.add(await EmailImageEncryption().encrypt(val: element.email!));
     }
     List<ChatUserImageModel> chatImages = await ChatApiClient().getUsersImages(encryptedEmails: emails);
     for (ChatUser user in searchedChats!) {
diff --git a/lib/ui/chat/chat_detailed_screen.dart b/lib/ui/chat/chat_detailed_screen.dart
index 6f9e4cf..345884f 100644
--- a/lib/ui/chat/chat_detailed_screen.dart
+++ b/lib/ui/chat/chat_detailed_screen.dart
@@ -68,7 +68,6 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
         isNewChat: userDetails["isNewChat"],
       );
     }
-    print("Img: "+ userDetails["targetUser"].image);
 
     return Scaffold(
       backgroundColor: MyColors.backgroundColor,
diff --git a/lib/ui/chat/chat_home.dart b/lib/ui/chat/chat_home.dart
index 1ae3252..0438dc6 100644
--- a/lib/ui/chat/chat_home.dart
+++ b/lib/ui/chat/chat_home.dart
@@ -28,7 +28,9 @@ class _ChatHomeState extends State<ChatHome> {
     super.initState();
     data = Provider.of<ChatProviderModel>(context, listen: false);
     data.registerEvents();
-    data.getUserRecentChats();
+    if (data.searchedChats == null || data.searchedChats!.isEmpty) {
+      data.getUserRecentChats();
+    }
   }
 
   @override