TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-14 06:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hook up message body

Browse Source
This commit is contained in:
nielsandriesse
2021-05-31 14:29:11 +10:00
parent b346a85d57
commit 502d485235
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2
import android.os.Bundle
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_home.*
import kotlinx.android.synthetic.main.activity_conversation_v2.*
import network.loki.messenger.R
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.database.DatabaseFactory
@@ -28,8 +28,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
val cursor = DatabaseFactory.getMmsSmsDatabase(this).getConversation(threadID)
val adapter = ConversationAdapter(this, cursor)
adapter.setHasStableIds(true)
recyclerView.adapter = adapter
recyclerView.layoutManager = LinearLayoutManager(this)
conversationRecyclerView.adapter = adapter
conversationRecyclerView.layoutManager = LinearLayoutManager(this)
}
// endregion
}

7
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageView.kt
View File

@@ -2,7 +2,10 @@ package org.thoughtcrime.securesms.conversation.v2.messages
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import kotlinx.android.synthetic.main.view_message.view.*
import network.loki.messenger.R
import org.thoughtcrime.securesms.database.model.MessageRecord
class MessageView : LinearLayout {
@@ -21,13 +24,13 @@ class MessageView : LinearLayout {
}
private fun setUpViewHierarchy() {
// TODO: Implement
LayoutInflater.from(context).inflate(R.layout.view_message, this)
}
// endregion
// region Updating
fun bind(message: MessageRecord) {
testTextView.text = message.body
}
fun recycle() {

10
app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
View File

@@ -38,6 +38,7 @@ import org.session.libsignal.utilities.ThreadUtils
import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.conversation.ConversationActivity
import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.database.model.ThreadRecord
import org.thoughtcrime.securesms.loki.api.OpenGroupManager
@@ -345,13 +346,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis
}
private fun openConversation(thread: ThreadRecord) {
val intent = Intent(this, ConversationActivity::class.java)
intent.putExtra(ConversationActivity.ADDRESS_EXTRA, thread.recipient.address)
intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, thread.threadId)
intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, thread.distributionType)
intent.putExtra(ConversationActivity.TIMING_EXTRA, System.currentTimeMillis())
intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, thread.lastSeen)
intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, -1)
val intent = Intent(this, ConversationActivityV2::class.java)
intent.putExtra(ConversationActivityV2.THREAD_ID, thread.threadId)
push(intent)
}