diff --git a/qksms/src/main/java/common/util/Preferences.kt b/qksms/src/main/java/common/util/Preferences.kt index c9c4f1e8..c0a9483e 100644 --- a/qksms/src/main/java/common/util/Preferences.kt +++ b/qksms/src/main/java/common/util/Preferences.kt @@ -34,7 +34,6 @@ class Preferences @Inject constructor(rxPrefs: RxSharedPreferences) { val vibration = rxPrefs.getBoolean("vibration", true) val ringtone = rxPrefs.getString("ringtone", Settings.System.DEFAULT_NOTIFICATION_URI.toString()) val delivery = rxPrefs.getBoolean("delivery", false) - val split = rxPrefs.getBoolean("split", false) val unicode = rxPrefs.getBoolean("unicode", false) val mms = rxPrefs.getBoolean("mms", true) val mmsSize = rxPrefs.getLong("mmsSize", -1) diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 8fe6d56b..7aebf7a2 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -23,56 +23,42 @@ import android.content.Context import android.content.Intent import android.telephony.SmsManager import common.util.Preferences +import data.model.Message import data.repository.MessageRepository +import io.reactivex.Flowable import presentation.receiver.MessageDeliveredReceiver import presentation.receiver.MessageSentReceiver -import io.reactivex.Flowable -import io.reactivex.rxkotlin.toFlowable import javax.inject.Inject class SendMessage @Inject constructor( private val context: Context, private val prefs: Preferences, private val messageRepo: MessageRepository) - : Interactor() { + : Interactor() { data class Params(val threadId: Long, val address: String, val body: String) - override fun buildObservable(params: Params): Flowable { - + override fun buildObservable(params: Params): Flowable { val smsManager = SmsManager.getDefault() - return Flowable.just(prefs.split.get()) - .map { split -> - when (split) { - true -> smsManager.divideMessage(params.body) - false -> arrayListOf(params.body) + return Flowable.just(params) + .map { messageRepo.insertSentSms(params.threadId, params.address, params.body) } + .doOnNext { message -> + val parts = smsManager.divideMessage(params.body) + + val sentIntents = parts.map { + val intent = Intent(context, MessageSentReceiver::class.java).putExtra("id", message.id) + PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) } - } - .flatMap { bodies -> bodies.toFlowable() } - .map { body -> messageRepo.insertSentSms(params.threadId, params.address, body) } - .map { message -> - val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("id", message.id) - val sentPI = PendingIntent.getBroadcast(context, message.id.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT) - val deliveredIntent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("id", message.id) - val deliveredPI = PendingIntent.getBroadcast(context, message.id.toInt(), deliveredIntent, PendingIntent.FLAG_UPDATE_CURRENT) - - Triple(message.body, sentPI, deliveredPI) - } - .toList().toFlowable() - .doOnNext { messages -> - if (messages.size == 1) { - smsManager.sendTextMessage(params.address, null, messages[0].first, messages[0].second, if (prefs.delivery.get()) messages[0].third else null) - } else { - val parts = ArrayList(messages.map { it.first }) - val sentIntents = ArrayList(messages.map { it.second }) - val deliveredIntents = ArrayList(messages.map { it.third }) - - smsManager.sendMultipartTextMessage(params.address, null, parts, sentIntents, if (prefs.delivery.get()) deliveredIntents else null) + val deliveredIntents = parts.map { + val intent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("id", message.id) + val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) + if (prefs.delivery.get()) pendingIntent else null } + + smsManager.sendMultipartTextMessage(params.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents)) } - .map { Unit } } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 8fb212c2..60f81c57 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -152,8 +152,6 @@ class SettingsActivity : QkActivity(), SettingsView { delivery.checkbox.isChecked = state.deliveryEnabled - split.checkbox.isChecked = state.splitSmsEnabled - unicode.checkbox.isChecked = state.stripUnicodeEnabled mms.checkbox.isChecked = state.mmsEnabled diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index bb16a67a..cc8238fc 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -66,10 +66,6 @@ class SettingsViewModel : QkViewModel(SettingsState newState { it.copy(deliveryEnabled = deliveryEnabled) } } - disposables += prefs.split.asObservable().subscribe { splitSmsEnabled -> - newState { it.copy(splitSmsEnabled = splitSmsEnabled) } - } - disposables += prefs.unicode.asObservable().subscribe { stripUnicodeEnabled -> newState { it.copy(stripUnicodeEnabled = stripUnicodeEnabled) } } @@ -110,8 +106,6 @@ class SettingsViewModel : QkViewModel(SettingsState R.id.delivery -> prefs.delivery.set(!prefs.delivery.get()) - R.id.split -> prefs.split.set(!prefs.split.get()) - R.id.unicode -> prefs.unicode.set(!prefs.unicode.get()) R.id.mms -> prefs.mms.set(!prefs.mms.get()) diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 4207df41..66968246 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -102,14 +102,6 @@ app:title="@string/settings_delivery_title" app:widget="@layout/settings_switch_widget" /> - - Ringtone Delivery confirmations Confirm that messages were sent successfully - Split long SMS - Split long messages into separate messages Strip unicode Swap characters that are not supported in full-length messages for GSM compatible characters MMS enabled