From 87113b6cc1263037b263f30541ebc0b8039f614a Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 11 Jan 2019 15:34:22 +1100 Subject: [PATCH 1/6] Added message ttl setting storage --- js/background.js | 16 ++++++++++++++++ js/settings_start.js | 1 + main.js | 3 +++ preload.js | 10 ++++++++++ settings_preload.js | 3 +++ 5 files changed, 33 insertions(+) diff --git a/js/background.js b/js/background.js index e53e79d5b..43fe75458 100644 --- a/js/background.js +++ b/js/background.js @@ -221,6 +221,10 @@ } first = false; + // The min and max message ttl value + const MIN_MESSAGE_TTL = 12; + const MAX_MESSAGE_TTL = 96; + // These make key operations available to IPC handlers created in preload.js window.Events = { getDeviceName: () => textsecure.storage.user.getDeviceName(), @@ -237,6 +241,18 @@ window.setMenuBarVisibility(!value); }, + getMessageTTL: () => { + // Make sure the ttl is between a given range + const current = storage.get('message-ttl', 24); + return Math.max(MIN_MESSAGE_TTL, Math.min(current, MAX_MESSAGE_TTL)); + }, + setMessageTTL: value => { + // Make sure the ttl is between a given range and is valid + const ttl = (typeof value !== 'number') ? 24 : value; + const current = Math.max(MIN_MESSAGE_TTL, Math.min(ttl, MAX_MESSAGE_TTL)); + storage.put('message-ttl', current); + }, + getReadReceiptSetting: () => storage.get('read-receipt-setting'), setReadReceiptSetting: value => diff --git a/js/settings_start.js b/js/settings_start.js index 01c47aa5c..02b842456 100644 --- a/js/settings_start.js +++ b/js/settings_start.js @@ -18,6 +18,7 @@ const getInitialData = async () => ({ themeSetting: await window.getThemeSetting(), hideMenuBar: await window.getHideMenuBar(), + messageTTL: await window.getMessageTTL(), readReceiptSetting: await window.getReadReceiptSetting(), notificationSetting: await window.getNotificationSetting(), audioNotification: await window.getAudioNotification(), diff --git a/main.js b/main.js index 5c26db5fe..c29c01ca5 100644 --- a/main.js +++ b/main.js @@ -1053,6 +1053,9 @@ installSettingsSetter('theme-setting'); installSettingsGetter('hide-menu-bar'); installSettingsSetter('hide-menu-bar'); +installSettingsGetter('message-ttl'); +installSettingsSetter('message-ttl'); + installSettingsGetter('read-receipt-setting'); installSettingsSetter('read-receipt-setting'); installSettingsGetter('notification-setting'); diff --git a/preload.js b/preload.js index e6942138a..36d8ebcac 100644 --- a/preload.js +++ b/preload.js @@ -154,6 +154,16 @@ installSetter('theme-setting', 'setThemeSetting'); installGetter('hide-menu-bar', 'getHideMenuBar'); installSetter('hide-menu-bar', 'setHideMenuBar'); +// Get the message TTL setting +window.getMessageTTL = () => { + if (window.Events.getMessageTTL) { + return window.Events.getMessageTTL(); + } + return null; +} +installGetter('message-ttl', 'getMessageTTL'); +installSetter('message-ttl', 'setMessageTTL'); + installGetter('read-receipt-setting', 'getReadReceiptSetting'); installSetter('read-receipt-setting', 'setReadReceiptSetting'); installGetter('notification-setting', 'getNotificationSetting'); diff --git a/settings_preload.js b/settings_preload.js index 1e20e8717..d772fec4e 100644 --- a/settings_preload.js +++ b/settings_preload.js @@ -41,6 +41,9 @@ window.setHideMenuBar = makeSetter('hide-menu-bar'); window.getSpellCheck = makeGetter('spell-check'); window.setSpellCheck = makeSetter('spell-check'); +window.getMessageTTL = makeGetter('message-ttl'); +window.setMessageTTL = makeSetter('message-ttl'); + window.getReadReceiptSetting = makeGetter('read-receipt-setting'); window.setReadReceiptSetting = makeSetter('read-receipt-setting'); window.getNotificationSetting = makeGetter('notification-setting'); From 235dbb2176a63d1a36959ecac53c4978c8046ffc Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 11 Jan 2019 16:06:28 +1100 Subject: [PATCH 2/6] Added display of message ttl in settings. Fixed setting message ttl. --- _locales/en/messages.json | 8 ++++++++ js/background.js | 3 ++- js/views/settings_view.js | 26 ++++++++++++++++++++++++++ settings.html | 6 ++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 758adc1d5..339952e9d 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1079,6 +1079,14 @@ "message": "Enable the sending and receiving of read receipts", "description": "Description of the read receipts setting" }, + "messageTTL": { + "message": "Message TTL", + "description": "Title of the Message TTL setting" + }, + "messageTTLSettingDescription": { + "message": "Time to live in hours (min: 12, max: 96)", + "description": "Description of the time to live setting" + }, "notificationSettingsDialog": { "message": "When messages arrive, display notifications that reveal:", "description": "Explain the purpose of the notification settings" diff --git a/js/background.js b/js/background.js index 43fe75458..761419dd6 100644 --- a/js/background.js +++ b/js/background.js @@ -248,7 +248,8 @@ }, setMessageTTL: value => { // Make sure the ttl is between a given range and is valid - const ttl = (typeof value !== 'number') ? 24 : value; + const intValue = parseInt(value, 10); + const ttl = Number.isNaN(intValue) ? 24 : intValue; const current = Math.max(MIN_MESSAGE_TTL, Math.min(ttl, MAX_MESSAGE_TTL)); storage.put('message-ttl', current); }, diff --git a/js/views/settings_view.js b/js/views/settings_view.js index cc18b8b08..ee7e09783 100644 --- a/js/views/settings_view.js +++ b/js/views/settings_view.js @@ -50,6 +50,25 @@ }, }); + const MessageTTLSettingView = Whisper.View.extend({ + initialize(options) { + this.value = options.value; + this.setFn = options.setFn; + this.populate(); + }, + events: { + change: 'change', + }, + change(e) { + this.value = e.target.value; + this.setFn(this.value); + window.log.info('message-ttl-setting changed to', this.value); + }, + populate() { + this.$('input').val(this.value); + }, + }); + const ReadReceiptSettingView = Whisper.View.extend({ initialize(options) { this.value = options.value; @@ -141,6 +160,11 @@ value: window.initialData.readReceiptSetting, setFn: window.setReadReceiptSetting, }); + new MessageTTLSettingView({ + el: this.$('.message-ttl-setting'), + value: window.initialData.messageTTL, + setFn: window.setMessageTTL, + }); const blockedNumberView = new Whisper.BlockedNumberView().render(); this.$('.blocked-user-setting').append(blockedNumberView.el); @@ -176,6 +200,8 @@ permissions: i18n('permissions'), mediaPermissionsDescription: i18n('mediaPermissionsDescription'), readReceiptSettingDescription: i18n('readReceiptSettingDescription'), + messageTTL: i18n('messageTTL'), + messageTTLSettingDescription: i18n('messageTTLSettingDescription'), spellCheckHeader: i18n('spellCheck'), spellCheckDescription: i18n('spellCheckDescription'), blockedHeader: 'Blocked Users', diff --git a/settings.html b/settings.html index 96bbfb556..1c6866d3e 100644 --- a/settings.html +++ b/settings.html @@ -112,6 +112,12 @@
+
+

{{ messageTTL }}

+ + +
+

{{ clearDataHeader }}

From 8f1650443f3d5826be18c335ba0203cf3191e697 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 14 Jan 2019 09:56:16 +1100 Subject: [PATCH 3/6] Set custom TTL in outgoing message. --- libtextsecure/outgoing_message.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index 9ab24570c..79426037a 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -345,11 +345,11 @@ OutgoingMessage.prototype = { const outgoingObject = outgoingObjects[0]; const socketMessage = await this.wrapInWebsocketMessage(outgoingObject); let ttl; - // TODO: Allow user to set ttl manually if (outgoingObject.type === textsecure.protobuf.Envelope.Type.FRIEND_REQUEST) { ttl = 4 * 24 * 60 * 60; // 4 days for friend request message } else { - ttl = 24 * 60 * 60; // 1 day default for any other message + const hours = window.getMessageTTL() || 24; // 1 day default for any other message + ttl = hours * 60 * 60; } await this.transmitMessage(number, socketMessage, this.timestamp, ttl); this.successfulNumbers[this.successfulNumbers.length] = number; From 24455fc8b7a40c703a9a079f596a322e763fd9f3 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 14 Jan 2019 12:41:25 +1100 Subject: [PATCH 4/6] Updated TTL to use slider. --- _locales/en/messages.json | 6 +++++- js/views/settings_view.js | 6 ++++++ settings.html | 34 ++++++++++++++++++++++++++++++++-- stylesheets/_settings.scss | 16 ++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 339952e9d..2ad7cb905 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1084,9 +1084,13 @@ "description": "Title of the Message TTL setting" }, "messageTTLSettingDescription": { - "message": "Time to live in hours (min: 12, max: 96)", + "message": "Time to live (how long the recipient will have to collect their messages)", "description": "Description of the time to live setting" }, + "messageTTLSettingWarning": { + "message": "Warning! Lowering the TTL could result in messages being lost if the recipient doesn't collect them in time!", + "description": "Warning for the time to live setting" + }, "notificationSettingsDialog": { "message": "When messages arrive, display notifications that reveal:", "description": "Explain the purpose of the notification settings" diff --git a/js/views/settings_view.js b/js/views/settings_view.js index ee7e09783..323ebba89 100644 --- a/js/views/settings_view.js +++ b/js/views/settings_view.js @@ -58,12 +58,17 @@ }, events: { change: 'change', + input: 'input', }, change(e) { this.value = e.target.value; this.setFn(this.value); window.log.info('message-ttl-setting changed to', this.value); }, + input(e) { + this.value = e.target.value; + this.$('label').html(`${this.value} Hours`); + }, populate() { this.$('input').val(this.value); }, @@ -202,6 +207,7 @@ readReceiptSettingDescription: i18n('readReceiptSettingDescription'), messageTTL: i18n('messageTTL'), messageTTLSettingDescription: i18n('messageTTLSettingDescription'), + messageTTLSettingWarning: i18n('messageTTLSettingWarning'), spellCheckHeader: i18n('spellCheck'), spellCheckDescription: i18n('spellCheckDescription'), blockedHeader: 'Blocked Users', diff --git a/settings.html b/settings.html index 1c6866d3e..209b180fa 100644 --- a/settings.html +++ b/settings.html @@ -114,8 +114,38 @@

{{ messageTTL }}

- - +
{{ messageTTLSettingDescription }}
+
{{ messageTTLSettingWarning }}
+
+ + + + +
diff --git a/stylesheets/_settings.scss b/stylesheets/_settings.scss index 973b7f90b..f8d55493a 100644 --- a/stylesheets/_settings.scss +++ b/stylesheets/_settings.scss @@ -90,4 +90,20 @@ color: white; } } + + .message-ttl-setting { + .inputs { + display: flex; + padding-top: 18px; + } + + #warning { + padding-top: 12px; + font-weight: 300; + color: red; + } + + input { flex: 1; } + label { padding-left: 12px; } + } } From 924c51d5c72885067d7cdd77eaf2667cc84d1b2f Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 14 Jan 2019 15:39:42 +1100 Subject: [PATCH 5/6] Removed min and max clamping in code. This should be done UI and Server side instead. --- js/background.js | 13 ++----------- preload.js | 7 +------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/js/background.js b/js/background.js index 761419dd6..e34d8a4b7 100644 --- a/js/background.js +++ b/js/background.js @@ -221,10 +221,6 @@ } first = false; - // The min and max message ttl value - const MIN_MESSAGE_TTL = 12; - const MAX_MESSAGE_TTL = 96; - // These make key operations available to IPC handlers created in preload.js window.Events = { getDeviceName: () => textsecure.storage.user.getDeviceName(), @@ -241,17 +237,12 @@ window.setMenuBarVisibility(!value); }, - getMessageTTL: () => { - // Make sure the ttl is between a given range - const current = storage.get('message-ttl', 24); - return Math.max(MIN_MESSAGE_TTL, Math.min(current, MAX_MESSAGE_TTL)); - }, + getMessageTTL: () => storage.get('message-ttl', 24), setMessageTTL: value => { // Make sure the ttl is between a given range and is valid const intValue = parseInt(value, 10); const ttl = Number.isNaN(intValue) ? 24 : intValue; - const current = Math.max(MIN_MESSAGE_TTL, Math.min(ttl, MAX_MESSAGE_TTL)); - storage.put('message-ttl', current); + storage.put('message-ttl', ttl); }, getReadReceiptSetting: () => diff --git a/preload.js b/preload.js index 36d8ebcac..189f41cd3 100644 --- a/preload.js +++ b/preload.js @@ -155,12 +155,7 @@ installGetter('hide-menu-bar', 'getHideMenuBar'); installSetter('hide-menu-bar', 'setHideMenuBar'); // Get the message TTL setting -window.getMessageTTL = () => { - if (window.Events.getMessageTTL) { - return window.Events.getMessageTTL(); - } - return null; -} +window.getMessageTTL = () => window.storage.get('message-ttl', 24) installGetter('message-ttl', 'getMessageTTL'); installSetter('message-ttl', 'setMessageTTL'); From d626344ae1cd25ef9bfe94b9700dc503dd06eac4 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 14 Jan 2019 15:42:24 +1100 Subject: [PATCH 6/6] Fix double quotes. --- settings.html | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/settings.html b/settings.html index 209b180fa..db6c57fbd 100644 --- a/settings.html +++ b/settings.html @@ -115,35 +115,35 @@

{{ messageTTL }}

{{ messageTTLSettingDescription }}
-
{{ messageTTLSettingWarning }}
+
{{ messageTTLSettingWarning }}
- -