forked from upstream-mirrors/quik
add delay send mms. add group send to individual recipients - sms and mms. add immediate show messages in convo, not wait for sent. new qktransaction that replaces android/smsmms transaction with mods for quik. lots of code cleanups and removing superfluous code. some bug fixes.
This commit is contained in:
@@ -32,7 +32,7 @@ class CursorToContactImpl @Inject constructor(
|
||||
) : CursorToContact {
|
||||
|
||||
companion object {
|
||||
val URI = Phone.CONTENT_URI
|
||||
val URI = Phone.CONTENT_URI!!
|
||||
val PROJECTION = arrayOf(
|
||||
Phone._ID,
|
||||
Phone.LOOKUP_KEY,
|
||||
|
||||
@@ -20,12 +20,10 @@ package dev.octoshrimpy.quik.mapper
|
||||
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import android.provider.Telephony.*
|
||||
import com.google.android.mms.pdu_alt.EncodedStringValue
|
||||
import com.google.android.mms.pdu_alt.PduHeaders
|
||||
import com.google.android.mms.pdu_alt.PduPersister
|
||||
import dev.octoshrimpy.quik.extensions.map
|
||||
import dev.octoshrimpy.quik.manager.KeyManager
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
import dev.octoshrimpy.quik.model.Message
|
||||
@@ -33,16 +31,16 @@ import dev.octoshrimpy.quik.util.Preferences
|
||||
import dev.octoshrimpy.quik.util.SqliteWrapper
|
||||
import dev.octoshrimpy.quik.util.tryOrNull
|
||||
import javax.inject.Inject
|
||||
import androidx.core.net.toUri
|
||||
|
||||
class CursorToMessageImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
private val cursorToPart: CursorToPart,
|
||||
private val keys: KeyManager,
|
||||
private val permissionManager: PermissionManager,
|
||||
private val preferences: Preferences
|
||||
) : CursorToMessage {
|
||||
|
||||
private val uri = Uri.parse("content://mms-sms/complete-conversations")
|
||||
private val uri = "content://mms-sms/complete-conversations".toUri()
|
||||
private val projection = arrayOf(
|
||||
MmsSms.TYPE_DISCRIMINATOR_COLUMN,
|
||||
MmsSms._ID,
|
||||
@@ -66,7 +64,7 @@ class CursorToMessageImpl @Inject constructor(
|
||||
Mms.MESSAGE_BOX,
|
||||
Mms.DELIVERY_REPORT,
|
||||
Mms.READ_REPORT,
|
||||
MmsSms.PendingMessages.ERROR_TYPE,
|
||||
// MmsSms.PendingMessages.ERROR_TYPE,
|
||||
Mms.STATUS
|
||||
)
|
||||
|
||||
@@ -77,8 +75,8 @@ class CursorToMessageImpl @Inject constructor(
|
||||
return Message().apply {
|
||||
type = when {
|
||||
cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) != -1 -> cursor.getString(columnsMap.msgType)
|
||||
cursor.getColumnIndex(Mms.SUBJECT) != -1 -> "mms"
|
||||
cursor.getColumnIndex(Sms.ADDRESS) != -1 -> "sms"
|
||||
cursor.getColumnIndex(Mms.SUBJECT) != -1 -> Message.TYPE_MMS
|
||||
cursor.getColumnIndex(Sms.ADDRESS) != -1 -> Message.TYPE_SMS
|
||||
else -> "unknown"
|
||||
}
|
||||
|
||||
@@ -92,7 +90,8 @@ class CursorToMessageImpl @Inject constructor(
|
||||
subId = if (columnsMap.subId != -1) cursor.getInt(columnsMap.subId) else -1
|
||||
|
||||
when (type) {
|
||||
"sms" -> {
|
||||
Message.TYPE_SMS -> {
|
||||
type = Message.TYPE_SMS
|
||||
address = cursor.getString(columnsMap.smsAddress) ?: ""
|
||||
boxId = cursor.getInt(columnsMap.smsType)
|
||||
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
||||
@@ -105,14 +104,15 @@ class CursorToMessageImpl @Inject constructor(
|
||||
deliveryStatus = cursor.getInt(columnsMap.smsStatus)
|
||||
}
|
||||
|
||||
"mms" -> {
|
||||
Message.TYPE_MMS -> {
|
||||
type = Message.TYPE_MMS
|
||||
address = getMmsAddress(contentId)
|
||||
boxId = cursor.getInt(columnsMap.mmsMessageBox)
|
||||
date *= 1000L
|
||||
dateSent *= 1000L
|
||||
seen = cursor.getInt(columnsMap.mmsSeen) != 0
|
||||
mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
|
||||
errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
|
||||
// errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
|
||||
messageSize = 0
|
||||
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
|
||||
messageType = cursor.getInt(columnsMap.mmsMessageType)
|
||||
|
||||
@@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.mapper
|
||||
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import dev.octoshrimpy.quik.manager.PermissionManager
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
import javax.inject.Inject
|
||||
import androidx.core.net.toUri
|
||||
|
||||
class CursorToRecipientImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
@@ -31,7 +31,7 @@ class CursorToRecipientImpl @Inject constructor(
|
||||
) : CursorToRecipient {
|
||||
|
||||
companion object {
|
||||
val URI = Uri.parse("content://mms-sms/canonical-addresses")
|
||||
val URI = "content://mms-sms/canonical-addresses".toUri()
|
||||
|
||||
const val COLUMN_ID = 0
|
||||
const val COLUMN_ADDRESS = 1
|
||||
|
||||
Reference in New Issue
Block a user