Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13603 from zfox23/MS16701_uninstallFirst

Browse source 
Fix MS16701: Uninstall installed app before updating
This commit is contained in:
Zach Fox 2018-07-13 10:18:16 -07:00 committed by GitHub
commit 5e2074c06a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -328,7 +328,15 @@ Item {
item.buttonColor = "#E2334D"; item.buttonColor = "#E2334D";
item.buttonClicked = function() { item.buttonClicked = function() {
sendToPurchases({ method: 'flipCard', closeAll: true }); sendToPurchases({ method: 'flipCard', closeAll: true });
sendToPurchases({method: 'updateItemClicked', itemId: root.itemId, itemEdition: root.itemEdition, upgradeUrl: root.upgradeUrl}); sendToPurchases({
method: 'updateItemClicked',
itemId: root.itemId,
itemEdition: root.itemEdition,
upgradeUrl: root.upgradeUrl,
itemHref: root.itemHref,
itemType: root.itemType,
isInstalled: root.isInstalled
});
} }
} }
} }

16
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -706,7 +706,23 @@ Rectangle {
} }
} }
} else if (msg.method === "updateItemClicked") { } else if (msg.method === "updateItemClicked") {
if (msg.itemType === "app" && msg.isInstalled) {
lightboxPopup.titleText = "Uninstall App";
lightboxPopup.bodyText = "The app that you are trying to update is installed.<br><br>" +
"If you proceed, the current version of the app will be uninstalled.";
lightboxPopup.button1text = "CANCEL";
lightboxPopup.button1method = function() {
lightboxPopup.visible = false;
}
lightboxPopup.button2text = "CONFIRM";
lightboxPopup.button2method = function() {
Commerce.uninstallApp(msg.itemHref);
sendToScript(msg); sendToScript(msg);
};
lightboxPopup.visible = true;
} else {
sendToScript(msg);
}
} else if (msg.method === "giftAsset") { } else if (msg.method === "giftAsset") {
sendAsset.assetName = msg.itemName; sendAsset.assetName = msg.itemName;
sendAsset.assetCertID = msg.certId; sendAsset.assetCertID = msg.certId;