shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: 雑談音声フラッシュバックの修正

Browse Source
This commit is contained in:
WhiteChi 2023-11-04 22:53:01 +08:00
parent 75dc5c0294
commit c8143bcf67
9 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/cpp/md5.cpp
View File

@ -61,8 +61,8 @@ const std::byte MD5::PADDING[64] = { (byte) 0x80 };
const char MD5::HEX[16] = {
'0', '1', '2', '3',
'4', '5', '6', '7',
'8', '9', 'a', 'b',
'c', 'd', 'e', 'f'
'8', '9', 'A', 'B',
'C', 'D', 'E', 'F'
};

4
qqinterface/build.gradle.kts
View File

@ -10,7 +10,6 @@ android {
defaultConfig {
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
@ -36,7 +35,4 @@ dependencies {
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}

5
qqinterface/src/main/java/com/tencent/mobileqq/transfile/BaseTransFileController.java
View File

@ -8,6 +8,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import mqq.app.AppRuntime;
public class BaseTransFileController implements ITransFileController {
@Override
public boolean containsProcessor(String name, long uin) {
return false;
}
@Override
public IHttpCommunicatorListener findProcessor(String str) {
return null;

2
qqinterface/src/main/java/com/tencent/mobileqq/transfile/api/ITransFileController.java
View File

@ -14,7 +14,7 @@ public interface ITransFileController extends IRuntimeService {
//@Deprecated
//void addProcessor(String str, IHttpCommunicatorListener iHttpCommunicatorListener);
//boolean containsProcessor(String str, long j2);
boolean containsProcessor(String name, long uin);
IHttpCommunicatorListener findProcessor(String str);

11
xposed/build.gradle.kts
View File

@ -13,7 +13,6 @@ android {
defaultConfig {
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
externalNativeBuild {
cmake {
@ -50,6 +49,9 @@ android {
}
dependencies {
compileOnly ("de.robv.android.xposed:api:82")
compileOnly (project(":qqinterface"))
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
@ -93,12 +95,5 @@ dependencies {
//ksp("androidx.room:room-compiler:$roomVersion")
// optional - Kotlin Extensions and Coroutines support for Room
implementation("androidx.room:room-ktx:$roomVersion")
compileOnly ("de.robv.android.xposed:api:82")
compileOnly (project(":qqinterface"))
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}

9
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/MessageMaker.kt
View File

@ -539,7 +539,7 @@ internal object MessageMaker {
file = FileUtils.parseAndSave(data["url"].asString)
}
if (!file.exists()) {
throw LogicException("Voice(${file.name}) file is not exists, please check your filename.")
return Result.failure(LogicException("Voice(${file.name}) file is not exists, please check your filename."))
}
val isMagic = data["magic"].asStringOrNull == "1"
@ -580,11 +580,14 @@ internal object MessageMaker {
// QQNTWrapperUtil.CppProxy.copyFile(file.absolutePath, originalPath)
//}
Transfer with when (chatType) {
if(!(Transfer with when (chatType) {
MsgConstant.KCHATTYPEGROUP -> Troop(peerId)
MsgConstant.KCHATTYPEC2C -> Private(peerId)
MsgConstant.KCHATTYPETEMPC2CFROMGROUP -> Private(peerId)
else -> error("Not supported chatType($chatType) for RecordMsg")
} trans VoiceResource(file)
} trans VoiceResource(file))) {
return Result.failure(RuntimeException("上传语音失败: $file"))
}
val elem = MsgElement()
elem.elementType = MsgConstant.KELEMTYPEPTT

19
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/FileTransfer.kt
View File

@ -10,6 +10,7 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withTimeoutOrNull
import moe.fuqiuluo.shamrock.utils.MD5
import moe.fuqiuluo.shamrock.xposed.helper.AppRuntimeFetcher
import mqq.app.AppRuntime
@ -73,16 +74,21 @@ internal abstract class FileTransfer {
transferRequest: TransferRequest,
wait: Boolean
): Boolean {
return withTimeoutOrNull(60_000) {
val service = runtime.getRuntimeService(ITransFileController::class.java, "all")
if(service.transferAsync(transferRequest)) {
if (!wait) { // 如果无需等待直接返回
return true
return@withTimeoutOrNull true
}
return suspendCancellableCoroutine { continuation ->
val waiter = GlobalScope.launch {
suspendCancellableCoroutine { continuation ->
GlobalScope.launch {
while (
service.findProcessor(transferRequest.keyForTransfer) != null
//service.findProcessor(
// transferRequest.keyForTransfer // uin + uniseq
//) != null
service.containsProcessor(runtime.currentAccountUin, transferRequest.mUniseq)
// 如果上传处理器依旧存在，说明没有上传成功
&& service.isWorking.get()
) {
delay(100)
}
@ -91,12 +97,11 @@ internal abstract class FileTransfer {
// 实现取消上传器
// 目前没什么用
continuation.invokeOnCancellation {
waiter.cancel()
continuation.resume(false)
}
}
}
return false
} else false
} ?: false
}
companion object {

8
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/Transfer.kt
View File

@ -24,12 +24,12 @@ internal object Transfer: FileTransfer() {
)
suspend fun uploadC2CVideo(
groupId: String,
userId: String,
file: File,
thumb: File,
wait: Boolean = true
): Boolean {
return transC2CResource(groupId, file, FileMsg.TRANSFILE_TYPE_SHORT_VIDEO_C2C, BUSI_TYPE_SHORT_VIDEO, wait) {
return transC2CResource(userId, file, FileMsg.TRANSFILE_TYPE_SHORT_VIDEO_C2C, BUSI_TYPE_SHORT_VIDEO, wait) {
it.mSourceVideoCodecFormat = VIDEO_FORMAT_MP4
it.mRec = MessageForShortVideo().also {
it.busiType = BUSI_TYPE_SHORT_VIDEO
@ -56,11 +56,11 @@ internal object Transfer: FileTransfer() {
}
suspend fun uploadC2CVoice(
groupId: String,
userId: String,
file: File,
wait: Boolean = true
): Boolean {
return transC2CResource(groupId, file, FileMsg.TRANSFILE_TYPE_PTT, 1002, wait) {
return transC2CResource(userId, file, FileMsg.TRANSFILE_TYPE_PTT, 1002, wait) {
it.mPttUploadPanel = 3
it.mPttCompressFinish = true
it.mIsPttPreSend = true

13
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/AntiDetection.kt
View File

@ -2,6 +2,7 @@
package moe.fuqiuluo.shamrock.xposed.actions
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import moe.fuqiuluo.shamrock.tools.hookMethod
@ -12,12 +13,24 @@ class AntiDetection: IAction {
override fun invoke(ctx: Context) {
antiTrace()
antiMemoryWalking()
antiFindPackage()
}
val isModuleStack = fun String.(): Boolean {
return contains("fuqiuluo") || contains("shamrock") || contains("whitechi") || contains("lsposed") || contains("xposed")
}
private fun antiFindPackage() {
//PackageManager::class.java.hookMethod("getApplicationInfo").before {
// val packageName = it.args[0] as String
// if(packageName == "moe.fuqiuluo.shamrock") {
// it.throwable = PackageManager.NameNotFoundException()
// } else if (packageName == "moe.fuqiuluo.shamrock.hided") {
// it.args[0] = "moe.fuqiuluo.shamrock"
// }
//}
}
private fun antiMemoryWalking() {
val c = Class.forName("dalvik.system.VMDebug")
//val startMethodTracingMethod = c.getDeclaredMethod(