From ee7fccf072cabb64e7f33281dab0e1e0fe2dd294 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 1 Jun 2022 15:10:19 +0200
Subject: [PATCH] Fix compilation issues after rebase

---
 .../im/vector/app/core/pushers/UnifiedPushHelper.kt  |  4 ++--
 .../app/core/pushers/VectorMessagingReceiver.kt      | 12 +++++-------
 .../settings/troubleshoot/TestPushFromPushGateway.kt |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
index c28cd8325e..16ed9fb6ab 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
@@ -55,7 +55,7 @@ object UnifiedPushHelper {
     }
 
     /**
-     * Store UnifiedPush Endpoint to the SharedPrefs
+     * Store UnifiedPush Endpoint to the SharedPrefs.
      * TODO Store in realm
      *
      * @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
      *
      * @param context android context
diff --git a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
index ef18b500c7..729c0bc435 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
@@ -33,7 +33,6 @@ import im.vector.app.BuildConfig
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.network.WifiDetector
 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.NotificationDrawerManager
 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.session.Session
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.unifiedpush.android.connector.MessagingReceiver
 import timber.log.Timber
 import javax.inject.Inject
@@ -96,6 +96,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
     /**
      * Called when message is received.
      *
+     * @param context the Android context
      * @param message the message
      * @param instance connection, for multi-account
      */
@@ -142,7 +143,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
                 // we are in foreground, let the sync do the things?
                 Timber.tag(loggerTag.value).d("PUSH received in a foreground state, ignore")
             } 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.
      */
-    private fun onMessageReceivedInternal(context: Context, notification: Notification) {
+    private fun onMessageReceivedInternal(notification: Notification) {
         try {
             if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
                 Timber.tag(loggerTag.value).d("## onMessageReceivedInternal() : $notification")
@@ -208,9 +209,6 @@ class VectorMessagingReceiver : MessagingReceiver() {
                 Timber.tag(loggerTag.value).d("## onMessageReceivedInternal()")
             }
 
-            // update the badge counter
-            BadgeProxy.updateBadgeCount(context, notification.unread)
-
             val session = activeSessionHolder.getSafeActiveSession()
 
             if (session == null) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
index da26200df2..e8696eafc7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -32,7 +32,7 @@ import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
 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,
                                                   private val stringProvider: StringProvider,