Fix attempt for issue signalapp#3728

NFM-8 · Nov 9, 2019 · 8b1e197 · 8b1e197
1 parent 483b2b3
commit 8b1e197
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/js/modules/web_api.js b/js/modules/web_api.js
@@ -466,6 +466,7 @@ function initialize({
       sendMessagesUnauth,
       setSignedPreKey,
       updateDeviceName,
+      unlinkDevice,
     };
 
     function _ajax(param) {
@@ -670,6 +671,14 @@ function initialize({
       });
     }
 
+    function unlinkDevice(deviceId) {
+      return _ajax({
+        call: 'devices',
+        httpType: 'DELETE',
+        urlParameters: "/" + deviceId
+      });
+    }
+
     function registerKeys(genKeys) {
       const keys = {};
       keys.identityKey = _btoa(_getString(genKeys.identityKey));

diff --git a/js/views/clear_data_view.js b/js/views/clear_data_view.js
@@ -49,6 +49,14 @@
           error && error.stack ? error.stack : error
         );
       }
+      try {
+        const deviceId = parseInt(textsecure.storage.user.getDeviceId(), 10);
+        await textsecure.messaging.unlinkDevice(deviceId);
+      } catch (error) {
+        window.log.error('Failed to unlink device:',
+        error && error.stack ? error.stack : error
+        );
+      }
       window.restart();
     },
     render_attributes() {

diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
@@ -556,6 +556,10 @@ MessageSender.prototype = {
     return this.server.getStickerPackManifest(packId);
   },
 
+  unlinkDevice(deviceId) {
+    return this.server.unlinkDevice(deviceId);
+  },
+
   sendRequestConfigurationSyncMessage(options) {
     const myNumber = textsecure.storage.user.getNumber();
     const myDevice = textsecure.storage.user.getDeviceId();
@@ -1261,6 +1265,7 @@ textsecure.MessageSender = function MessageSenderWrapper(username, password) {
   this.getStickerPackManifest = sender.getStickerPackManifest.bind(sender);
   this.sendStickerPackSync = sender.sendStickerPackSync.bind(sender);
   this.syncViewOnceOpen = sender.syncViewOnceOpen.bind(sender);
+  this.unlinkDevice = sender.unlinkDevice.bind(sender);
 };
 
 textsecure.MessageSender.prototype = {