From 3462df405c26acf6dd740a5fa1f725fe2a777ed8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Sat, 29 Feb 2020 09:41:45 +0100 Subject: [PATCH] Fix GPlay build issue --- .../riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt | 4 ++-- .../push/fcm/NotificationTroubleshootTestManagerFactory.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt index 7feb89879e..9fadbcafb6 100755 --- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt +++ b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt @@ -25,13 +25,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage +import im.vector.matrix.android.api.pushrules.rest.PushRule import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.Event import im.vector.riotx.BuildConfig import im.vector.riotx.R import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.core.preference.BingRule import im.vector.riotx.core.pushers.PushersManager import im.vector.riotx.features.badge.BadgeProxy import im.vector.riotx.features.notifications.NotifiableEventResolver @@ -196,7 +196,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() { description = "", type = null, timestamp = System.currentTimeMillis(), - soundName = BingRule.ACTION_VALUE_DEFAULT, + soundName = PushRule.ACTION_VALUE_DEFAULT, isPushGatewayEvent = true ) notificationDrawerManager.onNotifiableEventReceived(simpleNotifiableEvent) diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt index 6f980197dd..2830822918 100644 --- a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt @@ -18,8 +18,8 @@ package im.vector.riotx.push.fcm import androidx.fragment.app.Fragment import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings -import im.vector.riotx.features.settings.troubleshoot.TestBingRulesSettings import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings +import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices @@ -29,7 +29,7 @@ import javax.inject.Inject class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings, private val testAccountSettings: TestAccountSettings, private val testDeviceSettings: TestDeviceSettings, - private val testBingRulesSettings: TestBingRulesSettings, + private val testBingRulesSettings: TestPushRulesSettings, private val testPlayServices: TestPlayServices, private val testFirebaseToken: TestFirebaseToken, private val testTokenRegistration: TestTokenRegistration) {