From 924c51d5c72885067d7cdd77eaf2667cc84d1b2f Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Mon, 14 Jan 2019 15:39:42 +1100
Subject: [PATCH] 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');