From cc85de52506a56d92c618f2a511c26604b6ce634 Mon Sep 17 00:00:00 2001
From: Mikunj Varsani <mikunj@live.com.au>
Date: Tue, 11 Feb 2020 11:31:05 +1100
Subject: [PATCH] Optimisation and lint fixes
---
js/models/conversations.js | 6 +++++-
ts/components/EditProfileDialog.tsx | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 3abcecb58..7471c5798 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -205,10 +205,14 @@
return this.id === window.storage.get('primaryDevicePubKey');
},
async isOurDevice() {
+ if (this.isMe()) {
+ return true;
+ }
+
const ourDevices = await window.libloki.storage.getPairedDevicesFor(
this.ourNumber
);
- return this.isOurLocalDevice() || ourDevices.includes(this.id);
+ return ourDevices.includes(this.id);
},
isOurLocalDevice() {
return this.id === this.ourNumber;
diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx
index caddc5c55..1a560dfc7 100644
--- a/ts/components/EditProfileDialog.tsx
+++ b/ts/components/EditProfileDialog.tsx
@@ -71,9 +71,12 @@ export class EditProfileDialog extends React.Component<Props, State> {
const viewDefault = this.state.mode === 'default';
const viewEdit = this.state.mode === 'edit';
const viewQR = this.state.mode === 'qr';
+
+ /* tslint:disable:no-backbone-get-set-outside-model */
const sessionID =
- window.storage.get('primaryDevicePubKey') ||
+ window.textsecure.storage.get('primaryDevicePubKey') ||
window.textsecure.storage.user.getNumber();
+ /* tslint:enable:no-backbone-get-set-outside-model */
const backButton =
viewEdit || viewQR