fixing a compile error + some renaming

This commit is contained in:
Tibor Kaputa 2021-09-08 20:00:28 +02:00 committed by GitHub
parent df8759e00a
commit 327b7f673a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

View File

@ -35,9 +35,9 @@ import com.simplemobiletools.smsmessenger.interfaces.MessagesDao
import com.simplemobiletools.smsmessenger.models.* import com.simplemobiletools.smsmessenger.models.*
import com.simplemobiletools.smsmessenger.receivers.DirectReplyReceiver import com.simplemobiletools.smsmessenger.receivers.DirectReplyReceiver
import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver
import me.leolin.shortcutbadger.ShortcutBadger
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import me.leolin.shortcutbadger.ShortcutBadger
val Context.config: Config get() = Config.newInstance(applicationContext) val Context.config: Config get() = Config.newInstance(applicationContext)
@ -800,19 +800,20 @@ fun Context.saveSmsDraft(body: String, threadId: Long) {
} }
fun Context.deleteSmsDraft(threadId: Long) { fun Context.deleteSmsDraft(threadId: Long) {
val lookupUri = Sms.Draft.CONTENT_URI val uri = Sms.Draft.CONTENT_URI
val lookupProjection = arrayOf(Sms._ID) val projection = arrayOf(Sms._ID)
val lookupSelection = "${Sms.THREAD_ID} = ?" val selection = "${Sms.THREAD_ID} = ?"
val lookupSelectionArgs = arrayOf(threadId.toString()) val selectionArgs = arrayOf(threadId.toString())
try { try {
val cursor = contentResolver.query(lookupUri, lookupProjection, lookupSelection, lookupSelectionArgs, null) val cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
cursor.use { cursor.use {
if (cursor?.moveToFirst() == true) { if (cursor?.moveToFirst() == true) {
val draftId = cursor.getLong(0) val draftId = cursor.getLong(0)
val uri = Uri.withAppendedPath(Sms.CONTENT_URI, "/${draftId}") val draftUri = Uri.withAppendedPath(Sms.CONTENT_URI, "/${draftId}")
contentResolver.delete(uri, null, null) contentResolver.delete(draftUri, null, null)
} }
} }
} catch (e: Exception) {
} }
} }