filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-25 09:10:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues after rebase

Browse Source
This commit is contained in:
Benoit Marty 2022-06-01 15:10:19 +02:00 committed by Benoit Marty
parent 7eca405693
commit ee7fccf072
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
View File

@ -55,7 +55,7 @@ object UnifiedPushHelper {
} }
/** /**
* Store UnifiedPush Endpoint to the SharedPrefs * Store UnifiedPush Endpoint to the SharedPrefs.
* TODO Store in realm * TODO Store in realm
* *
* @param context android context * @param context android context
@ -78,7 +78,7 @@ object UnifiedPushHelper {
} }
/** /**
* Store Push Gateway to the SharedPrefs * Store Push Gateway to the SharedPrefs.
* TODO Store in realm * TODO Store in realm
* *
* @param context android context * @param context android context

12
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
View File

@ -33,7 +33,6 @@ import im.vector.app.BuildConfig
import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.network.WifiDetector import im.vector.app.core.network.WifiDetector
import im.vector.app.core.services.GuardServiceStarter import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.features.badge.BadgeProxy
import im.vector.app.features.notifications.NotifiableEventResolver import im.vector.app.features.notifications.NotifiableEventResolver
import im.vector.app.features.notifications.NotificationDrawerManager import im.vector.app.features.notifications.NotificationDrawerManager
import im.vector.app.features.notifications.NotificationUtils import im.vector.app.features.notifications.NotificationUtils
@ -48,6 +47,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.logger.LoggerTag import org.matrix.android.sdk.api.logger.LoggerTag
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.getRoom import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.getTimelineEvent
import org.unifiedpush.android.connector.MessagingReceiver import org.unifiedpush.android.connector.MessagingReceiver
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@ -96,6 +96,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
/** /**
* Called when message is received. * Called when message is received.
* *
* @param context the Android context
* @param message the message * @param message the message
* @param instance connection, for multi-account * @param instance connection, for multi-account
*/ */
@ -142,7 +143,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
// we are in foreground, let the sync do the things? // we are in foreground, let the sync do the things?
Timber.tag(loggerTag.value).d("PUSH received in a foreground state, ignore") Timber.tag(loggerTag.value).d("PUSH received in a foreground state, ignore")
} else { } else {
onMessageReceivedInternal(context, notification) onMessageReceivedInternal(notification)
} }
} }
} }
@ -196,11 +197,11 @@ class VectorMessagingReceiver : MessagingReceiver() {
} }
/** /**
* Internal receive method * Internal receive method.
* *
* @param notification Notification containing message data. * @param notification Notification containing message data.
*/ */
private fun onMessageReceivedInternal(context: Context, notification: Notification) { private fun onMessageReceivedInternal(notification: Notification) {
try { try {
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) { if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
Timber.tag(loggerTag.value).d("## onMessageReceivedInternal() : $notification") Timber.tag(loggerTag.value).d("## onMessageReceivedInternal() : $notification")
@ -208,9 +209,6 @@ class VectorMessagingReceiver : MessagingReceiver() {
Timber.tag(loggerTag.value).d("## onMessageReceivedInternal()") Timber.tag(loggerTag.value).d("## onMessageReceivedInternal()")
} }
// update the badge counter
BadgeProxy.updateBadgeCount(context, notification.unread)
val session = activeSessionHolder.getSafeActiveSession() val session = activeSessionHolder.getSafeActiveSession()
if (session == null) { if (session == null) {

2
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
View File

@ -32,7 +32,7 @@ import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
import javax.inject.Inject import javax.inject.Inject
/** /**
* Test Push by asking the Push Gateway to send a Push back * Test Push by asking the Push Gateway to send a Push back.
*/ */
class TestPushFromPushGateway @Inject constructor(private val context: FragmentActivity, class TestPushFromPushGateway @Inject constructor(private val context: FragmentActivity,
private val stringProvider: StringProvider, private val stringProvider: StringProvider,