From 0fce90758ff0781fa208c4183f2ba41446ab9baf Mon Sep 17 00:00:00 2001 From: "karl.hudgell" Date: Tue, 15 Sep 2020 13:04:24 +0100 Subject: [PATCH 1/2] move to remote json --- data/xiaomiPackageRemovalList.json | 5 +++++ lib/common.js | 6 ++++++ lib/inquirer.js | 2 +- pages/pages.js | 6 +++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/data/xiaomiPackageRemovalList.json b/data/xiaomiPackageRemovalList.json index 6950dba..8a9c95d 100644 --- a/data/xiaomiPackageRemovalList.json +++ b/data/xiaomiPackageRemovalList.json @@ -4,6 +4,11 @@ "klean": "X", "global": "" }, + { + "name": "com.eg.android.AlipayGphone", + "klean": "X", + "global": "" + }, { "name": "com.google.android.clockwork.flashlight", "klean": "X", diff --git a/lib/common.js b/lib/common.js index aaaa8b8..b0b4390 100644 --- a/lib/common.js +++ b/lib/common.js @@ -75,6 +75,12 @@ module.exports = { .then(res => res.json()) return response }, + getXiaomiAppsList: async () => { + let settings = { method: "Get" }; + const response = await fetch("http://kithub.cf/Karl/MiWatchKleaner/raw/master/data/xiaomiPackageRemovalList.json", settings) + .then(res => res.json()) + return response + }, clearApkFolder: async () => { await shell.rm('-rf', './data/apps/*.apk'); }, diff --git a/lib/inquirer.js b/lib/inquirer.js index 24f940f..b79c2f0 100644 --- a/lib/inquirer.js +++ b/lib/inquirer.js @@ -81,7 +81,7 @@ module.exports = { }, xiaomiAppsList: async () => { Language.setActiveLang(await settings.value("Lang")) - const packages = await files.loadPackageList(); + const packages = await common.getXiaomiAppsList(); let appList = [] packages.forEach(element => { appList.push(element.name) diff --git a/pages/pages.js b/pages/pages.js index 95bc276..dd0ee7e 100644 --- a/pages/pages.js +++ b/pages/pages.js @@ -27,7 +27,7 @@ module.exports = { common.log('main-menu-item-1') common.header('main-menu-item-1') common.print('remove-xiaomi-apps', 'whiteBright') - const removalPackagesList = files.loadPackageList() + const removalPackagesList = await common.getXiaomiAppsList() for (let package of removalPackagesList) { if (package.klean === "X" || package.global === "X") { await adb.removeXiaomiApk(package.name) @@ -235,7 +235,7 @@ module.exports = { common.log('main-menu-item-11') common.header('main-menu-item-11') common.print('enable-global-theme', 'whiteBright') - const removalPackagesList = files.loadPackageList() + const removalPackagesList = await common.getXiaomiAppsList() for (let package of removalPackagesList) { if (package.global === "X") { await adb.removeXiaomiApk(package.name) @@ -250,7 +250,7 @@ module.exports = { common.log('main-menu-item-11') common.header('main-menu-item-11') common.print('disable-global-theme', 'whiteBright') - const removalPackagesList = files.loadPackageList() + const removalPackagesList = await common.getXiaomiAppsList() for (let package of removalPackagesList) { if (package.global === "X") { await adb.restoreXiaomiApk(package.name) From 9eff3594a031a80bce1362c174df9033f49b16f7 Mon Sep 17 00:00:00 2001 From: "karl.hudgell" Date: Tue, 15 Sep 2020 13:09:16 +0100 Subject: [PATCH 2/2] more fix --- lib/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.js b/lib/common.js index b0b4390..52e5a09 100644 --- a/lib/common.js +++ b/lib/common.js @@ -71,7 +71,7 @@ module.exports = { }, getCompatibleAppsList: async () => { let settings = { method: "Get" }; - const response = await fetch("https://raw.githubusercontent.com/karl0ss/MiWatchKleaner-APKs/master/compatibleApps.json", settings) + const response = await fetch("http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/compatibleApps.json", settings) .then(res => res.json()) return response },