adj: rmv some hc hooktool

Author: Sevtinge

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/gallery/UnPrivacyWatermark.java

@@ -18,15 +18,15 @@
  */
 package com.sevtinge.hyperceiler.hook.module.rules.gallery;
 
-import static com.hchen.hooktool.core.CoreTool.callStaticMethod;
-
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.text.TextUtils;
 
 import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
 
+import de.robv.android.xposed.XposedHelpers;
+
 public class UnPrivacyWatermark extends BaseHook {
 
     public int num = mPrefsMap.getInt("gallery_enable_un_privacy_watermark_value", 14);
@@ -87,11 +87,11 @@ public void drawWatermark(Canvas canvas, String text, int mWidth, int mHeight, i
         }
         float min = Math.min(mWidth, mHeight) * 0.02037037f;
         float f2 = 7.0f * min;
-        Paint initialPaint = (Paint) (is ? callStaticMethod(
-                "com.miui.gallery.editor.photo.app.privacy.PrivacyWatermarkHelper",
+        Paint initialPaint = (Paint) (is ? XposedHelpers.callStaticMethod(
+                findClassIfExists("com.miui.gallery.editor.photo.app.privacy.PrivacyWatermarkHelper"),
                 "getInitialPaint"
-        ) : callStaticMethod(
-                "com.miui.gallery.privacywatermark.PrivacyWatermarkHelper",
+        ) : XposedHelpers.callStaticMethod(
+                findClassIfExists("com.miui.gallery.privacywatermark.PrivacyWatermarkHelper"),
                 "getInitialPaint"
         ));
         Rect rect = new Rect();

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/systemui/NotificationVolumeSeparateSlider.java

@@ -19,29 +19,28 @@
 
 package com.sevtinge.hyperceiler.hook.module.rules.various.clipboard;
 
-import com.hchen.hooktool.HCBase;
-import com.hchen.hooktool.hook.IHook;
+import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
 
 /**
  * 获取常用语的 classloader。
  * from <a href="https://github.com/HChenX/ClipboardList">ClipboardList</a>
  *
  * @author 焕晨HChen
  */
-public class LoadInputMethodDex extends HCBase {
+public class LoadInputMethodDex extends BaseHook {
     private boolean isLoaded;
 
     @Override
     public void init() {
-        hookMethod("android.inputmethodservice.InputMethodModuleManager",
+        findAndHookMethod("android.inputmethodservice.InputMethodModuleManager",
             "loadDex",
             ClassLoader.class, String.class,
-            new IHook() {
+            new MethodHook() {
                 @Override
-                public void after() {
+                protected void after(MethodHookParam param) throws Throwable {
                     if (isLoaded) return;
 
-                    ClassLoader classLoader = (ClassLoader) getArg(0);
+                    ClassLoader classLoader = (ClassLoader) param.args[0];
                     ClipboardLimit.unlock(classLoader);
 
                     logI(TAG, "Input method classloader: " + classLoader);

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/various/clipboard/LoadInputMethodDex.java

@@ -19,15 +19,18 @@
 
 package com.sevtinge.hyperceiler.hook.module.rules.various.clipboard;
 
+import static com.sevtinge.hyperceiler.hook.utils.InvokeUtils.setStaticField;
+
+import static de.robv.android.xposed.XposedHelpers.getObjectField;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.text.InputFilter;
 import android.view.View;
 import android.widget.EditText;
 
-import com.hchen.hooktool.HCBase;
-import com.hchen.hooktool.hook.IHook;
+import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
 import com.sevtinge.hyperceiler.hook.module.base.dexkit.DexKit;
 import com.sevtinge.hyperceiler.hook.module.base.dexkit.IDexKit;
 
@@ -49,29 +52,29 @@
  *
  * @author 焕晨HChen
  */
-public class NewUnPhraseLimit extends HCBase {
+public class NewUnPhraseLimit extends BaseHook {
 
     @Override
     public void init() {
         // 解除 20 条限制
         Class<?> InputMethodUtil = findClass("com.miui.inputmethod.InputMethodUtil");
         setStaticField(InputMethodUtil, "sPhraseListSize", 0);
-        hookMethod(InputMethodUtil, "queryPhrase", Context.class, new IHook() {
+        findAndHookMethod(InputMethodUtil, "queryPhrase", Context.class, new MethodHook() {
             @Override
-            public void after() {
+            protected void after(MethodHookParam param) throws Throwable {
                 setStaticField(InputMethodUtil, "sPhraseListSize", 0);
             }
         });
 
         Class<?> AddPhraseActivity = findClass("com.miui.phrase.AddPhraseActivity");
-        hookMethod("com.miui.phrase.PhraseEditActivity", "onClick", View.class, new IHook() {
+        findAndHookMethod("com.miui.phrase.PhraseEditActivity", "onClick", View.class, new MethodHook() {
             @Override
-            public void before() {
-                Activity activity = (Activity) thisObject();
+            protected void before(MethodHookParam param) throws Throwable {
+                Activity activity = (Activity) param.thisObject;
                 Intent intent = new Intent(activity, AddPhraseActivity);
                 intent.setAction("com.miui.intent.action.PHRASE_ADD");
                 activity.startActivityForResult(intent, 0);
-                returnNull();
+                param.setResult(null);
             }
         });
 
@@ -103,10 +106,10 @@ public BaseData dexkit(DexKitBridge bridge) throws ReflectiveOperationException
                 ).single();
             }
         });
-        hook(method, new IHook() {
+        hookMethod(method, new MethodHook() {
                 @Override
-                public void after() {
-                    EditText editText = (EditText) getField(thisObject(), field);
+                protected void after(MethodHookParam param) throws Throwable {
+                    EditText editText = (EditText) getObjectField(param.thisObject, field.getName());
                     editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(Integer.MAX_VALUE)});
                 }
             }

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/various/clipboard/NewUnPhraseLimit.java

@@ -19,27 +19,17 @@
 
 package com.sevtinge.hyperceiler.hook.module.rules.various.clipboard;
 
-import static com.sevtinge.hyperceiler.hook.utils.InvokeUtils.callMethod;
-import static com.sevtinge.hyperceiler.hook.utils.InvokeUtils.getField;
-import static com.sevtinge.hyperceiler.hook.utils.InvokeUtils.getStaticField;
 import static com.sevtinge.hyperceiler.hook.utils.InvokeUtils.setStaticField;
 import static com.sevtinge.hyperceiler.hook.utils.KotlinXposedHelperKt.callStaticMethod;
 import static com.sevtinge.hyperceiler.hook.utils.PropUtils.getProp;
 
-import static de.robv.android.xposed.XposedHelpers.findClassIfExists;
-import static de.robv.android.xposed.XposedHelpers.getObjectField;
-import static de.robv.android.xposed.XposedHelpers.getStaticObjectField;
-
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import com.hchen.hooktool.HCBase;
-import com.hchen.hooktool.hook.IHook;
 import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
 
 import java.util.Arrays;
-import java.util.List;
 
 import de.robv.android.xposed.callbacks.XC_LoadPackage;