Fixed bug with empty chats

Arquisoft · Apr 3, 2019 · 9c2f723 · 9c2f723
1 parent 12951c8
commit 9c2f723
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/lib/commprivate.js b/lib/commprivate.js
@@ -54,7 +54,7 @@ class PrivateCommunication {
 	     messages.push(new Message(sender,dateTime,message));
      }
      myMsgRead = true;
-    }, err => {if(!testing){$("#addOurMessages").empty()}});
+    }, err => {if(!testing){}});
 
     fc.readFile(fileWithMessagesSentByTheOtherUSer).then(  body => {
      var res = body.split("\n\n\n");
@@ -86,7 +86,9 @@ class PrivateCommunication {
      }else {
        this.orderAndShow(messages, me,testing);
      }
-    }, err => {if(!testing){$("#addOurMessages").empty()}}  );
+    }, err => {if(!testing){
+                  var that = this;
+                  setTimeout(function(){that.orderAndShow(messages, me,testing);}, 500);}}  );
   }
 
   orderAndShow(messages, me,testing){
@@ -97,23 +99,27 @@ class PrivateCommunication {
       return new Date(b.dateTime) - new Date(a.dateTime);
     });
     if(!testing){
-		console.log(messages);
-		$("#addMessages").empty();
+	  	console.log(messages);	
+    }
+    this.showMessages(messages,me,testing);
+  }
+
+  showMessages(messages, me,testing){
+    $("#addMessages").empty();
 		$("#addOurMessages").empty();
 		$("#addOtherMessages").empty();
-	}
     for ( var i=messages.length-1; i>=0; i--){
       var mesg = messages[i].content;
       var mesgToAdd = "";
-	  var year = messages[i].dateTime.split("-")[0];
-	  var month = messages[i].dateTime.split("-")[1];
-	  var day = messages[i].dateTime.split("-")[2].split("T")[0];
-	  var hourMinute = messages[i].dateTime.split("T")[1];
-	  var hour = hourMinute.split(":")[0];
-	  var minute = hourMinute.split(":")[1];
-	  var dateToAdd = year + "-" + month + "-" + day + " - " + hour + ":" + minute;;
+	    var year = messages[i].dateTime.split("-")[0];
+	    var month = messages[i].dateTime.split("-")[1];
+	    var day = messages[i].dateTime.split("-")[2].split("T")[0];
+	    var hourMinute = messages[i].dateTime.split("T")[1];
+	    var hour = hourMinute.split(":")[0];
+	    var minute = hourMinute.split(":")[1];
+	    var dateToAdd = year + "-" + month + "-" + day + " - " + hour + ":" + minute;;
       var format = mesg.split(".");
-	  console.log(dateToAdd);
+	    console.log(dateToAdd);
       if (format[format.length-1] == "jpg" || format[format.length-1] == "gif" || format[format.length-1] == "png"){
         mesgToAdd = "<p><img src='" + mesg + "'></p>";
       }else{