From 4644ab003d0ea6630c329bb08edabd18a4cb542b Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Thu, 21 Jun 2018 23:39:58 -0400
Subject: [PATCH] #1200 - Fix new conversations failing to sync on Huawei
 devices

---
 .../QKSMS/mapper/CursorToConversationImpl.kt  |  5 -----
 .../repository/ConversationRepositoryImpl.kt  |  9 ++++----
 .../QKSMS/repository/MessageRepositoryImpl.kt | 22 ++++++++++---------
 .../moez/QKSMS/mapper/CursorToConversation.kt |  2 --
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
index b30db96f..4e7befd2 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
@@ -75,9 +75,4 @@ class CursorToConversationImpl @Inject constructor(
         }
     }
 
-    override fun getConversationCursor(threadId: Long): Cursor? {
-        return context.contentResolver.query(URI, PROJECTION,
-                "_id = ?", arrayOf(threadId.toString()), null)
-    }
-
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
index a8bee73b..8b6bcc9b 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
@@ -256,11 +256,10 @@ class ConversationRepositoryImpl @Inject constructor(
      * conversation unless it contains at least 1 message
      */
     private fun getConversationFromCp(threadId: Long): Conversation? {
-        return cursorToConversation.getConversationCursor(threadId)
-                ?.takeIf { cursor -> cursor.moveToFirst() }
-                ?.use { cursor ->
-                    val conversation = cursorToConversation.map(cursor)
-
+        return cursorToConversation.getConversationsCursor()
+                ?.map(cursorToConversation::map)
+                ?.firstOrNull { it.id == threadId }
+                ?.let { conversation ->
                     val realm = Realm.getDefaultInstance()
                     val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll())
 
diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
index 3e58d6f4..122af2d7 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
@@ -28,14 +28,18 @@ import android.graphics.Bitmap
 import android.os.Build
 import android.provider.Telephony
 import android.telephony.SmsManager
+import androidx.core.content.contentValuesOf
 import com.google.android.mms.ContentType
 import com.klinker.android.send_message.BroadcastUtils
 import com.klinker.android.send_message.Settings
 import com.klinker.android.send_message.StripAccents
 import com.klinker.android.send_message.Transaction
+import com.moez.QKSMS.compat.TelephonyCompat
 import com.moez.QKSMS.extensions.anyOf
 import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.extensions.map
 import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.mapper.CursorToConversation
 import com.moez.QKSMS.model.Attachment
 import com.moez.QKSMS.model.Conversation
 import com.moez.QKSMS.model.Message
@@ -54,7 +58,6 @@ import javax.inject.Singleton
 class MessageRepositoryImpl @Inject constructor(
         private val context: Context,
         private val messageIds: KeyManager,
-        private val conversationRepo: ConversationRepository,
         private val imageRepository: ImageRepository,
         private val prefs: Preferences) : MessageRepository {
 
@@ -367,13 +370,12 @@ class MessageRepositoryImpl @Inject constructor(
     override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message {
 
         // Insert the message to the native content provider
-        val values = ContentValues().apply {
-            put(Telephony.Sms.ADDRESS, address)
-            put(Telephony.Sms.BODY, body)
-            put(Telephony.Sms.DATE_SENT, sentTime)
-            put(Telephony.Sms.SUBSCRIPTION_ID, subId)
-        }
-        val uri = context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values)
+        val uri = contentValuesOf(
+                Pair(Telephony.Sms.ADDRESS, address),
+                Pair(Telephony.Sms.BODY, body),
+                Pair(Telephony.Sms.DATE_SENT, sentTime),
+                Pair(Telephony.Sms.SUBSCRIPTION_ID, subId))
+                .let { values -> context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) }
 
         // Insert the message to Realm
         return Message().apply {
@@ -384,8 +386,8 @@ class MessageRepositoryImpl @Inject constructor(
             this.subId = subId
 
             id = messageIds.newId()
-            threadId = conversationRepo.getOrCreateConversation(address)?.id ?: 0L
-            contentId = uri.lastPathSegment.toLong()
+            threadId = TelephonyCompat.getOrCreateThreadId(context, address)
+            contentId = uri?.lastPathSegment?.toLong() ?: 0L
             boxId = Telephony.Sms.MESSAGE_TYPE_INBOX
             type = "sms"
             insertOrUpdate()
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
index 75eaa489..fcbdeaa3 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
@@ -25,6 +25,4 @@ interface CursorToConversation : Mapper<Cursor, Conversation> {
 
     fun getConversationsCursor(lastSync: Long = 0): Cursor?
 
-    fun getConversationCursor(threadId: Long): Cursor?
-
 }
\ No newline at end of file