diff --git a/qksms/src/main/java/com/moez/QKSMS/model/Message.kt b/qksms/src/main/java/com/moez/QKSMS/model/Message.kt index 8cb7f712..3a81f77e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/qksms/src/main/java/com/moez/QKSMS/model/Message.kt @@ -15,6 +15,8 @@ open class Message() : RealmObject() { var boxId: Int = 0 var type: String = "" var body: String = "" + var date: Long = 0 + var dateSent: Long = 0 var errorType: Int = 0 constructor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns) : this() { @@ -29,8 +31,12 @@ open class Message() : RealmObject() { if (isMms) { boxId = cursor.getInt(columnsMap.mmsMessageBox) + date = cursor.getLong(columnsMap.smsDate) + dateSent = cursor.getLong(columnsMap.smsDateSent) } else { boxId = cursor.getInt(columnsMap.smsType) + date = cursor.getLong(columnsMap.mmsDate) + dateSent = cursor.getLong(columnsMap.mmsDateSent) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index feb8d867..0a20c507 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.ui.messages import android.content.Context +import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.ViewGroup @@ -11,6 +12,7 @@ import io.realm.RealmRecyclerViewAdapter class MessageAdapter(context: Context, data: OrderedRealmCollection?) : RealmRecyclerViewAdapter(context, data, true) { + val TAG = "MessageAdapter" override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder { val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater @@ -20,6 +22,10 @@ class MessageAdapter(context: Context, data: OrderedRealmCollection?) : override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) { val message = getItem(position)!! + viewHolder.itemView.setOnClickListener { + Log.i(TAG, message.toString()) + } + viewHolder.body.text = message.body viewHolder.body.gravity = if (message.isMe()) Gravity.RIGHT else Gravity.LEFT } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt index 3e84f3b5..f6576f8a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListPresenter.kt @@ -17,7 +17,7 @@ class MessageListPresenter : MvpBasePresenter() { val realmResults = Realm.getDefaultInstance() .where(Message::class.java) .equalTo("threadId", threadId) - .findAll() + .findAllSorted("date") view?.setMessages(realmResults) }