Scheduling job when fail to send any messages

app/src/main/AndroidManifest.xml

@@ -102,8 +102,8 @@
         </service>
         <service
             android:name=".chatroom.service.MessageService"
-            android:exported="false">
-        </service>
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <meta-data
             android:name="io.fabric.ApiKey"

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -54,7 +54,8 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                                             private val roomsRepository: RoomRepository,
                                             private val localRepository: LocalRepository,
                                             factory: ConnectionManagerFactory,
-                                            private val mapper: ViewModelMapper) {
+                                            private val mapper: ViewModelMapper,
+                                            private val jobSchedulerInteractor: JobSchedulerInteractor) {
     private val currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
@@ -131,13 +132,11 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                                 senderAlias = null,
                                 type = null,
                                 updatedAt = null,
-                                urls = null
+                                urls = null,
+                                isTemporary = true
                         )
-                        val offlineMessage = mapper.map(newMessage).map {
-                            it.isTemporary = true
-                            it
-                        }
-                        view.showNewMessage(offlineMessage)
+                        messagesRepository.save(newMessage)
+                        view.showNewMessage(mapper.map(newMessage))
                         client.sendMessage(id, chatRoomId, text)
                     } else {
                         client.updateMessage(chatRoomId, messageId, text)
@@ -151,6 +150,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
+                jobSchedulerInteractor.scheduleSendingMessages()
             } finally {
                 view.enableSendMessageButton()
             }

app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt

@@ -3,9 +3,14 @@ package chat.rocket.android.chatroom.service
 import android.app.job.JobParameters
 import android.app.job.JobService
 import chat.rocket.android.server.domain.CurrentServerRepository
+import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.common.RocketChatException
+import chat.rocket.core.internal.rest.sendMessage
+import dagger.android.AndroidInjection
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 class MessageService : JobService() {
@@ -13,19 +18,56 @@ class MessageService : JobService() {
     lateinit var factory: ConnectionManagerFactory
     @Inject
     lateinit var currentServerRepository: CurrentServerRepository
+    @Inject
+    lateinit var messageRepository: MessagesRepository
+
+    override fun onCreate() {
+        super.onCreate()
+        AndroidInjection.inject(this)
+    }
 
     override fun onStopJob(params: JobParameters?): Boolean {
-        return true
+        return false
     }
 
     override fun onStartJob(params: JobParameters?): Boolean {
         launch(CommonPool) {
             val currentServer = currentServerRepository.get()
             if (currentServer != null) {
-                val connectionManager = factory.create(currentServer)
-            }
+                params?.let {
+                    try {
+                        retrySendingMessages(currentServer)
                         jobFinished(params, false)
+                    } catch (ex: RocketChatException) {
+                        Timber.e(ex)
+                        jobFinished(params, true)
+                    }
+                }
+            }
         }
         return true
     }
+
+    private suspend fun retrySendingMessages(currentServer: String) {
+        val temporaryMessages = messageRepository.getAllTemporary()
+        if (temporaryMessages.isNotEmpty()) {
+            val connectionManager = factory.create(currentServer)
+            val client = connectionManager.client
+            temporaryMessages.forEach { message ->
+                client.sendMessage(
+                        message = message.message,
+                        messageId = message.id,
+                        roomId = message.roomId,
+                        avatar = message.avatar,
+                        attachments = message.attachments,
+                        alias = message.senderAlias
+                )
+            }
+        }
+    }
+
+    companion object {
+        const val EXTRA_MESSAGE_ID = "extra_message_id"
+        const val RETRY_SEND_MESSAGE_ID = 1
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -212,12 +212,13 @@ class ViewModelMapper @Inject constructor(private val context: Context,
         val time = getTime(message.timestamp)
         val avatar = getUserAvatar(message)
         val preview = mapMessagePreview(message)
+        val isTemp = message.isTemporary ?: false
 
         val content = getContent(stripMessageQuotes(message))
         MessageViewModel(message = stripMessageQuotes(message), rawData = message,
                 messageId = message.id, avatar = avatar!!, time = time, senderName = sender,
                 content = content, isPinned = message.pinned, reactions = getReactions(message),
-                isFirstUnread = false, preview = preview)
+                isFirstUnread = false, preview = preview, isTemporary = isTemp)
     }
 
     private suspend fun mapMessagePreview(message: Message): Message {

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -2,7 +2,10 @@ package chat.rocket.android.dagger.module
 
 import android.app.Application
 import android.app.NotificationManager
+import android.app.job.JobInfo
+import android.app.job.JobScheduler
 import android.arch.persistence.room.Room
+import android.content.ComponentName
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.systemService
@@ -11,6 +14,7 @@ import chat.rocket.android.R
 import chat.rocket.android.app.RocketChatDatabase
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
+import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.qualifier.ForFresco
 import chat.rocket.android.helper.FrescoAuthInterceptor
 import chat.rocket.android.helper.MessageParser
@@ -19,19 +23,17 @@ import chat.rocket.android.infrastructure.SharedPrefsLocalRepository
 import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.*
-import chat.rocket.android.server.infraestructure.MemoryChatRoomsRepository
-import chat.rocket.android.server.infraestructure.MemoryMessagesRepository
-import chat.rocket.android.server.infraestructure.MemoryRoomRepository
-import chat.rocket.android.server.infraestructure.MemoryUsersRepository
-import chat.rocket.android.server.infraestructure.ServerDao
-import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infraestructure.*
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
+import chat.rocket.common.internal.ISO8601Date
+import chat.rocket.common.model.TimestampAdapter
+import chat.rocket.common.util.CalendarISO8601Converter
+import chat.rocket.common.util.Logger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.AttachmentAdapterFactory
 import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
 import com.facebook.imagepipeline.core.ImagePipelineConfig
@@ -121,7 +123,7 @@ class AppModule {
     @Provides
     @ForFresco
     @Singleton
-    fun provideFrescoAuthIntercepter(tokenRepository: TokenRepository, currentServerInteractor: GetCurrentServerInteractor): Interceptor {
+    fun provideFrescoAuthInterceptor(tokenRepository: TokenRepository, currentServerInteractor: GetCurrentServerInteractor): Interceptor {
         return FrescoAuthInterceptor(tokenRepository, currentServerInteractor)
     }
 
@@ -202,10 +204,16 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideMoshi(): Moshi {
+    fun provideMoshi(logger: PlatformLogger,
+                     currentServerInteractor: GetCurrentServerInteractor):
+            Moshi {
+        val url = currentServerInteractor.get() ?: ""
         return Moshi.Builder()
                 .add(FallbackSealedClassJsonAdapter.ADAPTER_FACTORY)
                 .add(AppJsonAdapterFactory.INSTANCE)
+                .add(AttachmentAdapterFactory(Logger(logger, url)))
+                .add(java.lang.Long::class.java, ISO8601Date::class.java, TimestampAdapter(CalendarISO8601Converter()))
+                .add(Long::class.java, ISO8601Date::class.java, TimestampAdapter(CalendarISO8601Converter()))
                 .build()
     }
 
@@ -217,8 +225,9 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideMessageRepository(): MessagesRepository {
-        return MemoryMessagesRepository()
+    fun provideMessageRepository(context: Application, moshi: Moshi): MessagesRepository {
+        val preferences = context.getSharedPreferences("messages", Context.MODE_PRIVATE)
+        return SharedPreferencesMessagesRepository(preferences, moshi)
     }
 
     @Provides
@@ -278,4 +287,22 @@ class AppModule {
             getSettingsInteractor: GetSettingsInteractor): PushManager {
         return PushManager(groupedPushes, manager, moshi, getAccountInteractor, getSettingsInteractor, context)
     }
+
+    @Provides
+    fun provideJobScheduler(context: Application): JobScheduler {
+        return context.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler
+    }
+
+    @Provides
+    fun provideSendMessageJob(context: Application): JobInfo {
+        return JobInfo.Builder(MessageService.RETRY_SEND_MESSAGE_ID,
+                ComponentName(context, MessageService::class.java))
+                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                .build()
+    }
+
+    @Provides
+    fun provideJobSchedulerInteractor(jobScheduler: JobScheduler, jobInfo: JobInfo): JobSchedulerInteractor {
+        return JobSchedulerInteractorImpl(jobScheduler, jobInfo)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/JobSchedulerInteractor.kt

+package chat.rocket.android.server.domain
+
+interface JobSchedulerInteractor {
+    /**
+     * Schedule job to retry previously failed sending messages.
+     */
+    fun scheduleSendingMessages()
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/MessagesRepository.kt

@@ -11,7 +11,7 @@ interface MessagesRepository {
      *
      * @return The Message object given by the id or null if message wasn't found.
      */
-    fun getById(id: String): Message?
+    suspend fun getById(id: String): Message?
 
     /**
      * Get all messages from the current room id.
@@ -19,7 +19,7 @@ interface MessagesRepository {
      * @param rid The room id.
      * @return A list of Message objects for the room with given room id or an empty list.
      */
-    fun getByRoomId(rid: String): List<Message>
+    suspend fun getByRoomId(rid: String): List<Message>
 
     /**
      * Get most recent messages up to count different users.
@@ -29,43 +29,47 @@ interface MessagesRepository {
      *
      * @return List of last count messages.
      */
-    fun getRecentMessages(rid: String, count: Long): List<Message>
+    suspend fun getRecentMessages(rid: String, count: Long): List<Message>
 
     /**
      * Get all messages. Use carefully!
      *
      * @return All messages or an empty list.
      */
-    fun getAll(): List<Message>
+    suspend fun getAll(): List<Message>
 
     /**
      * Save a single message object.
      *
      * @param The message object to saveAll.
      */
-    fun save(message: Message)
+    suspend fun save(message: Message)
 
     /**
      * Save a list of messages.
      */
-    fun saveAll(newMessages: List<Message>)
+    suspend fun saveAll(newMessages: List<Message>)
 
     /**
      * Removes all messages.
      */
-    fun clear()
+    suspend fun clear()
 
     /**
      * Remove message by id.
      *
      * @param id The id of the message to remove.
      */
-    fun removeById(id: String)
+    suspend fun removeById(id: String)
 
     /**
      * Remove all messages from a given room.
      *
      * @param rid The room id where messages are to be removed.
      */
-    fun removeByRoomId(rid: String)
+    suspend fun removeByRoomId(rid: String)
+
+    suspend fun getAllTemporary(): List<Message>
+
+    suspend fun getAllTemporaryByRoomId(roomId: String): List<Message>
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/JobSchedulerInteractorImpl.kt

+package chat.rocket.android.server.infraestructure
+
+import android.app.job.JobInfo
+import android.app.job.JobScheduler
+import chat.rocket.android.server.domain.JobSchedulerInteractor
+import javax.inject.Inject
+
+/**
+ * Uses the Android framework [JobScheduler].
+ */
+class JobSchedulerInteractorImpl @Inject constructor(
+        private val jobScheduler: JobScheduler,
+        private val jobInfo: JobInfo
+) : JobSchedulerInteractor {
+
+    override fun scheduleSendingMessages() {
+        jobScheduler.schedule(jobInfo)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/MemoryMessagesRepository.kt

@@ -2,45 +2,67 @@ package chat.rocket.android.server.infraestructure
 
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.core.model.Message
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.withContext
 
 class MemoryMessagesRepository : MessagesRepository {
 
     private val messages: HashMap<String, Message> = HashMap()
 
-    override fun getById(id: String): Message? {
-        return messages[id]
+    override suspend fun getById(id: String): Message? = withContext(CommonPool) {
+        return@withContext messages[id]
     }
 
-    override fun getByRoomId(rid: String): List<Message> {
-        return messages.filter { it.value.roomId == rid }.values.toList()
+    override suspend fun getByRoomId(rid: String): List<Message> = withContext(CommonPool) {
+        return@withContext messages.filter { it.value.roomId == rid }.values.toList()
     }
 
-    override fun getRecentMessages(rid: String, count: Long): List<Message> {
-        return getByRoomId(rid).sortedByDescending { it.timestamp }
+    override suspend fun getRecentMessages(rid: String, count: Long): List<Message> = withContext(CommonPool) {
+        return@withContext getByRoomId(rid).sortedByDescending { it.timestamp }
                 .distinctBy { it.sender }.take(count.toInt())
     }
 
-    override fun getAll(): List<Message> = messages.values.toList()
+    override suspend fun getAll(): List<Message> = withContext(CommonPool) {
+        return@withContext messages.values.toList()
+    }
+
+    override suspend fun getAllTemporaryByRoomId(roomId: String): List<Message> = withContext(CommonPool) {
+        val allByRoomId = getByRoomId(roomId)
+        if (allByRoomId.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        return@withContext allByRoomId.filter { it.isTemporary ?: false && it.roomId == roomId }
+    }
 
-    override fun save(message: Message) {
+    override suspend fun getAllTemporary(): List<Message> = withContext(CommonPool) {
+        val all = getAll()
+        if (all.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        return@withContext all.filter { it.isTemporary ?: false }
+    }
+
+    override suspend fun save(message: Message) = withContext(CommonPool) {
         messages[message.id] = message
     }
 
-    override fun saveAll(newMessages: List<Message>) {
+    override suspend fun saveAll(newMessages: List<Message>) = withContext(CommonPool) {
         for (msg in newMessages) {
             messages[msg.id] = msg
         }
     }
 
-    override fun clear() {
+    override suspend fun clear() = withContext(CommonPool) {
         messages.clear()
     }
 
-    override fun removeById(id: String) {
+    override suspend fun removeById(id: String) {
+        withContext(CommonPool) {
             messages.remove(id)
         }
+    }
 
-    override fun removeByRoomId(rid: String) {
+    override suspend fun removeByRoomId(rid: String) = withContext(CommonPool) {
         val roomMessages = messages.filter { it.value.roomId == rid }.values
         roomMessages.forEach {
             messages.remove(it.roomId)

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesMessagesRepository.kt

+package chat.rocket.android.server.infraestructure
+
+import android.content.SharedPreferences
+import chat.rocket.android.server.domain.MessagesRepository
+import chat.rocket.core.model.Message
+import com.squareup.moshi.Moshi
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.withContext
+
+class SharedPreferencesMessagesRepository(
+        private val prefs: SharedPreferences,
+        private val moshi: Moshi)
+    : MessagesRepository {
+
+    override suspend fun getById(id: String): Message? = withContext(CommonPool) {
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        if (prefs.all.values.isEmpty()) {
+            return@withContext null
+        }
+        val values = prefs.all.values as Collection<String>
+        return@withContext values.map { adapter.fromJson(it) }.firstOrNull { it?.id == id }
+    }
+
+    override suspend fun getByRoomId(rid: String): List<Message> = withContext(CommonPool) {
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        if (prefs.all.values.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        val values = prefs.all.values as Collection<String>
+        return@withContext values.mapNotNull { adapter.fromJson(it) }.filter {
+            it.roomId == rid
+        }.toList()
+    }
+
+    override suspend fun getRecentMessages(rid: String, count: Long): List<Message> {
+        return getByRoomId(rid).sortedByDescending { it.timestamp }
+                .distinctBy { it.sender }.take(count.toInt())
+    }
+
+    override suspend fun getAll(): List<Message> = withContext(CommonPool) {
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        if (prefs.all.values.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        val values = prefs.all.values as Collection<String>
+        return@withContext values.mapNotNull { adapter.fromJson(it) }
+    }
+
+    override suspend fun getAllTemporary(): List<Message> = withContext(CommonPool) {
+        if (prefs.all.values.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        val all = prefs.all.values as Collection<String>
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        return@withContext all.mapNotNull { adapter.fromJson(it) }
+                .filter { it.isTemporary ?: false }
+    }
+
+    override suspend fun getAllTemporaryByRoomId(roomId: String): List<Message> = withContext(CommonPool) {
+        val allByRoomId = getByRoomId(roomId)
+        if (allByRoomId.isEmpty()) {
+            return@withContext emptyList<Message>()
+        }
+        return@withContext allByRoomId.filter { it.isTemporary ?: false }
+    }
+
+    override suspend fun save(message: Message) = withContext(CommonPool) {
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        prefs.edit().putString(message.id, adapter.toJson(message)).apply()
+    }
+
+    override suspend fun saveAll(newMessages: List<Message>) = withContext(CommonPool) {
+        val adapter = moshi.adapter<Message>(Message::class.java)
+        val editor = prefs.edit()
+        for (msg in newMessages) {
+            editor.putString(msg.id, adapter.toJson(msg))
+        }
+        editor.apply()
+    }
+
+    override suspend fun clear() = withContext(CommonPool) {
+        prefs.edit().clear().apply()
+    }
+
+    override suspend fun removeById(id: String) = withContext(CommonPool) {
+        prefs.edit().putString(id, null).apply()
+    }
+
+    override suspend fun removeByRoomId(rid: String) {
+        withContext(CommonPool) {
+            val adapter = moshi.adapter<Message>(Message::class.java)
+            val editor = prefs.edit()
+            prefs.all.entries.forEach {
+                val value = it.value
+                if (value is String) {
+                    val message = adapter.fromJson(value)
+                    if (message?.roomId == rid) {
+                        editor.putString(message.id, null)
+                    }
+                }
+            }
+            editor.apply()
+        }
+    }
+}
\ No newline at end of file