gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2960 from nextcloud/bugfix/2959/fixToOpenConvList

Browse Source 
Fix to open conversation list when navigating back
This commit is contained in:
Marcel Hibbe 2023-04-21 13:54:41 +02:00 committed by GitHub
commit 0e1511a62f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -222,6 +222,7 @@
android:name=".chat.ChatActivity" android:name=".chat.ChatActivity"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:noHistory="true"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity

6
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -579,6 +579,12 @@ class ChatActivity :
viewThemeUtils.material.themeToolbar(binding.chatToolbar) viewThemeUtils.material.themeToolbar(binding.chatToolbar)
} }
override fun onBackPressed() {
val intent = Intent(this, ConversationsListActivity::class.java)
intent.putExtras(Bundle())
startActivity(intent)
}
private fun initAdapter() { private fun initAdapter() {
val senderId = if (!conversationUser!!.userId.equals("?")) { val senderId = if (!conversationUser!!.userId.equals("?")) {
"users/" + conversationUser!!.userId "users/" + conversationUser!!.userId