From ca50c4d4ba893c77fb1c81ca1099a030a12b5b4a Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Thu, 6 Nov 2025 18:28:46 -0500 Subject: [PATCH] fix memleak and manual release regex --- .github/workflows/manual-release.yml | 2 +- .../moez/QKSMS/repository/ConversationRepositoryImpl.kt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index ae238ed8..85b1cb8e 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -75,7 +75,7 @@ jobs: new_name = f"{major}.{minor}.{patch}" new_code = current_code + 1 - content, code_count = code_pattern.subn(rf"\1{new_code}", content, count=1) + content, code_count = code_pattern.subn(lambda m: f"{m.group(1)}{new_code}", content, count=1) content, name_count = name_pattern.subn(lambda m: f"{m.group(1)}{new_name}{m.group(3)}", content, count=1) if code_count != 1 or name_count != 1: diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 1fdbc0c9..3831dd1a 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -313,8 +313,8 @@ class ConversationRepositoryImpl @Inject constructor( override fun getConversation(recipient: String) = getConversation(listOf(recipient)) - override fun getConversation(recipients: Collection) = - Realm.getDefaultInstance().let { realm -> + override fun getConversation(recipients: Collection): Conversation? = + Realm.getDefaultInstance().use { realm -> realm.refresh() realm.where(Conversation::class.java) .findAll() @@ -325,6 +325,7 @@ class ConversationRepositoryImpl @Inject constructor( recipients.any { recipient -> phoneNumberUtils.compare(recipient, address) } } } + ?.let { realm.copyFromRealm(it) } } override fun getOrCreateConversation(threadId: Long) = @@ -516,4 +517,4 @@ class ConversationRepositoryImpl @Inject constructor( } } } -} \ No newline at end of file +}