From 8379a753b2e6fb827db09641db161e5bcd07e204 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 6 Apr 2020 11:22:40 +0200 Subject: [PATCH] adding a helper function for opening a specific thread --- .../smsmessenger/activities/MainActivity.kt | 7 ++----- .../smsmessenger/extensions/Context.kt | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 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 5b8ee0f8..405fea96 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -18,7 +18,7 @@ import com.simplemobiletools.smsmessenger.R import com.simplemobiletools.smsmessenger.adapters.MessagesAdapter import com.simplemobiletools.smsmessenger.extensions.config import com.simplemobiletools.smsmessenger.extensions.getMessages -import com.simplemobiletools.smsmessenger.helpers.THREAD_ID +import com.simplemobiletools.smsmessenger.extensions.launchThreadActivity import com.simplemobiletools.smsmessenger.models.Events import com.simplemobiletools.smsmessenger.models.Message import kotlinx.android.synthetic.main.activity_main.* @@ -136,10 +136,7 @@ class MainActivity : SimpleActivity() { val messages = getMessages() runOnUiThread { MessagesAdapter(this, messages, messages_list, messages_fastscroller) { - Intent(this, ThreadActivity::class.java).apply { - putExtra(THREAD_ID, (it as Message).thread) - startActivity(this) - } + launchThreadActivity((it as Message).thread) }.apply { messages_list.adapter = this } 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 3900a502..59b74882 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -3,6 +3,7 @@ package com.simplemobiletools.smsmessenger.extensions import android.annotation.SuppressLint import android.content.ContentValues import android.content.Context +import android.content.Intent import android.database.Cursor import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds @@ -11,12 +12,21 @@ import android.text.TextUtils import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.isMarshmallowPlus +import com.simplemobiletools.smsmessenger.activities.ThreadActivity import com.simplemobiletools.smsmessenger.helpers.Config +import com.simplemobiletools.smsmessenger.helpers.THREAD_ID import com.simplemobiletools.smsmessenger.models.Message import com.simplemobiletools.smsmessenger.models.MessagingThread val Context.config: Config get() = Config.newInstance(applicationContext) +fun Context.launchThreadActivity(id: Int) { + Intent(this, ThreadActivity::class.java).apply { + putExtra(THREAD_ID, id) + startActivity(this) + } +} + fun Context.getMessages(threadID: Int? = null): ArrayList { val messages = ArrayList() val hasContactsPermission = hasPermission(PERMISSION_READ_CONTACTS)