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] 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"