From 46bace97cf77acb62e5913e9a06e7915ea079bda Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Fri, 2 Feb 2018 19:08:50 +0300
Subject: [PATCH] FB11844 - Disable Preview enabled some time after unchecking
 the Display >Disable Preview option.

---
 scripts/system/commerce/wallet.js           | 15 +++--------
 scripts/system/marketplaces/marketplaces.js | 28 +++++++++++++++++----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 46672a3f66..6c3a0a5488 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -561,14 +561,9 @@
                 openLoginWindow();
                 break;
             case 'disableHmdPreview':
-                isHmdPreviewDisabled = Menu.isOptionChecked("Disable Preview");
-                DesktopPreviewProvider.setPreviewDisabledReason("SECURE_SCREEN");
-                Menu.setIsOptionChecked("Disable Preview", true);
-                break;
+                break; // do nothing here, handled in marketplaces.js
             case 'maybeEnableHmdPreview':
-                DesktopPreviewProvider.setPreviewDisabledReason("USER");
-                Menu.setIsOptionChecked("Disable Preview", isHmdPreviewDisabled);
-                break;
+                break; // do nothing here, handled in marketplaces.js
             case 'passphraseReset':
                 onButtonClicked();
                 onButtonClicked();
@@ -643,11 +638,7 @@
     //   -Called when the TabletScriptingInterface::screenChanged() signal is emitted. The "type" argument can be either the string
     //    value of "Home", "Web", "Menu", "QML", or "Closed". The "url" argument is only valid for Web and QML.
     function onTabletScreenChanged(type, url) {
-        var onWalletScreenNow = (type === "QML" && url === WALLET_QML_SOURCE);
-        if (!onWalletScreenNow && onWalletScreen) {
-            DesktopPreviewProvider.setPreviewDisabledReason("USER");
-        }
-        onWalletScreen = onWalletScreenNow;
+        onWalletScreen = (type === "QML" && url === WALLET_QML_SOURCE);
         wireEventBridge(onWalletScreen);
         // Change button to active when window is first openend, false otherwise.
         if (button) {
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index ee3a9ce7ec..a5ff9b79e4 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -114,9 +114,19 @@ var selectionDisplay = null; // for gridTool.js to ignore
     var filterText; // Used for updating Purchases QML
     function onScreenChanged(type, url) {
         onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1;
-        onWalletScreen = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
+        var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
         onCommerceScreen = type === "QML" && (url.indexOf(MARKETPLACE_CHECKOUT_QML_PATH) !== -1 || url === MARKETPLACE_PURCHASES_QML_PATH
             || url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1);
+
+        if (!onWalletScreenNow && onWalletScreen) { // exiting wallet screen
+            if (isHmdPreviewDisabledBySecurity) {
+                DesktopPreviewProvider.setPreviewDisabledReason("USER");
+                Menu.setIsOptionChecked("Disable Preview", false);
+                isHmdPreviewDisabledBySecurity = false;
+            }
+        }
+
+        onWalletScreen = onWalletScreenNow;
         wireEventBridge(onMarketplaceScreen || onCommerceScreen || onWalletScreen);
 
         if (url === MARKETPLACE_PURCHASES_QML_PATH) {
@@ -480,7 +490,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
     // Description:
     //   -Called when a message is received from Checkout.qml. The "message" argument is what is sent from the Checkout QML
     //    in the format "{method, params}", like json-rpc.
-    var isHmdPreviewDisabled = true;
+    var isHmdPreviewDisabledBySecurity = false;
     function fromQml(message) {
         switch (message.method) {
             case 'purchases_openWallet':
@@ -548,11 +558,19 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 openLoginWindow();
                 break;
             case 'disableHmdPreview':
-                isHmdPreviewDisabled = Menu.isOptionChecked("Disable Preview");
-                Menu.setIsOptionChecked("Disable Preview", true);
+                var isHmdPreviewDisabled = Menu.isOptionChecked("Disable Preview");
+                if (!isHmdPreviewDisabled) {
+                    DesktopPreviewProvider.setPreviewDisabledReason("SECURE_SCREEN");
+                    Menu.setIsOptionChecked("Disable Preview", true);
+                    isHmdPreviewDisabledBySecurity = true;
+                }
                 break;
             case 'maybeEnableHmdPreview':
-                Menu.setIsOptionChecked("Disable Preview", isHmdPreviewDisabled);
+                if (isHmdPreviewDisabledBySecurity) {
+                    DesktopPreviewProvider.setPreviewDisabledReason("USER");
+                    Menu.setIsOptionChecked("Disable Preview", false);
+                    isHmdPreviewDisabledBySecurity = false;
+                }
                 break;
             case 'purchases_openGoTo':
                 tablet.loadQMLSource("hifi/tablet/TabletAddressDialog.qml");