From 251eca882388f9bfdc6f9350c677068a6cf5ba90 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Apr 2020 15:06:27 +0200 Subject: [PATCH] adding a helper function for refreshing the messages --- .../smsmessenger/activities/SettingsActivity.kt | 5 ++--- .../smsmessenger/adapters/MessagesAdapter.kt | 5 ++--- .../smsmessenger/adapters/ThreadAdapter.kt | 13 ++++++------- .../smsmessenger/helpers/Constants.kt | 7 +++++++ .../smsmessenger/receivers/SmsReceiver.kt | 5 ++--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt index 8627c156..37d4e77b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -8,9 +8,8 @@ import com.simplemobiletools.commons.extensions.launchPurchaseThankYouIntent import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.models.Events +import com.simplemobiletools.smsmessenger.helpers.refreshMessages import kotlinx.android.synthetic.main.activity_settings.* -import org.greenrobot.eventbus.EventBus import java.util.* class SettingsActivity : SimpleActivity() { @@ -56,7 +55,7 @@ class SettingsActivity : SimpleActivity() { private fun setupChangeDateTimeFormat() { settings_change_date_time_format_holder.setOnClickListener { ChangeDateTimeFormatDialog(this) { - EventBus.getDefault().post(Events.RefreshMessages()) + refreshMessages() } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt index b7ff080c..dae1ee31 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt @@ -14,10 +14,9 @@ import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity import com.simplemobiletools.smsmessenger.extensions.deleteThread -import com.simplemobiletools.smsmessenger.models.Events +import com.simplemobiletools.smsmessenger.helpers.refreshMessages import com.simplemobiletools.smsmessenger.models.Message import kotlinx.android.synthetic.main.item_message.view.* -import org.greenrobot.eventbus.EventBus class MessagesAdapter( activity: SimpleActivity, var messages: ArrayList, @@ -97,7 +96,7 @@ class MessagesAdapter( activity.runOnUiThread { if (messagesToRemove.isEmpty()) { - EventBus.getDefault().post(Events.RefreshMessages()) + refreshMessages() finishActMode() } else { removeSelectedItems(positions) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt index d99a5aa7..3bac542e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt @@ -12,14 +12,13 @@ import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.activities.SimpleActivity import com.simplemobiletools.smsmessenger.extensions.deleteMessage -import com.simplemobiletools.smsmessenger.helpers.THREAD_DATE_TIME -import com.simplemobiletools.smsmessenger.helpers.THREAD_RECEIVED_MESSAGE -import com.simplemobiletools.smsmessenger.helpers.THREAD_SENT_MESSAGE -import com.simplemobiletools.smsmessenger.helpers.THREAD_SENT_MESSAGE_ERROR -import com.simplemobiletools.smsmessenger.models.* +import com.simplemobiletools.smsmessenger.helpers.* +import com.simplemobiletools.smsmessenger.models.Message +import com.simplemobiletools.smsmessenger.models.ThreadDateTime +import com.simplemobiletools.smsmessenger.models.ThreadError +import com.simplemobiletools.smsmessenger.models.ThreadItem import kotlinx.android.synthetic.main.item_received_message.view.* import kotlinx.android.synthetic.main.item_thread_date_time.view.* -import org.greenrobot.eventbus.EventBus class ThreadAdapter( activity: SimpleActivity, var messages: ArrayList, @@ -125,7 +124,7 @@ class ThreadAdapter( } else { removeSelectedItems(positions) } - EventBus.getDefault().post(Events.RefreshMessages()) + refreshMessages() } } 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 4da4f345..9160b077 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -1,5 +1,8 @@ package com.simplemobiletools.smsmessenger.helpers +import com.simplemobiletools.smsmessenger.models.Events +import org.greenrobot.eventbus.EventBus + const val THREAD_ID = "thread_id" const val THREAD_NAME = "thread_name" const val THREAD_NUMBER = "thread_number" @@ -9,3 +12,7 @@ const val THREAD_DATE_TIME = 1 const val THREAD_RECEIVED_MESSAGE = 2 const val THREAD_SENT_MESSAGE = 3 const val THREAD_SENT_MESSAGE_ERROR = 4 + +fun refreshMessages() { + EventBus.getDefault().post(Events.RefreshMessages()) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt index 3dd0e766..57584083 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt @@ -27,8 +27,7 @@ import com.simplemobiletools.smsmessenger.extensions.insertNewSMS import com.simplemobiletools.smsmessenger.helpers.THREAD_ID import com.simplemobiletools.smsmessenger.helpers.THREAD_NAME import com.simplemobiletools.smsmessenger.helpers.THREAD_NUMBER -import com.simplemobiletools.smsmessenger.models.Events -import org.greenrobot.eventbus.EventBus +import com.simplemobiletools.smsmessenger.helpers.refreshMessages class SmsReceiver : BroadcastReceiver() { @SuppressLint("NewApi") @@ -49,7 +48,7 @@ class SmsReceiver : BroadcastReceiver() { showNotification(context, address, body, threadID.toInt()) } - EventBus.getDefault().post(Events.RefreshMessages()) + refreshMessages() } @SuppressLint("NewApi")