mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-21 05:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename VectorMessagingHelper to VectorPushHandler

Browse source
This commit is contained in:
sim 2022-09-08 15:38:52 +02:00
parent 2527dbbeb2
commit dbea1726ec
3 changed files with 6 additions and 9 deletions
vector/src
gplay/java/im/vector/app/push/fcm
VectorFirebaseMessagingService.kt
main/java/im/vector/app/core/pushers
VectorMessagingReceiver.ktVectorPushHandler.kt

6
vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt
View file

@ -24,7 +24,7 @@ import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.pushers.FcmHelper import im.vector.app.core.pushers.FcmHelper
import im.vector.app.core.pushers.PushersManager import im.vector.app.core.pushers.PushersManager
import im.vector.app.core.pushers.UnifiedPushHelper import im.vector.app.core.pushers.UnifiedPushHelper
import im.vector.app.core.pushers.VectorMessagingHelper import im.vector.app.core.pushers.VectorPushHandler
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import org.json.JSONObject import org.json.JSONObject
import timber.log.Timber import timber.log.Timber
@ -36,7 +36,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
@Inject lateinit var vectorPreferences: VectorPreferences @Inject lateinit var vectorPreferences: VectorPreferences
@Inject lateinit var activeSessionHolder: ActiveSessionHolder @Inject lateinit var activeSessionHolder: ActiveSessionHolder
@Inject lateinit var pushersManager: PushersManager @Inject lateinit var pushersManager: PushersManager
@Inject lateinit var vectorMessagingHelper: VectorMessagingHelper @Inject lateinit var vectorPushHandler: VectorPushHandler
@Inject lateinit var unifiedPushHelper: UnifiedPushHelper @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
override fun onNewToken(token: String) { override fun onNewToken(token: String) {
@ -53,6 +53,6 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
override fun onMessageReceived(message: RemoteMessage) { override fun onMessageReceived(message: RemoteMessage) {
Timber.d("New Firebase message") Timber.d("New Firebase message")
vectorMessagingHelper.onMessage(JSONObject(message.data as Map<*, *>).toString()) vectorPushHandler.onMessage(JSONObject(message.data as Map<*, *>).toString())
} }
} }

4
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
View file

@ -42,7 +42,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
@Inject lateinit var pushersManager: PushersManager @Inject lateinit var pushersManager: PushersManager
@Inject lateinit var activeSessionHolder: ActiveSessionHolder @Inject lateinit var activeSessionHolder: ActiveSessionHolder
@Inject lateinit var vectorPreferences: VectorPreferences @Inject lateinit var vectorPreferences: VectorPreferences
@Inject lateinit var vectorMessagingHelper: VectorMessagingHelper @Inject lateinit var vectorPushHandler: VectorPushHandler
@Inject lateinit var guardServiceStarter: GuardServiceStarter @Inject lateinit var guardServiceStarter: GuardServiceStarter
@Inject lateinit var unifiedPushStore: UnifiedPushStore @Inject lateinit var unifiedPushStore: UnifiedPushStore
@Inject lateinit var unifiedPushHelper: UnifiedPushHelper @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
@ -57,7 +57,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
* @param instance connection, for multi-account * @param instance connection, for multi-account
*/ */
override fun onMessage(context: Context, message: ByteArray, instance: String) { override fun onMessage(context: Context, message: ByteArray, instance: String) {
vectorMessagingHelper.onMessage(String(message)) vectorPushHandler.onMessage(String(message))
} }
override fun onNewEndpoint(context: Context, endpoint: String, instance: String) { override fun onNewEndpoint(context: Context, endpoint: String, instance: String) {

5
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingHelper.kt → vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
View file

@ -47,11 +47,8 @@ import javax.inject.Inject
private val loggerTag = LoggerTag("Push", LoggerTag.SYNC) private val loggerTag = LoggerTag("Push", LoggerTag.SYNC)
/**
* Hilt injection happen at super.onReceive().
*/
class VectorMessagingHelper @Inject constructor( class VectorPushHandler @Inject constructor(
private val notificationDrawerManager: NotificationDrawerManager, private val notificationDrawerManager: NotificationDrawerManager,
private val notifiableEventResolver: NotifiableEventResolver, private val notifiableEventResolver: NotifiableEventResolver,
private val activeSessionHolder: ActiveSessionHolder, private val activeSessionHolder: ActiveSessionHolder,