Merge branch '3.3.0Fix'

This commit is contained in:
karl.hudgell 2020-09-15 13:14:47 +01:00
commit 7864480104
4 changed files with 16 additions and 5 deletions

View File

@ -4,6 +4,11 @@
"klean": "X",
"global": ""
},
{
"name": "com.eg.android.AlipayGphone",
"klean": "X",
"global": ""
},
{
"name": "com.google.android.clockwork.flashlight",
"klean": "X",

View File

@ -71,7 +71,13 @@ 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
},
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
},

View File

@ -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)

View File

@ -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)