Prefix keys on SharedPreferencesMessageRepository with the server url

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

@@ -9,6 +9,7 @@ import chat.rocket.android.util.extensions.isValidUrl
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.util.ifNull
 import javax.inject.Inject
+import javax.net.ssl.SSLHandshakeException
 
 class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val strategy: CancelStrategy,
@@ -16,6 +17,8 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val serverInteractor: SaveCurrentServerInteractor,
                                           private val refreshSettingsInteractor: RefreshSettingsInteractor,
                                           private val getAccountsInteractor: GetAccountsInteractor) {
+    private var retryCount = 0
+
     fun connect(server: String) {
         if (!server.isValidUrl()) {
             view.showInvalidServerUrlMessage()
@@ -34,10 +37,15 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                     serverInteractor.save(server)
                     navigator.toLogin()
                 } catch (ex: Exception) {
-                    ex.message?.let {
-                        view.showMessage(it)
-                    }.ifNull {
-                        view.showGenericErrorMessage()
+                    if (ex.cause is SSLHandshakeException && retryCount < MAX_RETRY_ATTEMPTS) {
+                        retryCount++
+                        connect(server.replace("https", "http"))
+                    } else {
+                        ex.message?.let {
+                            view.showMessage(it)
+                        }.ifNull {
+                            view.showGenericErrorMessage()
+                        }
                     }
                 } finally {
                     view.hideLoading()
@@ -45,4 +53,8 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
             }
         }
     }
+
+    companion object {
+        const val MAX_RETRY_ATTEMPTS = 1
+    }
 }
\ No newline at end of file

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

@@ -225,9 +225,9 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideMessageRepository(context: Application, moshi: Moshi): MessagesRepository {
+    fun provideMessageRepository(context: Application, moshi: Moshi, currentServerInteractor: GetCurrentServerInteractor): MessagesRepository {
         val preferences = context.getSharedPreferences("messages", Context.MODE_PRIVATE)
-        return SharedPreferencesMessagesRepository(preferences, moshi)
+        return SharedPreferencesMessagesRepository(preferences, moshi, currentServerInteractor)
     }
 
     @Provides

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.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.core.model.Message
 import com.squareup.moshi.Moshi
@@ -9,31 +10,40 @@ import kotlinx.coroutines.experimental.withContext
 
 class SharedPreferencesMessagesRepository(
     private val prefs: SharedPreferences,
-    private val moshi: Moshi)
+    private val moshi: Moshi,
+    private val currentServerInteractor: GetCurrentServerInteractor)
     : 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
+        currentServerInteractor.get()?.also { server ->
+            if (prefs.all.values.isEmpty()) {
+                return@withContext null
+            }
+            val adapter = moshi.adapter<Message>(Message::class.java)
+            val values = prefs.all.entries.filter { it.key.startsWith(server) }
+                .map { it.value } as Collection<String>
+            return@withContext values.map { adapter.fromJson(it) }.firstOrNull { it?.id == id }
         }
-        val values = prefs.all.values as Collection<String>
-        return@withContext values.map { adapter.fromJson(it) }.firstOrNull { it?.id == id }
+        return@withContext null
     }
 
     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>()
+        currentServerInteractor.get()?.also { server ->
+            val adapter = moshi.adapter<Message>(Message::class.java)
+            if (prefs.all.values.isEmpty()) {
+                return@withContext emptyList<Message>()
+            }
+            val values = prefs.all.entries.filter { it.key.startsWith(server) }
+                .map { it.value } as Collection<String>
+            return@withContext values.mapNotNull { adapter.fromJson(it) }.filter {
+                it.roomId == rid
+            }.toList().sortedWith(compareBy(Message::timestamp)).reversed()
         }
-        val values = prefs.all.values as Collection<String>
-        return@withContext values.mapNotNull { adapter.fromJson(it) }.filter {
-            it.roomId == rid
-        }.toList().sortedWith(compareBy(Message::timestamp)).reversed()
+        return@withContext emptyList<Message>()
     }
 
-    override suspend 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())
     }
 
@@ -42,18 +52,26 @@ class SharedPreferencesMessagesRepository(
         if (prefs.all.values.isEmpty()) {
             return@withContext emptyList<Message>()
         }
-        val values = prefs.all.values as Collection<String>
-        return@withContext values.mapNotNull { adapter.fromJson(it) }
+        currentServerInteractor.get()?.also { server ->
+            val values = prefs.all.entries.filter { it.key.startsWith(server) }
+                .map { it.value } as Collection<String>
+            return@withContext values.mapNotNull { adapter.fromJson(it) }
+        }
+        return@withContext emptyList<Message>()
     }
 
     override suspend fun getAllUnsent(): 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 }
+        currentServerInteractor.get()?.also { server ->
+            val values = prefs.all.entries.filter { it.key.startsWith(server) }
+                .map { it.value } as Collection<String>
+            val adapter = moshi.adapter<Message>(Message::class.java)
+            return@withContext values.mapNotNull { adapter.fromJson(it) }
+                .filter { it.isTemporary ?: false }
+        }
+        return@withContext emptyList<Message>()
     }
 
     override suspend fun getUnsentByRoomId(roomId: String): List<Message> = withContext(CommonPool) {
@@ -64,42 +82,56 @@ class SharedPreferencesMessagesRepository(
         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 save(message: Message) {
+        withContext(CommonPool) {
+            currentServerInteractor.get()?.also {
+                val adapter = moshi.adapter<Message>(Message::class.java)
+                prefs.edit().putString("${it}_${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))
+    override suspend fun saveAll(newMessages: List<Message>) {
+        withContext(CommonPool) {
+            currentServerInteractor.get()?.also {
+                val adapter = moshi.adapter<Message>(Message::class.java)
+                val editor = prefs.edit()
+                for (msg in newMessages) {
+                    editor.putString("${it}_${msg.id}", adapter.toJson(msg))
+                }
+                editor.apply()
+            }
         }
-        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 removeById(id: String) {
+        withContext(CommonPool) {
+            currentServerInteractor.get()?.also {
+                prefs.edit().putString("${it}_$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)
+            currentServerInteractor.get()?.also { server ->
+                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("${server}_${message.id}", null)
+                        }
                     }
                 }
+                editor.apply()
             }
-            editor.apply()
         }
     }
 }
\ No newline at end of file