diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index dd75871e..2fde1d4e 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 4b165bd1..72dc0f3d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -1,9 +1,11 @@ package com.moez.QKSMS.data.repository +import android.content.ContentResolver import android.content.ContentValues import android.content.Context import android.net.Uri import android.provider.Telephony +import android.telephony.SmsManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.sync.MessageColumns import io.realm.Realm @@ -19,16 +21,36 @@ class MessageRepository(val context: Context) { } fun insertMessage(address: String, body: String, time: Long) { - val contentResolver = context.contentResolver val cv = ContentValues() cv.put("address", address) cv.put("body", body) cv.put("date_sent", time) + val contentResolver = context.contentResolver val uri = contentResolver.insert(Uri.parse("content://sms/inbox"), cv) + copyLatestMessageToRealm(uri, contentResolver) + } - // TODO this is really sloppy, it should be fixed + fun sendMessage(threadId: Long, address: String, body: String) { + val smsManager = SmsManager.getDefault() + smsManager.sendTextMessage(address, null, body, null, null) + + val values = ContentValues() + values.put("address", address) + values.put("body", body) + values.put("date", System.currentTimeMillis()) + values.put("read", 1) + values.put("type", 4) + values.put("thread_id", threadId) + + val contentResolver = context.contentResolver + val uri = contentResolver.insert(Uri.parse("content://sms/"), values) + copyLatestMessageToRealm(uri, contentResolver) + } + + // TODO this is really sloppy, it should be fixed + private fun copyLatestMessageToRealm(uri: Uri, contentResolver: ContentResolver) { val projection = arrayOf(Telephony.Sms.Conversations.THREAD_ID) val cursor = contentResolver.query(uri, projection, null, null, null) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index 54d032cc..a529f3d6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -25,6 +25,8 @@ class MessageListActivity : QkActivity(), Observer { layoutManager.stackFromEnd = true messageList.layoutManager = layoutManager + send.setOnClickListener { viewModel.sendMessage(message.text.toString()) } + viewModel.state.observe(this) } @@ -33,11 +35,12 @@ class MessageListActivity : QkActivity(), Observer { is MessageListViewState.ConversationLoaded -> onConversationLoaded(state) is MessageListViewState.ConversationError -> onConversationError(state) is MessageListViewState.MessagesLoaded -> onMessagesLoaded(state) + is MessageListViewState.DraftLoaded -> onDraftLoaded(state) } } private fun onConversationLoaded(conversationLoaded: MessageListViewState.ConversationLoaded) { - title = conversationLoaded.data.getTitle() + title = conversationLoaded.conversation.getTitle() } private fun onConversationError(conversationError: MessageListViewState.ConversationError) { @@ -45,7 +48,11 @@ class MessageListActivity : QkActivity(), Observer { } private fun onMessagesLoaded(messagesLoaded: MessageListViewState.MessagesLoaded) { - messageList.adapter = MessageAdapter(this, messagesLoaded.data) + messageList.adapter = MessageAdapter(this, messagesLoaded.messages) + } + + private fun onDraftLoaded(draftLoaded: MessageListViewState.DraftLoaded) { + message.setText(draftLoaded.draft) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt index 0130966b..1196374a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -17,6 +17,8 @@ class MessageListViewModel : ViewModel() { val state: MutableLiveData = MutableLiveData() + private var threadId: Long = 0 + private var conversation: RealmResults? = null private var messages: RealmResults? = null @@ -27,9 +29,11 @@ class MessageListViewModel : ViewModel() { fun setThreadId(threadId: Long) { onCleared() + this.threadId = threadId + messageRepo.getMessages(threadId).let { messages = it - state.value = MessageListViewState.MessagesLoaded(messages!!) + state.value = MessageListViewState.MessagesLoaded(it) } conversationRepo.getConversation(threadId).let { @@ -43,6 +47,13 @@ class MessageListViewModel : ViewModel() { } } + fun sendMessage(body: String) { + conversation?.get(0)?.let { conversation -> + messageRepo.sendMessage(threadId, conversation.contacts[0].address, body) + state.value = MessageListViewState.DraftLoaded("") + } + } + override fun onCleared() { super.onCleared() conversation?.removeAllChangeListeners() diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt index e2c387c5..2618f09c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt @@ -5,7 +5,8 @@ import com.moez.QKSMS.data.model.Message import io.realm.OrderedRealmCollection sealed class MessageListViewState { - data class ConversationLoaded(val data: Conversation) : MessageListViewState() - data class ConversationError(val count: Int) : MessageListViewState() - data class MessagesLoaded(val data: OrderedRealmCollection) : MessageListViewState() + data class ConversationLoaded(val conversation: Conversation) : MessageListViewState() + data class ConversationError(val errorCode: Int) : MessageListViewState() + data class MessagesLoaded(val messages: OrderedRealmCollection) : MessageListViewState() + data class DraftLoaded(val draft: String) : MessageListViewState() } \ No newline at end of file diff --git a/qksms/src/main/res/drawable/ic_send_black_24dp.xml b/qksms/src/main/res/drawable/ic_send_black_24dp.xml new file mode 100644 index 00000000..e145ca83 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_send_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/layout/message_list_activity.xml b/qksms/src/main/res/layout/message_list_activity.xml index f54844fe..a6819e5b 100644 --- a/qksms/src/main/res/layout/message_list_activity.xml +++ b/qksms/src/main/res/layout/message_list_activity.xml @@ -8,11 +8,33 @@ + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 99396fd7..3407e1e1 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -2,6 +2,8 @@ QKSMS + Write a message + Yesterday Just now