mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-01 13:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

post rebase fix

Browse source
This commit is contained in:
Valere 2022-02-04 15:57:45 +01:00
parent 606286065e
commit 8c321ba74b
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View file

@ -2156,7 +2156,7 @@ class TimelineFragment @Inject constructor(
).show(childFragmentManager, "JSON_VIEWER") ).show(childFragmentManager, "JSON_VIEWER")
} }
is EventSharedAction.ViewEventE2EInformation -> { is EventSharedAction.ViewEventE2EInformation -> {
MessageE2EInfoActivity.getIntent(requireContext(), roomDetailArgs.roomId, action.eventId).let { MessageE2EInfoActivity.getIntent(requireContext(), timelineArgs.roomId, action.eventId).let {
startActivity(it) startActivity(it)
} }
} }

10
vector/src/main/java/im/vector/app/features/home/room/detail/e2einfo/MessageE2EInfoActivity.kt
View file

@ -43,7 +43,9 @@ class MessageE2EInfoActivity : SimpleFragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
configureToolbar(views.toolbar, true) setupToolbar(views.toolbar)
.setTitle(title)
.allowBack(useCross = true)
if (isFirstCreation()) { if (isFirstCreation()) {
val fragmentArgs: EncryptedMessageInfoArg = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return val fragmentArgs: EncryptedMessageInfoArg = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
@ -88,11 +90,7 @@ class MessageE2EInfoActivity : SimpleFragmentActivity() {
} }
private fun updateTitle(title: String) { private fun updateTitle(title: String) {
supportActionBar?.let { toolbar?.setTitle(title)
it.title = title
} ?: run {
setTitle(title)
}
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu?): Boolean {