diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 15f131f..38e06d1 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -652,7 +652,6 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u if (er.includes('SAFESIDE')) { this.appService.headerComponent.safeModal.openModal(); } - console.log('app failed', er); task.status = (task.app_name ? task.app_name + ': ' : '') + (e.message ? e.message : e.code ? e.code : e.reason ? e.reason : e.toString()); @@ -1036,7 +1035,7 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u async installLocalZip(filepath, dontCatchError, cb, task?, deleteAfter?) { const typeBasedActions = { '.apk': filepath => { - this.installAPK(filepath, true, false, 0, 0, deleteAfter, this.appService.path.basename(filepath)); + this.installAPK(filepath, true, false, 0, 0, deleteAfter, this.appService.path.basename(filepath) + ': '); }, '.obb': filepath => { if (this.appService.path.basename(filepath).match(this.obbRegex)) { @@ -1061,10 +1060,6 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u { dir: this.appService.path.join(this.appService.appData, 'tmp') }, extractErr => { if (!extractErr) { - if (task) { - task.status = 'Extracted Zip!'; - } - resolve(); this.appService.fs.readdir(this.appService.path.join(this.appService.appData, 'tmp'), (readErr, files) => { let installableFiles = files.filter((val, index) => { return Object.keys(typeBasedActions).includes(this.appService.path.extname(val)); @@ -1078,6 +1073,12 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u this ); }); + + if (task) { + task.status = installableFiles.length ? 'Extracted Zip!' : 'No installable files in this zip...'; + task.failed = !installableFiles.length; + } + resolve(); }); } else { console.warn(extractErr); diff --git a/desktop-app/src/app/current-task-item/current-task-item.component.scss b/desktop-app/src/app/current-task-item/current-task-item.component.scss index 40b31b6..6103079 100644 --- a/desktop-app/src/app/current-task-item/current-task-item.component.scss +++ b/desktop-app/src/app/current-task-item/current-task-item.component.scss @@ -1,3 +1,4 @@ .menu-chip{ max-width: 100%; + margin-bottom: 8px; } diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index 0cc29df..72fef7c 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -276,7 +276,7 @@ Thank you and have a great day! -
Back to Safety
+
Back to Safety
diff --git a/desktop-app/src/app/process-bucket.service.ts b/desktop-app/src/app/process-bucket.service.ts index c258bba..61babf2 100644 --- a/desktop-app/src/app/process-bucket.service.ts +++ b/desktop-app/src/app/process-bucket.service.ts @@ -113,9 +113,7 @@ export class ProcessBucketService { this.currentTask = null; this.statusService.showStatus(task.status, true); if (!task.cancelled) { - console.log('h1'); return timeout().then(async () => { - console.log('h2'); await this.processBucket(); }); } diff --git a/desktop-app/src/styles.scss b/desktop-app/src/styles.scss index e2a64e5..466e25f 100644 --- a/desktop-app/src/styles.scss +++ b/desktop-app/src/styles.scss @@ -204,7 +204,7 @@ body{ .chip>i { float: left; - margin: 0 8px 0 -8px; + margin: 0 8px 0 0px; font-size: 28px; line-height: 32px; border-radius: 50%;