Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc

This commit is contained in:
Inhishonor
2025-10-09 18:01:59 -07:00
254 changed files with 2886 additions and 1596 deletions
@@ -21,6 +21,7 @@ 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.extensions.getResourceBytes
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
@@ -42,7 +43,8 @@ class AddScheduledMessage @Inject constructor(
val recipients: List<String>,
val sendAsGroup: Boolean,
val body: String,
val attachments: List<Uri>
val attachments: List<Uri>,
val conversationId: Long
)
@SuppressLint("Range")
@@ -52,7 +54,13 @@ class AddScheduledMessage @Inject constructor(
.map { // step 1 - save, without attachments, to db to get primary key id which is
// needed for building the save file location dir name in step 2
scheduledMessageRepo.saveScheduledMessage(
it.date, it.subId, it.recipients, it.sendAsGroup, it.body, listOf()
it.date,
it.subId,
it.recipients,
it.sendAsGroup,
it.body,
listOf(),
it.conversationId
)
}
.map { scheduledMessage ->
@@ -86,5 +94,4 @@ class AddScheduledMessage @Inject constructor(
}
.flatMap { updateScheduledMessageAlarms.buildObservable(Unit) }
}
}
}
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.interactor
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
@@ -39,11 +40,12 @@ class DeleteScheduledMessages @Inject constructor(
val topDir = File(context.filesDir, "scheduled-${scheduledMessageId}")
topDir.exists() && topDir.deleteRecursively()
}
} catch (e: Exception) { /* nothing */ }
} catch (e: Exception) {
Timber.e("Unable to delete scheduled messages.")
}
// delete the db entries
scheduledMessageRepo.deleteScheduledMessages(params)
}
}
}
}
@@ -18,15 +18,22 @@
*/
package dev.octoshrimpy.quik.interactor
import dev.octoshrimpy.quik.manager.NotificationManager
import dev.octoshrimpy.quik.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
class SendExistingMessage @Inject constructor(
private val messageRepo: MessageRepository
private val messageRepo: MessageRepository,
private val notificationManager: NotificationManager
) : Interactor<Long>() {
override fun buildObservable(params: Long): Flowable<Long> =
Flowable.just(params)
.doOnNext { messageId -> messageRepo.sendMessage(messageId) }
.doOnNext { messageId ->
val message = messageRepo.getMessage(messageId)
messageRepo.sendMessage(messageId)
val threadId = message!!.threadId
notificationManager.cancel(threadId.toInt() + 100000)
}
}