Skip to content

[stable-22.1] avoid Npe in ConversationInfoActivity #5694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahibi merged 1 commit into from
Jan 13, 2026
Merged

[stable-22.1] avoid Npe in ConversationInfoActivity #5694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,18 +189,34 @@ class ConversationInfoActivity :
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)

binding = ActivityConversationInfoBinding.inflate(layoutInflater)
setupActionBar()
setContentView(binding.root)
initSystemBars()

viewModel =
ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java]
setupActionBar()
initSystemBars()

conversationUser = currentUserProviderOld.currentUser.blockingGet()
conversationToken = requireNotNull(
intent.getStringExtra(KEY_ROOM_TOKEN)
) { "Missing room token" }

conversationToken = intent.getStringExtra(KEY_ROOM_TOKEN)!!
hasAvatarSpacing = intent.getBooleanExtra(BundleKeys.KEY_ROOM_ONE_TO_ONE, false)
credentials = ApiUtils.getCredentials(conversationUser.username, conversationUser.token)!!

viewModel = ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java]

lifecycleScope.launch {
currentUserProvider.getCurrentUser()
.onSuccess { user ->
conversationUser = user
credentials = ApiUtils.getCredentials(user.username, user.token)!!
databaseStorageModule = DatabaseStorageModule(user, conversationToken)
viewModel.getRoom(user, conversationToken)
initObservers()
}
.onFailure {
Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
Log.e(TAG, "Failed to get current user")
finish()
}
}
}

override fun onStart() {
Expand All @@ -216,10 +232,6 @@ class ConversationInfoActivity :
override fun onResume() {
super.onResume()

if (databaseStorageModule == null) {
databaseStorageModule = DatabaseStorageModule(conversationUser, conversationToken)
}

binding.deleteConversationAction.setOnClickListener { showDeleteConversationDialog() }
binding.leaveConversationAction.setOnClickListener { leaveConversation() }
binding.clearConversationHistory.setOnClickListener { showClearHistoryDialog() }
Expand All @@ -233,15 +245,12 @@ class ConversationInfoActivity :
}
binding.listBansButton.setOnClickListener { listBans() }

viewModel.getRoom(conversationUser, conversationToken)

themeTextViews()
themeSwitchPreferences()

binding.addParticipantsAction.visibility = GONE

binding.progressBar.let { viewThemeUtils.platform.colorCircularProgressBar(it, ColorRole.PRIMARY) }
initObservers()
}

private fun initObservers() {
Expand Down
Loading