Merge pull request #373 from msgmaxim/timestamp-error

Show correct error on incorrect timestamp

js/modules/loki_message_api.js

@@ -240,6 +240,9 @@ class LokiMessageAPI {
           throw e;
         } else if (e instanceof textsecure.NotFoundError) {
           // TODO: Handle resolution error
+        } else if (e instanceof textsecure.TimestampError) {
+          log.warn('Timestamp is invalid');
+          throw e;
         } else if (e instanceof textsecure.HTTPError) {
           // TODO: Handle working connection but error response
           const body = await e.response.text();

js/modules/loki_rpc.js

@@ -77,6 +77,12 @@ const fetch = async (url, options = {}) => {
       throw new textsecure.WrongDifficultyError(difficulty);
     }
 
+    if (response.status === 406) {
+      throw new textsecure.TimestampError(
+        'Invalid Timestamp (check your clock)'
+      );
+    }
+
     if (!response.ok) {
       throw new textsecure.HTTPError('Loki_rpc error', response);
     }

libtextsecure/errors.js

@@ -263,6 +263,16 @@
     }
   }
 
+  function TimestampError(message) {
+    this.name = 'TimeStampError';
+
+    ReplayableError.call(this, {
+      name: 'TimestampError',
+      message,
+    });
+  }
+  inherit(ReplayableError, TimestampError);
+
   window.textsecure.UnregisteredUserError = UnregisteredUserError;
   window.textsecure.SendMessageNetworkError = SendMessageNetworkError;
   window.textsecure.IncomingIdentityKeyError = IncomingIdentityKeyError;
@@ -281,4 +291,5 @@
   window.textsecure.NotFoundError = NotFoundError;
   window.textsecure.WrongSwarmError = WrongSwarmError;
   window.textsecure.WrongDifficultyError = WrongDifficultyError;
+  window.textsecure.TimestampError = TimestampError;
 })();