diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 7271332..d467588 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -513,34 +513,23 @@ export class AdbClientService { } }) .then(r => { - task.status = name + 'APK file installed ok!!'; + task.status = name + 'APK installed ok!!'; if (deleteAfter) { this.appService.fs.unlink(filePath, err => {}); } if (filePath.indexOf('com.weloveoculus.BMBF') > -1) { return this.beatonService.setBeatOnPermission(this); } - if (filePath.toLowerCase().indexOf('sidequest.legends') > -1) { - return this.setPermission('com.sidequest.legends', 'android.permission.RECORD_AUDIO'); - } - if (filePath.toLowerCase().indexOf('pavlov') > -1) { - return this.setPermission('com.vankrupt.pavlov', 'android.permission.RECORD_AUDIO') - .then(() => this.setPermission('com.vankrupt.pavlov', 'android.permission.READ_EXTERNAL_STORAGE')) - .then(() => this.setPermission('com.vankrupt.pavlov', 'android.permission.WRITE_EXTERNAL_STORAGE')) - .then(() => - this.adbCommand('shell', { - serial: this.deviceSerial, - command: 'echo null > /sdcard/pavlov.name.txt', - }) - ); - } }) .catch(async e => { if (deleteAfter) { this.appService.fs.unlink(filePath, err => {}); } let er = e.message ? e.message : e.code ? e.code : e.reason ? e.reason : JSON.stringify(e); - if (er.indexOf('INSTALL_FAILED_UPDATE_INCOMPATIBLE') > -1 && er.indexOf('com.oculus.environment.prod.')) { + if ( + er.indexOf('INSTALL_FAILED_UPDATE_INCOMPATIBLE') > -1 && + er.indexOf('com.oculus.environment.prod.') > -1 + ) { let match = er.match(/([A-Za-z]*[A-Za-z\d_]*\.)+[A-Za-z][A-Za-z\d_]*/gm); await this.adbCommand('uninstall', { serial: this.deviceSerial, packageName: match[0] }); this.installAPK(filePath, isLocal, shouldUninstall, number, total, deleteAfter, name); @@ -647,7 +636,7 @@ export class AdbClientService { } async restoreDataBackup(packageName: string, folderName: string) { return this.processService.addItem('restore_files', async task => { - task.status = 'Restoring Files...'; + task.status = 'Transferring Files...'; let packageBackupPath = this.appService.path.join(this.appService.backupPath, packageName, 'data', folderName, 'files'); if (this.appService.fs.existsSync(packageBackupPath)) { this.localFiles = []; @@ -665,7 +654,7 @@ export class AdbClientService { return this.uploadFile(this.localFiles.filter(f => f.__isFile), task); }) .then(() => this.spinnerService.hideLoader()) - .then(() => (task.status = 'Restored game data backup OK!! ' + packageName + ' | ' + folderName)); + .then(() => (task.status = 'Files Transferred OK!! ' + packageName + ' | ' + folderName)); } let obbBackupPath = this.appService.path.join(this.appService.backupPath, packageName, 'data', folderName, 'obb'); if (this.appService.fs.existsSync(obbBackupPath)) { diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html index aa4eee7..5a0a5b1 100644 --- a/desktop-app/src/app/files/files.component.html +++ b/desktop-app/src/app/files/files.component.html @@ -75,13 +75,13 @@ Please enter a folder name.
- +
- + diff --git a/desktop-app/src/app/files/files.component.ts b/desktop-app/src/app/files/files.component.ts index 35a0710..eb35486 100644 --- a/desktop-app/src/app/files/files.component.ts +++ b/desktop-app/src/app/files/files.component.ts @@ -55,7 +55,7 @@ export class FilesComponent implements OnInit { ngOnInit() { this.appService.setTitle('Headset Files'); } - async makeFolder() { + async makeFolder(shouldOpen?: boolean) { if ( !!~this.files .filter(f => f.icon === 'folder') @@ -65,7 +65,11 @@ export class FilesComponent implements OnInit { return this.statusService.showStatus('A folder already exists with that name!!', true); } else { await this.adbService.makeDirectory(this.appService.path.posix.join(this.currentPath, this.folderName)).then(r => { - this.open(this.appService.path.posix.join(this.currentPath, this.folderName)); + if (shouldOpen) { + this.open(this.appService.path.posix.join(this.currentPath, this.folderName)); + } else { + this.open(this.currentPath); + } this.folderName = ''; }); } @@ -173,7 +177,7 @@ export class FilesComponent implements OnInit { setTimeout(() => { this.open(this.currentPath); }, 1500); - task.status = 'Upload complete!'; + task.status = 'Transfer complete!'; }) .catch(e => this.statusService.showStatus(e.toString(), true)); }); @@ -236,7 +240,7 @@ export class FilesComponent implements OnInit { return this.adbService .adbCommand('pull', { serial: this.adbService.deviceSerial, path, savePath }, stats => { task.status = - 'File downloading: ' + + 'File saving: ' + this.appService.path.basename(savePath) + ' - ' + Math.round(stats.bytesTransferred / 1024 / 1024) + diff --git a/electron/app.ts b/electron/app.ts index b819b1f..e48734f 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -50,7 +50,11 @@ class ADB { reject(error); } else { try { - resolve(JSON.parse(body).found); + const found = JSON.parse(body).found; + if (!found) { + updateStatus('APK is not in the blacklist. Installing...'); + } + resolve(found); } catch (e) { reject(e); } @@ -179,6 +183,7 @@ class ADB { return ecb('SAFESIDE'); } } + scb('Transferring APK to device...'); let stream; try { stream = isLocal diff --git a/package.json b/package.json index 705a8c3..f7847ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.23", + "version": "0.10.24", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/SideQuestVR/SideQuest.git", "license": "UNLICENCED",