From 74a639cf400eec2635fdcf1a6947a88c1f672dde Mon Sep 17 00:00:00 2001 From: gavine99 Date: Thu, 13 Mar 2025 09:39:02 +1100 Subject: [PATCH] change to start dial of last non-me recipient in a conversation in compose, qkreply and main-activity-swipe call actions --- .../QKSMS/repository/MessageRepositoryImpl.kt | 40 +++++++++++-------- .../QKSMS/repository/MessageRepository.kt | 2 + .../QKSMS/feature/compose/ComposeViewModel.kt | 14 ++++--- .../moez/QKSMS/feature/main/MainViewModel.kt | 31 +++++++++----- .../QKSMS/feature/qkreply/QkReplyViewModel.kt | 15 ++++--- 5 files changed, 65 insertions(+), 37 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index a93be920..c27f0658 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -63,6 +63,7 @@ import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.tryOrNull import io.realm.Case import io.realm.Realm +import io.realm.RealmQuery import io.realm.RealmResults import io.realm.Sort import timber.log.Timber @@ -73,7 +74,7 @@ import kotlin.collections.ArrayList import kotlin.math.sqrt @Singleton -class MessageRepositoryImpl @Inject constructor( +open class MessageRepositoryImpl @Inject constructor( private val activeConversationManager: ActiveConversationManager, private val context: Context, private val messageIds: KeyManager, @@ -82,23 +83,30 @@ class MessageRepositoryImpl @Inject constructor( private val syncRepository: SyncRepository ) : MessageRepository { - override fun getMessages(threadId: Long, query: String): RealmResults { + private fun getMessagesBase(threadId: Long, query: String): RealmQuery { return Realm.getDefaultInstance() - .where(Message::class.java) - .equalTo("threadId", threadId) - .let { - when (query.isEmpty()) { - true -> it - false -> it - .beginGroup() - .contains("body", query, Case.INSENSITIVE) - .or() - .contains("parts.text", query, Case.INSENSITIVE) - .endGroup() - } + .where(Message::class.java) + .equalTo("threadId", threadId) + .let { + when (query.isEmpty()) { + true -> it + false -> it + .beginGroup() + .contains("body", query, Case.INSENSITIVE) + .or() + .contains("parts.text", query, Case.INSENSITIVE) + .endGroup() } - .sort("date") - .findAllAsync() + } + .sort("date") + } + + override fun getMessages(threadId: Long, query: String): RealmResults { + return getMessagesBase(threadId, query).findAllAsync() + } + + override fun getMessagesSync(threadId: Long, query: String): RealmResults { + return getMessagesBase(threadId, query).findAll() } override fun getMessage(id: Long): Message? { diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index 45e4cdc7..d58579a5 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -29,6 +29,8 @@ interface MessageRepository { fun getMessages(threadId: Long, query: String = ""): RealmResults + fun getMessagesSync(threadId: Long, query: String = ""): RealmResults + fun getMessage(id: Long): Message? fun getMessageForPart(id: Long): Message? diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 5f80f98a..8bb0681f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -359,12 +359,14 @@ class ComposeViewModel @Inject constructor( // Open the phone dialer if the call button is clicked view.optionsItemIntent - .filter { it == R.id.call } - .withLatestFrom(conversation) { _, conversation -> conversation } - .mapNotNull { conversation -> conversation.recipients.firstOrNull() } - .map { recipient -> recipient.address } - .autoDisposable(view.scope()) - .subscribe { address -> navigator.makePhoneCall(address) } + .filter { it == R.id.call } + .withLatestFrom(state, conversation) + .mapNotNull { (_, state, conversation) -> + state.messages?.second?.lastOrNull { !it.isMe() }?.address // most recent non-me msg address + ?: conversation.recipients.firstOrNull()?.address // first recipient in convo + } + .autoDisposable(view.scope()) + .subscribe { navigator.makePhoneCall(it) } // Open the conversation settings if info button is clicked view.optionsItemIntent diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 5469b3ad..85a603eb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -46,6 +46,7 @@ import dev.octoshrimpy.quik.util.Preferences import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.interactor.SpeakThreads +import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom @@ -66,6 +67,7 @@ class MainViewModel @Inject constructor( syncRepository: SyncRepository, private val changelogManager: ChangelogManager, private val conversationRepo: ConversationRepository, + private val messageRepo: MessageRepository, private val deleteConversations: DeleteConversations, private val markArchived: MarkArchived, private val markPinned: MarkPinned, @@ -510,17 +512,28 @@ class MainViewModel @Inject constructor( view.swipeConversationIntent .autoDisposable(view.scope()) .subscribe { (threadId, direction) -> - val action = if (direction == ItemTouchHelper.RIGHT) prefs.swipeRight.get() else prefs.swipeLeft.get() + val action = + if (direction == ItemTouchHelper.RIGHT) prefs.swipeRight.get() + else prefs.swipeLeft.get() when (action) { - Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) - { - lastArchivedThreadIds.clear() - lastArchivedThreadIds.add(threadId) - view.showArchivedSnackbar(1) + Preferences.SWIPE_ACTION_ARCHIVE -> + markArchived.execute(listOf(threadId)) { + lastArchivedThreadIds.clear() + lastArchivedThreadIds.add(threadId) + view.showArchivedSnackbar(1) + } + Preferences.SWIPE_ACTION_DELETE -> + view.showDeleteDialog(listOf(threadId)) + Preferences.SWIPE_ACTION_BLOCK -> + view.showBlockingDialog(listOf(threadId), true) + Preferences.SWIPE_ACTION_CALL -> { + ( + messageRepo.getMessagesSync(threadId).lastOrNull { !it.isMe() } + ?.address // most recent non-me msg address + ?: conversationRepo.getConversation(threadId) + ?.recipients?.firstOrNull()?.address // first recipient in convo + )?.let(navigator::makePhoneCall) } - Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId)) - Preferences.SWIPE_ACTION_BLOCK -> view.showBlockingDialog(listOf(threadId), true) - Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall) Preferences.SWIPE_ACTION_READ -> markRead.execute(listOf(threadId)) Preferences.SWIPE_ACTION_UNREAD -> markUnread.execute(listOf(threadId)) Preferences.SWIPE_ACTION_SPEAK -> speakThreads.execute(listOf(threadId)) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index 049ea1af..318265c0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -120,12 +120,15 @@ class QkReplyViewModel @Inject constructor( // Call view.menuItemIntent - .filter { id -> id == R.id.call } - .withLatestFrom(conversation) { _, conversation -> conversation } - .mapNotNull { conversation -> conversation.recipients.first()?.address } - .doOnNext { address -> navigator.makePhoneCall(address) } - .autoDisposable(view.scope()) - .subscribe { newState { copy(hasError = true) } } + .filter { id -> id == R.id.call } + .withLatestFrom(state, conversation) + .mapNotNull { (_, state, conversation) -> + state.data?.second?.lastOrNull { !it.isMe() }?.address // most recent non-me msg address + ?: conversation.recipients.firstOrNull()?.address // first recipient in convo + } + .doOnNext { navigator.makePhoneCall(it) } + .autoDisposable(view.scope()) + .subscribe { newState { copy(hasError = true) } } // Show all messages view.menuItemIntent