working reworked apps list

data/xiaomiPackageRemovalList.json

@@ -1,211 +1,211 @@
 [
   {
-    "package": "com.android.messaging",
+    "name": "com.android.messaging",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.clockwork.flashlight",
+    "name": "com.google.android.clockwork.flashlight",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.clockwork.gestures.tutorial",
+    "name": "com.google.android.clockwork.gestures.tutorial",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.clockwork.lesetup",
+    "name": "com.google.android.clockwork.lesetup",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.inputmethod.pinyin",
+    "name": "com.google.android.inputmethod.pinyin",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.theme.baiji.default",
+    "name": "com.google.android.theme.baiji.default",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.google.android.wearable.frameworkpackagestubs",
+    "name": "com.google.android.wearable.frameworkpackagestubs",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.google.android.wearable.localedition.overlay.cmiit",
+    "name": "com.google.android.wearable.localedition.overlay.cmiit",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.google.android.wearable.overlay.common.baiji",
+    "name": "com.google.android.wearable.overlay.common.baiji",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.google.android.wearable.overlay.helium.baiji",
+    "name": "com.google.android.wearable.overlay.helium.baiji",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.google.android.wearable.overlay.home.baiji",
+    "name": "com.google.android.wearable.overlay.home.baiji",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.google.android.wearable.overlay.home.baiji.tiles",
+    "name": "com.google.android.wearable.overlay.home.baiji.tiles",
     "klean": "",
     "global": "X"
   },
   {
-    "package": "com.gotokeep.keep",
+    "name": "com.gotokeep.keep",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.onetrack.watch",
+    "name": "com.onetrack.watch",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.qb.qtranslator",
+    "name": "com.qb.qtranslator",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.sogou.ime.wear",
+    "name": "com.sogou.ime.wear",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.sogou.map.android.maps",
+    "name": "com.sogou.map.android.maps",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.tencent.qqmusicwatch",
+    "name": "com.tencent.qqmusicwatch",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.tigerbrokers.stock",
+    "name": "com.tigerbrokers.stock",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.umetrip.android.msky.app",
+    "name": "com.umetrip.android.msky.app",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.mihome",
+    "name": "com.xiaomi.mihome",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.anonymous.xiaoai",
+    "name": "com.xiaomi.wear.anonymous.xiaoai",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.calculator",
+    "name": "com.xiaomi.wear.calculator",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.camera",
+    "name": "com.xiaomi.wear.camera",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.card",
+    "name": "com.xiaomi.wear.card",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.charging",
+    "name": "com.xiaomi.wear.charging",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.compass",
+    "name": "com.xiaomi.wear.compass",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.deskclock",
+    "name": "com.xiaomi.wear.deskclock",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.hotwordle",
+    "name": "com.xiaomi.wear.hotwordle",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.market",
+    "name": "com.xiaomi.wear.market",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.mqs",
+    "name": "com.xiaomi.wear.mqs",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.pressure",
+    "name": "com.xiaomi.wear.pressure",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.setupprovider",
+    "name": "com.xiaomi.wear.setupprovider",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.tutorial",
+    "name": "com.xiaomi.wear.tutorial",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.watchface.album",
+    "name": "com.xiaomi.wear.watchface.album",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.watchface.art",
+    "name": "com.xiaomi.wear.watchface.art",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.watchface.classic",
+    "name": "com.xiaomi.wear.watchface.classic",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.watchface.decomposite",
+    "name": "com.xiaomi.wear.watchface.decomposite",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.watchface.function",
+    "name": "com.xiaomi.wear.watchface.function",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.ximalayaos.wear.common",
+    "name": "com.ximalayaos.wear.common",
     "klean": "X",
     "global": ""
   },
   {
-    "package": "com.xiaomi.wear.xiaoai",
+    "name": "com.xiaomi.wear.xiaoai",
     "klean": "",
     "global": ""
   },
   {
-    "package": "org.codeaurora.ims",
+    "name": "org.codeaurora.ims",
     "klean": "X",
     "global": ""
   }

lib/inquirer.js

@@ -78,15 +78,19 @@ module.exports = {
     },];
     return inquirer.prompt(questions);
   },
-  removeAppsList: async () => {
+  xiaomiAppsList: async () => {
     Language.setActiveLang(globalVariables.language)
     const packages = await files.loadPackageList();
+    let appList = []
+    packages.forEach(element => {
+      appList.push(element.name)
+    });
 
     const questions = [{
       type: "checkbox",
-      name: "removeAppsList",
+      name: "appList",
       message: await Language.get('restore-app-message'),
-      choices: packages.apps,
+      choices: appList,
     },];
     return inquirer.prompt(questions);
   },

pages/pages.js

@@ -26,8 +26,10 @@ module.exports = {
         common.header('main-menu-item-1')
         common.print('remove-xiaomi-apps', 'whiteBright')
         const removalPackagesList = files.loadPackageList()
-        for (let package of removalPackagesList.apps) {
-            await adb.removeXiaomiApk(package)
+        for (let package of removalPackagesList) {
+            if (package.klean === "X") {
+                await adb.removeXiaomiApk(package.name)
+            }
         }
         common.print('removal-complete', 'green')
         await common.pause(2000)
@@ -68,7 +70,7 @@ module.exports = {
     removeXiaomiApps: async () => {
         common.header('main-menu-item-2')
         common.log('main-menu-item-2')
-        const value = await inquirer.removeAppsList();
+        const value = await inquirer.xiaomiAppsList();
         for (let package of value.removeAppsList) {
             await adb.removeXiaomiApk(package)
         }
@@ -80,7 +82,7 @@ module.exports = {
     restoreXiaomiApps: async () => {
         common.header('main-menu-item-3')
         common.log('main-menu-item-3')
-        const value = await inquirer.removeAppsList();
+        const value = await inquirer.xiaomiAppsList();
         for (let package of value.removeAppsList) {
             await adb.restoreXiaomiApk(package)
         }