From 81fe39b14c82012bca03d7ff1dda79490bdad4ff Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 28 May 2020 12:33:44 +0100 Subject: [PATCH] fixed a bug in the install status on the tasks screen --- build-electron/app.jsc | Bin 65192 -> 65192 bytes desktop-app/src/app/adb-client.service.ts | 4 ++-- desktop-app/src/app/drag-and-drop.service.ts | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 3241528adcedc3ba5b113ac9f7adccb564a61500..97a761a82b651254371f9a28bce5335d88193581 100644 GIT binary patch delta 4488 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 Re-uO4o4uFVWgkZh{s+fp&l&&# diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index b094908..59e2778 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -507,8 +507,8 @@ export class AdbClientService { } else { task.status = status === 'Checking APK against blacklist...' - ? name + showTotal + 'Installing Apk...' - : name + showTotal + status; + ? name + showTotal + status + : name + showTotal + 'Installing Apk...'; } }) .then(r => { diff --git a/desktop-app/src/app/drag-and-drop.service.ts b/desktop-app/src/app/drag-and-drop.service.ts index ffa3e0c..b862208 100644 --- a/desktop-app/src/app/drag-and-drop.service.ts +++ b/desktop-app/src/app/drag-and-drop.service.ts @@ -59,11 +59,6 @@ export class DragAndDropService { this.statusService.showStatus(_e.toString(), true); }); } - // if (this.appService.path.extname(filepath) === '.apk') { - // await this.adbService.installAPK(filepath, true); - // } else { - // await this.adbService.installLocalObb(filepath); - // } } else { this.statusService.showStatus('Unrecognised File: ' + filepath, true); }