From 5f728c932131de5073befd2247e9b29b0fc9ce4b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 26 Oct 2022 18:36:44 +0200
Subject: [PATCH] minor fixes and updates here and there

---
 app/build.gradle                              |  2 +-
 .../smsmessenger/activities/ThreadActivity.kt | 17 ++++-------
 .../receivers/DirectReplyReceiver.kt          | 28 +++++++++----------
 build.gradle                                  |  2 +-
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0a28245b..4be70fbe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:78b27e9f16'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:0828fecd09'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'com.github.tibbi:android-smsmms:875a46a9c4'
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 9d7dde11..abe5a432 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -215,7 +215,7 @@ class ThreadActivity : SimpleActivity() {
         super.onActivityResult(requestCode, resultCode, resultData)
         if (resultCode != Activity.RESULT_OK) return
 
-        if (requestCode == TAKE_PHOTO_INTENT) {
+        if (requestCode == TAKE_PHOTO_INTENT && capturedImageUri != null) {
             addAttachment(capturedImageUri!!)
         } else if (requestCode == PICK_ATTACHMENT_INTENT && resultData != null && resultData.data != null) {
             addAttachment(resultData.data!!)
@@ -224,15 +224,6 @@ class ThreadActivity : SimpleActivity() {
         }
     }
 
-    private fun onHomePressed() {
-        hideKeyboard()
-        Intent(this, MainActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
     private fun setupCachedMessages(callback: () -> Unit) {
         ensureBackgroundThread {
             messages = try {
@@ -594,7 +585,11 @@ class ThreadActivity : SimpleActivity() {
             }
 
             thread_select_sim_number.setTextColor(getProperTextColor().getContrastColor())
-            thread_select_sim_number.text = (availableSIMCards[currentSIMCardIndex].id).toString()
+            try {
+                thread_select_sim_number.text = (availableSIMCards[currentSIMCardIndex].id).toString()
+            } catch (e: Exception) {
+                showErrorToast(e)
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
index 81114a0f..be412fb7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
@@ -39,21 +39,21 @@ class DirectReplyReceiver : BroadcastReceiver() {
         val transaction = Transaction(context, settings)
         val message = com.klinker.android.send_message.Message(msg, address)
 
-        try {
-            val smsSentIntent = Intent(context, SmsStatusSentReceiver::class.java)
-            val deliveredIntent = Intent(context, SmsStatusDeliveredReceiver::class.java)
-
-            transaction.setExplicitBroadcastForSentSms(smsSentIntent)
-            transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
-
-            transaction.sendNewMessage(message)
-        } catch (e: Exception) {
-            context.showErrorToast(e)
-        }
-
-        context.notificationManager.cancel(threadId.hashCode())
-
         ensureBackgroundThread {
+            try {
+                val smsSentIntent = Intent(context, SmsStatusSentReceiver::class.java)
+                val deliveredIntent = Intent(context, SmsStatusDeliveredReceiver::class.java)
+
+                transaction.setExplicitBroadcastForSentSms(smsSentIntent)
+                transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
+
+                transaction.sendNewMessage(message)
+            } catch (e: Exception) {
+                context.showErrorToast(e)
+            }
+
+            context.notificationManager.cancel(threadId.hashCode())
+
             context.markThreadMessagesRead(threadId)
             context.conversationsDB.markRead(threadId)
         }
diff --git a/build.gradle b/build.gradle
index 1fbde4f9..8b150fcb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong