From cc7f573e541bfb4186b4204ccd416e63046e85d5 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Wed, 10 Apr 2019 22:12:57 -0400 Subject: [PATCH] Format domain module --- .../QKSMS/interactor/AddScheduledMessage.kt | 19 ++++++++++++------- .../moez/QKSMS/interactor/DeleteMessages.kt | 4 +++- .../com/moez/QKSMS/interactor/ReceiveMms.kt | 13 ++++++++++--- .../com/moez/QKSMS/interactor/ReceiveSms.kt | 15 +++++++++++---- .../com/moez/QKSMS/interactor/SendMessage.kt | 12 +++++++----- .../UpdateScheduledMessageAlarms.kt | 4 +++- .../java/com/moez/QKSMS/model/Attachment.kt | 2 +- .../java/com/moez/QKSMS/model/Conversation.kt | 3 +-- .../com/moez/QKSMS/model/ScheduledMessage.kt | 16 +++++++++------- .../QKSMS/repository/MessageRepository.kt | 9 ++++++++- .../repository/ScheduledMessageRepository.kt | 10 ++++++++-- 11 files changed, 73 insertions(+), 34 deletions(-) diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index db4496b8..3b31402a 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt @@ -27,16 +27,21 @@ class AddScheduledMessage @Inject constructor( private val updateScheduledMessageAlarms: UpdateScheduledMessageAlarms ) : Interactor() { - data class Params(val date: Long, - val subId: Int, - val recipients: List, - val sendAsGroup: Boolean, - val body: String, - val attachments: List) + data class Params( + val date: Long, + val subId: Int, + val recipients: List, + val sendAsGroup: Boolean, + val body: String, + val attachments: List + ) override fun buildObservable(params: Params): Flowable<*> { return Flowable.just(params) - .map { scheduledMessageRepo.saveScheduledMessage(it.date, it.subId, it.recipients, it.sendAsGroup, it.body, it.attachments) } + .map { + scheduledMessageRepo.saveScheduledMessage(it.date, it.subId, it.recipients, it.sendAsGroup, it.body, + it.attachments) + } .flatMap { updateScheduledMessageAlarms.buildObservable(Unit) } } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt index 33611067..8c0969b6 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt @@ -36,7 +36,9 @@ class DeleteMessages @Inject constructor( override fun buildObservable(params: Params): Flowable<*> { return Flowable.just(params.messageIds.toLongArray()) .doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages - .doOnNext { params.threadId?.let { conversationRepo.updateConversations(it) } } // Update the conversation + .doOnNext { + params.threadId?.let { conversationRepo.updateConversations(it) } // Update the conversation + } .doOnNext { params.threadId?.let { notificationManager.update(it) } } .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt index 361dde2e..bf540dfe 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt @@ -58,10 +58,17 @@ class ReceiveMms @Inject constructor( if (blocked) messageRepo.deleteMessages(message.id) } } - .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } // Update the conversation - .mapNotNull { message -> conversationRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .doOnNext { message -> + conversationRepo.updateConversations(message.threadId) // Update the conversation + } + .mapNotNull { message -> + conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation + } .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations - .doOnNext { conversation -> if (conversation.archived) conversationRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary + .doOnNext { conversation -> + // Unarchive conversation if necessary + if (conversation.archived) conversationRepo.markUnarchived(conversation.id) + } .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread .doOnNext(notificationManager::update) // Update the notification .flatMap { updateBadge.buildObservable(Unit) } // Update the badge diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index 89cc50d6..aaa6052e 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -53,14 +53,21 @@ class ReceiveSms @Inject constructor( val time = messages[0].timestampMillis val body: String = messages .mapNotNull { message -> message.displayMessageBody } - .reduce { body, new -> body + new } ?: "" + .reduce { body, new -> body + new } messageRepo.insertReceivedSms(it.subId, address, body, time) // Add the message to the db } - .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } // Update the conversation - .mapNotNull { message -> conversationRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .doOnNext { message -> + conversationRepo.updateConversations(message.threadId) // Update the conversation + } + .mapNotNull { message -> + conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation + } .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations - .doOnNext { conversation -> if (conversation.archived) conversationRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary + .doOnNext { conversation -> + // Unarchive conversation if necessary + if (conversation.archived) conversationRepo.markUnarchived(conversation.id) + } .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt index 29e08068..687a5f81 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt @@ -21,14 +21,12 @@ package com.moez.QKSMS.interactor import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.MessageRepository -import com.moez.QKSMS.repository.SyncRepository import io.reactivex.Flowable import javax.inject.Inject class SendMessage @Inject constructor( private val conversationRepo: ConversationRepository, - private val messageRepo: MessageRepository, - private val syncRepo: SyncRepository + private val messageRepo: MessageRepository ) : Interactor() { data class Params( @@ -37,11 +35,15 @@ class SendMessage @Inject constructor( val addresses: List, val body: String, val attachments: List = listOf(), - val delay: Int = 0) + val delay: Int = 0 + ) override fun buildObservable(params: Params): Flowable<*> = Flowable.just(Unit) .filter { params.addresses.isNotEmpty() } - .doOnNext { messageRepo.sendMessage(params.subId, params.threadId, params.addresses, params.body, params.attachments, params.delay) } + .doOnNext { + messageRepo.sendMessage(params.subId, params.threadId, params.addresses, params.body, + params.attachments, params.delay) + } .map { // On some manufacturers, we can't obtain a threadId for a new conversation. In // this case, find the threadId manually now that it contains a message diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt index 58e8a6f7..5b8ab1ca 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt @@ -34,7 +34,9 @@ class UpdateScheduledMessageAlarms @Inject constructor( .map { scheduledMessageRepo.getScheduledMessages() } // Get all the scheduled messages .map { it.map { message -> Pair(message.id, message.date) } } // Map the data we need out of Realm .flatMap { messages -> Flowable.fromIterable(messages) } // Turn the list into a stream - .doOnNext { (id, date) -> alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) } // Create alarm + .doOnNext { (id, date) -> + alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) // Create alarm + } .filter { (_, date) -> date < System.currentTimeMillis() } // Filter messages that should have already been sent .flatMap { (id, _) -> sendScheduledMessage.buildObservable(id) } // Send them } diff --git a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt index df8d78a3..ca2ff3b4 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt @@ -51,4 +51,4 @@ sealed class Attachment { } -class Attachments(attachments: List): List by attachments +class Attachments(attachments: List) : List by attachments diff --git a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt index 6c12b9a3..dfb60780 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -36,8 +36,7 @@ open class Conversation( var me: Boolean = false, var draft: String = "", - // For group chats, the user is allowed to set a custom title for the conversation - var name: String = "" + var name: String = "" // For group chats, the user is allowed to set a custom title for the conversation ) : RealmObject() { fun getTitle(): String { diff --git a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt index 7cdaa3a5..de07f195 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt @@ -32,13 +32,15 @@ open class ScheduledMessage( var attachments: RealmList = RealmList() ) : RealmObject() { - fun copy(id: Long = this.id, - date: Long = this.date, - subId: Int = this.subId, - recipients: RealmList = this.recipients, - sendAsGroup: Boolean = this.sendAsGroup, - body: String = this.body, - attachments: RealmList = this.attachments): ScheduledMessage { + fun copy( + id: Long = this.id, + date: Long = this.date, + subId: Int = this.subId, + recipients: RealmList = this.recipients, + sendAsGroup: Boolean = this.sendAsGroup, + body: String = this.body, + attachments: RealmList = this.attachments + ): ScheduledMessage { return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments) } 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 ce8cf4ba..b3ec7b58 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -57,7 +57,14 @@ interface MessageRepository { fun markUnread(vararg threadIds: Long) - fun sendMessage(subId: Int, threadId: Long, addresses: List, body: String, attachments: List, delay: Int = 0) + fun sendMessage( + subId: Int, + threadId: Long, + addresses: List, + body: String, + attachments: List, + delay: Int = 0 + ) /** * Attempts to send the SMS message. This can be called if the message has already been persisted diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt index a13ea778..06f8e04f 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt @@ -26,8 +26,14 @@ interface ScheduledMessageRepository { /** * Saves a scheduled message */ - fun saveScheduledMessage(date: Long, subId: Int, recipients: List, sendAsGroup: Boolean, body: String, - attachments: List) + fun saveScheduledMessage( + date: Long, + subId: Int, + recipients: List, + sendAsGroup: Boolean, + body: String, + attachments: List + ) /** * Returns all of the scheduled messages, sorted chronologically