Skip to content

Commit

Permalink
chore: close resource after using
Browse files Browse the repository at this point in the history
  • Loading branch information
@cinit
cinit committed Jul 25, 2023
1 parent d9ef36b commit d4f55cb
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 138 deletions.
3 changes: 2 additions & 1 deletion app/src/main/java/io/github/qauxv/core/HookInstaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,13 @@ public static void doInitAndSetupHookForeground(@NonNull Context context, @NonNu
}
}
} catch (Throwable stepErr) {
DexDeobfsProvider.INSTANCE.exitDeobfsSection();
if (hook instanceof RuntimeErrorTracer) {
((RuntimeErrorTracer) hook).traceError(stepErr);
}
err = stepErr;
isSuccessful = false;
} finally {
DexDeobfsProvider.INSTANCE.exitDeobfsSection();
}
if (isSuccessful) {
if (hook.isTargetProcess()) {
Expand Down
139 changes: 70 additions & 69 deletions app/src/main/java/io/github/qauxv/core/InjectDelayableHooks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,81 +133,82 @@ public static boolean step(@Nullable Object director) {
}
}
DexDeobfsProvider.INSTANCE.enterDeobfsSection();
DexDeobfsBackend backend = DexDeobfsProvider.INSTANCE.getCurrentBackend();
if (backend.isBatchFindMethodSupported()) {
List<DexKitTarget> ids = new LinkedList<>();
for (String id : deobfIndexList) {
DexKitTarget target = DexKitTargetSealedEnum.INSTANCE.valueOf(id);
if (target instanceof DexKitTarget) {
ids.add(target);
try (DexDeobfsBackend backend = DexDeobfsProvider.INSTANCE.getCurrentBackend()) {
if (backend.isBatchFindMethodSupported()) {
List<DexKitTarget> ids = new LinkedList<>();
for (String id : deobfIndexList) {
DexKitTarget target = DexKitTargetSealedEnum.INSTANCE.valueOf(id);
if (target instanceof DexKitTarget) {
ids.add(target);
}
}
ShadowBatchDexDeobfStep shadowBatchStep = new ShadowBatchDexDeobfStep(backend, ids.toArray(new DexKitTarget[0]));
steps.add(shadowBatchStep);
}
ShadowBatchDexDeobfStep shadowBatchStep = new ShadowBatchDexDeobfStep(backend, ids.toArray(new DexKitTarget[0]));
steps.add(shadowBatchStep);
}
steps.sort(Collections.reverseOrder());
for (int idx = 0; idx < steps.size(); idx++) {
final int j = idx;
if (SyncUtils.isMainProcess() && activity != null) {
activity.runOnUiThread(() -> {
if (overlay[0] == null) {
overlay[0] = new LinearLayout(activity);
overlay[0].setOrientation(LinearLayout.VERTICAL);
overlay[0].setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
overlay[0].setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
main[0] = new LinearLayout(activity);
overlay[0].addView(main[0]);
main[0].setOrientation(LinearLayout.VERTICAL);
main[0].setGravity(Gravity.CENTER);
LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
llp.bottomMargin = LayoutHelper.dip2px(activity, 55);
main[0].setLayoutParams(llp);
LinearLayout lprop = new LinearLayout(activity);
ViewCompat.setBackground(lprop, new SimpleBgDrawable(0, 0xA0808080, 2));
final View _v = new View(activity);
prog[0] = new ProportionDrawable(0xA0202020, 0x40FFFFFF,
Gravity.LEFT, 0);
ViewCompat.setBackground(_v, prog[0]);
int __3_ = LayoutHelper.dip2px(activity, 3);
LinearLayout.LayoutParams _tmp_lllp = new LinearLayout.LayoutParams(
MATCH_PARENT, LayoutHelper.dip2px(activity, 4));
_tmp_lllp.setMargins(__3_, __3_, __3_, __3_);
lprop.addView(_v, _tmp_lllp);
LinearLayout.LayoutParams plp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
int __5_ = LayoutHelper.dip2px(activity, 5);
plp.setMargins(__5_ * 2, 0, __5_ * 2, __5_);
main[0].addView(lprop, plp);
text[0] = new TextView(activity);
text[0].setTextSize(16);
text[0].setGravity(Gravity.CENTER_HORIZONTAL);
text[0].setTextColor(0xFF000000);
text[0].setShadowLayer(__5_ * 2, -0, -0, 0xFFFFFFFF);
LinearLayout.LayoutParams tlp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
main[0].addView(text[0], tlp);
((ViewGroup) activity.getWindow().getDecorView()).addView(overlay[0]);
}
String statusText;
try {
statusText = "QAuxiliary " + BuildConfig.VERSION_NAME + " 正在初始化:\n"
+ steps.get(j).getDescription() + "\n每个类一般不会超过一分钟";
} catch (Throwable e22) {
statusText = e22.toString();
steps.sort(Collections.reverseOrder());
for (int idx = 0; idx < steps.size(); idx++) {
final int j = idx;
if (SyncUtils.isMainProcess() && activity != null) {
activity.runOnUiThread(() -> {
if (overlay[0] == null) {
overlay[0] = new LinearLayout(activity);
overlay[0].setOrientation(LinearLayout.VERTICAL);
overlay[0].setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
overlay[0].setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
main[0] = new LinearLayout(activity);
overlay[0].addView(main[0]);
main[0].setOrientation(LinearLayout.VERTICAL);
main[0].setGravity(Gravity.CENTER);
LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
llp.bottomMargin = LayoutHelper.dip2px(activity, 55);
main[0].setLayoutParams(llp);
LinearLayout lprop = new LinearLayout(activity);
ViewCompat.setBackground(lprop, new SimpleBgDrawable(0, 0xA0808080, 2));
final View _v = new View(activity);
prog[0] = new ProportionDrawable(0xA0202020, 0x40FFFFFF,
Gravity.LEFT, 0);
ViewCompat.setBackground(_v, prog[0]);
int __3_ = LayoutHelper.dip2px(activity, 3);
LinearLayout.LayoutParams _tmp_lllp = new LinearLayout.LayoutParams(
MATCH_PARENT, LayoutHelper.dip2px(activity, 4));
_tmp_lllp.setMargins(__3_, __3_, __3_, __3_);
lprop.addView(_v, _tmp_lllp);
LinearLayout.LayoutParams plp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
int __5_ = LayoutHelper.dip2px(activity, 5);
plp.setMargins(__5_ * 2, 0, __5_ * 2, __5_);
main[0].addView(lprop, plp);
text[0] = new TextView(activity);
text[0].setTextSize(16);
text[0].setGravity(Gravity.CENTER_HORIZONTAL);
text[0].setTextColor(0xFF000000);
text[0].setShadowLayer(__5_ * 2, -0, -0, 0xFFFFFFFF);
LinearLayout.LayoutParams tlp = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
main[0].addView(text[0], tlp);
((ViewGroup) activity.getWindow().getDecorView()).addView(overlay[0]);
}
String statusText;
try {
statusText = "QAuxiliary " + BuildConfig.VERSION_NAME + " 正在初始化:\n"
+ steps.get(j).getDescription() + "\n每个类一般不会超过一分钟";
} catch (Throwable e22) {
statusText = e22.toString();
}
text[0].setText(statusText);
prog[0].setProportion(1.0f * j / steps.size());
});
}
try {
Step step = steps.get(idx);
if (!step.isDone()) {
step.step();
}
text[0].setText(statusText);
prog[0].setProportion(1.0f * j / steps.size());
});
}
try {
Step step = steps.get(idx);
if (!step.isDone()) {
step.step();
} catch (Throwable e) {
Log.e(e);
}
} catch (Throwable e) {
Log.e(e);
}
} finally {
DexDeobfsProvider.INSTANCE.exitDeobfsSection();
}
backend.close();
DexDeobfsProvider.INSTANCE.exitDeobfsSection();
}
if (LicenseStatus.hasUserAcceptEula()) {
for (IDynamicHook h : hooks) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/github/qauxv/util/dexkit/DexDeobfsProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ object DexDeobfsProvider {
/**
* Create a new instance. Call [DexDeobfsBackend.close] when you are done.
*/
fun getCurrentBackend(): DexDeobfsBackend {
fun getCurrentBackend(): DexKitDeobfs {
checkDeobfuscationAvailable()
return DexKitDeobfs.newInstance()
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/github/qauxv/util/dexkit/DexKit.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ object DexKit {
is DexKitTarget.UsingStr,
is DexKitTarget.UsingStringVector -> {
loadClassFromCache(target)?.let { return it }
return DexDeobfsProvider.getCurrentBackend().doFindClass(target)
return DexDeobfsProvider.getCurrentBackend().use { it.doFindClass(target) }
}
else -> throw IllegalArgumentException("Unsupported target type: $target")
}
Expand All @@ -72,7 +72,7 @@ object DexKit {
is DexKitTarget.UsingStringVector -> {
check(target.findMethod) { "$target attempted to access method!" }
loadMethodFromCache(target)?.let { return it }
return DexDeobfsProvider.getCurrentBackend().doFindMethod(target)
return DexDeobfsProvider.getCurrentBackend().use { it.doFindMethod(target) }
}
else -> throw IllegalArgumentException("Unsupported target type: $target")
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/io/github/qauxv/util/dexkit/impl/DexKitDeobfs.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,10 @@ class DexKitDeobfs private constructor(

@Synchronized
override fun close() {
mSharedResourceImpl.decreaseRefCount()
mDexKitBridge = null
if (mDexKitBridge != null) {
mSharedResourceImpl.decreaseRefCount()
mDexKitBridge = null
}
}

companion object {
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/me/ketal/hook/ShowMsgAt.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import cc.ioctl.util.ui.FaultyDialog
import com.tencent.qqnt.kernel.nativeinterface.MsgRecord
import com.tencent.qqnt.kernel.nativeinterface.TextElement
import de.robv.android.xposed.XC_MethodHook
import io.github.qauxv.base.annotation.FunctionHookEntry
import io.github.qauxv.base.annotation.UiItemAgentEntry
import io.github.qauxv.bridge.ntapi.ChatTypeConstants
import io.github.qauxv.bridge.ntapi.RelationNTUinAndUidApi
Expand All @@ -54,7 +55,6 @@ import io.github.qauxv.util.dexkit.DexFlow
import io.github.qauxv.util.dexkit.DexKitFinder
import io.github.qauxv.util.dexkit.DexMethodDescriptor
import io.github.qauxv.util.dexkit.HostMainDexHelper
import io.github.qauxv.util.dexkit.impl.DexKitDeobfs
import io.github.qauxv.util.hostInfo
import io.github.qauxv.util.isTim
import io.luckypray.dexkit.annotations.DexKitExperimentalApi
Expand All @@ -69,6 +69,7 @@ import xyz.nextalone.util.invoke
import xyz.nextalone.util.method

@UiItemAgentEntry
@FunctionHookEntry
object ShowMsgAt : CommonSwitchFunctionHook(), OnBubbleBuilder, DexKitFinder {

override val name = "消息显示At对象"
Expand Down Expand Up @@ -239,9 +240,10 @@ object ShowMsgAt : CommonSwitchFunctionHook(), OnBubbleBuilder, DexKitFinder {
}
// step 1 find target class
// "Lcom/tencent/mobileqq/aio/msglist/holder/component/text/util/TextContentViewUtil;"
val dexkitBridge = (DexDeobfsProvider.getCurrentBackend() as DexKitDeobfs).getDexKitBridge()
val result = dexkitBridge.findClassUsingAnnotation {
annotationUsingString = "Lcom/tencent/mobileqq/aio/msglist/holder/component/text/util/TextContentViewUtil;"
val result = DexDeobfsProvider.getCurrentBackend().use {
it.getDexKitBridge().findClassUsingAnnotation {
annotationUsingString = "Lcom/tencent/mobileqq/aio/msglist/holder/component/text/util/TextContentViewUtil;"
}
}
val klass: Class<*>
if (result.size == 1) {
Expand Down
Loading

0 comments on commit d4f55cb

Please sign in to comment.