update dexkit version, bump to 1.2.0

Author: teble

README.md

@@ -10,20 +10,29 @@
 
 A high performance dex deobfuscator library(NDK).
 
+> **Warning**: The current project has been refactored, `1.1.0` and earlier APIs are deprecated. Please refer to the latest documentation for use.
+
 ## API introduction
 
 These two APIs can meet most of your usage scenarios:
 
-- **`DexKit::LocationClasses`**
-- **`DexKit::LocationMethods`**
+- **`DexKit::BatchFindClassesUsedStrings`**
+- **`DexKit::BatchFindMethodsUsedStrings`**
+
+> **Note**: In all cases you should avoid searching for keywords that contain duplicate content, eg: {"key_word", "word"}, as this will cause tags to be overwritten, resulting in inaccurate search results.
+> If there is such a need, open the advanced search mode as much as possible, and use the string to match the content exactly, for example, modify it to this: {"^key_word$", "^word$"}
 
 And there are many other APIs:
 
-- `DexKit::FindMethodInvoked`: Find caller for specified method.
-- `DexKit::FindMethodUsedString`
-- `DexKit::FindMethod`: Find method with various conditions
-- `DexKit::FindSubClasses`: Find sub class of specified class
-- `DexKit::FindMethodOpPrefixSeq`: Find method with op prefix
+- `DexKit::FindMethodBeInvoked`: find caller for specified method.
+- `DexKit::FindMethodInvoking`: find the called method
+- `DexKit::FindFieldBeUsed`: find method getting specified field, access types(put/get) can be limited by setting `be_used_flags`
+- `DexKit::FindMethodUsedString`: find method used utf8 string
+- `DexKit::FindMethod`: find method by multiple conditions
+- `DexKit::FindSubClasses`: find all direct subclasses of the specified class
+- `DexKit::FindMethodOpPrefixSeq`:  find all method used opcode prefix sequence
+
+For more detailed instructions, please refer to [dex_kit.h](https://github.com/LuckyPray/DexKit/blob/master/include/dex_kit.h).
 
 ## Integration
 
@@ -60,70 +69,9 @@ target_link_libraries(mylib dexkit::dex_kit_static z)
 At the same time, we also provide [DexKitJniHelper.h](https://github.com/LuckyPray/DexKit/blob/master/include/DexKitJniHelper.h) 
 for the conversion of complex objects between java and c++. For example: `HashMap<String, HashSet<String>>` -> `std::map<std::string, std::set<std::string>>`
 
-dexkit.cpp
-```c++
-#include<DexKitJniHelper.h>
-
-extern "C"
-JNIEXPORT jlong JNICALL
-Java_me_xxx_dexkit_DexKitHelper_initDexKit(JNIEnv *env, jobject thiz,
-                                           jstring apkPath) {
-    const char *cStr = env->GetStringUTFChars(apkPath, nullptr);
-    std::string filePathStr(cStr);
-    auto dexkit = new dexkit::DexKit(hostApkPath);
-    env->ReleaseStringUTFChars(apkPath, cStr);
-    return (jlong) dexkit;
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_me_xxx_dexkit_DexKitHelper_release(JNIEnv *env, jobject thiz, jlong token) {
-    ReleaseDexKitInstance(env, token);
-}
-
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_me_xxx_dexkit_DexKitHelper_batchFindClassUsedString(JNIEnv *env,
-                                                         jobject thiz,
-                                                         jlong token,
-                                                         jobject map,
-                                                         jboolean advanced_match) {
-    // this function is declared in DexKitJniHelper.h
-    // For more help methods, please check the source code: https://github.com/LuckyPray/DexKit/blob/master/include/DexKitJniHelper.h
-    return LocationClasses(env, token, map, advanced_match);
-}
-
-// omit...
-```
-
-DexKitHelper.kt
-```kotlin
-class DexKitHelper(
-    apkPath: String
-) {
-    
-    private var token: Long = 0
-
-    init {
-        token = initDexKit(apkPath)
-    }
-
-    private external fun initDexKit(apkPath: String): Long
-
-    /**
-     * free space allocated by c++
-     */
-    private external fun release(token: Long)
-
-    private external fun batchFindClassUsedString(
-        token: Long,
-        map: Map<String, Set<String>>,
-        advancedMatch: Boolean = false,
-    ): Map<String, Array<String>>
-    
-    //  omit...
-}
-```
+JNI used example :
+- [dexkit.cpp](https://github.com/LuckyPray/XAutoDaily/blob/master/app/src/main/cpp/dexkit.cpp)
+- [DexKitHelper.kt](https://github.com/LuckyPray/XAutoDaily/blob/master/app/src/main/java/me/teble/xposed/autodaily/dexkit/DexKitHelper.kt)
 
 ## Example
 

README_zh.md

@@ -10,21 +10,30 @@
 
 一个高性能的 dex 反混淆工具（NDK版本）。
 
+> **Warning**: 当前项目已经进行重构，`1.1.0`及以下的API全被弃用，请参考最新的文档进行使用。
+
 ## API说明
 
 这两个 API 可以满足你大部分的使用场景：
 
-- **`DexKit::LocationClasses`**
-- **`DexKit::LocationMethods`**
+- **`DexKit::BatchFindClassesUsedStrings`**
+- **`DexKit::BatchFindMethodsUsedStrings`**
+
+> **Note**：无论什么情况都应当避免搜索关键词包含重复内容， 例如：{"key_word", "word"}，因为这样会导致标记被覆盖，从而导致搜索结果不准确。
+> 如果真的有这样的需求，尽可能打开高级搜索模式，同时使用字符串完全匹配内容，例如修改成这样：{"^key_word$", "^word$"}
 
 以及其他 API：
 
-- `DexKit::FindMethodInvoked`: 查找指定方法的调用者(invoke-kind类别的opcode)
-- `DexKit::FindMethodUsedString`: 查找指定字符串的调用者(`const-string`、`const-string/jumbo`)
+- `DexKit::FindMethodBeInvoked`: 查找指定方法的调用者
+- `DexKit::FindMethodInvoking`: 查找指定方法调用的方法
+- `DexKit::FindFieldBeUsed`: 查找指定的属性被什么方法调用，可通过参数 `be_used_flags` 限制访问类型(put/get)
+- `DexKit::FindMethodUsedString`: 查找指定字符串的调用者
 - `DexKit::FindMethod`: 多条件查找方法
 - `DexKit::FindSubClasses`: 查找直系子类
 - `DexKit::FindMethodOpPrefixSeq`: 查找满足特定op前缀序列的方法(使用`0x00`-`0xff`)
 
+更详细的API说明请参考 [dex_kit.h](https://github.com/LuckyPray/DexKit/blob/master/include/dex_kit.h).
+
 ## 集成
 
 Gradle:
@@ -55,75 +64,14 @@ find_package(dexkit REQUIRED CONFIG)
 target_link_libraries(mylib dexkit::dex_kit_static z)
 ```
 
-> 注意：此头文件从 `1.1.0` 开始加入
+> 注意：此头文件从 `1.1.0` 版本开始加入
 
 同时，我们提供了 [DexKitJniHelper.h](https://github.com/LuckyPray/DexKit/blob/master/include/DexKitJniHelper.h)
 用于java与c++之间复杂对象的转换，例如：`HashMap<String, HashSet<String>>` -> `std::map<std::string, std::set<std::string>>`。
 
-dexkit.cpp
-```c++
-#include<DexKitJniHelper.h>
-
-extern "C"
-JNIEXPORT jlong JNICALL
-Java_me_xxx_dexkit_DexKitHelper_initDexKit(JNIEnv *env, jobject thiz,
-                                           jstring apkPath) {
-    const char *cStr = env->GetStringUTFChars(apkPath, nullptr);
-    std::string filePathStr(cStr);
-    auto dexkit = new dexkit::DexKit(hostApkPath);
-    env->ReleaseStringUTFChars(apkPath, cStr);
-    return (jlong) dexkit;
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_me_xxx_dexkit_DexKitHelper_release(JNIEnv *env, jobject thiz, jlong token) {
-    ReleaseDexKitInstance(env, token);
-}
-
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_me_xxx_dexkit_DexKitHelper_batchFindClassUsedString(JNIEnv *env,
-                                                         jobject thiz,
-                                                         jlong token,
-                                                         jobject map,
-                                                         jboolean advanced_match) {
-    // 该方法定义于 DexKitJniHelper.h
-    // 获取更多辅助方法请参阅源码：https://github.com/LuckyPray/DexKit/blob/master/include/DexKitJniHelper.h
-    return LocationClasses(env, token, map, advanced_match);
-}
-
-// 省略...
-```
-
-DexKitHelper.kt
-```kotlin
-class DexKitHelper(
-    apkPath: String
-) {
-    
-    private var token: Long = 0
-
-    init {
-        token = initDexKit(apkPath)
-    }
-
-    private external fun initDexKit(apkPath: String): Long
-
-    /**
-     * 释放c++分配的空间
-     */
-    private external fun release(token: Long)
-
-    private external fun batchFindClassUsedString(
-        token: Long,
-        map: Map<String, Set<String>>,
-        advancedMatch: Boolean = false,
-    ): Map<String, Array<String>>
-    
-    // 省略...
-}
-```
+JNI 使用示例：
+- [dexkit.cpp](https://github.com/LuckyPray/XAutoDaily/blob/master/app/src/main/cpp/dexkit.cpp)
+- [DexKitHelper.kt](https://github.com/LuckyPray/XAutoDaily/blob/master/app/src/main/java/me/teble/xposed/autodaily/dexkit/DexKitHelper.kt)
 
 ## 使用示例
 

dexkit/build.gradle

@@ -52,7 +52,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'io.luckypray'
                 artifactId = 'dexkit'
-                version = '1.0'
+                version = '1.2.0'
             }
         }
     }

dexkit/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.teble.dexkit">
+    package="io.luckypray.dexkit">
 
 </manifest>