Clean up Scheduling Code

Update documentation, remove deprecated and unused code, and clean up formatting.
This commit is contained in:
Inhishonor
2025-07-08 16:26:03 -07:00
parent e8c92a1422
commit 56a767bbd7
8 changed files with 41 additions and 33 deletions
@@ -8,6 +8,7 @@ import io.reactivex.schedulers.Schedulers
import io.realm.Realm
import io.realm.RealmList
import io.realm.RealmResults
import timber.log.Timber
import javax.inject.Inject
class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository {
@@ -71,12 +72,12 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
realm.executeTransaction { message?.deleteFromRealm() }
}
}.subscribeOn(Schedulers.io()) // Perform the operation in a background thread
.observeOn(AndroidSchedulers.mainThread()) // Switch back to the main thread if needed
}.subscribeOn(Schedulers.io()) // Run on a background thread and switch to main if needed
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
// Handle completion, e.g., log success or update UI
Timber.v("Successfully deleted scheduled messages.")
}, {
// Handle error, e.g., log or show error message
Timber.e("Deleting scheduled messages failed.")
})
disposables.add(subscription)
@@ -96,9 +97,4 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
.map { it.id }
}
}
// Ensure to clear disposables when the repository is no longer needed
fun clearDisposables() {
disposables.clear()
}
}
@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.interactor
import android.annotation.SuppressLint
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import dev.octoshrimpy.quik.extensions.getName
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
@@ -58,7 +57,7 @@ class AddScheduledMessage @Inject constructor(
// step 2 - copy attachments to app local storage
scheduledMessageDb.attachments = RealmList(
*scheduledMessageDb.attachments.mapNotNull {
val inUri = Uri.parse(it)
val inUri = it.toUri()
try {
// get filename of input uri or use random uuid on fail to get
val filename = inUri.getName(context) ?: UUID.randomUUID()
@@ -93,5 +92,4 @@ class AddScheduledMessage @Inject constructor(
}
.flatMap { updateScheduledMessageAlarms.buildObservable(Unit) }
}
}
}
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint
import android.content.Context
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
import io.reactivex.Flowable
import timber.log.Timber
import java.io.File
import javax.inject.Inject
@@ -41,11 +42,12 @@ class DeleteScheduledMessages @Inject constructor(
val topDir = File(context.filesDir, "scheduled-${it}")
topDir.exists() && topDir.deleteRecursively()
}
} catch (e: Exception) { /* nothing */ }
} catch (e: Exception) {
Timber.e("Unable to delete scheduled messages.")
}
// delete the db entries
scheduledMessageRepo.deleteScheduledMessages(it)
}
}
}
}
@@ -35,6 +35,9 @@ interface ScheduledMessageRepository {
attachments: List<String>
): ScheduledMessage
/**
* Updates scheduled messages with new uris
*/
fun updateScheduledMessage(scheduledMessage: ScheduledMessage)
/**
@@ -52,10 +55,14 @@ interface ScheduledMessageRepository {
*/
fun deleteScheduledMessage(id: Long)
// delete multiple scheduled messages by id list
/**
* Delete multiple scheduled messages by id list
*/
fun deleteScheduledMessages(ids: List<Long>)
// get a list of all scheduled message ids (in scheduled date order)
/**
* Get a list of all scheduled message ids (in scheduled date order)
*/
fun getAllScheduledMessageIdsSnapshot(): List<Long>
}
}
@@ -51,7 +51,9 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override val editScheduledMessage: Subject<Long> = PublishSubject.create()
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
private val viewModel by lazy {
ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java]
}
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
@@ -152,4 +154,4 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
finish()
}
}
}
@@ -53,7 +53,8 @@ class ScheduledMessageAdapter @Inject constructor(
val clicks: Subject<Long> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.scheduled_message_list_item, parent, false)
view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
view.attachments.setRecycledViewPool(imagesViewPool)
@@ -76,7 +77,8 @@ class ScheduledMessageAdapter @Inject constructor(
val message = getItem(position) ?: return
// GroupAvatarView only accepts recipients, so map the phone numbers to recipients
holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
holder.avatars.recipients =
message.recipients.map { address -> Recipient(address = address) }
holder.recipients.text = message.recipients.joinToString(",") { address ->
contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
@@ -111,10 +113,7 @@ class ScheduledMessageAdapter @Inject constructor(
}
})
}
return super.get(key)?.takeIf { it.isValid }
}
}
}
@@ -65,5 +65,4 @@ class ScheduledMessageAttachmentAdapter @Inject constructor(
else -> holder.fileName.visibility = View.GONE
}
}
}
@@ -50,10 +50,12 @@ class ScheduledViewModel @Inject constructor(
// show the delete message dialog if one or more messages selected
view.optionsItemIntent
.filter { it == R.id.delete }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
selectedMessages }
.autoDisposable(view.scope())
.subscribe {
val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage).map { it.id }
val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage)
.map { it.id }
view.showDeleteDialog(ids)
}
@@ -61,7 +63,8 @@ class ScheduledViewModel @Inject constructor(
// copy the selected message text to the clipboard
view.optionsItemIntent
.filter { it == R.id.copy }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
selectedMessages }
.autoDisposable(view.scope())
.subscribe {
val messages = it
@@ -82,14 +85,16 @@ class ScheduledViewModel @Inject constructor(
// send the messages now menu item selected
view.optionsItemIntent
.filter { it == R.id.send_now }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
selectedMessages }
.autoDisposable(view.scope())
.subscribe { view.showSendNowDialog(it) }
// edit message menu item selected
view.optionsItemIntent
.filter { it == R.id.edit_message }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> selectedMessage.first() }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage ->
selectedMessage.first() }
.autoDisposable(view.scope())
.subscribe { view.showEditMessageDialog(it) }
@@ -130,7 +135,7 @@ class ScheduledViewModel @Inject constructor(
// navigate back or unselect
view.optionsItemIntent
.filter { it == android.R.id.home }
.map { Unit }
.map { }
.mergeWith(view.backPressedIntent)
.withLatestFrom(state) { _, state -> state }
.autoDisposable(view.scope())