Read from old menu

KawaiiZapic · Jan 31, 2022 · b052c36 · b052c36
1 parent e0b3be2
commit b052c36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 58 deletions.
diff --git a/module/src/main/cpp/main.cpp b/module/src/main/cpp/main.cpp
@@ -80,6 +80,7 @@ namespace Config {
 #define CONFIG_PATH "/data/misc/mph/config"
 #define PROPS_PATH CONFIG_PATH "/properties"
 #define PACKAGES_PATH CONFIG_PATH "/packages"
+#define OLD_PACKAGES_PATH "/data/misc/riru/modules/mipush_fake/packages"
 
     static std::map<std::string, Property *> props;
     static std::unordered_set<std::string> packages;
@@ -145,6 +146,13 @@ namespace Config {
             Packages::Add(name);
             LOGV("add package %s", name);
         });
+        foreach_dir(OLD_PACKAGES_PATH, [](int, struct dirent *entry) {
+            auto name = entry->d_name;
+            // Cut off UID in the filename
+            while(*name++ != '.');
+            Packages::Add(name);
+            LOGV("add package %s", name);
+        });
         if (UNLIKELY(packages.empty()))
             LOGI("hook target package list is empty");
         if (UNLIKELY(props.empty()))

diff --git a/template/magisk_module/customize.sh b/template/magisk_module/customize.sh
@@ -86,7 +86,6 @@ CONFIG_PATH="/data/misc/mph/config"
 
 if [ ! -d /data/misc/mph ]
 then
-  rm -rf /data/misc/mph
   mkdir /data/misc/mph
 fi
 
@@ -106,40 +105,6 @@ fi
 if [ ! -d "$CONFIG_PATH/packages" ]; then
     ui_print "- Creating default configuration (2)"
     mkdir -p "$CONFIG_PATH/packages"
-
-    touch "$CONFIG_PATH/packages/prefer_system"
-
-    touch "$CONFIG_PATH/packages/cmb.pb"
-    touch "$CONFIG_PATH/packages/cn.adidas.app"
-    touch "$CONFIG_PATH/packages/com.autonavi.minimap"
-    touch "$CONFIG_PATH/packages/com.coolapk.market"
-    touch "$CONFIG_PATH/packages/com.dianping.v1"
-    touch "$CONFIG_PATH/packages/com.eastmoney.android.fund"
-    touch "$CONFIG_PATH/packages/com.eg.android.AlipayGphone"
-    touch "$CONFIG_PATH/packages/com.huami.watch.hmwatchmanager"
-    touch "$CONFIG_PATH/packages/com.icbc"
-    touch "$CONFIG_PATH/packages/com.sankuai.meituan"
-    touch "$CONFIG_PATH/packages/com.smzdm.client.android"
-    touch "$CONFIG_PATH/packages/com.starbucks.cn"
-    touch "$CONFIG_PATH/packages/com.taobao.idlefish"
-    touch "$CONFIG_PATH/packages/com.taobao.taobao"
-    touch "$CONFIG_PATH/packages/com.tencent.weread"
-    touch "$CONFIG_PATH/packages/com.tigerbrokers.stock"
-    touch "$CONFIG_PATH/packages/com.wudaokou.hippo"
-    touch "$CONFIG_PATH/packages/com.xes.jazhanghui.activity"
-    touch "$CONFIG_PATH/packages/com.xiaomi.hm.health"
-    touch "$CONFIG_PATH/packages/com.xiaomi.smarthome"
-    touch "$CONFIG_PATH/packages/com.xiaomi.wearable"
-    touch "$CONFIG_PATH/packages/com.ximalaya.ting.android"
-    touch "$CONFIG_PATH/packages/cool.dingstock.mobile"
-    touch "$CONFIG_PATH/packages/me.ele"
-    touch "$CONFIG_PATH/packages/org.xinkb.blackboard.android"
-    touch "$CONFIG_PATH/packages/com.jingdong.app.mall"
-    touch "$CONFIG_PATH/packages/com.tmri.app.main"
-    touch "$CONFIG_PATH/packages/com.chinaworld.main"
-    touch "$CONFIG_PATH/packages/com.max.xiaoheihe"
-    touch "$CONFIG_PATH/packages/tv.danmaku.bili"
-    touch "$CONFIG_PATH/packages/cmb.pb"
 fi
 
 set_perm_recursive /data/misc/mph 0 0 0755 0644

diff --git a/template/magisk_module/post-fs-data.sh b/template/magisk_module/post-fs-data.sh
@@ -12,26 +12,3 @@ else
   # In case user downgrade Riru to pre-v24
   [ -d "$MODDIR"/riru ] && mv "$MODDIR"/riru "$MODDIR"/system
 fi
-
-ORIG_DIR=/data/misc/riru/modules/mipush_fake/packages
-TARGET_DIR=/data/misc/mph/config/packages
-PREFER_SYSTEM=0
-if [ -d "$ORIG_DIR" ] && [ -d "$TARGET_DIR" ];
-then
-  if [ -f "$TARGET_DIR"/prefer_system ];
-  then
-    PREFER_SYSTEM=1
-  fi
-  rm "$TARGET_DIR"/* 2> /dev/null
-  for package in "$ORIG_DIR"/*
-  do
-    rename="$(echo $(basename "$package") | sed -E "s/^[0-9]+.//g")"
-    cp $package "$TARGET_DIR"/$rename
-  done
-  if [ PREFER_SYSTEM -eq 1 ];
-  then
-    touch "$TARGET_DIR"/prefer_system
-  fi
-  set_perm_recursive "$TARGET_DIR" 0 0 0755 0644
-  chcon -R u:object_r:magisk_file:s0 "$TARGET_DIR"
-fi