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 5398940c..7077c005 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -767,6 +767,20 @@ open class MessageRepositoryImpl @Inject constructor( return message } + override fun markAsSendingNow(messageId: Long) = + Realm.getDefaultInstance().use { realm -> + realm.refresh() + realm.where(Message::class.java) + .equalTo("id", messageId) + .findFirst() + ?.let { message -> + realm.executeTransaction { + message.date = System.currentTimeMillis() + } + } + Unit + } + /** * Marks the message as sending, in case we need to retry sending it */ diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ActionDelayedMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ActionDelayedMessage.kt index a612ba53..61211eb7 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ActionDelayedMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ActionDelayedMessage.kt @@ -51,6 +51,7 @@ class ActionDelayedMessage @Inject constructor( } Action.Send -> { + messageRepo.markAsSendingNow(message.id) updateConversations.addAll( messageRepo.sendMessage(message).map { it.threadId } ) diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendNewMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendNewMessage.kt index 41d350f5..191cd0dc 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SendNewMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendNewMessage.kt @@ -24,6 +24,7 @@ import dev.octoshrimpy.quik.model.Attachment import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.Flowable +import io.reactivex.android.schedulers.AndroidSchedulers import timber.log.Timber import javax.inject.Inject @@ -70,11 +71,14 @@ class SendNewMessage @Inject constructor( conversationRepo.updateConversations(threadIds) conversationRepo.markUnarchived(threadIds) - threadIds.forEach { threadId -> shortcutManager.reportShortcutUsed(threadId) } + AndroidSchedulers.mainThread().scheduleDirect { + threadIds.forEach { shortcutManager.reportShortcutUsed(it) } + } // delete attachment local files, if any, because they're saved to mms db by now params.attachments.forEach { it.removeCacheFile() } } + .observeOn(AndroidSchedulers.mainThread()) .flatMap { updateBadge.buildObservable(Unit) } // Update the widget } \ No newline at end of file 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 f85cd306..e0c31924 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -88,4 +88,5 @@ interface MessageRepository { fun deleteOldMessages(maxAgeDays: Int) + fun markAsSendingNow(messageId: Long) } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt index 0cbad1c3..4fde3262 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt @@ -6,6 +6,7 @@ import android.graphics.Bitmap import android.graphics.Path import android.provider.ContactsContract import android.util.TypedValue +import android.view.ContextThemeWrapper import android.view.Gravity import android.view.LayoutInflater import android.view.View.GONE @@ -28,11 +29,12 @@ import timber.log.Timber fun Recipient.getThemedIcon(context: Context, theme: Colors.Theme, width: Int, height: Int): IconCompat { var icon : IconCompat? = null - if(contact != null) { + val photoUri = contact?.photoUri + if (photoUri != null) { val req = GlideApp.with(context) .asBitmap() .circleCrop() - .load(contact!!.photoUri) + .load(photoUri) .submit(width, height) val bitmap = tryOrNull { req.get() } @@ -41,11 +43,12 @@ fun Recipient.getThemedIcon(context: Context, theme: Colors.Theme, width: Int, h else icon = IconCompat.createWithBitmap(bitmap) } - if(icon == null) { + if (icon == null) { // If there is no contact or no photo, create the default icon using the avatar_view layout try { - val inflater = LayoutInflater.from(context) - val container = FrameLayout(context) + val themedContext = ContextThemeWrapper(context, R.style.AppTheme) + val inflater = LayoutInflater.from(themedContext) + val container = FrameLayout(themedContext) container.layoutParams = FrameLayout.LayoutParams(width, height) val view = inflater.inflate(R.layout.avatar_view, container) val textView = view.findViewById(R.id.initial) @@ -61,7 +64,7 @@ fun Recipient.getThemedIcon(context: Context, theme: Colors.Theme, width: Int, h iconView.layoutParams = FrameLayout.LayoutParams((width * 0.5).toInt(), (height * 0.5).toInt(), Gravity.CENTER) - if(contact != null) { + if (contact != null) { val initials = contact!!.name .substringBefore(',') .split(" ")