Skip to content
Snippets Groups Projects
Verified Commit 1143aaea authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes broken "mention user" functionality

parent d6c5fd6a
Branches
Tags v1.2.27
No related merge requests found
Pipeline #557 canceled
...@@ -93,7 +93,6 @@ import de.kuschku.quasseldroid.util.service.ServiceBoundActivity ...@@ -93,7 +93,6 @@ import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
import de.kuschku.quasseldroid.util.ui.DragInterceptBottomSheetBehavior import de.kuschku.quasseldroid.util.ui.DragInterceptBottomSheetBehavior
import de.kuschku.quasseldroid.util.ui.drawable.DrawerToggleActivityDrawable import de.kuschku.quasseldroid.util.ui.drawable.DrawerToggleActivityDrawable
import de.kuschku.quasseldroid.util.ui.drawable.NickCountDrawable import de.kuschku.quasseldroid.util.ui.drawable.NickCountDrawable
import de.kuschku.quasseldroid.util.ui.view.MaterialContentLoadingProgressBar
import de.kuschku.quasseldroid.util.ui.view.WarningBarView import de.kuschku.quasseldroid.util.ui.view.WarningBarView
import de.kuschku.quasseldroid.viewmodel.ChatViewModel import de.kuschku.quasseldroid.viewmodel.ChatViewModel
import de.kuschku.quasseldroid.viewmodel.data.BufferData import de.kuschku.quasseldroid.viewmodel.data.BufferData
...@@ -152,9 +151,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -152,9 +151,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
private var restoredDrawerState = false private var restoredDrawerState = false
override fun onNewIntent(intent: Intent?) { fun processIntent(intent: Intent) {
super.onNewIntent(intent)
if (intent != null) {
when { when {
intent.type == "text/plain" -> { intent.type == "text/plain" -> {
val text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT) val text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)
...@@ -285,14 +282,13 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -285,14 +282,13 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
} }
} }
} }
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
chatlineFragment = supportFragmentManager.findFragmentByTag("fragment_chatline") as? ChatlineFragment chatlineFragment = supportFragmentManager.findFragmentById(R.id.fragment_chatline) as? ChatlineFragment
setSupportActionBar(binding.layoutMain.layoutToolbar.toolbar) setSupportActionBar(binding.layoutMain.layoutToolbar.toolbar)
...@@ -867,8 +863,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -867,8 +863,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
launch(this, bufferId = info.bufferId) launch(this, bufferId = info.bufferId)
} }
} }
}
onNewIntent(intent) override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
setIntent(intent)
} }
private var bufferData: BufferData? = null private var bufferData: BufferData? = null
...@@ -914,6 +913,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -914,6 +913,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
super.onStart() super.onStart()
} }
override fun onResume() {
super.onResume()
intent?.let(this@ChatActivity::processIntent)
}
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState) super.onSaveInstanceState(outState)
chatViewModel.onSaveInstanceState(outState) chatViewModel.onSaveInstanceState(outState)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment