diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index f235f327..5b7af23a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -108,11 +108,25 @@ class ThreadActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
+
+ val smsDraft = getSmsDraft(threadId)
+ if (smsDraft != null) {
+ thread_type_message.setText(smsDraft)
+ }
isActivityVisible = true
}
override fun onPause() {
super.onPause()
+
+ if (thread_type_message.value != "" && attachmentUris.isEmpty()) {
+ saveSmsDraft(thread_type_message.value, threadId)
+ } else {
+ deleteSmsDraft(threadId)
+ }
+
+ bus?.post(Events.RefreshMessages())
+
isActivityVisible = false
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
index c895ea85..40ad72d8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
@@ -23,6 +23,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.activities.SimpleActivity
import com.simplemobiletools.smsmessenger.extensions.deleteConversation
+import com.simplemobiletools.smsmessenger.extensions.getSmsDraft
import com.simplemobiletools.smsmessenger.helpers.refreshMessages
import com.simplemobiletools.smsmessenger.models.Conversation
import kotlinx.android.synthetic.main.item_conversation.view.*
@@ -220,6 +221,8 @@ class ConversationsAdapter(
private fun setupView(view: View, conversation: Conversation) {
view.apply {
+ val smsDraft = context.getSmsDraft(conversation.threadId)
+
conversation_frame.isSelected = selectedKeys.contains(conversation.hashCode())
conversation_address.apply {
@@ -228,10 +231,14 @@ class ConversationsAdapter(
}
conversation_body_short.apply {
- text = conversation.snippet
+ text = smsDraft ?: conversation.snippet
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.9f)
}
+ draft_indicator.apply {
+ visibility = if (smsDraft != null) View.VISIBLE else View.GONE
+ }
+
conversation_date.apply {
text = conversation.date.formatDateOrTime(context, true, false)
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index cb55e7c8..9d00d0cd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -764,3 +764,55 @@ fun Context.getLockScreenVisibilityText(type: Int) = getString(
else -> R.string.nothing
}
)
+
+fun Context.getSmsDraft(threadId: Long): String? {
+ val uri = Sms.Draft.CONTENT_URI
+ val projection = arrayOf(Sms.BODY)
+ val selection = "${Sms.THREAD_ID} = ?"
+ val selectionArgs = arrayOf(threadId.toString())
+
+ try {
+ val cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
+ cursor.use {
+ if (cursor?.moveToFirst() == true) {
+ return cursor.getString(0)
+ }
+ }
+ } catch (e: Exception) {
+ }
+
+ return null
+}
+
+fun Context.saveSmsDraft(body: String, threadId: Long) {
+ val uri = Sms.Draft.CONTENT_URI
+ val contentValues = ContentValues().apply {
+ put(Sms.BODY, body)
+ put(Sms.DATE, System.currentTimeMillis().toString())
+ put(Sms.TYPE, Sms.MESSAGE_TYPE_DRAFT)
+ put(Sms.THREAD_ID, threadId)
+ }
+
+ try {
+ contentResolver.insert(uri, contentValues)
+ } catch (e: Exception) {
+ }
+}
+
+fun Context.deleteSmsDraft(threadId: Long) {
+ val lookupUri = Sms.Draft.CONTENT_URI
+ val lookupProjection = arrayOf(Sms._ID)
+ val lookupSelection = "${Sms.THREAD_ID} = ?"
+ val lookupSelectionArgs = arrayOf(threadId.toString())
+ try {
+ val cursor = contentResolver.query(lookupUri, lookupProjection, lookupSelection, lookupSelectionArgs, null)
+ cursor.use {
+ if (cursor?.moveToFirst() == true) {
+ val draftId = cursor.getLong(0)
+ val uri = Uri.withAppendedPath(Sms.CONTENT_URI, "/${draftId}")
+ contentResolver.delete(uri, null, null)
+ }
+ }
+ } catch (e: Exception) {
+ }
+}
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 5fce6297..6cde1caa 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -37,12 +37,26 @@
android:textSize="@dimen/big_text_size"
tools:text="John" />
+
+