gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-09 23:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

set/read matching user context

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-07 14:05:33 +02:00
parent 7b4b1b7e84
commit 30cbe0f43c
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -426,6 +426,7 @@ public class NotificationWorker extends Worker {
// 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.
actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_INTERNAL_USER_ID(), Objects.requireNonNull(signatureVerification.getUserEntity()).getId());
actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_SYSTEM_NOTIFICATION_ID(), systemNotificationId);
actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), decryptedPushMessage.getId());

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.utils.ApiUtils
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_SYSTEM_NOTIFICATION_ID
import com.nextcloud.talk.utils.database.user.UserUtils
@ -55,12 +56,10 @@ import javax.inject.Inject
class DirectReplyReceiver : BroadcastReceiver() {
@Inject
@JvmField
var userUtils: UserUtils? = null
lateinit var userUtils: UserUtils
@Inject
@JvmField
var ncApi: NcApi? = null
lateinit var ncApi: NcApi
lateinit var context: Context
lateinit var currentUser: UserEntity
@ -74,13 +73,15 @@ class DirectReplyReceiver : BroadcastReceiver() {
override fun onReceive(receiveContext: Context, intent: Intent?) {
context = receiveContext
currentUser = userUtils!!.currentUser!!
// 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.
systemNotificationId = intent!!.getIntExtra(KEY_SYSTEM_NOTIFICATION_ID, 0)
roomToken = intent.getStringExtra(KEY_ROOM_TOKEN)
val id = intent.getLongExtra(KEY_INTERNAL_USER_ID, userUtils.currentUser!!.id)
currentUser = userUtils.getUserWithId(id)
replyMessage = getMessageText(intent)
sendDirectReply()
}
@ -94,7 +95,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
val apiVersion = ApiUtils.getChatApiVersion(currentUser, intArrayOf(1))
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())
?.observeOn(AndroidSchedulers.mainThread())
?.subscribe(object : Observer<GenericOverall> {