Merge pull request #23 from opendesktop/develop

Develop

Makefile

@@ -5,7 +5,7 @@ srcdir = .
 
 build_tmpdir = ./build_tmp
 ocsmanager_build = default
-ocsmanager_tree_ish = release-0.5.2
+ocsmanager_tree_ish = release-0.5.3
 
 DESTDIR =
 prefix = /usr/local

app/scripts/components/InstalledItemsPage.js

@@ -18,7 +18,7 @@ export default class InstalledItemsPage extends Component {
         for (const itemKey of Object.keys(this.state.installedItems)) {
             const installedItem = this.state.installedItems[itemKey];
             if (installedItem.install_type === type) {
-                const previewPic = `file://${electron.remote.app.getPath('userData')}/previewpic/${btoa(installedItem.url)}`;
+                const previewPic = `file://${electron.remote.app.getPath('userData')}/previewpic/${btoa(installedItem.url).slice(-255)}`;
                 for (const file of installedItem.files) {
                     totalFiles++;
 

app/scripts/renderers/window-renderer.js

@@ -167,7 +167,7 @@ import Root from '../components/Root.js';
                                 previewPicUrl = `${data.data[0].metadata.provider}content/previewpic/${data.data[0].metadata.content_id}`;
                             }
                             if (previewPicUrl) {
-                                downloadPreviewPic(previewPicUrl, btoa(data.data[0].metadata.url));
+                                downloadPreviewPic(previewPicUrl, btoa(data.data[0].metadata.url).slice(-255));
                             }
                         }
                     );
@@ -209,7 +209,7 @@ import Root from '../components/Root.js';
                 sendWebSocketMessage('', 'ConfigHandler::getUsrConfigInstalledItems', []);
             }
             else if (data.func === 'ItemHandler::uninstall') {
-                removePreviewPic(btoa(data.id));
+                removePreviewPic(btoa(data.id).slice(-255));
             }
             else if (data.func === 'ItemHandler::uninstallStarted') {
                 if (data.data[0].status !== 'success_uninstallstart') {

package-lock.json

 {
   "name": "opendesktop-app",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "opendesktop-app",
   "productName": "Opendesktop App",
-  "version": "3.0.1",
-  "_versioncode": 11,
+  "version": "3.0.2",
+  "_versioncode": 12,
   "_releaseMeta": "https://github.com/opendesktop/opendesktop-app/raw/master/release.json",
   "description": "Opendesktop Official App.",
   "keywords": [

pkg/appimage/appimage.sh

 #!/bin/sh
 
 PKGNAME='opendesktop-app'
-PKGVER='3.0.1'
+PKGVER='3.0.2'
 PKGREL='1'
 
 curl -L -o appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"

scripts/build-docker.sh

@@ -51,6 +51,7 @@ build_appimage() {
     #apt -y install build-essential qt5-default libqt5websockets5-dev
     #apt -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev
     apt -y install libssl1.0.0 zlib1g
+    apt -y install unzip p7zip unrar-free
     apt -y install libgconf-2-4 libxss1
 
     add-apt-repository -y ppa:beineri/opt-qt593-trusty