Merge pull request #1752 from RocketChat/fix/admin-panel-crash

[FIX] admin panel crash

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -719,9 +719,9 @@ class ChatRoomPresenter @Inject constructor(
                     .filterNot { filterSelfOut && it.sender?.username == self }
                 val activeUsers = mutableListOf<PeopleSuggestionUiModel>()
                 recentMessages.forEach {
-                    val sender = it.sender!!
-                    val username = sender.username ?: ""
-                    val name = sender.name ?: ""
+                    val sender = it.sender
+                    val username = sender?.username ?: ""
+                    val name = sender?.name ?: ""
                     val avatarUrl = currentServer.avatarUrl(username)
                     val found = members.firstOrNull { member -> member.username == username }
                     val status = if (found != null) found.status else UserStatus.Offline()

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

@@ -35,6 +35,7 @@ import chat.rocket.android.server.ui.ChangeServerActivity
 import chat.rocket.android.settings.di.SettingsFragmentProvider
 import chat.rocket.android.settings.password.di.PasswordFragmentProvider
 import chat.rocket.android.settings.password.ui.PasswordActivity
+import chat.rocket.android.webview.adminpanel.di.AdminPanelWebViewFragmentProvider
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -64,7 +65,8 @@ abstract class ActivityBuilder {
             ProfileFragmentProvider::class,
             SettingsFragmentProvider::class,
             AboutFragmentProvider::class,
-            PreferencesFragmentProvider::class
+            PreferencesFragmentProvider::class,
+            AdminPanelWebViewFragmentProvider::class
         ]
     )
     abstract fun bindMainActivity(): MainActivity

app/src/main/java/chat/rocket/android/webview/adminpanel/di/AdminPanelWebViewFragmentProvider.kt

+package chat.rocket.android.webview.adminpanel.di
+
+import chat.rocket.android.webview.adminpanel.ui.AdminPanelWebViewFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class AdminPanelWebViewFragmentProvider {
+
+    @ContributesAndroidInjector
+    abstract fun provideAdminPanelWebViewFragment(): AdminPanelWebViewFragment
+}
\ No newline at end of file