TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 21:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic message sending (incl. mentions)

Browse Source
This commit is contained in:
Niels Andriesse 2021-06-25 15:20:54 +10:00
parent 0ac0cba448
commit 82e4d3125c
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,11 @@ import nl.komponents.kovenant.ui.successUi
import org.session.libsession.messaging.contacts.Contact import org.session.libsession.messaging.contacts.Contact
import org.session.libsession.messaging.mentions.Mention import org.session.libsession.messaging.mentions.Mention
import org.session.libsession.messaging.mentions.MentionsManager import org.session.libsession.messaging.mentions.MentionsManager
import org.session.libsession.messaging.messages.signal.OutgoingTextMessage
import org.session.libsession.messaging.messages.visible.VisibleMessage
import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
import org.session.libsession.messaging.sending_receiving.MessageSender
import org.session.libsession.messaging.sending_receiving.MessageSender.send
import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
@ -635,12 +639,28 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
} }
override fun send() { override fun send() {
val message = VisibleMessage()
message.sentTimestamp = System.currentTimeMillis()
message.text = getMessageBody()
val outgoingTextMessage = OutgoingTextMessage.from(message, thread)
ApplicationContext.getInstance(this).typingStatusSender.onTypingStopped(threadID)
// silentlySetComposeText("")
// val id: Long = fragment.stageOutgoingMessage(outgoingTextMessage)
//
// if (initiating) {
// DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true)
// }
//
// val allocatedThreadId: Long = getAllocatedThreadId(context)
message.id = DatabaseFactory.getSmsDatabase(this).insertMessageOutbox(threadID, outgoingTextMessage, false, message.sentTimestamp!!) { /**fragment.releaseOutgoingMessage(id)*/ }
MessageSender.send(message, thread.address)
} }
// endregion // endregion
// region General // region General
private fun getMessageBody(): CharSequence { private fun getMessageBody(): String {
var result = inputBar.inputBarEditText.text?.trim() ?: "" var result = inputBar.inputBarEditText.text?.trim() ?: ""
for (mention in mentions) { for (mention in mentions) {
try { try {
@ -651,7 +671,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
Log.d("Loki", "Failed to process mention due to error: $exception") Log.d("Loki", "Failed to process mention due to error: $exception")
} }
} }
return result return result.toString()
} }
private fun saveDraft() { private fun saveDraft() {