Merge pull request #1345 from RocketChat/release/2.3.0-hotfix1

[FIX] 2.3.0 hotfix1

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2024
-        versionName "2.3.0"
+        versionCode 2025
+        versionName "2.3.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/src/main/java/chat/rocket/android/authentication/di/AuthenticationModule.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.di
 
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.authentication.ui.AuthenticationActivity
+import chat.rocket.android.dagger.qualifier.ForAuthentication
 import chat.rocket.android.dagger.scope.PerActivity
 import dagger.Module
 import dagger.Provides

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -41,12 +41,13 @@ class LoginPresenter @Inject constructor(
     private val localRepository: LocalRepository,
     private val getAccountsInteractor: GetAccountsInteractor,
     private val settingsInteractor: GetSettingsInteractor,
-    serverInteractor: GetCurrentServerInteractor,
+    serverInteractor: GetConnectingServerInteractor,
+    private val saveCurrentServer: SaveCurrentServerInteractor,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val factory: RocketChatClientFactory
 ) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
-    private val currentServer = serverInteractor.get()!!
+    private var currentServer = serverInteractor.get()!!
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
     private lateinit var usernameOrEmail: String
@@ -103,6 +104,7 @@ class LoginPresenter @Inject constructor(
     }
 
     private fun setupConnectionInfo(serverUrl: String) {
+        currentServer = serverUrl
         client = factory.create(serverUrl)
         settings = settingsInteractor.get(serverUrl)
     }
@@ -325,6 +327,7 @@ class LoginPresenter @Inject constructor(
                 val username = retryIO("me()") { client.me().username }
                 if (username != null) {
                     localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, username)
+                    saveCurrentServer.save(currentServer)
                     saveAccount(username)
                     saveToken(token)
                     registerPushToken()

app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt

@@ -27,7 +27,8 @@ class RegisterUsernamePresenter @Inject constructor(
     private val factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
-    serverInteractor: GetCurrentServerInteractor,
+    serverInteractor: GetConnectingServerInteractor,
+    private val saveCurrentServer: SaveCurrentServerInteractor,
     settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
@@ -47,6 +48,7 @@ class RegisterUsernamePresenter @Inject constructor(
                     val registeredUsername = me.username
                     if (registeredUsername != null) {
                         saveAccount(registeredUsername)
+                        saveCurrentServer.save(currentServer)
                         tokenRepository.save(currentServer, Token(userId, authToken))
                         registerPushToken()
                         navigator.toChatList()

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.resetpassword.presentation
 
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.isEmail
@@ -19,7 +20,7 @@ class ResetPasswordPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: AuthenticationNavigator,
     factory: RocketChatClientFactory,
-    serverInteractor: GetCurrentServerInteractor
+    serverInteractor: GetConnectingServerInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(currentServer)

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

@@ -6,7 +6,7 @@ import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
-import chat.rocket.android.server.domain.SaveCurrentServerInteractor
+import chat.rocket.android.server.domain.SaveConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.isValidUrl
@@ -16,7 +16,7 @@ import javax.inject.Inject
 class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val strategy: CancelStrategy,
                                           private val navigator: AuthenticationNavigator,
-                                          private val serverInteractor: SaveCurrentServerInteractor,
+                                          private val serverInteractor: SaveConnectingServerInteractor,
                                           private val refreshSettingsInteractor: RefreshSettingsInteractor,
                                           private val getAccountsInteractor: GetAccountsInteractor,
                                           factory: RocketChatClientFactory

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt

@@ -22,7 +22,8 @@ class SignupPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: AuthenticationNavigator,
     private val localRepository: LocalRepository,
-    private val serverInteractor: GetCurrentServerInteractor,
+    private val serverInteractor: GetConnectingServerInteractor,
+    private val saveCurrentServerInteractor: SaveCurrentServerInteractor,
     private val factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
@@ -60,6 +61,7 @@ class SignupPresenter @Inject constructor(
                         // TODO This function returns a user token so should we save it?
                         retryIO("login") { client.login(username, password) }
                         val me = retryIO("me") { client.me() }
+                        saveCurrentServerInteractor.save(currentServer)
                         localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
                         saveAccount(me)
                         registerPushToken()

app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt

@@ -25,7 +25,8 @@ class TwoFAPresenter @Inject constructor(private val view: TwoFAView,
                                          private val navigator: AuthenticationNavigator,
                                          private val tokenRepository: TokenRepository,
                                          private val localRepository: LocalRepository,
-                                         private val serverInteractor: GetCurrentServerInteractor,
+                                         private val serverInteractor: GetConnectingServerInteractor,
+                                         private val saveCurrentServerInteractor: SaveCurrentServerInteractor,
                                          private val factory: RocketChatClientFactory,
                                          private val saveAccountInteractor: SaveAccountInteractor,
                                          private val getAccountsInteractor: GetAccountsInteractor,
@@ -55,6 +56,7 @@ class TwoFAPresenter @Inject constructor(private val view: TwoFAView,
                         }
                         val me = retryIO("me") { client.me() }
                         saveAccount(me)
+                        saveCurrentServerInteractor.save(currentServer)
                         tokenRepository.save(server, token)
                         registerPushToken()
                         navigator.toChatList()

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -32,19 +32,27 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         setContentView(R.layout.activity_authentication)
         setTheme(R.style.AuthenticationTheme)
         super.onCreate(savedInstanceState)
+    }
 
+    override fun onStart() {
+        super.onStart()
         val deepLinkInfo = intent.getLoginDeepLinkInfo()
         launch(UI + job) {
             val newServer = intent.getBooleanExtra(INTENT_ADD_NEW_SERVER, false)
             // if we got authenticateWithDeepLink information, pass true to newServer also
             presenter.loadCredentials(newServer || deepLinkInfo != null) { authenticated ->
                 if (!authenticated) {
-                    showServerInput(savedInstanceState, deepLinkInfo)
+                    showServerInput(deepLinkInfo)
                 }
             }
         }
     }
 
+    override fun onStop() {
+        job.cancel()
+        super.onStop()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         val currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
@@ -53,17 +61,12 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         }
     }
 
-    override fun onDestroy() {
-        job.cancel()
-        super.onDestroy()
-    }
-
     override fun supportFragmentInjector(): AndroidInjector<Fragment> {
         return fragmentDispatchingAndroidInjector
     }
 
-    fun showServerInput(savedInstanceState: Bundle?, deepLinkInfo: LoginDeepLinkInfo?) {
-        addFragment("ServerFragment", R.id.fragment_container) {
+    fun showServerInput(deepLinkInfo: LoginDeepLinkInfo?) {
+        addFragment("ServerFragment", R.id.fragment_container, allowStateLoss = true) {
             ServerFragment.newInstance(deepLinkInfo)
         }
     }

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt

 package chat.rocket.android.chatroom.di
 
 import android.arch.lifecycle.LifecycleOwner
-import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatroom.presentation.ChatRoomView
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.ChatRoomFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
@@ -12,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class ChatRoomFragmentModule {
 
     @Provides
+    @PerFragment
     fun chatRoomView(frag: ChatRoomFragment): ChatRoomView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: ChatRoomFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentProvider.kt

 package chat.rocket.android.chatroom.di
 
 import chat.rocket.android.chatroom.ui.ChatRoomFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class ChatRoomFragmentProvider {
 
     @ContributesAndroidInjector(modules = [ChatRoomFragmentModule::class])
+    @PerFragment
     abstract fun provideChatRoomFragment(): ChatRoomFragment
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@ import androidx.core.text.color
 import androidx.core.text.scale
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.domain.MessageReply
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.helper.MessageHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
@@ -47,6 +48,7 @@ import okhttp3.HttpUrl
 import java.security.InvalidParameterException
 import javax.inject.Inject
 
+@PerFragment
 class ViewModelMapper @Inject constructor(
     private val context: Context,
     private val parser: MessageParser,

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentProvider.kt

 package chat.rocket.android.chatrooms.di
 
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class ChatRoomsFragmentProvider {
 
     @ContributesAndroidInjector(modules = [ChatRoomsFragmentModule::class])
+    @PerFragment
     abstract fun provideChatRoomsFragment(): ChatRoomsFragment
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@ 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.ForAuthentication
 import chat.rocket.android.dagger.qualifier.ForMessages
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
@@ -23,6 +24,7 @@ import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.*
 import chat.rocket.android.util.AppJsonAdapterFactory
+import chat.rocket.android.util.HttpLoggingInterceptor
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
 import chat.rocket.common.internal.ISO8601Date
@@ -42,7 +44,6 @@ import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import ru.noties.markwon.SpannableConfiguration
 import ru.noties.markwon.spans.SpannableTheme
 import timber.log.Timber
@@ -54,7 +55,9 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideRocketChatClient(okHttpClient: OkHttpClient, repository: TokenRepository, logger: PlatformLogger): RocketChatClient {
+    fun provideRocketChatClient(okHttpClient: OkHttpClient,
+                                repository: TokenRepository,
+                                logger: PlatformLogger): RocketChatClient {
         return RocketChatClient.create {
             httpClient = okHttpClient
             tokenRepository = repository
@@ -68,7 +71,8 @@ class AppModule {
     @Provides
     @Singleton
     fun provideRocketChatDatabase(context: Application): RocketChatDatabase {
-        return Room.databaseBuilder(context.applicationContext, RocketChatDatabase::class.java, "rocketchat-db").build()
+        return Room.databaseBuilder(context.applicationContext, RocketChatDatabase::class.java,
+                "rocketchat-db").build()
     }
 
     @Provides
@@ -91,8 +95,10 @@ class AppModule {
     @Provides
     @Singleton
     fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor {
-        val interceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { message ->
-            Timber.d(message)
+        val interceptor = HttpLoggingInterceptor(object  : HttpLoggingInterceptor.Logger {
+            override fun log(message: String) {
+                Timber.d(message)
+            }
         })
         if (BuildConfig.DEBUG) {
             interceptor.level = HttpLoggingInterceptor.Level.BODY
@@ -168,6 +174,12 @@ class AppModule {
         return SharedPrefsCurrentServerRepository(prefs)
     }
 
+    @Provides
+    @ForAuthentication
+    fun provideConnectingServerRepository(prefs: SharedPreferences): CurrentServerRepository {
+        return SharedPrefsConnectingServerRepository(prefs)
+    }
+
     @Provides
     @Singleton
     fun provideSettingsRepository(localRepository: LocalRepository): SettingsRepository {

app/src/main/java/chat/rocket/android/dagger/qualifier/ForAuthentication.kt

+package chat.rocket.android.dagger.qualifier
+
+import javax.inject.Qualifier
+
+/**
+ * Created by luciofm on 4/14/18.
+ */
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ForAuthentication
\ No newline at end of file

app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentProvider.kt

 package chat.rocket.android.chatroom.di
 
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.favoritemessages.ui.FavoriteMessagesFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class FavoriteMessagesFragmentProvider {
 
     @ContributesAndroidInjector(modules = [FavoriteMessagesFragmentModule::class])
+    @PerFragment
     abstract fun provideFavoriteMessageFragment(): FavoriteMessagesFragment
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentProvider.kt

 package chat.rocket.android.pinnedmessages.di
 
 import chat.rocket.android.chatroom.di.PinnedMessagesFragmentModule
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -9,5 +10,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class PinnedMessagesFragmentProvider {
 
     @ContributesAndroidInjector(modules = [PinnedMessagesFragmentModule::class])
+    @PerFragment
     abstract fun providePinnedMessageFragment(): PinnedMessagesFragment
 }
\ No newline at end of file

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

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.dagger.qualifier.ForAuthentication
+import javax.inject.Inject
+
+class GetConnectingServerInteractor @Inject constructor(
+    @ForAuthentication private val repository: CurrentServerRepository
+) {
+    fun get(): String? = repository.get()
+
+    fun clear() {
+        repository.clear()
+    }
+}
\ No newline at end of file

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

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.dagger.qualifier.ForAuthentication
+import javax.inject.Inject
+
+class SaveConnectingServerInteractor @Inject constructor(
+    @ForAuthentication private val repository: CurrentServerRepository
+) {
+    fun save(url: String) = repository.save(url)
+}
\ No newline at end of file

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

+package chat.rocket.android.server.infraestructure
+
+import android.content.SharedPreferences
+import chat.rocket.android.server.domain.CurrentServerRepository
+
+class SharedPrefsConnectingServerRepository(private val preferences: SharedPreferences) : CurrentServerRepository {
+
+    override fun save(url: String) {
+        preferences.edit().putString(CONNECTING_SERVER_KEY, url).apply()
+    }
+
+    override fun get(): String? {
+        return preferences.getString(CONNECTING_SERVER_KEY, null)
+    }
+
+    companion object {
+        private const val CONNECTING_SERVER_KEY = "connecting_server"
+    }
+
+    override fun clear() {
+        preferences.edit().remove(CONNECTING_SERVER_KEY).apply()
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

@@ -31,11 +31,16 @@ fun View.isVisible(): Boolean {
 fun ViewGroup.inflate(@LayoutRes resource: Int, attachToRoot: Boolean = false): View =
     LayoutInflater.from(context).inflate(resource, this, attachToRoot)
 
-fun AppCompatActivity.addFragment(tag: String, layoutId: Int, newInstance: () -> Fragment) {
+fun AppCompatActivity.addFragment(tag: String, layoutId: Int, allowStateLoss: Boolean = false,
+                                  newInstance: () -> Fragment) {
     val fragment = supportFragmentManager.findFragmentByTag(tag) ?: newInstance()
-    supportFragmentManager.beginTransaction()
-        .replace(layoutId, fragment, tag)
-        .commit()
+    val transaction = supportFragmentManager.beginTransaction()
+            .replace(layoutId, fragment, tag)
+    if (allowStateLoss) {
+        transaction.commitAllowingStateLoss()
+    } else {
+        transaction.commit()
+    }
 }
 
 fun AppCompatActivity.addFragmentBackStack(

app/src/main/java/chat/rocket/android/util/extensions/View.kt

@@ -5,12 +5,17 @@ import android.support.customtabs.CustomTabsIntent
 import android.support.v4.content.res.ResourcesCompat
 import android.view.View
 import chat.rocket.android.R
+import timber.log.Timber
 
 fun View.openTabbedUrl(url: Uri) {
     with(this) {
         val tabsbuilder = CustomTabsIntent.Builder()
         tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
         val customTabsIntent = tabsbuilder.build()
-        customTabsIntent.launchUrl(context, url)
+        try {
+            customTabsIntent.launchUrl(context, url)
+        } catch (ex: Exception) {
+            Timber.d(ex, "Unable to launch URL")
+        }
     }
 }
\ No newline at end of file