refactor scope and regular message requests

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

@@ -15,7 +15,6 @@ import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.json.chat.ChatMessageJson
 import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 
 @Suppress("TooManyFunctions")
@@ -52,7 +51,11 @@ interface ChatMessageRepository : LifecycleAwareManager {
 
     fun updateConversation(conversationModel: ConversationModel)
 
-    fun initScopeAndLoadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean)
+    suspend fun loadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean)
+
+    fun startRegularMessagePolling(
+        hasHighPerformanceBackend: Boolean
+    ): Flow<Unit>
 
     /**
      * Loads messages from local storage. If the messages are not found, then it
@@ -61,19 +64,12 @@ interface ChatMessageRepository : LifecycleAwareManager {
      *
      * [withNetworkParams] credentials and url
      */
-    fun loadMoreMessages(
+    suspend fun loadMoreMessages(
         beforeMessageId: Long,
         roomToken: String,
         withMessageLimit: Int,
         withNetworkParams: Bundle
-    ): Job
-
-    /**
-     * Long polls the server for any updates to the chat, if found, it synchronizes
-     * the database with the server and emits the new messages to [messageFlow],
-     * else it simply retries after timeout.
-     */
-    fun initLongPolling(initialMessageId: Long): Job
+    )
 
     /**
      * Gets a individual message.
@@ -127,7 +123,7 @@ interface ChatMessageRepository : LifecycleAwareManager {
 
     suspend fun hidePinnedMessage(credentials: String, url: String): Flow<Boolean>
 
-    fun onSignalingChatMessageReceived(chatMessage: ChatMessageJson)
+    suspend fun onSignalingChatMessageReceived(chatMessage: ChatMessageJson)
 
     fun observeMessages(internalConversationId: String): Flow<List<ChatMessageEntity>>
 }