#505 - Signature support

This commit is contained in:
moezbhatti
2019-07-26 23:34:00 -04:00
parent 4681b03895
commit 3915b9322b
12 changed files with 146 additions and 33 deletions
@@ -218,10 +218,16 @@ class MessageRepositoryImpl @Inject constructor(
attachments: List<Attachment>,
delay: Int
) {
val signedBody = when {
prefs.signature.get().isEmpty() -> body
body.isNotEmpty() -> body + '\n' + prefs.signature.get()
else -> prefs.signature.get()
}
if (addresses.size == 1 && attachments.isEmpty()) { // SMS
if (delay > 0) { // With delay
val sendTime = System.currentTimeMillis() + delay
val message = insertSentSms(subId, threadId, addresses.first(), body, sendTime)
val message = insertSentSms(subId, threadId, addresses.first(), signedBody, sendTime)
val intent = getIntentForDelayedSms(message.id)
@@ -232,14 +238,14 @@ class MessageRepositoryImpl @Inject constructor(
alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent)
}
} else { // No delay
val message = insertSentSms(subId, threadId, addresses.first(), body, System.currentTimeMillis())
val message = insertSentSms(subId, threadId, addresses.first(), signedBody, System.currentTimeMillis())
sendSms(message)
}
} else { // MMS
val parts = arrayListOf<MMSPart>()
if (body.isNotBlank()) {
parts += MMSPart("text", ContentType.TEXT_PLAIN, body.toByteArray())
if (signedBody.isNotBlank()) {
parts += MMSPart("text", ContentType.TEXT_PLAIN, signedBody.toByteArray())
}
// Add the GIFs as attachments
@@ -83,6 +83,7 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
val swipeLeft = rxPrefs.getInteger("swipeLeft", SWIPE_ACTION_ARCHIVE)
val autoEmoji = rxPrefs.getBoolean("autoEmoji", true)
val delivery = rxPrefs.getBoolean("delivery", false)
val signature = rxPrefs.getString("signature", "")
val unicode = rxPrefs.getBoolean("unicode", false)
val mobileOnly = rxPrefs.getBoolean("mobileOnly", false)
val mmsSize = rxPrefs.getInteger("mmsSize", 300)