forked from upstream-mirrors/quik
Remove SetupActivity, perform setup in MainActivity
Squashed commit of the following: commit ff6ece72a60917ceec3ea1485901e8929e65bb43 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 9 01:50:33 2018 -0400 Remove default SMS UI from settings commit 1ce79ea756259268c4d2fcd8acbee3101fdbe019 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Wed May 9 01:45:33 2018 -0400 Remove SetupActivity, perform setup in MainActivity commit ccad342d2ab8a5346d63dab273ba9cadb2fa62c0 Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Mon May 7 18:02:26 2018 -0400 Don't query ContentProvider without appropriate permission commit 527be2e5331ba0cbfd6f3375c12378105d282b0c Author: Moez Bhatti <moez.bhatti@gmail.com> Date: Mon May 7 17:12:00 2018 -0400 Show non-blocking UI in MainActivity while syncing
This commit is contained in:
@@ -21,11 +21,15 @@ package mapper
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.provider.ContactsContract.CommonDataKinds.Phone.*
|
||||
import manager.PermissionManager
|
||||
import model.Contact
|
||||
import model.PhoneNumber
|
||||
import javax.inject.Inject
|
||||
|
||||
class CursorToContactImpl @Inject constructor(private val context: Context) : CursorToContact {
|
||||
class CursorToContactImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
private val permissionManager: PermissionManager
|
||||
) : CursorToContact {
|
||||
|
||||
companion object {
|
||||
val URI = CONTENT_URI
|
||||
@@ -48,7 +52,10 @@ class CursorToContactImpl @Inject constructor(private val context: Context) : Cu
|
||||
}
|
||||
|
||||
override fun getContactsCursor(): Cursor? {
|
||||
return context.contentResolver.query(URI, PROJECTION, null, null, null)
|
||||
return when (permissionManager.hasContacts()) {
|
||||
true -> context.contentResolver.query(URI, PROJECTION, null, null, null)
|
||||
false -> null
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,11 +22,15 @@ import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import android.provider.Telephony.Threads
|
||||
import manager.PermissionManager
|
||||
import model.Conversation
|
||||
import model.Recipient
|
||||
import javax.inject.Inject
|
||||
|
||||
class CursorToConversationImpl @Inject constructor(private val context: Context) : CursorToConversation {
|
||||
class CursorToConversationImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
private val permissionManager: PermissionManager
|
||||
) : CursorToConversation {
|
||||
|
||||
companion object {
|
||||
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
|
||||
@@ -62,9 +66,13 @@ class CursorToConversationImpl @Inject constructor(private val context: Context)
|
||||
}
|
||||
|
||||
override fun getConversationsCursor(lastSync: Long): Cursor? {
|
||||
return context.contentResolver.query(URI, PROJECTION,
|
||||
"date > $lastSync", null,
|
||||
"date desc")
|
||||
return when (permissionManager.hasSms()) {
|
||||
true -> context.contentResolver.query(URI, PROJECTION,
|
||||
"date > $lastSync", null,
|
||||
"date desc")
|
||||
|
||||
false -> null
|
||||
}
|
||||
}
|
||||
|
||||
override fun getConversationCursor(threadId: Long): Cursor? {
|
||||
|
||||
@@ -24,14 +24,16 @@ import android.net.Uri
|
||||
import android.provider.Telephony.*
|
||||
import com.google.android.mms.pdu_alt.PduHeaders
|
||||
import manager.KeyManager
|
||||
import manager.PermissionManager
|
||||
import model.Message
|
||||
import util.extensions.map
|
||||
import javax.inject.Inject
|
||||
|
||||
class CursorToMessageImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
private val cursorToPart: CursorToPart,
|
||||
private val keys: KeyManager,
|
||||
private val cursorToPart: CursorToPart
|
||||
private val permissionManager: PermissionManager
|
||||
) : CursorToMessage {
|
||||
|
||||
companion object {
|
||||
@@ -120,7 +122,10 @@ class CursorToMessageImpl @Inject constructor(
|
||||
}
|
||||
|
||||
override fun getMessagesCursor(): Cursor? {
|
||||
return context.contentResolver.query(URI, PROJECTION, null, null, "normalized_date desc")
|
||||
return when (permissionManager.hasSms()) {
|
||||
true -> context.contentResolver.query(URI, PROJECTION, null, null, "normalized_date desc")
|
||||
false -> null
|
||||
}
|
||||
}
|
||||
|
||||
override fun getMessageCursor(id: Long): Cursor? {
|
||||
|
||||
@@ -21,10 +21,14 @@ package mapper
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import manager.PermissionManager
|
||||
import model.Recipient
|
||||
import javax.inject.Inject
|
||||
|
||||
class CursorToRecipientImpl @Inject constructor(private val context: Context) : CursorToRecipient {
|
||||
class CursorToRecipientImpl @Inject constructor(
|
||||
private val context: Context,
|
||||
private val permissionManager: PermissionManager
|
||||
) : CursorToRecipient {
|
||||
|
||||
companion object {
|
||||
val URI = Uri.parse("content://mms-sms/canonical-addresses")
|
||||
@@ -40,7 +44,10 @@ class CursorToRecipientImpl @Inject constructor(private val context: Context) :
|
||||
}
|
||||
|
||||
override fun getRecipientCursor(): Cursor? {
|
||||
return context.contentResolver.query(URI, null, null, null, null)
|
||||
return when (permissionManager.hasSms()) {
|
||||
true -> context.contentResolver.query(URI, null, null, null, null)
|
||||
false -> null
|
||||
}
|
||||
}
|
||||
|
||||
override fun getRecipientCursor(id: Long): Cursor? {
|
||||
|
||||
Reference in New Issue
Block a user