no connection error when sending messages while offline

Adamant-im · Dec 14, 2017 · 2488834 · 2488834
1 parent 9179a82
commit 2488834
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
@@ -97,7 +97,7 @@ export default {
       if (this.message) {
         var message = this.message
         var partner = this.$route.params.partner
-        this.encodeMessageForAddress(message, partner)
+        this.encodeMessageForAddress(message, partner, this)
         this.message = ''
         this.$refs.messageField.$el.value = ''
       }

diff --git a/src/i18n/en.js b/src/i18n/en.js
@@ -28,6 +28,7 @@ export default {
     'no_money': 'Not enough funds. Top up your balance.',
     'no_empty': 'Message can\'t be empty',
     'no_address': 'Please specify recipient address',
+    'no_connection': 'Connection problems',
     'too_long': 'Message is too long',
     'incorrect_address': 'Incorrect recipient address',
     'title': 'Chats',

diff --git a/src/i18n/ru.js b/src/i18n/ru.js
@@ -28,6 +28,7 @@ export default {
     'no_money': 'Недостаточно токенов. Пополните баланс.',
     'no_empty': 'Сообщение не может быть пустым',
     'no_address': 'Укажите адрес получателя сообщения',
+    'no_connection': 'Проблема с соединением',
     'too_long': 'Сообщение слишком длинное',
     'incorrect_address': 'Адрес получателя неверный',
     'title': 'Диалоги',

diff --git a/src/lib/adamantServerApi.js b/src/lib/adamantServerApi.js
@@ -167,7 +167,6 @@ function install (Vue) {
   }
   Vue.prototype.getAddressPublicKey = function (recipientAddress) {
     if (window.pk_cache[recipientAddress]) {
-      // return Promise.resolve(window.pk_cache[recipientAddress])
       return window.pk_cache[recipientAddress]
     }
     return this.$http.get(this.getAddressString() + '/api/accounts/getPublicKey?address=' + recipientAddress).then(response => {
@@ -179,8 +178,7 @@ function install (Vue) {
       // error callback
     })
   }
-  Vue.prototype.encodeMessageForAddress = function (msg, recipientAddress) {
-    // recipientAddress = 'U14345892393468009728'
+  Vue.prototype.encodeMessageForAddress = function (msg, recipientAddress, caller) {
     this.$http.get(this.getAddressString() + '/api/accounts/getPublicKey?address=' + recipientAddress).then(response => {
       if (response.body.success) {
         var msgObject = this.encodeMessage(msg, response.body.publicKey)
@@ -189,6 +187,10 @@ function install (Vue) {
         this.sendMessage(msgObject, recipientAddress)
       }
     }, response => {
+      if (caller) {
+        caller.message = msg
+        caller.errorMessage('no_connection')
+      }
       // error callback
     })
   }