6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix / compilation in gplay flavor

This commit is contained in:
Valere 2019-06-21 18:32:17 +02:00 committed by Benoit Marty
parent 0584fc3666
commit 9ae9830de4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vector/src/gplay/java/im/vector/riotredesign/push/fcm/VectorFirebaseMessagingService.kt
View File

@ -24,13 +24,11 @@ import android.os.Looper
import android.text.TextUtils import android.text.TextUtils
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner
import androidx.work.*
import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.FirebaseMessagingService
import com.google.firebase.messaging.RemoteMessage import com.google.firebase.messaging.RemoteMessage
import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.Matrix
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.internal.session.sync.job.SyncWorker
import im.vector.riotredesign.BuildConfig import im.vector.riotredesign.BuildConfig
import im.vector.riotredesign.R import im.vector.riotredesign.R
import im.vector.riotredesign.core.preference.BingRule import im.vector.riotredesign.core.preference.BingRule
@ -42,7 +40,6 @@ import im.vector.riotredesign.features.notifications.NotificationDrawerManager
import im.vector.riotredesign.features.notifications.SimpleNotifiableEvent import im.vector.riotredesign.features.notifications.SimpleNotifiableEvent
import org.koin.android.ext.android.inject import org.koin.android.ext.android.inject
import timber.log.Timber import timber.log.Timber
import java.util.concurrent.TimeUnit


/** /**
* Class extending FirebaseMessagingService. * Class extending FirebaseMessagingService.
@ -144,7 +141,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
Timber.i("Ignoring push, event already knwown") Timber.i("Ignoring push, event already knwown")
} else { } else {
Timber.v("Requesting background sync") Timber.v("Requesting background sync")
session.requireBackgroundSync(0L) session.requireBackgroundSync()
} }
} }


@ -219,7 +216,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
return return
} else { } else {


var notifiableEvent = notifiableEventResolver.resolveEvent(event, null /* TODO session.fulfillRule(event) */, session) var notifiableEvent = notifiableEventResolver.resolveEvent(event, session)


if (notifiableEvent == null) { if (notifiableEvent == null) {
Timber.e("Unsupported notifiable event ${eventId}") Timber.e("Unsupported notifiable event ${eventId}")