diff options
| author | Aleksei Korkov <akorkov@luxoft.com> | 2020-02-03 14:42:19 +0300 |
|---|---|---|
| committer | Egor Nemtsev <enemtsev@luxoft.com> | 2020-02-05 11:18:53 +0000 |
| commit | 65e988f85a8e8e545e360c05356e8637b87dc7a0 (patch) | |
| tree | 937f5dbf2d91f1e7b1d3421e6b61669975a2bcc4 /apps | |
| parent | c1442f3cb64ecd6f15ed8bd3c275d967ad7debd5 (diff) | |
[downloads] Request for applications icon contains parameter 'architecture'
- deployment server requires active session with login phase to identify
architecture and return required icon of app. Qml Image doesn't share
session and it leads to empty icon for apps with defined architecture.
This patch sends request for applications icon with get-parameter 'architecture'.
This patch needs another patch https://codereview.qt-project.org/c/qt-apps/qtauto-deployment-server/+/288218
Task-number: AUTOSUITE-1370
Change-Id: I65f25e1bea1305cc0ae6888778725dc56bf96ac1
Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/com.pelagicore.downloads/controls/DownloadAppList.qml | 4 | ||||
| -rw-r--r-- | apps/com.pelagicore.downloads/stores/DownloadsStore.qml | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/apps/com.pelagicore.downloads/controls/DownloadAppList.qml b/apps/com.pelagicore.downloads/controls/DownloadAppList.qml index cef05a82..8d174c80 100644 --- a/apps/com.pelagicore.downloads/controls/DownloadAppList.qml +++ b/apps/com.pelagicore.downloads/controls/DownloadAppList.qml @@ -54,7 +54,9 @@ ListView { width: Sizes.dp(720) height: Sizes.dp(100) - icon.source: root.store.appServerUrl + "/app/icon?id=" + model.id + icon.source: root.store.appServerUrl + + "/app/icon?id=" + model.id + + "&architecture=" + store.cpuArch text: model.name subText: model.id secondaryText: delegatedItem.isInstalled ? root.store.getInstalledPackageSizeText(model.id) diff --git a/apps/com.pelagicore.downloads/stores/DownloadsStore.qml b/apps/com.pelagicore.downloads/stores/DownloadsStore.qml index ad609068..0a5717cb 100644 --- a/apps/com.pelagicore.downloads/stores/DownloadsStore.qml +++ b/apps/com.pelagicore.downloads/stores/DownloadsStore.qml @@ -45,6 +45,7 @@ Item { property alias categoryModel: catModel property alias appStoreConfig: appStoreConfig property string appServerUrl: appStoreConfig.serverUrl + property alias cpuArch: appStoreConfig.cpuArch property int categoryid: 0 property string filter: "" property real currentInstallationProgress: 0.0 @@ -82,7 +83,9 @@ Item { if (data !== 0) { if (data.status === "ok") { console.log(Logging.apps, "start downloading"); - var icon = root.appServerUrl + "/app/icon?id=" + packageId; + var icon = root.appServerUrl + + "/app/icon?id=" + packageId + + "&architecture=" + root.cpuArch; var installID = PackageManager.startPackageInstallation(data.url); PackageManager.acknowledgePackageInstallation(installID); } else if (data.status === "fail" && data.error === "not-logged-in"){ @@ -204,7 +207,9 @@ Item { var packageName = ""; if (packageId !== "") { - icon = root.appServerUrl + "/app/icon?id=" + packageId; + icon = root.appServerUrl + + "/app/icon?id=" + packageId + + "&architecture=" + root.cpuArch; pkg = PackageManager.package(packageId); packageName = root.getPackageName(packageId); } @@ -228,7 +233,9 @@ Item { var packageName = ""; if (packageId !== "") { - icon = root.appServerUrl + "/app/icon?id=" + packageId; + icon = root.appServerUrl + + "/app/icon?id=" + packageId + + "&architecture=" + root.cpuArch; pkg = PackageManager.package(packageId); // cannot use name module from the application manager, because it won't work when |