Merge branch 'hotfix/5.234.2'

Author: karlenDimla

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.234.1
+VERSION=5.234.2

remote-messaging/remote-messaging-impl/src/main/java/com/duckduckgo/remote/messaging/impl/di/RMFMapperModule.kt

@@ -34,6 +34,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.SingleInstanceIn
@@ -45,7 +46,7 @@ object RMFMapperModule {
     @Provides
     @SingleInstanceIn(AppScope::class)
     fun providesMessageMapper(
-        messageAdapter: JsonAdapter<RemoteMessage>,
+        messageAdapter: Lazy<JsonAdapter<RemoteMessage>>,
     ): MessageMapper {
         return MessageMapper(messageAdapter)
     }

remote-messaging/remote-messaging-impl/src/main/java/com/duckduckgo/remote/messaging/impl/mappers/MessageMapper.kt

@@ -18,18 +18,19 @@ package com.duckduckgo.remote.messaging.impl.mappers
 
 import com.duckduckgo.remote.messaging.api.RemoteMessage
 import com.squareup.moshi.JsonAdapter
+import dagger.Lazy
 
 class MessageMapper(
-    private val messageAdapter: JsonAdapter<RemoteMessage>,
+    private val messageAdapter: Lazy<JsonAdapter<RemoteMessage>>,
 ) {
 
     fun toString(sitePayload: RemoteMessage): String {
-        return messageAdapter.toJson(sitePayload)
+        return messageAdapter.get().toJson(sitePayload)
     }
 
     fun fromMessage(payload: String): RemoteMessage? {
         return runCatching {
-            messageAdapter.fromJson(payload)
+            messageAdapter.get().fromJson(payload)
         }.getOrNull()
     }
 }

remote-messaging/remote-messaging-impl/src/test/java/com/duckduckgo/remote/messaging/fixtures/TestMessageMapper.kt

@@ -16,7 +16,18 @@
 
 package com.duckduckgo.remote.messaging.fixtures
 
+import com.duckduckgo.remote.messaging.api.RemoteMessage
 import com.duckduckgo.remote.messaging.impl.di.RMFMapperModule
 import com.duckduckgo.remote.messaging.impl.mappers.MessageMapper
+import com.squareup.moshi.JsonAdapter
+import dagger.Lazy
 
-fun getMessageMapper() = MessageMapper(RMFMapperModule.provideMoshiAdapter(messageActionPlugins))
+fun getMessageMapper(): MessageMapper {
+    val lazyAdapter = object : Lazy<JsonAdapter<RemoteMessage>> {
+        override fun get(): JsonAdapter<RemoteMessage> {
+            return RMFMapperModule.provideMoshiAdapter(messageActionPlugins)
+        }
+    }
+
+    return MessageMapper(lazyAdapter)
+}