mirror of
https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
synced 2025-06-05 21:49:22 +02:00
apply some configs at sending message from anywhere
This commit is contained in:
@@ -32,7 +32,6 @@ import com.bumptech.glide.request.RequestOptions
|
|||||||
import com.bumptech.glide.request.target.Target
|
import com.bumptech.glide.request.target.Target
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import com.klinker.android.send_message.Settings
|
|
||||||
import com.klinker.android.send_message.Transaction
|
import com.klinker.android.send_message.Transaction
|
||||||
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
|
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
@@ -768,12 +767,7 @@ class ThreadActivity : SimpleActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val settings = Settings()
|
val settings = getSendMessageSettings()
|
||||||
settings.useSystemSending = true
|
|
||||||
settings.deliveryReports = config.enableDeliveryReports
|
|
||||||
settings.sendLongAsMms = config.sendLongMessageMMS
|
|
||||||
settings.sendLongAsMmsAfter = 1
|
|
||||||
|
|
||||||
val SIMId = availableSIMCards.getOrNull(currentSIMCardIndex)?.subscriptionId
|
val SIMId = availableSIMCards.getOrNull(currentSIMCardIndex)?.subscriptionId
|
||||||
if (SIMId != null) {
|
if (SIMId != null) {
|
||||||
settings.subscriptionId = SIMId
|
settings.subscriptionId = SIMId
|
||||||
|
@@ -22,6 +22,7 @@ import android.provider.Telephony.*
|
|||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.RemoteInput
|
import androidx.core.app.RemoteInput
|
||||||
|
import com.klinker.android.send_message.Settings
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.*
|
import com.simplemobiletools.commons.helpers.*
|
||||||
import com.simplemobiletools.commons.models.PhoneNumber
|
import com.simplemobiletools.commons.models.PhoneNumber
|
||||||
@@ -958,3 +959,12 @@ fun Context.getFileSizeFromUri(uri: Uri): Long {
|
|||||||
return FILE_SIZE_NONE
|
return FILE_SIZE_NONE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun Context.getSendMessageSettings(): Settings {
|
||||||
|
val settings = Settings()
|
||||||
|
settings.useSystemSending = true
|
||||||
|
settings.deliveryReports = config.enableDeliveryReports
|
||||||
|
settings.sendLongAsMms = config.sendLongMessageMMS
|
||||||
|
settings.sendLongAsMmsAfter = 1
|
||||||
|
return settings
|
||||||
|
}
|
||||||
|
@@ -4,12 +4,12 @@ import android.content.BroadcastReceiver
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import androidx.core.app.RemoteInput
|
import androidx.core.app.RemoteInput
|
||||||
import com.klinker.android.send_message.Settings
|
|
||||||
import com.klinker.android.send_message.Transaction
|
import com.klinker.android.send_message.Transaction
|
||||||
import com.simplemobiletools.commons.extensions.notificationManager
|
import com.simplemobiletools.commons.extensions.notificationManager
|
||||||
import com.simplemobiletools.commons.extensions.showErrorToast
|
import com.simplemobiletools.commons.extensions.showErrorToast
|
||||||
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
|
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
|
||||||
import com.simplemobiletools.smsmessenger.extensions.conversationsDB
|
import com.simplemobiletools.smsmessenger.extensions.conversationsDB
|
||||||
|
import com.simplemobiletools.smsmessenger.extensions.getSendMessageSettings
|
||||||
import com.simplemobiletools.smsmessenger.extensions.markThreadMessagesRead
|
import com.simplemobiletools.smsmessenger.extensions.markThreadMessagesRead
|
||||||
import com.simplemobiletools.smsmessenger.extensions.removeDiacriticsIfNeeded
|
import com.simplemobiletools.smsmessenger.extensions.removeDiacriticsIfNeeded
|
||||||
import com.simplemobiletools.smsmessenger.helpers.REPLY
|
import com.simplemobiletools.smsmessenger.helpers.REPLY
|
||||||
@@ -24,10 +24,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
|
|||||||
|
|
||||||
msg = context.removeDiacriticsIfNeeded(msg)
|
msg = context.removeDiacriticsIfNeeded(msg)
|
||||||
|
|
||||||
val settings = Settings()
|
val settings = context.getSendMessageSettings()
|
||||||
settings.useSystemSending = true
|
|
||||||
settings.deliveryReports = true
|
|
||||||
|
|
||||||
val transaction = Transaction(context, settings)
|
val transaction = Transaction(context, settings)
|
||||||
val message = com.klinker.android.send_message.Message(msg, address)
|
val message = com.klinker.android.send_message.Message(msg, address)
|
||||||
|
|
||||||
|
@@ -3,8 +3,8 @@ package com.simplemobiletools.smsmessenger.services
|
|||||||
import android.app.Service
|
import android.app.Service
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import com.klinker.android.send_message.Settings
|
|
||||||
import com.klinker.android.send_message.Transaction
|
import com.klinker.android.send_message.Transaction
|
||||||
|
import com.simplemobiletools.smsmessenger.extensions.getSendMessageSettings
|
||||||
import com.simplemobiletools.smsmessenger.extensions.getThreadId
|
import com.simplemobiletools.smsmessenger.extensions.getThreadId
|
||||||
import com.simplemobiletools.smsmessenger.receivers.SmsStatusDeliveredReceiver
|
import com.simplemobiletools.smsmessenger.receivers.SmsStatusDeliveredReceiver
|
||||||
import com.simplemobiletools.smsmessenger.receivers.SmsStatusSentReceiver
|
import com.simplemobiletools.smsmessenger.receivers.SmsStatusSentReceiver
|
||||||
@@ -20,10 +20,7 @@ class HeadlessSmsSendService : Service() {
|
|||||||
|
|
||||||
val number = Uri.decode(intent.dataString!!.removePrefix("sms:").removePrefix("smsto:").removePrefix("mms").removePrefix("mmsto:").trim())
|
val number = Uri.decode(intent.dataString!!.removePrefix("sms:").removePrefix("smsto:").removePrefix("mms").removePrefix("mmsto:").trim())
|
||||||
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
|
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
|
||||||
val settings = Settings()
|
val settings = getSendMessageSettings()
|
||||||
settings.useSystemSending = true
|
|
||||||
settings.deliveryReports = true
|
|
||||||
|
|
||||||
val transaction = Transaction(this, settings)
|
val transaction = Transaction(this, settings)
|
||||||
val message = com.klinker.android.send_message.Message(text, number)
|
val message = com.klinker.android.send_message.Message(text, number)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user