Merge branch 'beta' into develop

Author: philipbrito

app/build.gradle

@@ -140,6 +140,7 @@ dependencies {
     implementation libraries.frescoAnimatedWebP
 
     implementation libraries.glide
+    implementation libraries.glideTransformations
 
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi

app/src/main/AndroidManifest.xml

@@ -78,11 +78,6 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <activity
-            android:name=".chatdetails.ui.ChatDetailsActivity"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
@@ -93,16 +88,6 @@
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
 
-        <activity
-            android:name=".userdetails.ui.UserDetailsActivity"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="stateAlwaysHidden">
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".chatroom.ui.ChatRoomActivity" />
-        </activity>
-
         <receiver
             android:name=".push.DirectReplyReceiver"
             android:enabled="true"

app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt

@@ -16,9 +16,9 @@ sealed class ScreenViewEvent(val screenName: String) {
     object ChatRoom : ScreenViewEvent("ChatRoomFragment")
     object ChatRooms : ScreenViewEvent("ChatRoomsFragment")
     object CreateChannel : ScreenViewEvent("CreateChannelFragment")
+    object UserDetails : ScreenViewEvent("UserDetailsFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
-    object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
     object Members : ScreenViewEvent("MembersFragment")
     object Mentions : ScreenViewEvent("MentionsFragment")
     object MessageInfo : ScreenViewEvent("MessageInfoFragment")

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

@@ -5,7 +5,8 @@ import chat.rocket.android.dagger.scope.PerFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
-@Module abstract class TwoFAFragmentProvider {
+@Module
+abstract class TwoFAFragmentProvider {
 
     @ContributesAndroidInjector(modules = [TwoFAFragmentModule::class])
     @PerFragment

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt

@@ -1,23 +1,16 @@
 package chat.rocket.android.chatdetails.di
 
-import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatdetails.presentation.ChatDetailsView
 import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.DatabaseManager
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class ChatDetailsFragmentModule {
 
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
     @Provides
     @PerFragment
     fun chatDetailsView(frag: ChatDetailsFragment): ChatDetailsView {
@@ -27,16 +20,4 @@ class ChatDetailsFragmentModule {
     @Provides
     @PerFragment
     fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: ChatDetailsFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
 }

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt

@@ -1,6 +1,7 @@
 package chat.rocket.android.chatdetails.presentation
 
 import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
@@ -10,11 +11,12 @@ import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.getInfo
 import chat.rocket.core.model.Room
+import timber.log.Timber
 import javax.inject.Inject
 
 class ChatDetailsPresenter @Inject constructor(
     private val view: ChatDetailsView,
-    private val navigator: ChatDetailsNavigator,
+    private val navigator: ChatRoomNavigator,
     private val strategy: CancelStrategy,
     serverInteractor: GetCurrentServerInteractor,
     factory: ConnectionManagerFactory
@@ -29,11 +31,11 @@ class ChatDetailsPresenter @Inject constructor(
                 val room = retryIO("getInfo($chatRoomId, null, $chatRoomType") {
                     client.getInfo(chatRoomId, null, roomTypeOf(chatRoomType))
                 }
-
                 view.displayDetails(roomToChatDetails(room))
-            } catch(e: Exception) {
-                e.message.let {
-                    view.showMessage(it!!)
+            } catch(exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }