From e6515436d98e5b23122266c016d77db145615b22 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 16 Jul 2022 20:08:47 +0530
Subject: [PATCH 1/4] Show long toast errors

---
 .../smsmessenger/activities/ThreadActivity.kt            | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 5d037145..6f3677d0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -847,6 +847,7 @@ class ThreadActivity : SimpleActivity() {
     private fun sendMessage() {
         var msg = thread_type_message.value
         if (msg.isEmpty() && attachmentSelections.isEmpty()) {
+            toast(R.string.unknown_error_occurred, length = Toast.LENGTH_LONG)
             return
         }
 
@@ -878,9 +879,9 @@ class ThreadActivity : SimpleActivity() {
                     val mimeType = contentResolver.getType(selection.uri) ?: continue
                     message.addMedia(byteArray, mimeType)
                 } catch (e: Exception) {
-                    showErrorToast(e)
+                    showErrorToast(e, length = Toast.LENGTH_LONG)
                 } catch (e: Error) {
-                    toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
+                    toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
                 }
             }
         }
@@ -903,9 +904,9 @@ class ThreadActivity : SimpleActivity() {
                 refreshMessages()
             }
         } catch (e: Exception) {
-            showErrorToast(e)
+            showErrorToast(e, length = Toast.LENGTH_LONG)
         } catch (e: Error) {
-            toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
+            toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
         }
     }
 

From a5f57a239ab7d437b16c3a803222556fc3e552e1 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 16 Jul 2022 20:18:45 +0530
Subject: [PATCH 2/4] Remove default toast parameter

---
 .../smsmessenger/activities/ThreadActivity.kt                 | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6f3677d0..82c96d54 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -879,7 +879,7 @@ class ThreadActivity : SimpleActivity() {
                     val mimeType = contentResolver.getType(selection.uri) ?: continue
                     message.addMedia(byteArray, mimeType)
                 } catch (e: Exception) {
-                    showErrorToast(e, length = Toast.LENGTH_LONG)
+                    showErrorToast(e)
                 } catch (e: Error) {
                     toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
                 }
@@ -904,7 +904,7 @@ class ThreadActivity : SimpleActivity() {
                 refreshMessages()
             }
         } catch (e: Exception) {
-            showErrorToast(e, length = Toast.LENGTH_LONG)
+            showErrorToast(e)
         } catch (e: Error) {
             toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
         }

From 9643dbea28e20d9fc4188e3b6e9fee245b6d2b00 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 16 Jul 2022 20:23:02 +0530
Subject: [PATCH 3/4] Use MyButton view

---
 app/src/main/res/layout/activity_thread.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 316e5298..7854987f 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -225,7 +225,7 @@
             android:visibility="gone"
             tools:ignore="HardcodedText" />
 
-        <Button
+        <com.simplemobiletools.commons.views.MyButton
             android:id="@+id/thread_send_message"
             android:layout_width="@dimen/normal_icon_size"
             android:layout_height="@dimen/normal_icon_size"

From e73117b872e695610c080b973f15739e7fc28247 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sun, 17 Jul 2022 11:46:08 +0530
Subject: [PATCH 4/4] Use `showErrorToast`

---
 .../smsmessenger/activities/ThreadActivity.kt       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 82c96d54..395a6a3a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -23,7 +23,6 @@ import android.view.inputmethod.EditorInfo
 import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
 import android.widget.RelativeLayout
-import android.widget.Toast
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -742,7 +741,7 @@ class ThreadActivity : SimpleActivity() {
             try {
                 startActivityForResult(this, PICK_ATTACHMENT_INTENT)
             } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
+                showErrorToast(getString(R.string.no_app_found))
             } catch (e: Exception) {
                 showErrorToast(e)
             }
@@ -847,7 +846,7 @@ class ThreadActivity : SimpleActivity() {
     private fun sendMessage() {
         var msg = thread_type_message.value
         if (msg.isEmpty() && attachmentSelections.isEmpty()) {
-            toast(R.string.unknown_error_occurred, length = Toast.LENGTH_LONG)
+            showErrorToast(getString(R.string.unknown_error_occurred))
             return
         }
 
@@ -881,7 +880,7 @@ class ThreadActivity : SimpleActivity() {
                 } catch (e: Exception) {
                     showErrorToast(e)
                 } catch (e: Error) {
-                    toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
+                    showErrorToast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
                 }
             }
         }
@@ -906,7 +905,7 @@ class ThreadActivity : SimpleActivity() {
         } catch (e: Exception) {
             showErrorToast(e)
         } catch (e: Error) {
-            toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred), length = Toast.LENGTH_LONG)
+            showErrorToast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
         }
     }
 
@@ -1010,7 +1009,7 @@ class ThreadActivity : SimpleActivity() {
                 action = Intent.ACTION_VIEW
                 putExtra(CONTACT_ID, contact.rawId)
                 putExtra(IS_PRIVATE, true)
-                `package` = if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug
+                setPackage(if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug)
                 setDataAndType(ContactsContract.Contacts.CONTENT_LOOKUP_URI, "vnd.android.cursor.dir/person")
                 launchActivityIntent(this)
             }
@@ -1036,7 +1035,7 @@ class ThreadActivity : SimpleActivity() {
             try {
                 startActivityForResult(this, PICK_SAVE_FILE_INTENT)
             } catch (e: ActivityNotFoundException) {
-                toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
+                showErrorToast(getString(R.string.system_service_disabled))
             } catch (e: Exception) {
                 showErrorToast(e)
             }