Merge pull request #886 from RocketChat/fix/logout

[FIX] Logout

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

@@ -3,11 +3,9 @@ package chat.rocket.android.chatrooms.di
 import android.arch.lifecycle.LifecycleOwner
 import chat.rocket.android.chatrooms.presentation.ChatRoomsView
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 @PerFragment
@@ -22,9 +20,4 @@ class ChatRoomsFragmentModule {
     fun provideLifecycleOwner(frag: ChatRoomsFragment): LifecycleOwner {
         return frag
     }
-
-    @Provides
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file

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

-package chat.rocket.android.chatrooms.di
-
-import android.content.Context
-import chat.rocket.android.chatrooms.presentation.ChatRoomsNavigator
-import chat.rocket.android.main.ui.MainActivity
-import chat.rocket.android.dagger.scope.PerActivity
-import dagger.Module
-import dagger.Provides
-
-@Module
-class ChatRoomsModule {
-
-    @Provides
-    @PerActivity
-    fun provideChatRoomsNavigator(activity: MainActivity, context: Context) = ChatRoomsNavigator(activity, context)
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsNavigator.kt

-package chat.rocket.android.chatrooms.presentation
-
-import android.content.Context
-import chat.rocket.android.R
-import chat.rocket.android.chatroom.ui.chatRoomIntent
-import chat.rocket.android.main.ui.MainActivity
-
-class ChatRoomsNavigator(private val activity: MainActivity, private val context: Context) {
-
-    fun toChatRoom(chatRoomId: String, chatRoomName: String, chatRoomType: String, isChatRoomReadOnly: Boolean, chatRoomLastSeen: Long) {
-        activity.startActivity(context.chatRoomIntent(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen))
-        activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

 package chat.rocket.android.chatrooms.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
@@ -24,7 +25,7 @@ import javax.inject.Inject
 
 class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
                                              private val strategy: CancelStrategy,
-                                             private val navigator: ChatRoomsNavigator,
+                                             private val navigator: MainNavigator,
                                              private val serverInteractor: GetCurrentServerInteractor,
                                              private val getChatRoomsInteractor: GetChatRoomsInteractor,
                                              private val saveChatRoomsInteractor: SaveChatRoomsInteractor,

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

@@ -11,9 +11,7 @@ import chat.rocket.android.chatroom.di.PinnedMessagesFragmentProvider
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.PinnedMessagesActivity
 import chat.rocket.android.chatrooms.di.ChatRoomsFragmentProvider
-import chat.rocket.android.chatrooms.di.ChatRoomsModule
 import chat.rocket.android.dagger.scope.PerActivity
-import chat.rocket.android.main.di.MainActivityProvider
 import chat.rocket.android.main.di.MainModule
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.members.di.MembersFragmentProvider
@@ -37,8 +35,6 @@ abstract class ActivityBuilder {
 
     @PerActivity
     @ContributesAndroidInjector(modules = [MainModule::class,
-        MainActivityProvider::class,
-        ChatRoomsModule::class,
         ChatRoomsFragmentProvider::class,
         ProfileFragmentProvider::class
     ])

app/src/main/java/chat/rocket/android/main/di/MainActivityModule.kt

-package chat.rocket.android.main.di
-
-import android.arch.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.main.presentation.MainView
-import chat.rocket.android.main.ui.MainActivity
-import dagger.Module
-import dagger.Provides
-import kotlinx.coroutines.experimental.Job
-
-@Module
-class MainActivityModule {
-
-//    @Provides
-//    fun provideMainView(activity: MainActivity): MainView = activity
-
-    @Provides
-    fun provideLifecycleOwner(activity: MainActivity): LifecycleOwner = activity
-
-    @Provides
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy = CancelStrategy(owner, jobs)
-
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/di/MainActivityProvider.kt

-package chat.rocket.android.main.di
-
-import chat.rocket.android.main.ui.MainActivity
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class MainActivityProvider {
-
-    @ContributesAndroidInjector(modules = [MainActivityModule::class])
-    abstract fun provideMainActivity(): MainActivity
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/di/MainModule.kt

 package chat.rocket.android.main.di
 
+import android.arch.lifecycle.LifecycleOwner
 import android.content.Context
+import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import chat.rocket.android.main.presentation.MainNavigator
+import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.ui.MainActivity
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.experimental.Job
 
 @Module
 class MainModule {
@@ -13,4 +17,13 @@ class MainModule {
     @Provides
     @PerActivity
     fun provideMainNavigator(activity: MainActivity, context: Context) = MainNavigator(activity, context)
+
+    @Provides
+    fun provideMainView(activity: MainActivity): MainView = activity
+
+    @Provides
+    fun provideLifecycleOwner(activity: MainActivity): LifecycleOwner = activity
+
+    @Provides
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy = CancelStrategy(owner, jobs)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.main.presentation
 
 import android.content.Context
 import chat.rocket.android.R
+import chat.rocket.android.chatroom.ui.chatRoomIntent
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.profile.ui.ProfileFragment
@@ -27,4 +28,9 @@ class MainNavigator(internal val activity: MainActivity, internal val context: C
             SettingsFragment.newInstance()
         }
     }
+
+    fun toChatRoom(chatRoomId: String, chatRoomName: String, chatRoomType: String, isChatRoomReadOnly: Boolean, chatRoomLastSeen: Long) {
+        activity.startActivity(context.chatRoomIntent(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen))
+        activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

 package chat.rocket.android.main.presentation
 
+import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.realtime.disconnect
+import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.unregisterPushToken
-import timber.log.Timber
 import javax.inject.Inject
 
-class MainPresenter @Inject constructor(private val navigator: MainNavigator,
+class MainPresenter @Inject constructor(private val view: MainView,
+                                        private val strategy: CancelStrategy,
+                                        private val navigator: MainNavigator,
                                         private val serverInteractor: GetCurrentServerInteractor,
                                         private val localRepository: LocalRepository,
                                         managerFactory: ConnectionManagerFactory,
@@ -30,19 +35,21 @@ class MainPresenter @Inject constructor(private val navigator: MainNavigator,
      * Logout from current server.
      */
     fun logout() {
-        // TODO: inject CancelStrategy, and MainView.
-//        launchUI(strategy) {
+        launchUI(strategy) {
             try {
-//                clearTokens()
-//                client.logout()
+                clearTokens()
+                client.logout()
                 //TODO: Add the code to unsubscribe to all subscriptions.
                 client.disconnect()
-//                view.onLogout()
-            } catch (e: RocketChatException) {
-                Timber.e(e)
-//                view.showMessage(e.message!!)
+                view.onLogout()
+            } catch (exception: RocketChatException) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            }
         }
-//        }
     }
 
     private suspend fun clearTokens() {

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

 package chat.rocket.android.main.ui
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.support.v4.app.Fragment
@@ -7,25 +8,21 @@ import android.support.v7.app.AppCompatActivity
 import android.view.Gravity
 import android.view.MenuItem
 import chat.rocket.android.R
-
-import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
-import chat.rocket.android.profile.ui.ProfileFragment
-import chat.rocket.android.settings.ui.SettingsFragment
-import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.authentication.ui.AuthenticationActivity
 import chat.rocket.android.main.presentation.MainPresenter
 import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.util.extensions.showToast
-
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasActivityInjector
 import dagger.android.support.HasSupportFragmentInjector
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.app_bar.*
 import javax.inject.Inject
 
-class MainActivity : AppCompatActivity(), MainView, HasSupportFragmentInjector {
+class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupportFragmentInjector {
+    @Inject lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
     @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject lateinit var presenter: MainPresenter
     private var isFragmentAdded: Boolean = false
@@ -68,6 +65,8 @@ class MainActivity : AppCompatActivity(), MainView, HasSupportFragmentInjector {
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
+    override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector
+
     override fun supportFragmentInjector(): AndroidInjector<Fragment> = fragmentDispatchingAndroidInjector
 
     private fun setupToolbar() {

app/src/main/java/chat/rocket/android/profile/di/ProfileFragmentModule.kt

 package chat.rocket.android.profile.di
 
 import android.arch.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.profile.presentation.ProfileView
 import chat.rocket.android.profile.ui.ProfileFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 @PerFragment
@@ -22,9 +20,4 @@ class ProfileFragmentModule {
     fun provideLifecycleOwner(frag: ProfileFragment): LifecycleOwner {
         return frag
     }
-
-    @Provides
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }
\ No newline at end of file