jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Simplified going back action

Browse source
This commit is contained in:
Agnieszka C 2021-10-19 18:41:16 +02:00
parent 21365e3b96
commit 40b168cbeb
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View file

@ -159,7 +159,7 @@ class ThreadActivity : SimpleActivity() {
R.id.delete -> askConfirmDelete() R.id.delete -> askConfirmDelete()
R.id.manage_people -> managePeople() R.id.manage_people -> managePeople()
R.id.mark_as_unread -> markAsUnread() R.id.mark_as_unread -> markAsUnread()
android.R.id.home -> onBackPressed() android.R.id.home -> onHomePressed()
else -> return super.onOptionsItemSelected(item) else -> return super.onOptionsItemSelected(item)
} }
return true return true
@ -173,14 +173,7 @@ class ThreadActivity : SimpleActivity() {
} }
override fun onBackPressed() { override fun onBackPressed() {
super.onBackPressed() if (intent.getBooleanExtra(FROM_NOTIFICATION, false)) {
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
finish()
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && intent.getBooleanExtra(FROM_NOTIFICATION, false)) {
val intent = Intent(this@ThreadActivity, MainActivity::class.java).apply { val intent = Intent(this@ThreadActivity, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
putExtra(EXIT, true) putExtra(EXIT, true)
@ -188,7 +181,13 @@ class ThreadActivity : SimpleActivity() {
startActivity(intent) startActivity(intent)
finish() finish()
} }
return super.onKeyDown(keyCode, event) super.onBackPressed()
}
private fun onHomePressed() {
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
finish()
} }
private fun setupCachedMessages(callback: () -> Unit) { private fun setupCachedMessages(callback: () -> Unit) {