Code cleanup

Author: MlgmXyysd

app/src/main/AndroidManifest.xml

@@ -4,15 +4,15 @@
     android:installLocation="internalOnly">
 
     <application
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round">
+        tools:ignore="AllowBackup">
         <!-- Xposed -->
         <meta-data
             android:name="xposedmodule"
-            android:value="true"/>
+            android:value="true" />
         <meta-data
             android:name="xposeddescription"
             android:value="@string/xposed_description" />
@@ -21,8 +21,8 @@
             android:value="53" />
 
         <activity
-            android:label="@string/app_name"
-            android:name="top.trumeet.mipush.settings.PreferenceActivity">
+            android:name="top.trumeet.mipush.settings.PreferenceActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

app/src/main/java/org/meowcat/xposed/mipush/Constants.java

@@ -22,16 +22,15 @@ public final class Constants {
 
     // Built-in package name Blacklists. The module will never
     // hook these packages due to known compatibility issues.
-    // regExp required
     public static final String[] BUILT_IN_BLACKLIST = new String[]{ // TODO: more built-in blacklist packages
             "android", // Android system
-            "com\\.android.*", // Android system components
-            "com\\.google\\.android.*", // Google apps
-            "de\\.robv\\.android\\.xposed\\.installer", // Xposed Installer
-            "org\\.meowcat\\.edxposed\\.manager", // EdXposed Manager
-            "com\\.xiaomi\\.xmsf", // MiPush Framework
-            "com\\.tencent\\.mm", // WeChat
-            "top\\.trumeet\\.mipush" // MiPush Manager
+            "com.android.*", // Android system components
+            "com.google.android.*", // Google apps
+            "de.robv.android.xposed.installer", // Xposed Installer
+            "org.meowcat.edxposed.manager", // EdXposed Manager
+            "com.xiaomi.xmsf", // MiPush Framework
+            "com.tencent.mm", // WeChat
+            "top.trumeet.mipush" // MiPush Manager
     }; // UserHandle.isCore(uid) will auto pass
 
     static {

app/src/main/java/org/meowcat/xposed/mipush/Enhancement.java

@@ -4,14 +4,14 @@
 import android.content.Context;
 import android.os.Binder;
 import android.os.UserHandle;
-import android.util.Log;
 
 import java.io.IOException;
 import java.util.Collections;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.XC_MethodHook;
 import de.robv.android.xposed.XC_MethodReplacement;
+import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 import de.robv.android.xposed.callbacks.XC_LoadPackage;
 import top.trumeet.mipush.settings.ini.IniConf;
@@ -23,7 +23,6 @@
 import static org.meowcat.xposed.mipush.Constants.MODE_BLACK;
 import static org.meowcat.xposed.mipush.Constants.MODE_WHITE;
 import static org.meowcat.xposed.mipush.Constants.PROPS;
-import static org.meowcat.xposed.mipush.Constants.TAG;
 import static top.trumeet.mipush.settings.ini.IniConstants.MODULE_BLACKLIST;
 import static top.trumeet.mipush.settings.ini.IniConstants.MODULE_WHITELIST;
 import static top.trumeet.mipush.settings.ini.IniConstants.MODULE_WORKING_MODE;
@@ -44,7 +43,7 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) {
         String packageName = lpparam.packageName;
 
         if (Utils.inBuiltInBlackList(packageName)) {
-            // is blacklisted package
+            // is in built-in blacklisted package
             return;
         }
 
@@ -59,7 +58,9 @@ protected void afterHookedMethod(MethodHookParam param) {
                 final boolean availability = Utils.getParamAvailability(param, packagePid);
 
                 // hook myself
-                XposedHelpers.findAndHookMethod(Utils.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true));
+                if (packageName.equals(BuildConfig.APPLICATION_ID)) {
+                    XposedHelpers.findAndHookMethod(Utils.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true));
+                }
 
                 if ((boolean) callStaticMethod(UserHandle.class, "isCore", packageUid) || !availability) {
                     // is Android code package
@@ -81,7 +82,7 @@ protected void afterHookedMethod(MethodHookParam param) {
                             }
                             break;
                         default:
-                            Log.e(TAG, "Unknown working mode.");
+//                            Log.e(TAG, "Unknown working mode.");
                             return;
                     }
 
@@ -130,7 +131,7 @@ protected void afterHookedMethod(MethodHookParam param) {
                     XposedHelpers.setStaticObjectField(android.os.Build.class, "MANUFACTURER", BRAND);
                     XposedHelpers.setStaticObjectField(android.os.Build.class, "BRAND", BRAND);
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    XposedBridge.log(e);
                 }
             }
         });

app/src/main/java/org/meowcat/xposed/mipush/Utils.java

@@ -18,8 +18,10 @@
 import de.robv.android.xposed.XposedHelpers;
 
 public class Utils {
+
     /**
      * Check package name in built-in blacklist
+     *
      * @param pkgName package name to check
      * @return is in built-in blacklist
      */
@@ -38,7 +40,7 @@ static boolean inBuiltInBlackList(String pkgName) {
      * call this method after got any MethodHookParam
      *
      * @param methodHookParam Xposed hook param
-     * @param callingPid Process Pid
+     * @param callingPid      Process Pid
      * @return true
      */
     public static boolean getParamAvailability(final XC_MethodHook.MethodHookParam methodHookParam, int callingPid) {
@@ -68,6 +70,7 @@ public static boolean getParamAvailability(final XC_MethodHook.MethodHookParam m
 
     /**
      * Check Xposed module status
+     *
      * @return true if hooked
      */
     public static boolean isEnhancementEnabled() {
@@ -76,9 +79,10 @@ public static boolean isEnhancementEnabled() {
 
     /**
      * Hide or show app icon
+     *
      * @param packageManager packageNamager
-     * @param componentName compoentName
-     * @param hide hide or show icon
+     * @param componentName  compoentName
+     * @param hide           hide or show icon
      */
     public static void hideIcon(PackageManager packageManager, ComponentName componentName, boolean hide) {
         packageManager.getComponentEnabledSetting(componentName);

app/src/main/java/top/trumeet/mipush/settings/PreferenceFragment.java

@@ -7,7 +7,6 @@
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.text.Html;
-import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -16,7 +15,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.meowcat.xposed.mipush.BuildConfig;
 import org.meowcat.xposed.mipush.R;
 import org.meowcat.xposed.mipush.Utils;
 
@@ -38,7 +36,6 @@
 import top.trumeet.mipush.settings.ini.IniConstants;
 import top.trumeet.mipush.settings.ini.IniUtils;
 
-import static org.meowcat.xposed.mipush.Constants.TAG;
 import static org.meowcat.xposed.mipush.Utils.hideIcon;
 
 public class PreferenceFragment extends moe.shizuku.preference.PreferenceFragment implements
@@ -116,7 +113,7 @@ public void onResume() {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        Log.d(TAG, "onSharedPreferenceChanged(): " + key);
+//        Log.d(TAG, "onSharedPreferenceChanged(): " + key);
         if (key.equals("module_blacklist") || key.equals("module_whitelist")) {
             mConf.putAll(IniUtils.convertKeyToIni(key), new ArrayList<>(Objects.requireNonNull(sharedPreferences.getStringSet(key, Collections.emptySet()))));
         } else if (key.equals("hide_icon")) {

app/src/main/java/top/trumeet/mipush/settings/ini/IniConf.java

@@ -103,15 +103,15 @@ private Ini createDefaultConfig(@Nullable final File file) throws IOException {
     private void compare(@NonNull Ini parent, @NonNull Ini child) {
         for (final String section : parent.keySet()) {
             if (!child.containsKey(section)) {
-                Log.i(TAG, "Adding section " + section);
+//                Log.i(TAG, "Adding section " + section);
                 child.put(section, parent.get(section));
                 child.putComment(section, parent.getComment(section));
             } else {
                 final Profile.Section parentSection = parent.get(section);
                 final Profile.Section childSection = child.get(section);
                 for (final String option : Objects.requireNonNull(parentSection).keySet()) {
                     if (!Objects.requireNonNull(childSection).containsKey(option)) {
-                        Log.i(TAG, "Adding option " + option);
+//                        Log.i(TAG, "Adding option " + option);
                         childSection.put(option, Objects.requireNonNull(parentSection.get(option)));
                         childSection.putComment(option, parentSection.getComment(option));
                     }
@@ -141,7 +141,7 @@ public Map<IniKey, Object> getAll() {
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public void write() throws IOException {
-        Log.d(TAG, "Saving configuration");
+//        Log.d(TAG, "Saving configuration");
         if (mIni.getFile() != null) {
             // Create the parent if needed.
             final File parent = mIni.getFile().getParentFile();
@@ -197,7 +197,7 @@ public List<String> getAll(@NonNull IniKey key, List<String> defaultValue) {
      * Put a value
      */
     public void put(@NonNull IniKey key, @Nullable Object value) {
-        Log.d(TAG, "put() " + key + ", " + value);
+//        Log.d(TAG, "put() " + key + ", " + value);
         mIni.put(key.section, key.option, value);
     }
 

app/src/main/java/top/trumeet/mipush/settings/ini/IniUtils.java

@@ -30,6 +30,7 @@ public static String convertKeyToSP(@NonNull final IniKey key) {
 
     /**
      * Change file permission with given permission mode
+     *
      * @param file file to change permissions
      * @param mode file permission
      */

app/src/main/res/xml/preferences.xml

@@ -2,13 +2,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
-        android:title="@string/pref_cat_module"
-        android:key="pref_category">
+        android:key="pref_category"
+        android:title="@string/pref_cat_module">
 
         <Preference
             android:key="device_status"
-            android:title="@string/pref_enhancement_status"
-            android:summary="@string/pref_enhancement_status_failed" />
+            android:summary="@string/pref_enhancement_status_failed"
+            android:title="@string/pref_enhancement_status" />
 
         <SimpleMenuPreference
             android:defaultValue="blacklist"
@@ -29,10 +29,10 @@
             android:title="@string/pref_whitelist" />
 
         <SwitchPreference
-            android:key="hide_icon"
             android:defaultValue="false"
+            android:key="hide_icon"
             android:summary="@string/pref_hide_icon_summary"
-            android:title="@string/pref_hide_icon"/>
+            android:title="@string/pref_hide_icon" />
 
     </PreferenceCategory>