Set a default value for fields that use @InternalStreamChatApi to a…

…void the needed of impolement it on customer's implmenetaiton
GetStream · Jul 11, 2024 · 7aa9aa6 · 7aa9aa6
1 parent da98076
commit 7aa9aa6
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/stream-chat-android-client/api/stream-chat-android-client.api b/stream-chat-android-client/api/stream-chat-android-client.api
@@ -2525,6 +2525,7 @@ public abstract interface class io/getstream/chat/android/client/plugin/Plugin :
 }
 
 public final class io/getstream/chat/android/client/plugin/Plugin$DefaultImpls {
+	public static fun getErrorHandler (Lio/getstream/chat/android/client/plugin/Plugin;)Lio/getstream/chat/android/client/errorhandler/ErrorHandler;
 	public static fun onAttachmentSendRequest (Lio/getstream/chat/android/client/plugin/Plugin;Ljava/lang/String;Ljava/lang/String;Lio/getstream/chat/android/models/Message;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun onChannelMarkReadPrecondition (Lio/getstream/chat/android/client/plugin/Plugin;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static fun onCreateChannelPrecondition (Lio/getstream/chat/android/client/plugin/Plugin;Lio/getstream/chat/android/models/User;Ljava/lang/String;Ljava/util/List;)Lio/getstream/result/Result;

diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
@@ -371,7 +371,7 @@ internal constructor(
      * Error handlers for API calls.
      */
     private val errorHandlers: List<ErrorHandler>
-        get() = plugins.mapNotNull { it.errorHandler }.sorted()
+        get() = plugins.mapNotNull { it.getErrorHandler() }.sorted()
 
     public var logicRegistry: ChannelStateLogicProvider? = null
 

diff --git a/...ndroid-client/src/main/java/io/getstream/chat/android/client/plugin/DependencyResolver.kt b/...ndroid-client/src/main/java/io/getstream/chat/android/client/plugin/DependencyResolver.kt
@@ -31,5 +31,5 @@ public interface DependencyResolver {
      * @see [KClass] to look for.
      */
     @InternalStreamChatApi
-    public fun <T : Any> resolveDependency(klass: KClass<T>): T?
+    public fun <T : Any> resolveDependency(klass: KClass<T>): T? = null
 }
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/plugin/Plugin.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/plugin/Plugin.kt
@@ -78,7 +78,7 @@ public interface Plugin :
     GetMessageListener,
     FetchCurrentUserListener {
 
-    public val errorHandler: ErrorHandler?
+    public fun getErrorHandler(): ErrorHandler? = null
 
     override suspend fun onQueryMembersResult(
         result: Result<List<Member>>,

diff --git a/...-android-client/src/main/java/io/getstream/chat/android/client/plugin/ThrottlingPlugin.kt b/...-android-client/src/main/java/io/getstream/chat/android/client/plugin/ThrottlingPlugin.kt
@@ -24,7 +24,6 @@ import io.getstream.result.Result
 import kotlin.reflect.KClass
 
 internal class ThrottlingPlugin : Plugin {
-    override val errorHandler = null
     private val lastMarkReadMap: MutableMap<String, Long> = mutableMapOf()
 
     override suspend fun onChannelMarkReadPrecondition(channelType: String, channelId: String): Result<Unit> {

diff --git a/...t-android-client/src/test/java/io/getstream/chat/android/client/DependencyResolverTest.kt b/...t-android-client/src/test/java/io/getstream/chat/android/client/DependencyResolverTest.kt
@@ -16,7 +16,6 @@
 
 package io.getstream.chat.android.client
 
-import io.getstream.chat.android.client.errorhandler.ErrorHandler
 import io.getstream.chat.android.client.plugin.Plugin
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
 import io.getstream.chat.android.client.scope.ClientTestScope
@@ -183,7 +182,6 @@ public class DependencyResolverTest {
     private class PluginDependency(
         private val classes: Map<KClass<*>, Any>,
     ) : Plugin {
-        override val errorHandler: ErrorHandler? = null
         override fun onUserSet(user: User) {
             /** NO-OP */
         }

diff --git a/...-offline/src/main/java/io/getstream/chat/android/offline/plugin/internal/OfflinePlugin.kt b/...-offline/src/main/java/io/getstream/chat/android/offline/plugin/internal/OfflinePlugin.kt
@@ -16,7 +16,6 @@
 
 package io.getstream.chat.android.offline.plugin.internal
 
-import io.getstream.chat.android.client.errorhandler.ErrorHandler
 import io.getstream.chat.android.client.plugin.Plugin
 import io.getstream.chat.android.client.plugin.listeners.CreateChannelListener
 import io.getstream.chat.android.client.plugin.listeners.DeleteChannelListener
@@ -93,8 +92,6 @@ internal class OfflinePlugin(
     GetMessageListener by getMessageListener,
     FetchCurrentUserListener by fetchCurrentUserListener {
 
-    override val errorHandler: ErrorHandler? = null
-
     override fun onUserSet(user: User) {
         /* No-Op */
     }

diff --git a/...ndroid-state/src/main/java/io/getstream/chat/android/state/plugin/internal/StatePlugin.kt b/...ndroid-state/src/main/java/io/getstream/chat/android/state/plugin/internal/StatePlugin.kt
@@ -112,7 +112,8 @@ public class StatePlugin internal constructor(
     SendAttachmentListener by SendAttachmentListenerState(logic),
     FetchCurrentUserListener by FetchCurrentUserListenerState(clientState, globalState) {
 
-    override var errorHandler: ErrorHandler = errorHandlerFactory.create()
+    private val lazyErrorHandler: ErrorHandler by lazy { errorHandlerFactory.create() }
+    override fun getErrorHandler(): ErrorHandler = lazyErrorHandler
 
     override fun onUserSet(user: User) {
         syncManager.start()