diff --git a/build.gradle b/build.gradle
index 2b4c0fda..8a73a653 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,19 @@
buildscript {
ext.autodispose_version = '0.5.1'
ext.constraintlayout_version = '1.1.0-beta5'
+ ext.dagger_version = "2.11"
ext.kotlin_version = '1.2.20'
+ ext.ktx_version = "0.2"
ext.lifecycle_version = '1.1.0'
ext.realm_version = '4.3.1'
ext.realm_adapters_version = '2.1.0'
+ ext.rxandroid_version = '2.0.1'
ext.rxbinding_version = '2.0.0'
+ ext.rxjava_version = '2.1.4'
+ ext.rxkotlin_version = '2.1.0'
+ ext.rx_preferences_version = '2.0.0-RC3'
ext.support_version = '27.1.0'
+ ext.timber_version = '4.5.1'
repositories {
diff --git a/data/build.gradle b/data/build.gradle
new file mode 100644
index 00000000..92fc5b78
--- /dev/null
+++ b/data/build.gradle
@@ -0,0 +1,38 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+ compileSdkVersion 27
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 27
+ }
+}
+
+dependencies {
+
+ // support
+ implementation "com.android.support:appcompat-v7:$support_version"
+
+ // dagger
+ implementation "com.google.dagger:dagger:$dagger_version"
+ kapt "com.google.dagger:dagger-compiler:$dagger_version"
+ provided "javax.annotation:jsr250-api:1.0"
+
+ // rxjava
+ implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+ implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+ implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+
+ implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
+ implementation "com.jakewharton.timber:timber:$timber_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ implementation "me.leolin:ShortcutBadger:1.1.21"
+ implementation project(":android-smsmms")
+ implementation project(':domain')
+}
+
+repositories {
+ mavenCentral()
+}
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..23457cf6
--- /dev/null
+++ b/data/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/qksms/src/main/java/common/util/Keys.kt b/data/src/main/java/manager/KeyManagerImpl.kt
similarity index 86%
rename from qksms/src/main/java/common/util/Keys.kt
rename to data/src/main/java/manager/KeyManagerImpl.kt
index bcae98f2..a62a2851 100644
--- a/qksms/src/main/java/common/util/Keys.kt
+++ b/data/src/main/java/manager/KeyManagerImpl.kt
@@ -16,18 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package manager
-import data.model.Message
import io.realm.Realm
+import model.Message
import javax.inject.Inject
import javax.inject.Singleton
-/**
- * Helper class for generating incrementing ids for messages
- */
@Singleton
-class Keys @Inject constructor() {
+class KeyManagerImpl @Inject constructor() : KeyManager {
private var maxValue: Long = 0L
@@ -40,16 +37,16 @@ class Keys @Inject constructor() {
/**
* Should be called when a new sync is being started
*/
- fun reset() {
+ override fun reset() {
maxValue = 0L
}
/**
* Returns a valid ID that can be used to store a new message
*/
- fun newId(): Long {
+ override fun newId(): Long {
maxValue++
return maxValue
}
-}
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/Permissions.kt b/data/src/main/java/manager/PermissionManagerImpl.kt
similarity index 67%
rename from qksms/src/main/java/common/util/Permissions.kt
rename to data/src/main/java/manager/PermissionManagerImpl.kt
index 4dc0cb87..bb5453bb 100644
--- a/qksms/src/main/java/common/util/Permissions.kt
+++ b/data/src/main/java/manager/PermissionManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package manager
import android.Manifest
import android.content.Context
@@ -24,9 +24,11 @@ import android.content.pm.PackageManager
import android.support.v4.content.ContextCompat
import javax.inject.Inject
-class Permissions @Inject constructor(private val context: Context) {
+class PermissionManagerImpl @Inject constructor(private val context: Context) : PermissionManager {
- fun hasSmsAndContacts() = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED &&
- ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
+ override fun hasSmsAndContacts(): Boolean {
+ return ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED &&
+ ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
+ }
}
\ No newline at end of file
diff --git a/data/src/main/java/manager/WidgetManagerImpl.kt b/data/src/main/java/manager/WidgetManagerImpl.kt
new file mode 100644
index 00000000..d8b0dae5
--- /dev/null
+++ b/data/src/main/java/manager/WidgetManagerImpl.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package manager
+
+import android.content.Context
+import me.leolin.shortcutbadger.ShortcutBadger
+import javax.inject.Inject
+
+class WidgetManagerImpl @Inject constructor(private val context: Context) : WidgetManager {
+
+ override fun updateUnreadCount(count: Int) {
+ ShortcutBadger.applyCount(context, count)
+ }
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/mapper/CursorToContact.kt b/data/src/main/java/mapper/CursorToContactImpl.kt
similarity index 76%
rename from qksms/src/main/java/data/mapper/CursorToContact.kt
rename to data/src/main/java/mapper/CursorToContactImpl.kt
index e32a74f3..92fb0d19 100644
--- a/qksms/src/main/java/data/mapper/CursorToContact.kt
+++ b/data/src/main/java/mapper/CursorToContactImpl.kt
@@ -16,25 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.mapper
+package mapper
import android.content.Context
import android.database.Cursor
import android.provider.ContactsContract.CommonDataKinds.Phone.*
-import data.model.Contact
-import data.model.PhoneNumber
+import model.Contact
+import model.PhoneNumber
import javax.inject.Inject
-class CursorToContact @Inject constructor(private val context: Context) : Mapper {
+class CursorToContactImpl @Inject constructor(private val context: Context) : CursorToContact {
companion object {
val URI = CONTENT_URI
val PROJECTION = arrayOf(LOOKUP_KEY, NUMBER, TYPE, DISPLAY_NAME)
- val COLUMN_LOOKUP_KEY = 0
- val COLUMN_NUMBER = 1
- val COLUMN_TYPE = 2
- val COLUMN_DISPLAY_NAME = 3
+ const val COLUMN_LOOKUP_KEY = 0
+ const val COLUMN_NUMBER = 1
+ const val COLUMN_TYPE = 2
+ const val COLUMN_DISPLAY_NAME = 3
}
override fun map(from: Cursor) = Contact().apply {
@@ -47,4 +47,8 @@ class CursorToContact @Inject constructor(private val context: Context) : Mapper
lastUpdate = System.currentTimeMillis()
}
+ override fun getContactsCursor(): Cursor {
+ return context.contentResolver.query(URI, PROJECTION, null, null, null)
+ }
+
}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/mapper/CursorToConversation.kt b/data/src/main/java/mapper/CursorToConversationImpl.kt
similarity index 69%
rename from qksms/src/main/java/data/mapper/CursorToConversation.kt
rename to data/src/main/java/mapper/CursorToConversationImpl.kt
index 0089aaaa..481cc632 100644
--- a/qksms/src/main/java/data/mapper/CursorToConversation.kt
+++ b/data/src/main/java/mapper/CursorToConversationImpl.kt
@@ -16,16 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.mapper
+package mapper
+import android.content.Context
import android.database.Cursor
import android.net.Uri
+import android.provider.Telephony
import android.provider.Telephony.Threads
-import data.model.Conversation
-import data.model.Recipient
+import model.Conversation
+import model.Recipient
import javax.inject.Inject
-class CursorToConversation @Inject constructor() : Mapper {
+class CursorToConversationImpl @Inject constructor(private val context: Context) : CursorToConversation {
companion object {
val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
@@ -48,4 +50,15 @@ class CursorToConversation @Inject constructor() : Mapper
}
}
+ override fun getConversationsCursor(lastSync: Long): Cursor {
+ return context.contentResolver.query(URI, PROJECTION,
+ "date > $lastSync AND ${Telephony.Threads.MESSAGE_COUNT} > 0", null,
+ "date desc")
+ }
+
+ 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/qksms/src/main/java/data/mapper/CursorToMessage.kt b/data/src/main/java/mapper/CursorToMessageImpl.kt
similarity index 65%
rename from qksms/src/main/java/data/mapper/CursorToMessage.kt
rename to data/src/main/java/mapper/CursorToMessageImpl.kt
index 5a325e32..0368bbb2 100644
--- a/qksms/src/main/java/data/mapper/CursorToMessage.kt
+++ b/data/src/main/java/mapper/CursorToMessageImpl.kt
@@ -16,29 +16,54 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.mapper
+package mapper
import android.content.Context
import android.database.Cursor
import android.net.Uri
-import android.provider.Telephony
import android.provider.Telephony.*
import com.google.android.mms.pdu_alt.PduHeaders
-import common.util.Keys
-import common.util.extensions.map
-import data.model.Message
-import data.model.MmsPart
-import timber.log.Timber
-import java.util.*
+import manager.KeyManager
+import model.Message
+import util.extensions.map
import javax.inject.Inject
-class CursorToMessage @Inject constructor(
+class CursorToMessageImpl @Inject constructor(
private val context: Context,
- private val keys: Keys,
+ private val keys: KeyManager,
private val cursorToPart: CursorToPart
-) : Mapper, Message> {
+) : CursorToMessage {
- override fun map(from: Pair): Message {
+ companion object {
+ val URI = Uri.parse("content://mms-sms/complete-conversations")
+ val PROJECTION = arrayOf(
+ MmsSms.TYPE_DISCRIMINATOR_COLUMN,
+ MmsSms._ID,
+ Mms.DATE,
+ Mms.DATE_SENT,
+ Mms.READ,
+ Mms.THREAD_ID,
+ Mms.LOCKED,
+
+ Sms.ADDRESS,
+ Sms.BODY,
+ Sms.SEEN,
+ Sms.TYPE,
+ Sms.STATUS,
+ Sms.ERROR_CODE,
+
+ Mms.SUBJECT,
+ Mms.SUBJECT_CHARSET,
+ Mms.SEEN,
+ Mms.MESSAGE_TYPE,
+ Mms.MESSAGE_BOX,
+ Mms.DELIVERY_REPORT,
+ Mms.READ_REPORT,
+ MmsSms.PendingMessages.ERROR_TYPE,
+ Mms.STATUS)
+ }
+
+ override fun map(from: Pair): Message {
val cursor = from.first
val columnsMap = from.second
@@ -84,12 +109,19 @@ class CursorToMessage @Inject constructor(
textContentType = ""
attachmentType = Message.AttachmentType.NOT_LOADED
- parts.addAll(getMmsParts(contentId))
+ parts.addAll(cursorToPart.getPartsCursor(contentId)?.map { cursorToPart.map(it) } ?: listOf())
}
}
}
}
+ override fun getMessagesCursor(): Cursor {
+ return context.contentResolver.query(URI, PROJECTION, null, null, "normalized_date desc")
+ }
+
+ override fun getMessageCursor(id: Long): Cursor {
+ TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+ }
private fun getMmsAddress(messageId: Long): String {
val uri = Mms.CONTENT_URI.buildUpon()
@@ -110,73 +142,4 @@ class CursorToMessage @Inject constructor(
return ""
}
- private fun getMmsParts(contentId: Long): List {
- return context.contentResolver.query(CursorToPart.CONTENT_URI, null,
- "${Telephony.Mms.Part.MSG_ID} = ?", arrayOf(contentId.toString()), null)
- ?.map { cursorToPart.map(it) } ?: listOf()
- }
-
- companion object {
- val URI = Uri.parse("content://mms-sms/complete-conversations")
- val PROJECTION = arrayOf(
- MmsSms.TYPE_DISCRIMINATOR_COLUMN,
- MmsSms._ID,
- Mms.DATE,
- Mms.DATE_SENT,
- Mms.READ,
- Mms.THREAD_ID,
- Mms.LOCKED,
-
- Sms.ADDRESS,
- Sms.BODY,
- Sms.SEEN,
- Sms.TYPE,
- Sms.STATUS,
- Sms.ERROR_CODE,
-
- Mms.SUBJECT,
- Mms.SUBJECT_CHARSET,
- Mms.SEEN,
- Mms.MESSAGE_TYPE,
- Mms.MESSAGE_BOX,
- Mms.DELIVERY_REPORT,
- Mms.READ_REPORT,
- MmsSms.PendingMessages.ERROR_TYPE,
- Mms.STATUS)
- }
-
- class MessageColumns(private val cursor: Cursor) {
-
- val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
- val msgId by lazy { getColumnIndex(MmsSms._ID) }
- val date by lazy { getColumnIndex(Mms.DATE) }
- val dateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
- val read by lazy { getColumnIndex(Mms.READ) }
- val threadId by lazy { getColumnIndex(Mms.THREAD_ID) }
- val locked by lazy { getColumnIndex(Mms.LOCKED) }
-
- val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
- val smsBody by lazy { getColumnIndex(Sms.BODY) }
- val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
- val smsType by lazy { getColumnIndex(Sms.TYPE) }
- val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
- val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
-
- val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
- val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
- val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
- val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
- val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
- val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
- val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
- val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
- val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
-
- private fun getColumnIndex(columnsName: String) = try {
- cursor.getColumnIndexOrThrow(columnsName)
- } catch (e: Exception) {
- Timber.e("Couldn't find column \'$columnsName\' in ${Arrays.toString(cursor.columnNames)}")
- -1
- }
- }
}
diff --git a/qksms/src/main/java/data/mapper/CursorToPart.kt b/data/src/main/java/mapper/CursorToPartImpl.kt
similarity index 85%
rename from qksms/src/main/java/data/mapper/CursorToPart.kt
rename to data/src/main/java/mapper/CursorToPartImpl.kt
index 4bf64cdf..67398b00 100644
--- a/qksms/src/main/java/data/mapper/CursorToPart.kt
+++ b/data/src/main/java/mapper/CursorToPartImpl.kt
@@ -16,20 +16,23 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.mapper
+package mapper
import android.content.ContentUris
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony
-import data.model.MmsPart
+import model.MmsPart
import timber.log.Timber
+import util.extensions.isImage
+import util.extensions.isSmil
+import util.extensions.isText
import java.io.BufferedReader
import java.io.InputStreamReader
import javax.inject.Inject
-class CursorToPart @Inject constructor(private val context: Context) : Mapper {
+class CursorToPartImpl @Inject constructor(private val context: Context) : CursorToPart {
companion object {
val CONTENT_URI: Uri = Uri.parse("content://mms/part")
@@ -74,4 +77,9 @@ class CursorToPart @Inject constructor(private val context: Context) : Mapper.
*/
-package data.mapper
+package mapper
+import android.content.Context
import android.database.Cursor
import android.net.Uri
-import data.model.Recipient
+import model.Recipient
import javax.inject.Inject
-class CursorToRecipient @Inject constructor() : Mapper {
+class CursorToRecipienImpl @Inject constructor(private val context: Context) : CursorToRecipient {
companion object {
val URI = Uri.parse("content://mms-sms/canonical-addresses")
- val COLUMN_ID = 0
- val COLUMN_ADDRESS = 1
+ const val COLUMN_ID = 0
+ const val COLUMN_ADDRESS = 1
}
override fun map(from: Cursor) = Recipient().apply {
@@ -38,4 +39,12 @@ class CursorToRecipient @Inject constructor() : Mapper {
lastUpdate = System.currentTimeMillis()
}
+ override fun getRecipientCursor(): Cursor {
+ return context.contentResolver.query(URI, null, null, null, null)
+ }
+
+ override fun getRecipientCursor(id: Long): Cursor {
+ return context.contentResolver.query(URI, null, "_id = ?", arrayOf(id.toString()), null)
+ }
+
}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/repository/ContactRepository.kt b/data/src/main/java/repository/ContactRepositoryImpl.kt
similarity index 87%
rename from qksms/src/main/java/data/repository/ContactRepository.kt
rename to data/src/main/java/repository/ContactRepositoryImpl.kt
index 47636fe1..76d4d489 100644
--- a/qksms/src/main/java/data/repository/ContactRepository.kt
+++ b/data/src/main/java/repository/ContactRepositoryImpl.kt
@@ -16,25 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.repository
+package repository
import android.content.Context
import android.net.Uri
import android.provider.ContactsContract
-import common.util.extensions.asFlowable
-import data.model.Contact
import io.reactivex.Flowable
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
+import model.Contact
+import util.extensions.asFlowable
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class ContactRepository @Inject constructor(val context: Context) {
+class ContactRepositoryImpl @Inject constructor(val context: Context) : ContactRepository {
- fun findContactUri(address: String): Single {
+ override fun findContactUri(address: String): Single {
return Flowable.just(address)
.map { Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) }
.flatMap { uri -> context.contentResolver.query(uri, arrayOf(ContactsContract.PhoneLookup._ID), null, null, null).asFlowable() }
@@ -43,7 +43,7 @@ class ContactRepository @Inject constructor(val context: Context) {
.map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) }
}
- fun getUnmanagedContacts(): Flowable> {
+ override fun getUnmanagedContacts(): Flowable> {
val realm = Realm.getDefaultInstance()
return realm.where(Contact::class.java)
.sort("name")
diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt
similarity index 78%
rename from qksms/src/main/java/data/repository/MessageRepository.kt
rename to data/src/main/java/repository/MessageRepositoryImpl.kt
index 92cd53a8..75318aa9 100644
--- a/qksms/src/main/java/data/repository/MessageRepository.kt
+++ b/data/src/main/java/repository/MessageRepositoryImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.repository
+package repository
import android.app.PendingIntent
import android.content.ContentUris
@@ -26,17 +26,10 @@ import android.content.Intent
import android.net.Uri
import android.provider.BaseColumns
import android.provider.Telephony
-import android.provider.Telephony.Sms
import android.telephony.PhoneNumberUtils
import android.telephony.SmsManager
+import com.klinker.android.send_message.BroadcastUtils
import com.klinker.android.send_message.StripAccents
-import common.util.Keys
-import common.util.MessageUtils
-import common.util.Preferences
-import common.util.extensions.*
-import data.mapper.CursorToConversation
-import data.mapper.CursorToRecipient
-import data.model.*
import io.reactivex.Flowable
import io.reactivex.Maybe
import io.reactivex.Observable
@@ -46,20 +39,32 @@ import io.reactivex.schedulers.Schedulers
import io.realm.Realm
import io.realm.RealmResults
import io.realm.Sort
-import presentation.receiver.MessageDeliveredReceiver
-import presentation.receiver.MessageSentReceiver
+import manager.KeyManager
+import mapper.CursorToConversation
+import mapper.CursorToRecipient
+import model.Contact
+import model.Conversation
+import model.Message
+import model.MmsPart
+import util.MessageUtils
+import util.Preferences
+import util.extensions.asFlowable
+import util.extensions.asMaybe
+import util.extensions.asObservable
+import util.extensions.insertOrUpdate
+import util.extensions.map
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class MessageRepository @Inject constructor(
+class MessageRepositoryImpl @Inject constructor(
private val context: Context,
- private val messageIds: Keys,
+ private val messageIds: KeyManager,
private val cursorToConversation: CursorToConversation,
private val cursorToRecipient: CursorToRecipient,
- private val prefs: Preferences) {
+ private val prefs: Preferences) : MessageRepository {
- fun getConversations(archived: Boolean = false): Flowable> {
+ override fun getConversations(archived: Boolean): Flowable>> {
val realm = Realm.getDefaultInstance()
val conversationFlowable = realm.where(Conversation::class.java)
@@ -83,12 +88,12 @@ class MessageRepository @Inject constructor(
messages.mapNotNull { message ->
val conversation = conversationMap[message.threadId]
- if (conversation == null) null else InboxItem(conversation, message)
+ if (conversation == null) null else Pair(conversation, message)
}
})
}
- fun getBlockedConversations(): Flowable> {
+ override fun getBlockedConversations(): Flowable> {
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.equalTo("blocked", true)
@@ -98,29 +103,29 @@ class MessageRepository @Inject constructor(
.map { it.toList() }
}
- fun getConversationAsync(threadId: Long): Conversation {
+ override fun getConversationAsync(threadId: Long): Conversation {
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.equalTo("id", threadId)
.findFirstAsync()
}
- fun getConversation(threadId: Long): Conversation? {
+ override fun getConversation(threadId: Long): Conversation? {
return Realm.getDefaultInstance()
.where(Conversation::class.java)
.equalTo("id", threadId)
.findFirst()
}
- fun getOrCreateConversation(threadId: Long): Conversation? {
+ override fun getOrCreateConversation(threadId: Long): Conversation? {
return getConversation(threadId) ?: getConversationFromCp(threadId)
}
- fun getOrCreateConversation(address: String): Maybe {
+ override fun getOrCreateConversation(address: String): Maybe {
return getOrCreateConversation(listOf(address))
}
- fun getOrCreateConversation(addresses: List): Maybe {
+ override fun getOrCreateConversation(addresses: List): Maybe {
return Maybe.just(addresses)
.map { recipients ->
recipients.map { address ->
@@ -151,7 +156,7 @@ class MessageRepository @Inject constructor(
.observeOn(AndroidSchedulers.mainThread())
}
- fun saveDraft(threadId: Long, draft: String) {
+ override fun saveDraft(threadId: Long, draft: String) {
Realm.getDefaultInstance().use { realm ->
val conversation = realm.where(Conversation::class.java)
.equalTo("id", threadId)
@@ -165,7 +170,7 @@ class MessageRepository @Inject constructor(
}
}
- fun getMessages(threadId: Long): RealmResults {
+ override fun getMessages(threadId: Long): RealmResults {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
@@ -173,35 +178,35 @@ class MessageRepository @Inject constructor(
.findAllAsync()
}
- fun getMessage(id: Long): Message? {
+ override fun getMessage(id: Long): Message? {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("id", id)
.findFirst()
}
- fun getMessageForPart(id: Long): Message? {
+ override fun getMessageForPart(id: Long): Message? {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("parts.id", id)
.findFirst()
}
- fun getUnreadMessageCount(): Long {
+ override fun getUnreadMessageCount(): Long {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("read", false)
.count()
}
- fun getPart(id: Long): MmsPart? {
+ override fun getPart(id: Long): MmsPart? {
return Realm.getDefaultInstance()
.where(MmsPart::class.java)
.equalTo("id", id)
.findFirst()
}
- fun getPartsForConversation(threadId: Long): Observable> {
+ override fun getPartsForConversation(threadId: Long): Observable> {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("threadId", threadId)
@@ -216,7 +221,7 @@ class MessageRepository @Inject constructor(
* Retrieves the list of messages which should be shown in the notification
* for a given conversation
*/
- fun getUnreadUnseenMessages(threadId: Long): RealmResults {
+ override fun getUnreadUnseenMessages(threadId: Long): RealmResults {
return Realm.getDefaultInstance()
.where(Message::class.java)
.equalTo("seen", false)
@@ -226,7 +231,7 @@ class MessageRepository @Inject constructor(
.findAll()
}
- fun markArchived(threadId: Long) {
+ override fun markArchived(threadId: Long) {
val realm = Realm.getDefaultInstance()
val conversation = realm.where(Conversation::class.java)
.equalTo("id", threadId)
@@ -236,7 +241,7 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun markUnarchived(threadId: Long) {
+ override fun markUnarchived(threadId: Long) {
val realm = Realm.getDefaultInstance()
val conversation = realm.where(Conversation::class.java)
.equalTo("id", threadId)
@@ -246,7 +251,7 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun markBlocked(threadId: Long) {
+ override fun markBlocked(threadId: Long) {
val realm = Realm.getDefaultInstance()
val conversation = realm.where(Conversation::class.java)
.equalTo("id", threadId)
@@ -256,7 +261,7 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun markUnblocked(threadId: Long) {
+ override fun markUnblocked(threadId: Long) {
val realm = Realm.getDefaultInstance()
val conversation = realm.where(Conversation::class.java)
.equalTo("id", threadId)
@@ -266,14 +271,14 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun markAllSeen() {
+ override fun markAllSeen() {
val realm = Realm.getDefaultInstance()
val messages = realm.where(Message::class.java).equalTo("seen", false).findAll()
realm.executeTransaction { messages.forEach { message -> message.seen = true } }
realm.close()
}
- fun markSeen(threadId: Long) {
+ override fun markSeen(threadId: Long) {
val realm = Realm.getDefaultInstance()
val messages = realm.where(Message::class.java)
.equalTo("threadId", threadId)
@@ -288,20 +293,20 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun markRead(threadId: Long) {
+ override fun markRead(threadId: Long) {
// TODO also need to mark MMS in ContentProvider as Read
val projection = arrayOf(BaseColumns._ID)
- val selection = "${Sms.THREAD_ID} = $threadId AND (${Sms.SEEN} = 0 OR ${Sms.READ} = 0)"
+ val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)"
val contentResolver = context.contentResolver
- contentResolver.query(Sms.Inbox.CONTENT_URI, projection, selection, null, null)
+ contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null)
.asFlowable()
.subscribeOn(Schedulers.io())
.map { cursor -> cursor.getLong(0) }
- .map { id -> Uri.withAppendedPath(Sms.CONTENT_URI, id.toString()) }
+ .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) }
.subscribe { uri ->
val values = ContentValues()
- values.put(Sms.SEEN, true)
- values.put(Sms.READ, true)
+ values.put(Telephony.Sms.SEEN, true)
+ values.put(Telephony.Sms.READ, true)
contentResolver.update(uri, values, null, null)
}
@@ -325,29 +330,27 @@ class MessageRepository @Inject constructor(
realm.close()
}
- /**
- * Persists the SMS and attempts to send it
- */
- fun sendSmsAndPersist(threadId: Long, address: String, body: String) {
+ override fun sendSmsAndPersist(threadId: Long, address: String, body: String) {
val message = insertSentSms(threadId, address, body)
sendSms(message)
}
- /**
- * Attempts to send the SMS message. This can be called if the message has already been persisted
- */
- fun sendSms(message: Message) {
+ override fun sendSms(message: Message) {
val smsManager = SmsManager.getDefault()
val parts = smsManager.divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body)
val sentIntents = parts.map {
- val intent = Intent(context, MessageSentReceiver::class.java).putExtra("id", message.id)
+ val action = "com.moez.QKSMS.SMS_SENT"
+ val intent = Intent(action).putExtra("id", message.id)
+ BroadcastUtils.addClassName(context, intent, action)
PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
}
val deliveredIntents = parts.map {
- val intent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("id", message.id)
+ val action = "com.moez.QKSMS.SMS_DELIVERED"
+ val intent = Intent(action).putExtra("id", message.id)
+ BroadcastUtils.addClassName(context, intent, action)
val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
if (prefs.delivery.get()) pendingIntent else null
}
@@ -355,7 +358,7 @@ class MessageRepository @Inject constructor(
smsManager.sendMultipartTextMessage(message.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents))
}
- fun insertSentSms(threadId: Long, address: String, body: String): Message {
+ override fun insertSentSms(threadId: Long, address: String, body: String): Message {
// Insert the message to Realm
val message = Message().apply {
@@ -365,7 +368,7 @@ class MessageRepository @Inject constructor(
this.date = System.currentTimeMillis()
id = messageIds.newId()
- boxId = Sms.MESSAGE_TYPE_OUTBOX
+ boxId = Telephony.Sms.MESSAGE_TYPE_OUTBOX
type = "sms"
read = true
seen = true
@@ -393,7 +396,7 @@ class MessageRepository @Inject constructor(
return message
}
- fun insertReceivedSms(address: String, body: String, sentTime: Long): Message {
+ override fun insertReceivedSms(address: String, body: String, sentTime: Long): Message {
// Insert the message to Realm
val message = Message().apply {
@@ -404,7 +407,7 @@ class MessageRepository @Inject constructor(
id = messageIds.newId()
threadId = getOrCreateConversation(address).blockingGet().id
- boxId = Sms.MESSAGE_TYPE_INBOX
+ boxId = Telephony.Sms.MESSAGE_TYPE_INBOX
type = "sms"
}
@@ -430,7 +433,7 @@ class MessageRepository @Inject constructor(
/**
* Marks the message as sending, in case we need to retry sending it
*/
- fun markSending(id: Long) {
+ override fun markSending(id: Long) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
@@ -438,18 +441,18 @@ class MessageRepository @Inject constructor(
message?.let {
// Update the message in realm
realm.executeTransaction {
- message.boxId = Sms.MESSAGE_TYPE_OUTBOX
+ message.boxId = Telephony.Sms.MESSAGE_TYPE_OUTBOX
}
// Update the message in the native ContentProvider
val values = ContentValues()
- values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX)
+ values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX)
context.contentResolver.update(message.getUri(), values, null, null)
}
}
}
- fun markSent(id: Long) {
+ override fun markSent(id: Long) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
@@ -457,18 +460,18 @@ class MessageRepository @Inject constructor(
message?.let {
// Update the message in realm
realm.executeTransaction {
- message.boxId = Sms.MESSAGE_TYPE_SENT
+ message.boxId = Telephony.Sms.MESSAGE_TYPE_SENT
}
// Update the message in the native ContentProvider
val values = ContentValues()
- values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT)
+ values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_SENT)
context.contentResolver.update(message.getUri(), values, null, null)
}
}
}
- fun markFailed(id: Long, resultCode: Int) {
+ override fun markFailed(id: Long, resultCode: Int) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
@@ -476,20 +479,20 @@ class MessageRepository @Inject constructor(
message?.let {
// Update the message in realm
realm.executeTransaction {
- message.boxId = Sms.MESSAGE_TYPE_FAILED
+ message.boxId = Telephony.Sms.MESSAGE_TYPE_FAILED
message.errorCode = resultCode
}
// Update the message in the native ContentProvider
val values = ContentValues()
- values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
- values.put(Sms.ERROR_CODE, resultCode)
+ values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_FAILED)
+ values.put(Telephony.Sms.ERROR_CODE, resultCode)
context.contentResolver.update(message.getUri(), values, null, null)
}
}
}
- fun markDelivered(id: Long) {
+ override fun markDelivered(id: Long) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
@@ -497,22 +500,22 @@ class MessageRepository @Inject constructor(
message?.let {
// Update the message in realm
realm.executeTransaction {
- message.deliveryStatus = Sms.STATUS_COMPLETE
+ message.deliveryStatus = Telephony.Sms.STATUS_COMPLETE
message.dateSent = System.currentTimeMillis()
message.read = true
}
// Update the message in the native ContentProvider
val values = ContentValues()
- values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
- values.put(Sms.DATE_SENT, System.currentTimeMillis())
- values.put(Sms.READ, true)
+ values.put(Telephony.Sms.STATUS, Telephony.Sms.STATUS_COMPLETE)
+ values.put(Telephony.Sms.DATE_SENT, System.currentTimeMillis())
+ values.put(Telephony.Sms.READ, true)
context.contentResolver.update(message.getUri(), values, null, null)
}
}
}
- fun markDeliveryFailed(id: Long, resultCode: Int) {
+ override fun markDeliveryFailed(id: Long, resultCode: Int) {
Realm.getDefaultInstance().use { realm ->
realm.refresh()
@@ -520,7 +523,7 @@ class MessageRepository @Inject constructor(
message?.let {
// Update the message in realm
realm.executeTransaction {
- message.deliveryStatus = Sms.STATUS_FAILED
+ message.deliveryStatus = Telephony.Sms.STATUS_FAILED
message.dateSent = System.currentTimeMillis()
message.read = true
message.errorCode = resultCode
@@ -528,16 +531,16 @@ class MessageRepository @Inject constructor(
// Update the message in the native ContentProvider
val values = ContentValues()
- values.put(Sms.STATUS, Sms.STATUS_FAILED)
- values.put(Sms.DATE_SENT, System.currentTimeMillis())
- values.put(Sms.READ, true)
- values.put(Sms.ERROR_CODE, resultCode)
+ values.put(Telephony.Sms.STATUS, Telephony.Sms.STATUS_FAILED)
+ values.put(Telephony.Sms.DATE_SENT, System.currentTimeMillis())
+ values.put(Telephony.Sms.READ, true)
+ values.put(Telephony.Sms.ERROR_CODE, resultCode)
context.contentResolver.update(message.getUri(), values, null, null)
}
}
}
- fun deleteMessage(messageId: Long) {
+ override fun deleteMessage(messageId: Long) {
val realm = Realm.getDefaultInstance()
realm.where(Message::class.java).equalTo("id", messageId).findFirst()?.let { message ->
val uri = message.getUri()
@@ -547,7 +550,7 @@ class MessageRepository @Inject constructor(
realm.close()
}
- fun deleteConversation(threadId: Long) {
+ override fun deleteConversation(threadId: Long) {
Realm.getDefaultInstance().use { realm ->
val conversation = realm.where(Conversation::class.java).equalTo("id", threadId).findAll()
val messages = realm.where(Message::class.java).equalTo("threadId", threadId).findAll()
@@ -565,8 +568,7 @@ class MessageRepository @Inject constructor(
private fun getConversationFromCp(threadId: Long): Conversation? {
var conversation: Conversation? = null
- val cursor = context.contentResolver.query(CursorToConversation.URI, CursorToConversation.PROJECTION,
- "_id = ?", arrayOf(threadId.toString()), null)
+ val cursor = cursorToConversation.getConversationCursor(threadId)
if (cursor.moveToFirst()) {
conversation = cursorToConversation.map(cursor)
@@ -575,8 +577,8 @@ class MessageRepository @Inject constructor(
val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll())
val recipients = conversation.recipients
- .map { recipient -> recipient.id.toString() }
- .map { id -> context.contentResolver.query(CursorToRecipient.URI, null, "_id = ?", arrayOf(id), null) }
+ .map { recipient -> recipient.id }
+ .map { id -> cursorToRecipient.getRecipientCursor(id) }
.map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } }
.flatten()
.map { recipient ->
diff --git a/qksms/src/main/java/common/util/SyncManager.kt b/data/src/main/java/repository/SyncRepositoryImpl.kt
similarity index 81%
rename from qksms/src/main/java/common/util/SyncManager.kt
rename to data/src/main/java/repository/SyncRepositoryImpl.kt
index f7ca37bc..b053aff4 100644
--- a/qksms/src/main/java/common/util/SyncManager.kt
+++ b/data/src/main/java/repository/SyncRepositoryImpl.kt
@@ -16,36 +16,41 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package repository
import android.content.ContentUris
import android.content.Context
import android.net.Uri
import android.provider.Telephony
import android.telephony.PhoneNumberUtils
-import common.util.extensions.asFlowable
-import common.util.extensions.insertOrUpdate
-import common.util.extensions.map
-import common.util.extensions.mapWhile
-import data.mapper.CursorToContact
-import data.mapper.CursorToConversation
-import data.mapper.CursorToMessage
-import data.mapper.CursorToRecipient
-import data.model.*
-import data.repository.MessageRepository
import io.reactivex.Flowable
import io.realm.Realm
+import mapper.CursorToContact
+import mapper.CursorToConversation
+import mapper.CursorToMessage
+import mapper.CursorToRecipient
+import model.Contact
+import model.Conversation
+import model.Message
+import model.MmsPart
+import model.Recipient
+import model.SyncLog
+import util.extensions.asFlowable
+import util.extensions.insertOrUpdate
+import util.extensions.map
+import util.extensions.mapWhile
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class SyncManager @Inject constructor(
+class SyncRepositoryImpl @Inject constructor(
private val context: Context,
private val messageRepo: MessageRepository,
private val cursorToConversation: CursorToConversation,
private val cursorToMessage: CursorToMessage,
private val cursorToRecipient: CursorToRecipient,
- private val cursorToContact: CursorToContact) {
+ private val cursorToContact: CursorToContact
+) : SyncRepository {
sealed class Status {
class Idle : Status()
@@ -55,8 +60,7 @@ class SyncManager @Inject constructor(
private val contentResolver = context.contentResolver
private var status: Status = Status.Idle()
- // TODO: This needs to be substantially faster
- fun syncMessages(fullSync: Boolean = false) {
+ override fun syncMessages(fullSync: Boolean) {
// If the sync is already running, don't try to do another one
if (status is Status.Running) return
@@ -77,18 +81,14 @@ class SyncManager @Inject constructor(
realm.insert(SyncLog())
// Sync conversations
- val conversationCursor = contentResolver.query(
- CursorToConversation.URI,
- CursorToConversation.PROJECTION,
- "date > $lastSync AND ${Telephony.Threads.MESSAGE_COUNT} > 0", null,
- "date desc")
+ val conversationCursor = cursorToConversation.getConversationsCursor()
val conversations = conversationCursor.map { cursor -> cursorToConversation.map(cursor) }
realm.insertOrUpdate(conversations)
conversationCursor.close()
// Sync messages
- val messageCursor = contentResolver.query(CursorToMessage.URI, CursorToMessage.PROJECTION, null, null, "normalized_date desc")
+ val messageCursor = cursorToMessage.getMessagesCursor()
val messageColumns = CursorToMessage.MessageColumns(messageCursor)
val messages = messageCursor.mapWhile(
{ cursor -> cursorToMessage.map(Pair(cursor, messageColumns)) },
@@ -98,7 +98,7 @@ class SyncManager @Inject constructor(
// Sync recipients
- val recipientCursor = contentResolver.query(CursorToRecipient.URI, null, null, null, null)
+ val recipientCursor = cursorToRecipient.getRecipientCursor()
val recipients = recipientCursor.map { cursor -> cursorToRecipient.map(cursor) }
realm.insertOrUpdate(recipients)
recipientCursor.close()
@@ -111,7 +111,7 @@ class SyncManager @Inject constructor(
status = Status.Idle()
}
- fun syncMessage(uri: Uri): Flowable {
+ override fun syncMessage(uri: Uri): Flowable {
val id = ContentUris.parseId(uri)
val type = when {
uri.toString().contains("mms") -> "mms"
@@ -150,9 +150,9 @@ class SyncManager @Inject constructor(
.doOnNext { message -> message.insertOrUpdate() }
}
- fun syncContacts() {
+ override fun syncContacts() {
// Load all the contacts
- var contacts = context.contentResolver.query(CursorToContact.URI, CursorToContact.PROJECTION, null, null, null)
+ var contacts = cursorToContact.getContactsCursor()
.map { cursor -> cursorToContact.map(cursor) }
.groupBy { contact -> contact.lookupKey }
.map { contacts ->
diff --git a/qksms/src/main/java/common/util/MessageUtils.kt b/data/src/main/java/util/MessageUtils.kt
similarity index 98%
rename from qksms/src/main/java/common/util/MessageUtils.kt
rename to data/src/main/java/util/MessageUtils.kt
index 92397eb1..50598670 100644
--- a/qksms/src/main/java/common/util/MessageUtils.kt
+++ b/data/src/main/java/util/MessageUtils.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package util
import android.text.TextUtils
import android.util.Patterns
diff --git a/qksms/src/main/java/common/util/Preferences.kt b/data/src/main/java/util/Preferences.kt
similarity index 99%
rename from qksms/src/main/java/common/util/Preferences.kt
rename to data/src/main/java/util/Preferences.kt
index 3d9bf34a..b4ef80f7 100644
--- a/qksms/src/main/java/common/util/Preferences.kt
+++ b/data/src/main/java/util/Preferences.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package util
import android.provider.Settings
import com.f2prateek.rx.preferences2.Preference
diff --git a/qksms/src/main/java/common/util/extensions/CursorExtensions.kt b/data/src/main/java/util/extensions/CursorExtensions.kt
similarity index 98%
rename from qksms/src/main/java/common/util/extensions/CursorExtensions.kt
rename to data/src/main/java/util/extensions/CursorExtensions.kt
index 58e9f5b9..48be27be 100644
--- a/qksms/src/main/java/common/util/extensions/CursorExtensions.kt
+++ b/data/src/main/java/util/extensions/CursorExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package util.extensions
import android.database.Cursor
import io.reactivex.Flowable
diff --git a/data/src/main/java/util/extensions/MmsPartExtensions.kt b/data/src/main/java/util/extensions/MmsPartExtensions.kt
new file mode 100644
index 00000000..8c6c76da
--- /dev/null
+++ b/data/src/main/java/util/extensions/MmsPartExtensions.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package util.extensions
+
+import com.google.android.mms.ContentType
+import model.MmsPart
+
+fun MmsPart.isSmil() = ContentType.APP_SMIL == type
+
+fun MmsPart.isImage() = ContentType.isImageType(type)
+
+fun MmsPart.isText() = ContentType.isTextType(type)
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/extensions/RealmExtensions.kt b/data/src/main/java/util/extensions/RealmExtensions.kt
similarity index 97%
rename from qksms/src/main/java/common/util/extensions/RealmExtensions.kt
rename to data/src/main/java/util/extensions/RealmExtensions.kt
index db6184c6..d612f65e 100644
--- a/qksms/src/main/java/common/util/extensions/RealmExtensions.kt
+++ b/data/src/main/java/util/extensions/RealmExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package util.extensions
import io.reactivex.Observable
import io.realm.Realm
diff --git a/qksms/src/main/java/common/util/extensions/RxExtensions.kt b/data/src/main/java/util/extensions/RxExtensions.kt
similarity index 92%
rename from qksms/src/main/java/common/util/extensions/RxExtensions.kt
rename to data/src/main/java/util/extensions/RxExtensions.kt
index b787ffa4..eb0581f3 100644
--- a/qksms/src/main/java/common/util/extensions/RxExtensions.kt
+++ b/data/src/main/java/util/extensions/RxExtensions.kt
@@ -17,12 +17,15 @@
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package util.extensions
-import common.util.Optional
import io.reactivex.Flowable
import io.reactivex.Observable
+data class Optional(val value: T?) {
+ fun notNull() = value != null
+}
+
fun Flowable.mapNotNull(mapper: (T) -> R?): Flowable
= map { input -> Optional(mapper(input)) }
.filter { optional -> optional.notNull() }
diff --git a/domain/build.gradle b/domain/build.gradle
new file mode 100644
index 00000000..19ad8c25
--- /dev/null
+++ b/domain/build.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'com.android.library'
+apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
+apply plugin: 'kotlin-android'
+
+android {
+ compileSdkVersion 27
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 27
+ }
+}
+
+dependencies {
+
+ // dagger
+ implementation "com.google.dagger:dagger:$dagger_version"
+ kapt "com.google.dagger:dagger-compiler:$dagger_version"
+ provided "javax.annotation:jsr250-api:1.0"
+
+ // realm
+ kapt "io.realm:realm-annotations:$realm_version"
+ kapt "io.realm:realm-annotations-processor:$realm_version"
+
+ // rxjava
+ implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+ implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+ implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+
+ implementation "androidx.core:core-ktx:$ktx_version"
+ implementation "com.jakewharton.timber:timber:$timber_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+repositories {
+ mavenCentral()
+}
diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..415bfe8f
--- /dev/null
+++ b/domain/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/qksms/src/main/java/interactor/ContactSync.kt b/domain/src/main/java/interactor/ContactSync.kt
similarity index 94%
rename from qksms/src/main/java/interactor/ContactSync.kt
rename to domain/src/main/java/interactor/ContactSync.kt
index f9ba546d..de402bcf 100644
--- a/qksms/src/main/java/interactor/ContactSync.kt
+++ b/domain/src/main/java/interactor/ContactSync.kt
@@ -18,13 +18,13 @@
*/
package interactor
-import common.util.SyncManager
import io.reactivex.Flowable
+import repository.SyncRepository
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
-open class ContactSync @Inject constructor(private val syncManager: SyncManager) : Interactor() {
+open class ContactSync @Inject constructor(private val syncManager: SyncRepository) : Interactor() {
override fun buildObservable(params: Unit): Flowable {
return Flowable.just(System.currentTimeMillis())
diff --git a/qksms/src/main/java/interactor/DeleteConversation.kt b/domain/src/main/java/interactor/DeleteConversation.kt
similarity index 96%
rename from qksms/src/main/java/interactor/DeleteConversation.kt
rename to domain/src/main/java/interactor/DeleteConversation.kt
index feb79637..94e08fe2 100644
--- a/qksms/src/main/java/interactor/DeleteConversation.kt
+++ b/domain/src/main/java/interactor/DeleteConversation.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class DeleteConversation @Inject constructor(
diff --git a/qksms/src/main/java/interactor/DeleteMessage.kt b/domain/src/main/java/interactor/DeleteMessage.kt
similarity index 96%
rename from qksms/src/main/java/interactor/DeleteMessage.kt
rename to domain/src/main/java/interactor/DeleteMessage.kt
index bbddc4f3..3d7a7f6a 100644
--- a/qksms/src/main/java/interactor/DeleteMessage.kt
+++ b/domain/src/main/java/interactor/DeleteMessage.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class DeleteMessage @Inject constructor(
diff --git a/qksms/src/main/java/interactor/FullSync.kt b/domain/src/main/java/interactor/FullSync.kt
similarity index 90%
rename from qksms/src/main/java/interactor/FullSync.kt
rename to domain/src/main/java/interactor/FullSync.kt
index 25e65778..a71d84a1 100644
--- a/qksms/src/main/java/interactor/FullSync.kt
+++ b/domain/src/main/java/interactor/FullSync.kt
@@ -18,16 +18,16 @@
*/
package interactor
-import common.util.Keys
-import common.util.SyncManager
import io.reactivex.Flowable
+import manager.KeyManager
+import repository.SyncRepository
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
class FullSync @Inject constructor(
- private val syncManager: SyncManager,
- private val keys: Keys
+ private val syncManager: SyncRepository,
+ private val keys: KeyManager
) : Interactor() {
override fun buildObservable(params: Unit): Flowable {
diff --git a/qksms/src/main/java/interactor/Interactor.kt b/domain/src/main/java/interactor/Interactor.kt
similarity index 100%
rename from qksms/src/main/java/interactor/Interactor.kt
rename to domain/src/main/java/interactor/Interactor.kt
diff --git a/qksms/src/main/java/interactor/MarkAllSeen.kt b/domain/src/main/java/interactor/MarkAllSeen.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkAllSeen.kt
rename to domain/src/main/java/interactor/MarkAllSeen.kt
index 19cd541d..e2c44b4f 100644
--- a/qksms/src/main/java/interactor/MarkAllSeen.kt
+++ b/domain/src/main/java/interactor/MarkAllSeen.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkArchived.kt b/domain/src/main/java/interactor/MarkArchived.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkArchived.kt
rename to domain/src/main/java/interactor/MarkArchived.kt
index 9ed9c962..0c587b45 100644
--- a/qksms/src/main/java/interactor/MarkArchived.kt
+++ b/domain/src/main/java/interactor/MarkArchived.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkBlocked.kt b/domain/src/main/java/interactor/MarkBlocked.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkBlocked.kt
rename to domain/src/main/java/interactor/MarkBlocked.kt
index 29b52c6a..e4eb3f8e 100644
--- a/qksms/src/main/java/interactor/MarkBlocked.kt
+++ b/domain/src/main/java/interactor/MarkBlocked.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkDelivered.kt b/domain/src/main/java/interactor/MarkDelivered.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkDelivered.kt
rename to domain/src/main/java/interactor/MarkDelivered.kt
index 32643815..8aac3603 100644
--- a/qksms/src/main/java/interactor/MarkDelivered.kt
+++ b/domain/src/main/java/interactor/MarkDelivered.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt b/domain/src/main/java/interactor/MarkDeliveryFailed.kt
similarity index 88%
rename from qksms/src/main/java/interactor/MarkDeliveryFailed.kt
rename to domain/src/main/java/interactor/MarkDeliveryFailed.kt
index 278b0f1a..9eb67802 100644
--- a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt
+++ b/domain/src/main/java/interactor/MarkDeliveryFailed.kt
@@ -18,13 +18,13 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkDeliveryFailed @Inject constructor(
- private val messageRepo: MessageRepository)
- : Interactor() {
+ private val messageRepo: MessageRepository
+) : Interactor() {
data class Params(val id: Long, val resultCode: Int)
diff --git a/qksms/src/main/java/interactor/MarkFailed.kt b/domain/src/main/java/interactor/MarkFailed.kt
similarity index 94%
rename from qksms/src/main/java/interactor/MarkFailed.kt
rename to domain/src/main/java/interactor/MarkFailed.kt
index 9578bec1..8e798753 100644
--- a/qksms/src/main/java/interactor/MarkFailed.kt
+++ b/domain/src/main/java/interactor/MarkFailed.kt
@@ -18,9 +18,9 @@
*/
package interactor
-import common.util.NotificationManager
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import manager.NotificationManager
+import repository.MessageRepository
import javax.inject.Inject
class MarkFailed @Inject constructor(
diff --git a/qksms/src/main/java/interactor/MarkRead.kt b/domain/src/main/java/interactor/MarkRead.kt
similarity index 94%
rename from qksms/src/main/java/interactor/MarkRead.kt
rename to domain/src/main/java/interactor/MarkRead.kt
index 23c02b58..d7c64e45 100644
--- a/qksms/src/main/java/interactor/MarkRead.kt
+++ b/domain/src/main/java/interactor/MarkRead.kt
@@ -18,9 +18,9 @@
*/
package interactor
-import common.util.NotificationManager
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import manager.NotificationManager
+import repository.MessageRepository
import javax.inject.Inject
class MarkRead @Inject constructor(
diff --git a/qksms/src/main/java/interactor/MarkSeen.kt b/domain/src/main/java/interactor/MarkSeen.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkSeen.kt
rename to domain/src/main/java/interactor/MarkSeen.kt
index 8390485d..3afc4ab7 100644
--- a/qksms/src/main/java/interactor/MarkSeen.kt
+++ b/domain/src/main/java/interactor/MarkSeen.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkSent.kt b/domain/src/main/java/interactor/MarkSent.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkSent.kt
rename to domain/src/main/java/interactor/MarkSent.kt
index dcfd5f17..42ec9d1d 100644
--- a/qksms/src/main/java/interactor/MarkSent.kt
+++ b/domain/src/main/java/interactor/MarkSent.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkUnarchived.kt b/domain/src/main/java/interactor/MarkUnarchived.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkUnarchived.kt
rename to domain/src/main/java/interactor/MarkUnarchived.kt
index 77f820c5..4d1a8a26 100644
--- a/qksms/src/main/java/interactor/MarkUnarchived.kt
+++ b/domain/src/main/java/interactor/MarkUnarchived.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/MarkUnblocked.kt b/domain/src/main/java/interactor/MarkUnblocked.kt
similarity index 96%
rename from qksms/src/main/java/interactor/MarkUnblocked.kt
rename to domain/src/main/java/interactor/MarkUnblocked.kt
index 4be11da5..8b82e021 100644
--- a/qksms/src/main/java/interactor/MarkUnblocked.kt
+++ b/domain/src/main/java/interactor/MarkUnblocked.kt
@@ -18,8 +18,8 @@
*/
package interactor
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/PartialSync.kt b/domain/src/main/java/interactor/PartialSync.kt
similarity index 89%
rename from qksms/src/main/java/interactor/PartialSync.kt
rename to domain/src/main/java/interactor/PartialSync.kt
index 363120db..e764f924 100644
--- a/qksms/src/main/java/interactor/PartialSync.kt
+++ b/domain/src/main/java/interactor/PartialSync.kt
@@ -18,16 +18,16 @@
*/
package interactor
-import common.util.Permissions
-import common.util.SyncManager
import io.reactivex.Flowable
+import manager.PermissionManager
+import repository.SyncRepository
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
open class PartialSync @Inject constructor(
- private val syncManager: SyncManager,
- private val permissions: Permissions
+ private val syncManager: SyncRepository,
+ private val permissions: PermissionManager
) : Interactor() {
override fun buildObservable(params: Unit): Flowable {
diff --git a/qksms/src/main/java/interactor/RetrySending.kt b/domain/src/main/java/interactor/RetrySending.kt
similarity index 96%
rename from qksms/src/main/java/interactor/RetrySending.kt
rename to domain/src/main/java/interactor/RetrySending.kt
index 1bab0bb5..a349973c 100644
--- a/qksms/src/main/java/interactor/RetrySending.kt
+++ b/domain/src/main/java/interactor/RetrySending.kt
@@ -18,9 +18,9 @@
*/
package interactor
-import data.model.Message
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import model.Message
+import repository.MessageRepository
import javax.inject.Inject
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/qksms/src/main/java/interactor/SaveImage.kt b/domain/src/main/java/interactor/SaveImage.kt
similarity index 97%
rename from qksms/src/main/java/interactor/SaveImage.kt
rename to domain/src/main/java/interactor/SaveImage.kt
index 21184bd5..ca4eca80 100644
--- a/qksms/src/main/java/interactor/SaveImage.kt
+++ b/domain/src/main/java/interactor/SaveImage.kt
@@ -21,8 +21,8 @@ package interactor
import android.content.Context
import android.provider.MediaStore
import androidx.net.toUri
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
import javax.inject.Inject
class SaveImage @Inject constructor(
diff --git a/qksms/src/main/java/interactor/SyncMessage.kt b/domain/src/main/java/interactor/SyncMessage.kt
similarity index 92%
rename from qksms/src/main/java/interactor/SyncMessage.kt
rename to domain/src/main/java/interactor/SyncMessage.kt
index 765a62c2..b690c31d 100644
--- a/qksms/src/main/java/interactor/SyncMessage.kt
+++ b/domain/src/main/java/interactor/SyncMessage.kt
@@ -19,12 +19,12 @@
package interactor
import android.net.Uri
-import common.util.SyncManager
-import data.model.Message
import io.reactivex.Flowable
+import model.Message
+import repository.SyncRepository
import javax.inject.Inject
-class SyncMessage @Inject constructor(private val syncManager: SyncManager) : Interactor() {
+class SyncMessage @Inject constructor(private val syncManager: SyncRepository) : Interactor() {
override fun buildObservable(params: Uri): Flowable {
return Flowable.just(params)
diff --git a/qksms/src/main/java/interactor/UpdateBadge.kt b/domain/src/main/java/interactor/UpdateBadge.kt
similarity index 78%
rename from qksms/src/main/java/interactor/UpdateBadge.kt
rename to domain/src/main/java/interactor/UpdateBadge.kt
index f5751f31..4363be25 100644
--- a/qksms/src/main/java/interactor/UpdateBadge.kt
+++ b/domain/src/main/java/interactor/UpdateBadge.kt
@@ -18,22 +18,21 @@
*/
package interactor
-import android.content.Context
-import data.repository.MessageRepository
import io.reactivex.Flowable
-import me.leolin.shortcutbadger.ShortcutBadger
+import manager.WidgetManager
+import repository.MessageRepository
import javax.inject.Inject
class UpdateBadge @Inject constructor(
- private val context: Context,
- private val messageRepo: MessageRepository
+ private val messageRepo: MessageRepository,
+ private val widgetManager: WidgetManager
) : Interactor() {
override fun buildObservable(params: Unit): Flowable<*> {
return Flowable.just(params)
.map { messageRepo.getUnreadMessageCount() }
.map { count -> count.toInt() }
- .doOnNext { count -> ShortcutBadger.applyCount(context, count) }
+ .doOnNext { count -> widgetManager.updateUnreadCount(count) }
}
}
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/Analytics.kt b/domain/src/main/java/manager/AnalyticsManager.kt
similarity index 94%
rename from qksms/src/main/java/common/util/Analytics.kt
rename to domain/src/main/java/manager/AnalyticsManager.kt
index 12b56077..5d0930d1 100644
--- a/qksms/src/main/java/common/util/Analytics.kt
+++ b/domain/src/main/java/manager/AnalyticsManager.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package manager
-interface Analytics {
+interface AnalyticsManager {
fun track(event: String)
diff --git a/domain/src/main/java/manager/KeyManager.kt b/domain/src/main/java/manager/KeyManager.kt
new file mode 100644
index 00000000..2347a54a
--- /dev/null
+++ b/domain/src/main/java/manager/KeyManager.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package manager
+
+/**
+ * Helper class for generating incrementing ids for messages
+ */
+interface KeyManager {
+
+ /**
+ * Should be called when a new sync is being started
+ */
+ fun reset()
+
+ /**
+ * Returns a valid ID that can be used to store a new message
+ */
+ fun newId(): Long
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/manager/NotificationManager.kt b/domain/src/main/java/manager/NotificationManager.kt
new file mode 100644
index 00000000..d2f9a4f7
--- /dev/null
+++ b/domain/src/main/java/manager/NotificationManager.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package manager
+
+interface NotificationManager {
+
+ fun update(threadId: Long)
+
+ fun notifyFailed(threadId: Long)
+
+ fun createNotificationChannel(threadId: Long)
+
+ fun buildNotificationChannelId(threadId: Long): String
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/Optional.kt b/domain/src/main/java/manager/PermissionManager.kt
similarity index 88%
rename from qksms/src/main/java/common/util/Optional.kt
rename to domain/src/main/java/manager/PermissionManager.kt
index 98150640..675fba3c 100644
--- a/qksms/src/main/java/common/util/Optional.kt
+++ b/domain/src/main/java/manager/PermissionManager.kt
@@ -16,9 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
+package manager
-package common.util
+interface PermissionManager {
+
+ fun hasSmsAndContacts(): Boolean
-data class Optional(val value: T?) {
- fun notNull() = value != null
}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/model/MenuItem.kt b/domain/src/main/java/manager/WidgetManager.kt
similarity index 89%
rename from qksms/src/main/java/data/model/MenuItem.kt
rename to domain/src/main/java/manager/WidgetManager.kt
index cd4e06bf..f30fe599 100644
--- a/qksms/src/main/java/data/model/MenuItem.kt
+++ b/domain/src/main/java/manager/WidgetManager.kt
@@ -16,6 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package manager
-data class MenuItem(val title: String, val actionId: Int)
\ No newline at end of file
+interface WidgetManager {
+
+ fun updateUnreadCount(count: Int)
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/model/InboxItem.kt b/domain/src/main/java/mapper/CursorToContact.kt
similarity index 81%
rename from qksms/src/main/java/data/model/InboxItem.kt
rename to domain/src/main/java/mapper/CursorToContact.kt
index 78360e35..324d993b 100644
--- a/qksms/src/main/java/data/model/InboxItem.kt
+++ b/domain/src/main/java/mapper/CursorToContact.kt
@@ -16,9 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package mapper
-/**
- * Groups a conversation with its latest message into a single model
- */
-data class InboxItem(val conversation: Conversation, val message: Message)
\ No newline at end of file
+import android.database.Cursor
+import model.Contact
+
+interface CursorToContact : Mapper {
+
+ fun getContactsCursor(): Cursor
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/mapper/CursorToConversation.kt b/domain/src/main/java/mapper/CursorToConversation.kt
new file mode 100644
index 00000000..2509ddec
--- /dev/null
+++ b/domain/src/main/java/mapper/CursorToConversation.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package mapper
+
+import android.database.Cursor
+import model.Conversation
+
+interface CursorToConversation : Mapper {
+
+ fun getConversationsCursor(lastSync: Long = 0): Cursor
+
+ fun getConversationCursor(threadId: Long): Cursor
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/mapper/CursorToMessage.kt b/domain/src/main/java/mapper/CursorToMessage.kt
new file mode 100644
index 00000000..0de555b5
--- /dev/null
+++ b/domain/src/main/java/mapper/CursorToMessage.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package mapper
+
+import android.database.Cursor
+import android.provider.Telephony.*
+import model.Message
+import timber.log.Timber
+import java.util.*
+
+interface CursorToMessage : Mapper, Message> {
+
+ fun getMessagesCursor(): Cursor
+
+ fun getMessageCursor(id: Long): Cursor
+
+ class MessageColumns(private val cursor: Cursor) {
+
+ val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
+ val msgId by lazy { getColumnIndex(MmsSms._ID) }
+ val date by lazy { getColumnIndex(Mms.DATE) }
+ val dateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
+ val read by lazy { getColumnIndex(Mms.READ) }
+ val threadId by lazy { getColumnIndex(Mms.THREAD_ID) }
+ val locked by lazy { getColumnIndex(Mms.LOCKED) }
+
+ val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
+ val smsBody by lazy { getColumnIndex(Sms.BODY) }
+ val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
+ val smsType by lazy { getColumnIndex(Sms.TYPE) }
+ val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
+ val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
+
+ val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
+ val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
+ val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
+ val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
+ val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
+ val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
+ val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
+ val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
+ val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
+
+ private fun getColumnIndex(columnsName: String) = try {
+ cursor.getColumnIndexOrThrow(columnsName)
+ } catch (e: Exception) {
+ Timber.e("Couldn't find column \'$columnsName\' in ${Arrays.toString(cursor.columnNames)}")
+ -1
+ }
+ }
+}
diff --git a/domain/src/main/java/mapper/CursorToPart.kt b/domain/src/main/java/mapper/CursorToPart.kt
new file mode 100644
index 00000000..a9273313
--- /dev/null
+++ b/domain/src/main/java/mapper/CursorToPart.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package mapper
+
+import android.database.Cursor
+import model.MmsPart
+
+interface CursorToPart : Mapper {
+
+ fun getPartsCursor(messageId: Long): Cursor?
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/mapper/CursorToRecipient.kt b/domain/src/main/java/mapper/CursorToRecipient.kt
new file mode 100644
index 00000000..88b97325
--- /dev/null
+++ b/domain/src/main/java/mapper/CursorToRecipient.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package mapper
+
+import android.database.Cursor
+import model.Recipient
+
+interface CursorToRecipient : Mapper {
+
+ fun getRecipientCursor(): Cursor
+
+ fun getRecipientCursor(id: Long): Cursor
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/mapper/Mapper.kt b/domain/src/main/java/mapper/Mapper.kt
similarity index 97%
rename from qksms/src/main/java/data/mapper/Mapper.kt
rename to domain/src/main/java/mapper/Mapper.kt
index 7cbac38e..3c8ec609 100644
--- a/qksms/src/main/java/data/mapper/Mapper.kt
+++ b/domain/src/main/java/mapper/Mapper.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.mapper
+package mapper
interface Mapper {
diff --git a/qksms/src/main/java/data/model/Contact.kt b/domain/src/main/java/model/Contact.kt
similarity index 98%
rename from qksms/src/main/java/data/model/Contact.kt
rename to domain/src/main/java/model/Contact.kt
index 093c08bc..d97ee772 100644
--- a/qksms/src/main/java/data/model/Contact.kt
+++ b/domain/src/main/java/model/Contact.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import io.realm.RealmList
import io.realm.RealmObject
diff --git a/qksms/src/main/java/data/model/Conversation.kt b/domain/src/main/java/model/Conversation.kt
similarity index 98%
rename from qksms/src/main/java/data/model/Conversation.kt
rename to domain/src/main/java/model/Conversation.kt
index 1677f2cc..efb8cf45 100644
--- a/qksms/src/main/java/data/model/Conversation.kt
+++ b/domain/src/main/java/model/Conversation.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import android.telephony.PhoneNumberUtils
import io.realm.RealmList
diff --git a/qksms/src/main/java/data/model/Message.kt b/domain/src/main/java/model/Message.kt
similarity index 99%
rename from qksms/src/main/java/data/model/Message.kt
rename to domain/src/main/java/model/Message.kt
index 79a07070..6048c0d6 100644
--- a/qksms/src/main/java/data/model/Message.kt
+++ b/domain/src/main/java/model/Message.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import android.content.ContentUris
import android.net.Uri
diff --git a/qksms/src/main/java/data/model/MmsPart.kt b/domain/src/main/java/model/MmsPart.kt
similarity index 82%
rename from qksms/src/main/java/data/model/MmsPart.kt
rename to domain/src/main/java/model/MmsPart.kt
index aea1e645..7b9bbd7c 100644
--- a/qksms/src/main/java/data/model/MmsPart.kt
+++ b/domain/src/main/java/model/MmsPart.kt
@@ -16,9 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
-import com.google.android.mms.ContentType
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
@@ -31,10 +30,4 @@ open class MmsPart : RealmObject() {
var text: String? = null
var image: String? = null
- fun isSmil() = ContentType.APP_SMIL == type
-
- fun isImage() = ContentType.isImageType(type)
-
- fun isText() = ContentType.isTextType(type)
-
}
\ No newline at end of file
diff --git a/qksms/src/main/java/data/model/PhoneNumber.kt b/domain/src/main/java/model/PhoneNumber.kt
similarity index 97%
rename from qksms/src/main/java/data/model/PhoneNumber.kt
rename to domain/src/main/java/model/PhoneNumber.kt
index b2a8838e..5a641ff6 100644
--- a/qksms/src/main/java/data/model/PhoneNumber.kt
+++ b/domain/src/main/java/model/PhoneNumber.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import io.realm.RealmObject
diff --git a/qksms/src/main/java/data/model/Recipient.kt b/domain/src/main/java/model/Recipient.kt
similarity index 98%
rename from qksms/src/main/java/data/model/Recipient.kt
rename to domain/src/main/java/model/Recipient.kt
index ed164cbf..b38710be 100644
--- a/qksms/src/main/java/data/model/Recipient.kt
+++ b/domain/src/main/java/model/Recipient.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
diff --git a/qksms/src/main/java/data/model/SyncLog.kt b/domain/src/main/java/model/SyncLog.kt
similarity index 97%
rename from qksms/src/main/java/data/model/SyncLog.kt
rename to domain/src/main/java/model/SyncLog.kt
index 2b4152c7..2e017ef5 100644
--- a/qksms/src/main/java/data/model/SyncLog.kt
+++ b/domain/src/main/java/model/SyncLog.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package data.model
+package model
import io.realm.RealmObject
diff --git a/domain/src/main/java/repository/ContactRepository.kt b/domain/src/main/java/repository/ContactRepository.kt
new file mode 100644
index 00000000..bbdf968b
--- /dev/null
+++ b/domain/src/main/java/repository/ContactRepository.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package repository
+
+import android.net.Uri
+import io.reactivex.Flowable
+import io.reactivex.Single
+import model.Contact
+
+interface ContactRepository {
+
+ fun findContactUri(address: String): Single
+
+ fun getUnmanagedContacts(): Flowable>
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt
new file mode 100644
index 00000000..764a57dd
--- /dev/null
+++ b/domain/src/main/java/repository/MessageRepository.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package repository
+
+import io.reactivex.Flowable
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.realm.RealmResults
+import model.Conversation
+import model.Message
+import model.MmsPart
+
+interface MessageRepository {
+
+ fun getConversations(archived: Boolean = false): Flowable>>
+
+ fun getBlockedConversations(): Flowable>
+
+ fun getConversationAsync(threadId: Long): Conversation
+
+ fun getConversation(threadId: Long): Conversation?
+
+ fun getOrCreateConversation(threadId: Long): Conversation?
+
+ fun getOrCreateConversation(address: String): Maybe
+
+ fun getOrCreateConversation(addresses: List): Maybe
+
+ fun saveDraft(threadId: Long, draft: String)
+
+ fun getMessages(threadId: Long): RealmResults
+
+ fun getMessage(id: Long): Message?
+
+ fun getMessageForPart(id: Long): Message?
+
+ fun getUnreadMessageCount(): Long
+
+ fun getPart(id: Long): MmsPart?
+
+ fun getPartsForConversation(threadId: Long): Observable>
+
+ /**
+ * Retrieves the list of messages which should be shown in the notification
+ * for a given conversation
+ */
+ fun getUnreadUnseenMessages(threadId: Long): RealmResults
+
+ fun markArchived(threadId: Long)
+
+ fun markUnarchived(threadId: Long)
+
+ fun markBlocked(threadId: Long)
+
+ fun markUnblocked(threadId: Long)
+
+ fun markAllSeen()
+
+ fun markSeen(threadId: Long)
+
+ fun markRead(threadId: Long)
+
+ /**
+ * Persists the SMS and attempts to send it
+ */
+ fun sendSmsAndPersist(threadId: Long, address: String, body: String)
+
+ /**
+ * Attempts to send the SMS message. This can be called if the message has already been persisted
+ */
+ fun sendSms(message: Message)
+
+ fun insertSentSms(threadId: Long, address: String, body: String): Message
+
+ fun insertReceivedSms(address: String, body: String, sentTime: Long): Message
+
+ /**
+ * Marks the message as sending, in case we need to retry sending it
+ */
+ fun markSending(id: Long)
+
+ fun markSent(id: Long)
+
+ fun markFailed(id: Long, resultCode: Int)
+
+ fun markDelivered(id: Long)
+
+ fun markDeliveryFailed(id: Long, resultCode: Int)
+
+ fun deleteMessage(messageId: Long)
+
+ fun deleteConversation(threadId: Long)
+
+}
\ No newline at end of file
diff --git a/domain/src/main/java/repository/SyncRepository.kt b/domain/src/main/java/repository/SyncRepository.kt
new file mode 100644
index 00000000..ba3da334
--- /dev/null
+++ b/domain/src/main/java/repository/SyncRepository.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package repository
+
+import android.net.Uri
+import io.reactivex.Flowable
+import model.Message
+
+interface SyncRepository {
+
+ fun syncMessages(fullSync: Boolean = false)
+
+ fun syncMessage(uri: Uri): Flowable
+
+ fun syncContacts()
+
+}
\ No newline at end of file
diff --git a/qksms/build.gradle b/presentation/build.gradle
similarity index 88%
rename from qksms/build.gradle
rename to presentation/build.gradle
index fd3d9baa..a5349414 100644
--- a/qksms/build.gradle
+++ b/presentation/build.gradle
@@ -87,36 +87,41 @@ dependencies {
implementation "com.uber.autodispose:autodispose-android-kotlin:$autodispose_version"
implementation "com.uber.autodispose:autodispose-kotlin:$autodispose_version"
+ // dagger
+ implementation "com.google.dagger:dagger:$dagger_version"
+ kapt "com.google.dagger:dagger-compiler:$dagger_version"
+ provided "javax.annotation:jsr250-api:1.0"
+
// realm
implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false }
kapt "io.realm:realm-annotations:$realm_version"
kapt "io.realm:realm-annotations-processor:$realm_version"
+ // rxjava
+ implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+ implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+ implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+
androidTestCompile("com.android.support.test.espresso:espresso-core:2.2.2", {
exclude group: "com.android.support", module: "support-annotations"
})
- implementation "androidx.core:core-ktx:0.2"
+ implementation "androidx.core:core-ktx:$ktx_version"
implementation "com.android.billingclient:billing:1.0"
implementation "com.bugsnag:bugsnag-android:4.1.1"
implementation "com.github.chrisbanes:PhotoView:2.0.0"
- implementation "com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3"
+ implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
implementation "com.github.bumptech.glide:glide:4.3.0"
implementation "com.google.android:flexbox:0.3.1"
- implementation "com.google.dagger:dagger:2.11"
- implementation "com.jakewharton.timber:timber:4.5.1"
+ implementation "com.jakewharton.timber:timber:$timber_version"
implementation "com.mlsdev.rximagepicker:library:2.0.2"
- implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
- implementation "io.reactivex.rxjava2:rxjava:2.1.4"
- implementation "io.reactivex.rxjava2:rxkotlin:2.1.0"
- implementation "me.leolin:ShortcutBadger:1.1.21"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation project(":android-smsmms")
+ implementation project(':data')
+ implementation project(':domain')
kapt "com.github.bumptech.glide:compiler:4.3.0"
- kapt "com.google.dagger:dagger-compiler:2.11"
testCompile "com.android.support.test:runner:1.0.1"
testCompile "junit:junit:4.12"
testCompile "org.mockito:mockito-core:1.10.19"
- provided "javax.annotation:jsr250-api:1.0"
withAnalyticsCompile "com.amplitude:android-sdk:2.16.0"
withAnalyticsCompile "com.mixpanel.android:mixpanel-android:5.2.1"
}
diff --git a/qksms/proguard-rules.pro b/presentation/proguard-rules.pro
similarity index 100%
rename from qksms/proguard-rules.pro
rename to presentation/proguard-rules.pro
diff --git a/qksms/src/androidTest/java/MessageStoreTest.kt b/presentation/src/androidTest/java/MessageStoreTest.kt
similarity index 100%
rename from qksms/src/androidTest/java/MessageStoreTest.kt
rename to presentation/src/androidTest/java/MessageStoreTest.kt
diff --git a/qksms/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
similarity index 95%
rename from qksms/src/main/AndroidManifest.xml
rename to presentation/src/main/AndroidManifest.xml
index faa6bfc9..77ef3d8c 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -97,8 +97,12 @@
-
-
+
+
diff --git a/qksms/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt
similarity index 95%
rename from qksms/src/main/java/common/QKApplication.kt
rename to presentation/src/main/java/common/QKApplication.kt
index 6f7e40c5..dc03e749 100644
--- a/qksms/src/main/java/common/QKApplication.kt
+++ b/presentation/src/main/java/common/QKApplication.kt
@@ -27,7 +27,7 @@ import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
import common.di.AppComponentManager
import common.di.appComponent
-import common.util.Analytics
+import manager.AnalyticsManager
import io.realm.Realm
import io.realm.RealmConfiguration
import timber.log.Timber
@@ -40,7 +40,7 @@ class QKApplication : Application() {
* Inject this so that it is forced to initialize
*/
@Suppress("unused")
- @Inject lateinit var analytics: Analytics
+ @Inject lateinit var analyticsManager: AnalyticsManager
override fun onCreate() {
super.onCreate()
diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/presentation/src/main/java/common/di/AppComponent.kt
similarity index 78%
rename from qksms/src/main/java/common/di/AppComponent.kt
rename to presentation/src/main/java/common/di/AppComponent.kt
index a3d7866c..0032791c 100644
--- a/qksms/src/main/java/common/di/AppComponent.kt
+++ b/presentation/src/main/java/common/di/AppComponent.kt
@@ -21,7 +21,14 @@ package common.di
import common.QKApplication
import common.util.ContactImageLoader
import dagger.Component
-import presentation.common.widget.*
+import presentation.common.widget.AvatarView
+import presentation.common.widget.MmsPreviewView
+import presentation.common.widget.PagerTitleView
+import presentation.common.widget.PreferenceView
+import presentation.common.widget.QkEditText
+import presentation.common.widget.QkSwitch
+import presentation.common.widget.QkTextView
+import presentation.common.widget.Separator
import presentation.feature.blocked.BlockedActivity
import presentation.feature.blocked.BlockedViewModel
import presentation.feature.compose.ComposeActivity
@@ -43,7 +50,18 @@ import presentation.feature.setup.SetupActivity
import presentation.feature.setup.SetupViewModel
import presentation.feature.themepicker.ThemePickerActivity
import presentation.feature.themepicker.ThemePickerViewModel
-import presentation.receiver.*
+import presentation.receiver.DefaultSmsChangedReceiver
+import presentation.receiver.MarkReadReceiver
+import presentation.receiver.MarkSeenReceiver
+import presentation.receiver.MmsReceivedReceiver
+import presentation.receiver.MmsSentReceiver
+import presentation.receiver.MmsUpdatedReceiver
+import presentation.receiver.NightModeReceiver
+import presentation.receiver.RemoteMessagingReceiver
+import presentation.receiver.SmsDeliveredReceiver
+import presentation.receiver.SmsProviderChangedReceiver
+import presentation.receiver.SmsReceiver
+import presentation.receiver.SmsSentReceiver
import javax.inject.Singleton
@Singleton
@@ -64,8 +82,8 @@ interface AppComponent {
fun inject(activity: ThemePickerActivity)
fun inject(receiver: DefaultSmsChangedReceiver)
- fun inject(receiver: MessageDeliveredReceiver)
- fun inject(receiver: MessageSentReceiver)
+ fun inject(receiver: SmsDeliveredReceiver)
+ fun inject(receiver: SmsSentReceiver)
fun inject(receiver: MarkSeenReceiver)
fun inject(receiver: MarkReadReceiver)
fun inject(receiver: MmsReceivedReceiver)
diff --git a/qksms/src/main/java/common/di/AppComponentManager.kt b/presentation/src/main/java/common/di/AppComponentManager.kt
similarity index 100%
rename from qksms/src/main/java/common/di/AppComponentManager.kt
rename to presentation/src/main/java/common/di/AppComponentManager.kt
diff --git a/presentation/src/main/java/common/di/AppModule.kt b/presentation/src/main/java/common/di/AppModule.kt
new file mode 100644
index 00000000..57d17b4d
--- /dev/null
+++ b/presentation/src/main/java/common/di/AppModule.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2017 Moez Bhatti
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS. If not, see .
+ */
+package common.di
+
+import android.app.Application
+import android.content.Context
+import android.preference.PreferenceManager
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import common.util.AnalyticsManagerImpl
+import common.util.NotificationManagerImpl
+import dagger.Module
+import dagger.Provides
+import manager.AnalyticsManager
+import manager.KeyManager
+import manager.KeyManagerImpl
+import manager.NotificationManager
+import manager.PermissionManager
+import manager.PermissionManagerImpl
+import manager.WidgetManager
+import manager.WidgetManagerImpl
+import mapper.CursorToContact
+import mapper.CursorToContactImpl
+import mapper.CursorToConversation
+import mapper.CursorToConversationImpl
+import mapper.CursorToMessage
+import mapper.CursorToMessageImpl
+import mapper.CursorToPart
+import mapper.CursorToPartImpl
+import mapper.CursorToRecipienImpl
+import mapper.CursorToRecipient
+import repository.ContactRepository
+import repository.ContactRepositoryImpl
+import repository.MessageRepository
+import repository.MessageRepositoryImpl
+import repository.SyncRepository
+import repository.SyncRepositoryImpl
+import javax.inject.Singleton
+
+@Module
+class AppModule(private var application: Application) {
+
+ @Provides
+ @Singleton
+ fun provideContext(): Context {
+ return application
+ }
+
+ @Provides
+ @Singleton
+ fun provideRxPreferences(context: Context): RxSharedPreferences {
+ val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+ return RxSharedPreferences.create(preferences)
+ }
+
+ // Manager
+
+ @Provides
+ fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager
+
+ @Provides
+ fun provideKeyManager(manager: KeyManagerImpl): KeyManager = manager
+
+ @Provides
+ fun provideNotificationsManager(manager: NotificationManagerImpl): NotificationManager = manager
+
+ @Provides
+ fun providePermissionsManager(manager: PermissionManagerImpl): PermissionManager = manager
+
+ @Provides
+ fun provideWidgetManager(manager: WidgetManagerImpl): WidgetManager = manager
+
+
+ // Mapper
+
+ @Provides
+ fun provideCursorToContact(mapper: CursorToContactImpl): CursorToContact = mapper
+
+ @Provides
+ fun provideCursorToConversation(mapper: CursorToConversationImpl): CursorToConversation = mapper
+
+ @Provides
+ fun provideCursorToMessage(mapper: CursorToMessageImpl): CursorToMessage = mapper
+
+ @Provides
+ fun provideCursorToPart(mapper: CursorToPartImpl): CursorToPart = mapper
+
+ @Provides
+ fun provideCursorToRecipient(mapper: CursorToRecipienImpl): CursorToRecipient = mapper
+
+
+ // Repository
+
+ @Provides
+ fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository
+
+ @Provides
+ fun provideMessageRepository(repository: MessageRepositoryImpl): MessageRepository = repository
+
+ @Provides
+ fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository
+
+}
\ No newline at end of file
diff --git a/qksms/src/main/java/common/util/BillingManager.kt b/presentation/src/main/java/common/util/BillingManager.kt
similarity index 92%
rename from qksms/src/main/java/common/util/BillingManager.kt
rename to presentation/src/main/java/common/util/BillingManager.kt
index a74bbfe5..00efe90b 100644
--- a/qksms/src/main/java/common/util/BillingManager.kt
+++ b/presentation/src/main/java/common/util/BillingManager.kt
@@ -20,9 +20,15 @@ package common.util
import android.app.Activity
import android.content.Context
-import com.android.billingclient.api.*
+import com.android.billingclient.api.BillingClient
import com.android.billingclient.api.BillingClient.BillingResponse
import com.android.billingclient.api.BillingClient.SkuType
+import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.PurchasesUpdatedListener
+import com.android.billingclient.api.SkuDetails
+import com.android.billingclient.api.SkuDetailsParams
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
diff --git a/qksms/src/main/java/common/util/ClipboardUtils.kt b/presentation/src/main/java/common/util/ClipboardUtils.kt
similarity index 100%
rename from qksms/src/main/java/common/util/ClipboardUtils.kt
rename to presentation/src/main/java/common/util/ClipboardUtils.kt
diff --git a/qksms/src/main/java/common/util/Colors.kt b/presentation/src/main/java/common/util/Colors.kt
similarity index 99%
rename from qksms/src/main/java/common/util/Colors.kt
rename to presentation/src/main/java/common/util/Colors.kt
index de42e3cd..299c8540 100644
--- a/qksms/src/main/java/common/util/Colors.kt
+++ b/presentation/src/main/java/common/util/Colors.kt
@@ -27,6 +27,7 @@ import android.view.View
import com.moez.QKSMS.R
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
+import util.Preferences
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/qksms/src/main/java/common/util/ContactImageLoader.kt b/presentation/src/main/java/common/util/ContactImageLoader.kt
similarity index 98%
rename from qksms/src/main/java/common/util/ContactImageLoader.kt
rename to presentation/src/main/java/common/util/ContactImageLoader.kt
index 361c48a2..4d07f8fb 100644
--- a/qksms/src/main/java/common/util/ContactImageLoader.kt
+++ b/presentation/src/main/java/common/util/ContactImageLoader.kt
@@ -30,9 +30,9 @@ import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import common.di.appComponent
-import data.repository.ContactRepository
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
+import repository.ContactRepository
import java.io.InputStream
import java.security.MessageDigest
import javax.inject.Inject
@@ -60,6 +60,7 @@ class ContactImageLoader(val context: Context) : ModelLoader {
@Inject lateinit var contactRepo: ContactRepository
+
private var loadPhotoDisposable: Disposable? = null
init {
diff --git a/qksms/src/main/java/common/util/DateFormatter.kt b/presentation/src/main/java/common/util/DateFormatter.kt
similarity index 100%
rename from qksms/src/main/java/common/util/DateFormatter.kt
rename to presentation/src/main/java/common/util/DateFormatter.kt
diff --git a/qksms/src/main/java/common/util/FontProvider.kt b/presentation/src/main/java/common/util/FontProvider.kt
similarity index 100%
rename from qksms/src/main/java/common/util/FontProvider.kt
rename to presentation/src/main/java/common/util/FontProvider.kt
diff --git a/qksms/src/main/java/common/util/GlideAppModule.kt b/presentation/src/main/java/common/util/GlideAppModule.kt
similarity index 100%
rename from qksms/src/main/java/common/util/GlideAppModule.kt
rename to presentation/src/main/java/common/util/GlideAppModule.kt
diff --git a/qksms/src/main/java/common/util/LiveRealmData.kt b/presentation/src/main/java/common/util/LiveRealmData.kt
similarity index 100%
rename from qksms/src/main/java/common/util/LiveRealmData.kt
rename to presentation/src/main/java/common/util/LiveRealmData.kt
diff --git a/qksms/src/main/java/common/util/NightModeManager.kt b/presentation/src/main/java/common/util/NightModeManager.kt
similarity index 99%
rename from qksms/src/main/java/common/util/NightModeManager.kt
rename to presentation/src/main/java/common/util/NightModeManager.kt
index bf292254..10518a7e 100644
--- a/qksms/src/main/java/common/util/NightModeManager.kt
+++ b/presentation/src/main/java/common/util/NightModeManager.kt
@@ -23,6 +23,7 @@ import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import presentation.receiver.NightModeReceiver
+import util.Preferences
import java.util.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/qksms/src/main/java/common/util/NotificationManager.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt
similarity index 96%
rename from qksms/src/main/java/common/util/NotificationManager.kt
rename to presentation/src/main/java/common/util/NotificationManagerImpl.kt
index 6fec6e45..63f7ae9e 100644
--- a/qksms/src/main/java/common/util/NotificationManager.kt
+++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt
@@ -32,21 +32,22 @@ import android.support.v4.app.NotificationManagerCompat
import android.support.v4.app.RemoteInput
import android.support.v4.app.TaskStackBuilder
import com.moez.QKSMS.R
-import data.repository.MessageRepository
import presentation.feature.compose.ComposeActivity
import presentation.receiver.MarkReadReceiver
import presentation.receiver.MarkSeenReceiver
import presentation.receiver.RemoteMessagingReceiver
+import repository.MessageRepository
+import util.Preferences
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class NotificationManager @Inject constructor(
+class NotificationManagerImpl @Inject constructor(
private val context: Context,
private val prefs: Preferences,
private val colors: Colors,
private val messageRepo: MessageRepository
-) {
+): manager.NotificationManager {
companion object {
const val DEFAULT_CHANNEL_ID = "notifications_default"
@@ -74,7 +75,7 @@ class NotificationManager @Inject constructor(
/**
* Updates the notification for a particular conversation
*/
- fun update(threadId: Long) {
+ override fun update(threadId: Long) {
// If notifications are disabled, don't do anything
if (!prefs.notifications(threadId).get()) {
return
@@ -130,7 +131,7 @@ class NotificationManager @Inject constructor(
notificationManager.notify(threadId.toInt(), notification.build())
}
- fun notifyFailed(msgId: Long) {
+ override fun notifyFailed(msgId: Long) {
val message = messageRepo.getMessage(msgId)
if (message == null || !message.isFailedMessage()) {
@@ -183,7 +184,7 @@ class NotificationManager @Inject constructor(
/**
* Creates a notification channel for the given conversation
*/
- fun createNotificationChannel(threadId: Long) {
+ override fun createNotificationChannel(threadId: Long) {
// Only proceed if the android version supports notification channels
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
@@ -241,7 +242,7 @@ class NotificationManager @Inject constructor(
/**
* Formats a notification channel id for a given thread id, whether the channel exists or not
*/
- fun buildNotificationChannelId(threadId: Long): String {
+ override fun buildNotificationChannelId(threadId: Long): String {
return when (threadId) {
0L -> DEFAULT_CHANNEL_ID
else -> "notifications_$threadId"
diff --git a/qksms/src/main/java/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/common/util/extensions/CalendarExtensions.kt
similarity index 100%
rename from qksms/src/main/java/common/util/extensions/CalendarExtensions.kt
rename to presentation/src/main/java/common/util/extensions/CalendarExtensions.kt
diff --git a/qksms/src/main/java/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/common/util/extensions/ContextExtensions.kt
similarity index 100%
rename from qksms/src/main/java/common/util/extensions/ContextExtensions.kt
rename to presentation/src/main/java/common/util/extensions/ContextExtensions.kt
diff --git a/qksms/src/main/java/common/util/extensions/NumberExtensions.kt b/presentation/src/main/java/common/util/extensions/NumberExtensions.kt
similarity index 100%
rename from qksms/src/main/java/common/util/extensions/NumberExtensions.kt
rename to presentation/src/main/java/common/util/extensions/NumberExtensions.kt
diff --git a/qksms/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt
similarity index 100%
rename from qksms/src/main/java/common/util/extensions/ViewExtensions.kt
rename to presentation/src/main/java/common/util/extensions/ViewExtensions.kt
diff --git a/qksms/src/main/java/common/util/filter/ContactFilter.kt b/presentation/src/main/java/common/util/filter/ContactFilter.kt
similarity index 97%
rename from qksms/src/main/java/common/util/filter/ContactFilter.kt
rename to presentation/src/main/java/common/util/filter/ContactFilter.kt
index e2d8aebd..122311c4 100644
--- a/qksms/src/main/java/common/util/filter/ContactFilter.kt
+++ b/presentation/src/main/java/common/util/filter/ContactFilter.kt
@@ -18,7 +18,7 @@
*/
package common.util.filter
-import data.model.Contact
+import model.Contact
import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() {
diff --git a/qksms/src/main/java/common/util/filter/ConversationFilter.kt b/presentation/src/main/java/common/util/filter/ConversationFilter.kt
similarity index 97%
rename from qksms/src/main/java/common/util/filter/ConversationFilter.kt
rename to presentation/src/main/java/common/util/filter/ConversationFilter.kt
index 4ec55f9c..fcc0bdbf 100644
--- a/qksms/src/main/java/common/util/filter/ConversationFilter.kt
+++ b/presentation/src/main/java/common/util/filter/ConversationFilter.kt
@@ -18,7 +18,7 @@
*/
package common.util.filter
-import data.model.Conversation
+import model.Conversation
import javax.inject.Inject
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() {
diff --git a/qksms/src/main/java/common/util/filter/Filter.kt b/presentation/src/main/java/common/util/filter/Filter.kt
similarity index 100%
rename from qksms/src/main/java/common/util/filter/Filter.kt
rename to presentation/src/main/java/common/util/filter/Filter.kt
diff --git a/qksms/src/main/java/common/util/filter/PhoneNumberFilter.kt b/presentation/src/main/java/common/util/filter/PhoneNumberFilter.kt
similarity index 100%
rename from qksms/src/main/java/common/util/filter/PhoneNumberFilter.kt
rename to presentation/src/main/java/common/util/filter/PhoneNumberFilter.kt
diff --git a/qksms/src/main/java/common/util/filter/RecipientFilter.kt b/presentation/src/main/java/common/util/filter/RecipientFilter.kt
similarity index 97%
rename from qksms/src/main/java/common/util/filter/RecipientFilter.kt
rename to presentation/src/main/java/common/util/filter/RecipientFilter.kt
index 630487ea..cbd27664 100644
--- a/qksms/src/main/java/common/util/filter/RecipientFilter.kt
+++ b/presentation/src/main/java/common/util/filter/RecipientFilter.kt
@@ -18,7 +18,7 @@
*/
package common.util.filter
-import data.model.Recipient
+import model.Recipient
import javax.inject.Inject
class RecipientFilter @Inject constructor(
diff --git a/qksms/src/main/java/interactor/MigratePreferences.kt b/presentation/src/main/java/interactor/MigratePreferences.kt
similarity index 99%
rename from qksms/src/main/java/interactor/MigratePreferences.kt
rename to presentation/src/main/java/interactor/MigratePreferences.kt
index ab32806f..ffbea53f 100644
--- a/qksms/src/main/java/interactor/MigratePreferences.kt
+++ b/presentation/src/main/java/interactor/MigratePreferences.kt
@@ -20,7 +20,7 @@ package interactor
import com.f2prateek.rx.preferences2.RxSharedPreferences
import common.util.NightModeManager
-import common.util.Preferences
+import util.Preferences
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/interactor/ReceiveMms.kt b/presentation/src/main/java/interactor/ReceiveMms.kt
similarity index 90%
rename from qksms/src/main/java/interactor/ReceiveMms.kt
rename to presentation/src/main/java/interactor/ReceiveMms.kt
index 768e1ceb..3aa7eaf0 100644
--- a/qksms/src/main/java/interactor/ReceiveMms.kt
+++ b/presentation/src/main/java/interactor/ReceiveMms.kt
@@ -19,15 +19,15 @@
package interactor
import android.net.Uri
-import common.util.NotificationManager
-import common.util.SyncManager
-import common.util.extensions.mapNotNull
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import manager.NotificationManager
+import repository.MessageRepository
+import repository.SyncRepository
+import util.extensions.mapNotNull
import javax.inject.Inject
class ReceiveMms @Inject constructor(
- private val syncManager: SyncManager,
+ private val syncManager: SyncRepository,
private val messageRepo: MessageRepository,
private val notificationManager: NotificationManager,
private val updateBadge: UpdateBadge
diff --git a/qksms/src/main/java/interactor/ReceiveSms.kt b/presentation/src/main/java/interactor/ReceiveSms.kt
similarity index 95%
rename from qksms/src/main/java/interactor/ReceiveSms.kt
rename to presentation/src/main/java/interactor/ReceiveSms.kt
index 80d0f191..c9beec5c 100644
--- a/qksms/src/main/java/interactor/ReceiveSms.kt
+++ b/presentation/src/main/java/interactor/ReceiveSms.kt
@@ -19,10 +19,10 @@
package interactor
import android.telephony.SmsMessage
-import common.util.NotificationManager
-import common.util.extensions.mapNotNull
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import manager.NotificationManager
+import repository.MessageRepository
+import util.extensions.mapNotNull
import javax.inject.Inject
class ReceiveSms @Inject constructor(
diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/presentation/src/main/java/interactor/SendMessage.kt
similarity index 98%
rename from qksms/src/main/java/interactor/SendMessage.kt
rename to presentation/src/main/java/interactor/SendMessage.kt
index 24df87ba..a017c6bf 100644
--- a/qksms/src/main/java/interactor/SendMessage.kt
+++ b/presentation/src/main/java/interactor/SendMessage.kt
@@ -25,9 +25,9 @@ import com.klinker.android.send_message.Message
import com.klinker.android.send_message.Settings
import com.klinker.android.send_message.Transaction
import com.mlsdev.rximagepicker.RxImageConverters
-import common.util.Preferences
-import data.repository.MessageRepository
import io.reactivex.Flowable
+import repository.MessageRepository
+import util.Preferences
import java.io.ByteArrayOutputStream
import javax.inject.Inject
diff --git a/qksms/src/main/java/presentation/common/GlideCompletionListener.kt b/presentation/src/main/java/presentation/common/GlideCompletionListener.kt
similarity index 100%
rename from qksms/src/main/java/presentation/common/GlideCompletionListener.kt
rename to presentation/src/main/java/presentation/common/GlideCompletionListener.kt
diff --git a/qksms/src/main/java/presentation/common/MenuItemAdapter.kt b/presentation/src/main/java/presentation/common/MenuItemAdapter.kt
similarity index 98%
rename from qksms/src/main/java/presentation/common/MenuItemAdapter.kt
rename to presentation/src/main/java/presentation/common/MenuItemAdapter.kt
index 4ae643d2..310b3c56 100644
--- a/qksms/src/main/java/presentation/common/MenuItemAdapter.kt
+++ b/presentation/src/main/java/presentation/common/MenuItemAdapter.kt
@@ -28,7 +28,6 @@ import com.moez.QKSMS.R
import common.util.Colors
import common.util.extensions.setTint
import common.util.extensions.setVisible
-import data.model.MenuItem
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
@@ -38,6 +37,8 @@ import presentation.common.base.QkAdapter
import presentation.common.base.QkViewHolder
import javax.inject.Inject
+data class MenuItem(val title: String, val actionId: Int)
+
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter