Update dagger

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class LoginFragmentModule {
 
     @Provides
+    @PerFragment
     fun loginView(frag: LoginFragment): LoginView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: LoginFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

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

 package chat.rocket.android.authentication.login.di
 
 import chat.rocket.android.authentication.login.ui.LoginFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module abstract class LoginFragmentProvider {
 
     @ContributesAndroidInjector(modules = [LoginFragmentModule::class])
+    @PerFragment
     abstract fun provideLoginFragment(): LoginFragment
 }
\ No newline at end of file

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class RegisterUsernameFragmentModule {
 
     @Provides
+    @PerFragment
     fun registerUsernameView(frag: RegisterUsernameFragment): RegisterUsernameView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: RegisterUsernameFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

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

 package chat.rocket.android.authentication.registerusername.di
 
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class RegisterUsernameFragmentProvider {
 
     @ContributesAndroidInjector(modules = [RegisterUsernameFragmentModule::class])
+    @PerFragment
     abstract fun provideRegisterUsernameFragment(): RegisterUsernameFragment
 }
\ No newline at end of file

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class ResetPasswordFragmentModule {
 
     @Provides
+    @PerFragment
     fun resetPasswordView(frag: ResetPasswordFragment): ResetPasswordView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: ResetPasswordFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

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

 package chat.rocket.android.authentication.resetpassword.di
 
 import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class ResetPasswordFragmentProvider {
 
     @ContributesAndroidInjector(modules = [ResetPasswordFragmentModule::class])
+    @PerFragment
     abstract fun provideResetPasswordFragment(): ResetPasswordFragment
 }
\ No newline at end of file

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class SignupFragmentModule {
 
     @Provides
+    @PerFragment
     fun signupView(frag: SignupFragment): SignupView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: SignupFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

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

 package chat.rocket.android.authentication.signup.di
 
 import chat.rocket.android.authentication.signup.ui.SignupFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class SignupFragmentProvider {
 
     @ContributesAndroidInjector(modules = [SignupFragmentModule::class])
+    @PerFragment
     abstract fun provideSignupFragment(): SignupFragment
 }
\ No newline at end of file

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class TwoFAFragmentModule {
 
     @Provides
+    @PerFragment
     fun loginView(frag: TwoFAFragment): TwoFAView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: TwoFAFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

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

 package chat.rocket.android.authentication.twofactor.di
 
 import chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
+import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
 @Module abstract class TwoFAFragmentProvider {
 
     @ContributesAndroidInjector(modules = [TwoFAFragmentModule::class])
+    @PerFragment
     abstract fun provideTwoFAFragment(): TwoFAFragment
 }

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

@@ -12,20 +12,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/di/ChatRoomModule.kt

@@ -7,8 +7,8 @@ import dagger.Module
 import dagger.Provides
 
 @Module
-@PerActivity
 class ChatRoomModule {
     @Provides
+    @PerActivity
     fun provideChatRoomNavigator(activity: ChatRoomActivity) = ChatRoomNavigator(activity)
 }
\ No newline at end of file

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/members/di/MembersFragmentModule.kt

@@ -12,23 +12,26 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class MembersFragmentModule {
 
     @Provides
+    @PerFragment
     fun provideChatRoomNavigator(activity: ChatRoomActivity) = MembersNavigator(activity)
 
     @Provides
+    @PerFragment
     fun membersView(frag: MembersFragment): MembersView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: MembersFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt

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

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

@@ -10,20 +10,22 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class PinnedMessagesFragmentModule {
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: PinnedMessagesFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }
 
     @Provides
+    @PerFragment
     fun providePinnedMessagesView(frag: PinnedMessagesFragment): PinnedMessagesView {
         return frag
     }

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

 package chat.rocket.android.chatroom.di
 
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -8,5 +9,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/profile/di/ProfileFragmentModule.kt

@@ -8,15 +8,16 @@ import dagger.Module
 import dagger.Provides
 
 @Module
-@PerFragment
 class ProfileFragmentModule {
 
     @Provides
+    @PerFragment
     fun profileView(frag: ProfileFragment): ProfileView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideLifecycleOwner(frag: ProfileFragment): LifecycleOwner {
         return frag
     }

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

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

app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt

@@ -10,19 +10,21 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class SettingsFragmentModule {
     @Provides
+    @PerFragment
     fun settingsView(frag: SettingsFragment): SettingsView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun settingsLifecycleOwner(frag: SettingsFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

app/src/main/java/chat/rocket/android/settings/password/di/PasswordFragmentModule.kt

@@ -10,19 +10,21 @@ import dagger.Provides
 import kotlinx.coroutines.experimental.Job
 
 @Module
-@PerFragment
 class PasswordFragmentModule {
     @Provides
+    @PerFragment
     fun passwordView(frag: PasswordFragment): PasswordView {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun settingsLifecycleOwner(frag: PasswordFragment): LifecycleOwner {
         return frag
     }
 
     @Provides
+    @PerFragment
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }

app/src/main/java/chat/rocket/android/settings/password/di/PasswordFragmentProvider.kt

 package chat.rocket.android.settings.password.di
 
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.settings.password.ui.PasswordFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -7,5 +8,6 @@ import dagger.android.ContributesAndroidInjector
 @Module
 abstract class PasswordFragmentProvider {
     @ContributesAndroidInjector(modules = [PasswordFragmentModule::class])
+    @PerFragment
     abstract fun providePasswordFragment(): PasswordFragment
 }
\ No newline at end of file

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

@@ -45,3 +45,7 @@ fun String.parseColor(): Int {
         Color.parseColor("white")
     }
 }
+
+fun String.userId(userId: String?): String? {
+    return userId?.let { this.replace(it, "") }
+}
\ No newline at end of file

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

@@ -94,3 +94,9 @@ var TextView.content: CharSequence?
         Markwon.scheduleDrawables(this)
         Markwon.scheduleTableRows(this)
     }
+
+var TextView.spanned: CharSequence?
+    get() = text
+    set(value) {
+        text = spanned
+    }
\ No newline at end of file