From 202f6fb94d91a42d864431176984b4e6c6294a81 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 17 Jul 2019 14:48:14 +0100
Subject: [PATCH] Continue to next config level after device for features

This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
---
 src/settings/handlers/DeviceSettingsHandler.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index b5c4382768..780815efd1 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -122,7 +122,10 @@ export default class DeviceSettingsHandler extends SettingsHandler {
         }
 
         const value = localStorage.getItem("mx_labs_feature_" + featureName);
-        return value === "true";
+        if (value === "true") return true;
+        if (value === "false") return false;
+        // Try to read the next config level for the feature.
+        return null;
     }
 
     _writeFeature(featureName, enabled) {