Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f84205 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch '141-stripAccent-body' into 'main'

update for stripped body

See merge request !55
parents f5ad1369 6ef918be
Loading
Loading
Loading
Loading
Loading
+5 −13
Original line number Diff line number Diff line
@@ -311,19 +311,10 @@ class MessageRepositoryImpl @Inject constructor(
                ?.let(SmsManagerFactory::createSmsManager)
                ?: SmsManager.getDefault()

        // We only care about stripping SMS
        val strippedBody = when (prefs.unicode.get()) {
            true -> StripAccents.stripAccents(signedBody)
            false -> signedBody
        }

        val parts = smsManager.divideMessage(strippedBody).orEmpty()
        val forceMms = prefs.longAsMms.get() && parts.size > 1

        if (addresses.size == 1 && attachments.isEmpty() && !forceMms) { // SMS
        if (addresses.size == 1 && attachments.isEmpty()) { // SMS
            if (delay > 0) { // With delay
                val sendTime = System.currentTimeMillis() + delay
                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, sendTime)
                val message = insertSentSms(subId, threadId, addresses.first(), signedBody, sendTime)

                val intent = getIntentForDelayedSms(message.id)

@@ -334,10 +325,11 @@ class MessageRepositoryImpl @Inject constructor(
                    alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent)
                }
            } else { // No delay
                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, now())
                val message = insertSentSms(subId, threadId, addresses.first(), signedBody, System.currentTimeMillis())
                sendSms(message)
            }
        } else { // MMS
        }
        else { // MMS
            val parts = arrayListOf<MMSPart>()

            val maxWidth = smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH)