Merge pull request #167 from BeaudanBrown/p2p-fixes

P2p logic fixes

js/modules/loki_p2p_api.js

@@ -8,7 +8,7 @@ class LokiP2pAPI extends EventEmitter {
     this.contactP2pDetails = {};
   }
 
-  addContactP2pDetails(pubKey, address, port, resetTimer = false) {
+  updateContactP2pDetails(pubKey, address, port, fromP2p = false) {
     // Stagger the timers so the friends don't ping each other at the same time
     this.ourKey = this.ourKey || window.textsecure.storage.user.getNumber();
     const timerDuration =
@@ -16,12 +16,10 @@ class LokiP2pAPI extends EventEmitter {
         ? 60 * 1000 // 1 minute
         : 2 * 60 * 1000; // 2 minutes
 
-    if (
+    if (this.contactP2pDetails[pubKey]) {
-      this.contactP2pDetails[pubKey] &&
-      this.contactP2pDetails[pubKey].pingTimer
-    ) {
       clearTimeout(this.contactP2pDetails[pubKey].pingTimer);
     }
+
     this.contactP2pDetails[pubKey] = {
       address,
       port,
@@ -29,16 +27,12 @@ class LokiP2pAPI extends EventEmitter {
       isOnline: false,
       pingTimer: null,
     };
-    if (resetTimer) {
+
-      // If this contact is simply sharing the same details with us
+    if (fromP2p) {
-      // then we just reset our timer
+      this.setContactOnline(pubKey);
-      this.contactP2pDetails[pubKey].pingTimer = setTimeout(
-        this.pingContact.bind(this),
-        this.contactP2pDetails[pubKey].timerDuration,
-        pubKey
-      );
       return;
     }
+
     this.pingContact(pubKey);
   }
 

libtextsecure/message_receiver.js

@@ -908,7 +908,7 @@ MessageReceiver.prototype.extend({
   },
   async handleLokiAddressMessage(envelope, lokiAddressMessage) {
     const { p2pAddress, p2pPort } = lokiAddressMessage;
-    lokiP2pAPI.addContactP2pDetails(
+    lokiP2pAPI.updateContactP2pDetails(
       envelope.source,
       p2pAddress,
       p2pPort,