From c1765c857e5db05dd95a953ab2953eb64e3ccb92 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Fri, 2 Oct 2020 17:43:49 -0400
Subject: [PATCH] apply changes from review

---
 src/Lifecycle.js         | 2 +-
 src/settings/Settings.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index dba9dd7d65..dc04e47535 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -473,7 +473,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
     MatrixClientPeg.replaceUsingCreds(credentials);
     const client = MatrixClientPeg.get();
 
-    if (credentials.freshLogin) {
+    if (credentials.freshLogin && SettingsStore.getValue("feature_dehydration")) {
         // If we just logged in, try to rehydrate a device instead of using a
         // new device.  If it succeeds, we'll get a new device ID, so make sure
         // we persist that ID to localStorage
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index a94ad24256..8b96a2e819 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -188,7 +188,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "feature_dehydration": {
         isFeature: true,
-        displayName: _td("Offline encrypted messaging using dehydrated devices."),
+        displayName: _td("Offline encrypted messaging using dehydrated devices"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },