gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-01-31 19:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

read matching user context

Browse Source 
Resolves #2180

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-06 22:59:00 +02:00
parent 1577a99567
commit 07c57bcfd1
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt
View File

@ -42,6 +42,7 @@ import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.models.json.generic.GenericOverall import com.nextcloud.talk.models.json.generic.GenericOverall
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.NotificationUtils
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SYSTEM_NOTIFICATION_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SYSTEM_NOTIFICATION_ID
import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.database.user.UserUtils
@ -55,12 +56,10 @@ import javax.inject.Inject
class DirectReplyReceiver : BroadcastReceiver() { class DirectReplyReceiver : BroadcastReceiver() {
@Inject @Inject
@JvmField lateinit var userUtils: UserUtils
var userUtils: UserUtils? = null
@Inject @Inject
@JvmField lateinit var ncApi: NcApi
var ncApi: NcApi? = null
lateinit var context: Context lateinit var context: Context
lateinit var currentUser: UserEntity lateinit var currentUser: UserEntity
@ -74,13 +73,15 @@ class DirectReplyReceiver : BroadcastReceiver() {
override fun onReceive(receiveContext: Context, intent: Intent?) { override fun onReceive(receiveContext: Context, intent: Intent?) {
context = receiveContext context = receiveContext
currentUser = userUtils!!.currentUser!!
// NOTE - systemNotificationId is an internal ID used on the device only. // NOTE - systemNotificationId is an internal ID used on the device only.
// It is NOT the same as the notification ID used in communication with the server. // It is NOT the same as the notification ID used in communication with the server.
systemNotificationId = intent!!.getIntExtra(KEY_SYSTEM_NOTIFICATION_ID, 0) systemNotificationId = intent!!.getIntExtra(KEY_SYSTEM_NOTIFICATION_ID, 0)
roomToken = intent.getStringExtra(KEY_ROOM_TOKEN) roomToken = intent.getStringExtra(KEY_ROOM_TOKEN)
val id = intent.getLongExtra(KEY_INTERNAL_USER_ID, userUtils.currentUser!!.getId())
currentUser = userUtils.getUserWithId(id)
replyMessage = getMessageText(intent) replyMessage = getMessageText(intent)
sendDirectReply() sendDirectReply()
} }
@ -94,7 +95,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
val apiVersion = ApiUtils.getChatApiVersion(currentUser, intArrayOf(1)) val apiVersion = ApiUtils.getChatApiVersion(currentUser, intArrayOf(1))
val url = ApiUtils.getUrlForChat(apiVersion, currentUser.baseUrl, roomToken) val url = ApiUtils.getUrlForChat(apiVersion, currentUser.baseUrl, roomToken)
ncApi!!.sendChatMessage(credentials, url, replyMessage, currentUser.displayName, null, false) ncApi.sendChatMessage(credentials, url, replyMessage, currentUser.displayName, null, false)
?.subscribeOn(Schedulers.io()) ?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread()) ?.observeOn(AndroidSchedulers.mainThread())
?.subscribe(object : Observer<GenericOverall> { ?.subscribe(object : Observer<GenericOverall> {