From 661798cff4b0050d7aa4b56322d140523cc9c26d Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 30 May 2020 20:03:13 +0200 Subject: [PATCH] renaming system_id to thread_id --- .../smsmessenger/activities/MainActivity.kt | 8 ++++---- .../smsmessenger/adapters/ConversationsAdapter.kt | 12 ++++++------ .../smsmessenger/interfaces/ConversationsDao.kt | 2 +- .../smsmessenger/models/Conversation.kt | 4 ++-- 4 files changed, 13 insertions(+), 13 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 3fa20029..68842dfc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -187,20 +187,20 @@ class MainActivity : SimpleActivity() { } conversations.forEach { clonedConversation -> - if (!cachedConversations.map { it.system_id }.contains(clonedConversation.system_id)) { + if (!cachedConversations.map { it.thread_id }.contains(clonedConversation.thread_id)) { conversationsDB.insertOrUpdate(clonedConversation) cachedConversations.add(clonedConversation) } } cachedConversations.forEach { cachedConversation -> - if (!conversations.map { it.system_id }.contains(cachedConversation.system_id)) { + if (!conversations.map { it.thread_id }.contains(cachedConversation.thread_id)) { conversationsDB.delete(cachedConversation.id!!) } } cachedConversations.forEach { cachedConversation -> - val conv = conversations.firstOrNull { it.system_id == cachedConversation.system_id && it.getStringToCompare() != cachedConversation.getStringToCompare() } + val conv = conversations.firstOrNull { it.thread_id == cachedConversation.thread_id && it.getStringToCompare() != cachedConversation.getStringToCompare() } if (conv != null) { conversationsDB.insertOrUpdate(conv) } @@ -218,7 +218,7 @@ class MainActivity : SimpleActivity() { if (currAdapter == null) { ConversationsAdapter(this, conversations, conversations_list, conversations_fastscroller) { Intent(this, ThreadActivity::class.java).apply { - putExtra(THREAD_ID, (it as Conversation).system_id) + putExtra(THREAD_ID, (it as Conversation).thread_id) putExtra(THREAD_TITLE, it.title) startActivity(this) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt index 96cc40ab..4d294124 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt @@ -59,9 +59,9 @@ class ConversationsAdapter(activity: SimpleActivity, var conversations: ArrayLis override fun getIsItemSelectable(position: Int) = true - override fun getItemSelectionKey(position: Int) = conversations.getOrNull(position)?.system_id + override fun getItemSelectionKey(position: Int) = conversations.getOrNull(position)?.thread_id - override fun getItemKeyPosition(key: Int) = conversations.indexOfFirst { it.system_id == key } + override fun getItemKeyPosition(key: Int) = conversations.indexOfFirst { it.thread_id == key } override fun onActionModeCreated() {} @@ -129,10 +129,10 @@ class ConversationsAdapter(activity: SimpleActivity, var conversations: ArrayLis return } - val conversationsToRemove = conversations.filter { selectedKeys.contains(it.system_id) } as ArrayList + val conversationsToRemove = conversations.filter { selectedKeys.contains(it.thread_id) } as ArrayList val positions = getSelectedItemPositions() conversationsToRemove.forEach { - activity.deleteConversation(it.system_id) + activity.deleteConversation(it.thread_id) } conversations.removeAll(conversationsToRemove) @@ -164,7 +164,7 @@ class ConversationsAdapter(activity: SimpleActivity, var conversations: ArrayLis } } - private fun getSelectedItems() = conversations.filter { selectedKeys.contains(it.system_id) } as ArrayList + private fun getSelectedItems() = conversations.filter { selectedKeys.contains(it.thread_id) } as ArrayList override fun onViewRecycled(holder: ViewHolder) { super.onViewRecycled(holder) @@ -184,7 +184,7 @@ class ConversationsAdapter(activity: SimpleActivity, var conversations: ArrayLis private fun setupView(view: View, conversation: Conversation) { view.apply { - conversation_frame.isSelected = selectedKeys.contains(conversation.system_id) + conversation_frame.isSelected = selectedKeys.contains(conversation.thread_id) conversation_address.text = conversation.title conversation_body_short.text = conversation.snippet diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt index 6cc15187..2f729a36 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt @@ -17,6 +17,6 @@ interface ConversationsDao { @Query("DELETE FROM conversations WHERE id = :id") fun delete(id: Long) - @Query("DELETE FROM conversations WHERE system_id = :threadId") + @Query("DELETE FROM conversations WHERE thread_id = :threadId") fun deleteThreadId(threadId: Long) } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt index f1636025..73e557c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Conversation.kt @@ -5,10 +5,10 @@ import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey -@Entity(tableName = "conversations", indices = [(Index(value = ["system_id"], unique = true))]) +@Entity(tableName = "conversations", indices = [(Index(value = ["thread_id"], unique = true))]) data class Conversation( @PrimaryKey(autoGenerate = true) var id: Long?, - @ColumnInfo(name = "system_id") var system_id: Int, + @ColumnInfo(name = "thread_id") var thread_id: Int, @ColumnInfo(name = "snippet") var snippet: String, @ColumnInfo(name = "date") var date: Int, @ColumnInfo(name = "read") var read: Boolean,