From cce617b12fb148175e3ddd7ca4b2d268cdd90b1c Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 26 Sep 2021 23:33:39 +0200 Subject: [PATCH 1/6] Changed back button behavior in thread (#187) --- .../smsmessenger/activities/ThreadActivity.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index d40ac05d..d94bd05c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -159,6 +159,7 @@ class ThreadActivity : SimpleActivity() { R.id.delete -> askConfirmDelete() R.id.manage_people -> managePeople() R.id.mark_as_unread -> markAsUnread() + android.R.id.home -> onBackPressed() else -> return super.onOptionsItemSelected(item) } return true @@ -171,6 +172,13 @@ class ThreadActivity : SimpleActivity() { } } + override fun onBackPressed() { + super.onBackPressed() + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + finish() + } + private fun setupCachedMessages(callback: () -> Unit) { ensureBackgroundThread { messages = try { From 21365e3b968d3820fbb25bfdf0010d79ef1d0cf7 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:33:49 +0200 Subject: [PATCH 2/6] Exit on pressing Back --- .../smsmessenger/activities/MainActivity.kt | 10 ++++++---- .../smsmessenger/activities/ThreadActivity.kt | 12 ++++++++++++ .../smsmessenger/extensions/Context.kt | 1 + .../smsmessenger/helpers/Constants.kt | 3 +++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 2a66fa41..7e23f74f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -23,10 +23,7 @@ import com.simplemobiletools.smsmessenger.adapters.ConversationsAdapter import com.simplemobiletools.smsmessenger.dialogs.ExportMessagesDialog import com.simplemobiletools.smsmessenger.dialogs.ImportMessagesDialog import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.EXPORT_MIME_TYPE -import com.simplemobiletools.smsmessenger.helpers.MessagesExporter -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID -import com.simplemobiletools.smsmessenger.helpers.THREAD_TITLE +import com.simplemobiletools.smsmessenger.helpers.* import com.simplemobiletools.smsmessenger.models.Conversation import com.simplemobiletools.smsmessenger.models.Events import kotlinx.android.synthetic.main.activity_main.* @@ -84,6 +81,11 @@ class MainActivity : SimpleActivity() { override fun onResume() { super.onResume() + + if (intent.getBooleanExtra(EXIT, false)) { + finish() + return + } if (storedTextColor != config.textColor) { (conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(config.textColor) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index d94bd05c..fc6b6791 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -179,6 +179,18 @@ class ThreadActivity : SimpleActivity() { 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 { + flags = Intent.FLAG_ACTIVITY_CLEAR_TOP + putExtra(EXIT, true) + } + startActivity(intent) + finish() + } + return super.onKeyDown(keyCode, event) + } + private fun setupCachedMessages(callback: () -> Unit) { ensureBackgroundThread { messages = try { diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index c67adaf8..76ef27af 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -711,6 +711,7 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon val intent = Intent(this, ThreadActivity::class.java).apply { putExtra(THREAD_ID, threadId) + putExtra(FROM_NOTIFICATION, true) } val pendingIntent = PendingIntent.getActivity(this, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt index b18c19c8..6e3a6477 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -26,6 +26,9 @@ const val EXPORT_FILE_EXT = ".json" const val IMPORT_SMS = "import_sms" const val IMPORT_MMS = "import_mms" +const val EXIT = "EXIT" +const val FROM_NOTIFICATION = "FROM_NOTIFICATION" + private const val PATH = "com.simplemobiletools.smsmessenger.action." const val MARK_AS_READ = PATH + "mark_as_read" const val REPLY = PATH + "reply" From 40b168cbebf445341c13ad1dad50db5ac090355a Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Tue, 19 Oct 2021 18:41:16 +0200 Subject: [PATCH 3/6] Simplified going back action --- .../smsmessenger/activities/ThreadActivity.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index fc6b6791..2674d16b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -159,7 +159,7 @@ class ThreadActivity : SimpleActivity() { R.id.delete -> askConfirmDelete() R.id.manage_people -> managePeople() R.id.mark_as_unread -> markAsUnread() - android.R.id.home -> onBackPressed() + android.R.id.home -> onHomePressed() else -> return super.onOptionsItemSelected(item) } return true @@ -173,14 +173,7 @@ class ThreadActivity : SimpleActivity() { } override fun onBackPressed() { - super.onBackPressed() - 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)) { + if (intent.getBooleanExtra(FROM_NOTIFICATION, false)) { val intent = Intent(this@ThreadActivity, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_CLEAR_TOP putExtra(EXIT, true) @@ -188,7 +181,13 @@ class ThreadActivity : SimpleActivity() { startActivity(intent) 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) { From cd7e29c518f34d62db32eaed2a98845d9aa3317c Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Tue, 19 Oct 2021 23:51:33 +0200 Subject: [PATCH 4/6] Removed overriding Back press --- .../smsmessenger/activities/MainActivity.kt | 4 ---- .../smsmessenger/activities/ThreadActivity.kt | 12 ------------ .../smsmessenger/extensions/Context.kt | 1 - .../smsmessenger/helpers/Constants.kt | 3 --- 4 files changed, 20 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 7e23f74f..88057811 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -82,10 +82,6 @@ class MainActivity : SimpleActivity() { override fun onResume() { super.onResume() - if (intent.getBooleanExtra(EXIT, false)) { - finish() - return - } if (storedTextColor != config.textColor) { (conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(config.textColor) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 2674d16b..ea4d5c9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -172,18 +172,6 @@ class ThreadActivity : SimpleActivity() { } } - override fun onBackPressed() { - if (intent.getBooleanExtra(FROM_NOTIFICATION, false)) { - val intent = Intent(this@ThreadActivity, MainActivity::class.java).apply { - flags = Intent.FLAG_ACTIVITY_CLEAR_TOP - putExtra(EXIT, true) - } - startActivity(intent) - finish() - } - super.onBackPressed() - } - private fun onHomePressed() { val intent = Intent(this, MainActivity::class.java) startActivity(intent) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index 76ef27af..c67adaf8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -711,7 +711,6 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon val intent = Intent(this, ThreadActivity::class.java).apply { putExtra(THREAD_ID, threadId) - putExtra(FROM_NOTIFICATION, true) } val pendingIntent = PendingIntent.getActivity(this, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt index 6e3a6477..b18c19c8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -26,9 +26,6 @@ const val EXPORT_FILE_EXT = ".json" const val IMPORT_SMS = "import_sms" const val IMPORT_MMS = "import_mms" -const val EXIT = "EXIT" -const val FROM_NOTIFICATION = "FROM_NOTIFICATION" - private const val PATH = "com.simplemobiletools.smsmessenger.action." const val MARK_AS_READ = PATH + "mark_as_read" const val REPLY = PATH + "reply" From ae223b3613d0a6445377727a9a93792c06be909b Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:11:15 +0200 Subject: [PATCH 5/6] Removed empty line --- .../simplemobiletools/smsmessenger/activities/MainActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 88057811..d114473d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -81,7 +81,6 @@ class MainActivity : SimpleActivity() { override fun onResume() { super.onResume() - if (storedTextColor != config.textColor) { (conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(config.textColor) } From c06482d22f48d7611e0d82fb7a85be29e6157b96 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:15:56 +0200 Subject: [PATCH 6/6] Reverted changes in MainActivity --- .../smsmessenger/activities/MainActivity.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index d114473d..2a66fa41 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -23,7 +23,10 @@ import com.simplemobiletools.smsmessenger.adapters.ConversationsAdapter import com.simplemobiletools.smsmessenger.dialogs.ExportMessagesDialog import com.simplemobiletools.smsmessenger.dialogs.ImportMessagesDialog import com.simplemobiletools.smsmessenger.extensions.* -import com.simplemobiletools.smsmessenger.helpers.* +import com.simplemobiletools.smsmessenger.helpers.EXPORT_MIME_TYPE +import com.simplemobiletools.smsmessenger.helpers.MessagesExporter +import com.simplemobiletools.smsmessenger.helpers.THREAD_ID +import com.simplemobiletools.smsmessenger.helpers.THREAD_TITLE import com.simplemobiletools.smsmessenger.models.Conversation import com.simplemobiletools.smsmessenger.models.Events import kotlinx.android.synthetic.main.activity_main.*