From d5716fadeac9b8931c3b1c898580c2894be5c975 Mon Sep 17 00:00:00 2001 From: "karl.hudgell" Date: Tue, 2 Jun 2020 11:09:39 +0100 Subject: [PATCH] 1 click r&r --- lib/inquirer.js | 1 + logger.lock | 4 ++-- package.json | 2 +- pages/pages.js | 29 +++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/lib/inquirer.js b/lib/inquirer.js index 564d3d0..4b1e9e6 100644 --- a/lib/inquirer.js +++ b/lib/inquirer.js @@ -13,6 +13,7 @@ module.exports = { message: "What do you want to do?", choices: [ "Connect to MiWatch via Wifi", + "1-Click Remove & Install", "Remove Xiaomi Apps", "Restore Xiaomi Apps", "Install Compatible Apps", diff --git a/logger.lock b/logger.lock index bf1f725..e603371 100644 --- a/logger.lock +++ b/logger.lock @@ -5,7 +5,7 @@ "pid": 26780 }, "RunTIme": { - "startTime": 1588233573984, - "pid": 17884 + "startTime": 1591092451742, + "pid": 27212 } } \ No newline at end of file diff --git a/package.json b/package.json index ad5da50..780b777 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "miwatchkleaner2.0", - "version": "2.0.4", + "version": "2.0.5", "description": "MiWatch Cleaning Tool", "main": "app.js", "bin": "app.js", diff --git a/pages/pages.js b/pages/pages.js index f1322d4..1511857 100644 --- a/pages/pages.js +++ b/pages/pages.js @@ -224,6 +224,32 @@ module.exports = { }).catch() } }, + oneClick: async () => { + logger.info("1-Click") + common.header('1-Click Remove & Install') + await common.pause(1000) + console.log(chalk.white('Removing Xiaomi Apps')) + await common.pause(1000) + let value = await files.loadPackageList() + for (let element of value.apps) { + await shellExec(adbRun + ' shell pm uninstall -k --user 0 ' + element).then(function (result) { + if (result.stderr != '') { + logger.info('Error ' + result.stderr); + console.log(chalk.redBright('Error - Device not authorised')); + } else { + logger.info('Removing ' + element + ' - ' + result.stdout); + console.log('Removing ' + element + ' - ' + result.stdout); + } + }); + } + console.log(chalk.green('Removal Complete')) + await common.pause(2000) + logger.info("Remove Complete") + await common.pause(1000) + console.log(chalk.white('Installing Google Apps')) + await common.pause(1000) + module.exports.mainMenu() + }, mainMenu: async () => { common.header('Main Menu') if (process.platform === 'win32' || process.platform === 'win64') { @@ -249,6 +275,9 @@ module.exports = { case 'remove installed apps': module.exports.removeCompatibleApps() break; + case '1-click remove & install': + module.exports.oneClick() + break; case 'quit': break; default: