From bf4954d6675a1cf8ac0e1d4c28af376db85562da Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 11 Jul 2018 15:27:43 -0700
Subject: [PATCH] Fix MS16615: Don't early-remove .app.json we JUST installed

---
 .../qml/hifi/commerce/checkout/Checkout.qml   |  2 +-
 .../hifi/commerce/purchases/PurchasedItem.qml |  4 ++--
 .../qml/hifi/commerce/purchases/Purchases.qml |  2 +-
 interface/src/commerce/QmlCommerce.cpp        | 20 ++++++++++++++++---
 interface/src/commerce/QmlCommerce.h          |  6 +++---
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 653d814020..cac62d3976 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -129,7 +129,7 @@ Rectangle {
         }
 
         onAppInstalled: {
-            if (appHref === root.itemHref) {
+            if (appID === root.itemId) {
                 root.isInstalled = true;
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 9f1d307f0e..0a69b8b3b5 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -67,13 +67,13 @@ Item {
         }
 
         onAppInstalled: {
-            if (appHref === root.itemHref) {
+            if (appID === root.itemId) {
                 root.isInstalled = true;
             }
         }
 
         onAppUninstalled: {
-            if (appHref === root.itemHref) {
+            if (appID === root.itemId) {
                 root.isInstalled = false;
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 8a5b1fb0e7..16ad01a56d 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -98,7 +98,7 @@ Rectangle {
         }
 
         onAppInstalled: {
-            root.installedApps = Commerce.getInstalledApps();
+            root.installedApps = Commerce.getInstalledApps(appID);
         }
 
         onAppUninstalled: {
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index b960c0b703..1f44343bdc 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -208,7 +208,7 @@ void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
     ledger->alreadyOwned(marketplaceId);
 }
 
-QString QmlCommerce::getInstalledApps() {
+QString QmlCommerce::getInstalledApps(const QString& justInstalledAppID) {
     QString installedAppsFromMarketplace;
     QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
 
@@ -217,6 +217,18 @@ QString QmlCommerce::getInstalledApps() {
     foreach(QString appFileName, apps) {
         installedAppsFromMarketplace += appFileName;
         installedAppsFromMarketplace += ",";
+
+        // If we were supplied a "justInstalledAppID" argument, that means we're entering this function
+        // to get the new list of installed apps immediately after installing an app.
+        // In that case, the app we installed may not yet have its associated script running -
+        // that task is asynchronous and takes a nonzero amount of time. This is especially true
+        // for apps that are not in Interface's script cache.
+        // Thus, we protect against deleting the .app.json from the user's disk (below)
+        // by skipping that check for the app we just installed.
+        if ((justInstalledAppID != "") && ((justInstalledAppID + ".app.json") == appFileName)) {
+            continue;
+        }
+
         QFile appFile(_appsPath + appFileName);
         if (appFile.open(QIODevice::ReadOnly)) {
             QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(appFile.readAll());
@@ -291,7 +303,8 @@ bool QmlCommerce::installApp(const QString& itemHref) {
             return false;
         }
 
-        emit appInstalled(itemHref);
+        QFileInfo appFileInfo(appFile);
+        emit appInstalled(appFileInfo.baseName());
         return true;
     });
     request->send();
@@ -321,7 +334,8 @@ bool QmlCommerce::uninstallApp(const QString& itemHref) {
         qCWarning(commerce) << "Couldn't delete local .app.json file during app uninstall. Continuing anyway. App filename is:" << appHref.fileName();
     }
 
-    emit appUninstalled(itemHref);
+    QFileInfo appFileInfo(appFile);
+    emit appUninstalled(appFileInfo.baseName());
     return true;
 }
 
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index a0c6916799..79d8e82e71 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -53,8 +53,8 @@ signals:
 
     void contentSetChanged(const QString& contentSetHref);
 
-    void appInstalled(const QString& appHref);
-    void appUninstalled(const QString& appHref);
+    void appInstalled(const QString& appID);
+    void appUninstalled(const QString& appID);
 
 protected:
     Q_INVOKABLE void getWalletStatus();
@@ -86,7 +86,7 @@ protected:
 
     Q_INVOKABLE void replaceContentSet(const QString& itemHref, const QString& certificateID);
 
-    Q_INVOKABLE QString getInstalledApps();
+    Q_INVOKABLE QString getInstalledApps(const QString& justInstalledAppID = "");
     Q_INVOKABLE bool installApp(const QString& appHref);
     Q_INVOKABLE bool uninstallApp(const QString& appHref);
     Q_INVOKABLE bool openApp(const QString& appHref);