jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

renaming system_id to thread_id

Browse source
This commit is contained in:
tibbi 2020-05-30 20:03:13 +02:00
parent 35c205605d
commit 661798cff4
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View file

@ -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)
}