Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-06-12 13:17:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core/downloader): better duplicate handling

Browse Source 
- fix runOnUIThread
This commit is contained in:
rhunk
2023-10-08 00:35:57 +02:00
parent 3fbe5ef121
commit f2813d45c7
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt
View File

@ -67,6 +67,10 @@ class ModContext {
}
fun runOnUiThread(runnable: () -> Unit) {
if (Looper.myLooper() == Looper.getMainLooper()) {
runnable()
return
}
Handler(Looper.getMainLooper()).post {
runCatching(runnable).onFailure {
Logger.xposedLog("UI thread runnable failed", it)
@ -86,11 +90,15 @@ class ModContext {
}
fun shortToast(message: Any?) {
Toast.makeText(androidContext, message.toString(), Toast.LENGTH_SHORT).show()
runOnUiThread {
Toast.makeText(androidContext, message.toString(), Toast.LENGTH_SHORT).show()
}
}
fun longToast(message: Any?) {
Toast.makeText(androidContext, message.toString(), Toast.LENGTH_LONG).show()
runOnUiThread {
Toast.makeText(androidContext, message.toString(), Toast.LENGTH_LONG).show()
}
}
fun softRestartApp(saveSettings: Boolean = false) {

4
core/src/main/kotlin/me/rhunk/snapenhance/core/util/export/MessageExporter.kt
View File

@ -119,7 +119,7 @@ class MessageExporter(
}.forEach { message ->
threadPool.execute {
MessageDecoder.decode(message.messageContent).forEach decode@{ attachment ->
val protoMediaReference = Base64.UrlSafe.decode(attachment.mediaKey ?: return@decode)
val protoMediaReference = Base64.UrlSafe.decode(attachment.mediaUrlKey ?: return@decode)
runCatching {
RemoteMediaResolver.downloadBoltMedia(protoMediaReference, decryptionCallback = {
@ -291,7 +291,7 @@ class MessageExporter(
if (attachments.type == AttachmentType.STICKER) //TODO: implement stickers
return@attachments
add(JsonObject().apply {
addProperty("key", attachments.mediaKey?.replace("=", ""))
addProperty("key", attachments.mediaUrlKey?.replace("=", ""))
addProperty("type", attachments.type.toString())
add("encryption", attachments.attachmentInfo?.encryption?.let { encryption ->
JsonObject().apply {

9
core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt
View File

@ -289,9 +289,10 @@ class MediaDownloader : MessagingRuleFeature("MediaDownloader", MessagingRuleTyp
val author = context.database.getFriendInfo(senderId) ?: return
val authorUsername = author.usernameForSorting!!
val mediaId = paramMap["MEDIA_ID"]?.toString()?.split("-")?.getOrNull(1) ?: ""
downloadOperaMedia(provideDownloadManagerClient(
mediaIdentifier = "$conversationId$senderId${conversationMessage.serverMessageId}",
mediaIdentifier = "$conversationId$senderId${conversationMessage.serverMessageId}$mediaId",
mediaAuthor = authorUsername,
downloadSource = MediaDownloadSource.CHAT_MEDIA,
friendInfo = author
@ -533,12 +534,12 @@ class MediaDownloader : MessagingRuleFeature("MediaDownloader", MessagingRuleTyp
attachments.forEach { attachment ->
runCatching {
provideDownloadManagerClient(
mediaIdentifier = "${message.clientConversationId}${message.senderId}${message.serverMessageId}${attachment.attachmentInfo?.encryption?.iv}",
mediaIdentifier = "${message.clientConversationId}${message.senderId}${message.serverMessageId}${attachment.mediaUniqueId}",
downloadSource = MediaDownloadSource.CHAT_MEDIA,
mediaAuthor = authorName,
friendInfo = friendInfo
).downloadSingleMedia(
mediaData = attachment.mediaKey!!,
mediaData = attachment.mediaUrlKey!!,
mediaType = DownloadMediaType.PROTO_MEDIA,
encryption = attachment.attachmentInfo?.encryption,
attachmentType = attachment.type
@ -614,7 +615,7 @@ class MediaDownloader : MessagingRuleFeature("MediaDownloader", MessagingRuleTyp
val firstAttachment = decodedAttachments.first()
val previewCoroutine = async {
val downloadedMedia = RemoteMediaResolver.downloadBoltMedia(Base64.decode(firstAttachment.mediaKey!!), decryptionCallback = {
val downloadedMedia = RemoteMediaResolver.downloadBoltMedia(Base64.decode(firstAttachment.mediaUrlKey!!), decryptionCallback = {
firstAttachment.attachmentInfo?.encryption?.decryptInputStream(it) ?: it
}) ?: return@async null

17
core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/decoder/MessageDecoder.kt
View File

@ -10,17 +10,22 @@ import kotlin.io.encoding.Base64
import kotlin.io.encoding.ExperimentalEncodingApi
data class DecodedAttachment(
val mediaKey: String?,
val mediaUrlKey: String?,
val type: AttachmentType,
val attachmentInfo: AttachmentInfo?
)
) {
@OptIn(ExperimentalEncodingApi::class)
val mediaUniqueId: String? by lazy {
runCatching { Base64.UrlSafe.decode(mediaUrlKey.toString()) }.getOrNull()?.let { ProtoReader(it).getString(2, 2) }
}
}
@OptIn(ExperimentalEncodingApi::class)
object MessageDecoder {
private val gson = GsonBuilder().create()
private fun decodeAttachment(protoReader: ProtoReader): AttachmentInfo? {
val mediaInfo = protoReader.followPath(1, 1) ?: return null
val mediaInfo = protoReader.followPath(1, 1) ?: return null
return AttachmentInfo(
encryption = run {
@ -94,7 +99,7 @@ object MessageDecoder {
fun decodeMedia(type: AttachmentType, protoReader: ProtoReader) {
decodedAttachment.add(
DecodedAttachment(
mediaKey = mediaReferences.getOrNull(mediaKeyIndex++),
mediaUrlKey = mediaReferences.getOrNull(mediaKeyIndex++),
type = type,
attachmentInfo = decodeAttachment(protoReader) ?: return
)
@ -110,7 +115,7 @@ object MessageDecoder {
protoReader.followPath(1) {
decodedAttachment.add(
DecodedAttachment(
mediaKey = null,
mediaUrlKey = null,
type = AttachmentType.STICKER,
attachmentInfo = BitmojiSticker(
reference = getString(2) ?: return@followPath
@ -149,7 +154,7 @@ object MessageDecoder {
decodedAttachment.add(
DecodedAttachment(
mediaKey = mediaReferences.getOrNull(mediaKeyIndex++),
mediaUrlKey = mediaReferences.getOrNull(mediaKeyIndex++),
type = AttachmentType.NOTE,
attachmentInfo = audioNote
)