From 5a8b8f36eefdc17a24ac4ed799c0429d7331c92f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 14:20:13 -0400 Subject: [PATCH 01/18] Reorganize packages --- qksms/src/main/AndroidManifest.xml | 6 +++--- .../com/moez/QKSMS/{ => common}/QKApplication.kt | 4 ++-- .../QKSMS/{dagger => common/di}/AppComponent.kt | 16 ++++++++-------- .../{dagger => common/di}/AppComponentManager.kt | 4 ++-- .../QKSMS/{dagger => common/di}/AppModule.kt | 8 ++++---- .../QKSMS/{ => common}/util/DateFormatter.kt | 8 ++++---- .../QKSMS/{ => common}/util/LiveRealmData.kt | 2 +- .../{ => common}/util/NotificationManager.kt | 4 ++-- .../moez/QKSMS/{ => common}/util/ThemeManager.kt | 2 +- .../util/extensions/CalendarExtensions.kt | 2 +- .../util/extensions/ContextExtensions.kt | 2 +- .../util/extensions/CursorExtensions.kt | 2 +- .../util/extensions/NumberExtensions.kt | 2 +- .../util/extensions/RealmExtensions.kt | 2 +- .../util/extensions/ViewExtensions.kt | 2 +- .../QKSMS/data/repository/MessageRepository.kt | 6 +++--- .../java/com/moez/QKSMS/data/sync/SyncManager.kt | 2 +- .../{ui => presentation}/base/QkActivity.kt | 2 +- .../conversations/ConversationAdapter.kt | 12 ++++++------ .../conversations/ConversationListActivity.kt | 6 +++--- .../conversations/ConversationListViewModel.kt | 6 +++--- .../conversations/ConversationListViewState.kt | 2 +- .../conversations/ConversationViewHolder.kt | 4 ++-- .../messages/MessageAdapter.kt | 14 +++++++------- .../messages/MessageListActivity.kt | 10 +++++----- .../messages/MessageListViewModel.kt | 5 +++-- .../messages/MessageListViewState.kt | 2 +- .../messages/MessageViewHolder.kt | 4 ++-- .../{ui => presentation}/view/AvatarView.kt | 6 +++--- .../{ui => presentation}/view/GroupAvatarView.kt | 2 +- .../com/moez/QKSMS/receiver/MarkReadReceiver.kt | 2 +- .../com/moez/QKSMS/receiver/MarkSeenReceiver.kt | 2 +- .../moez/QKSMS/receiver/MessageSentReceiver.kt | 2 +- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 4 ++-- .../java/com/moez/QKSMS/receiver/SmsReceiver.kt | 2 +- qksms/src/main/res/layout/avatar_view.xml | 2 +- .../main/res/layout/conversation_list_item.xml | 2 +- .../res/layout/conversation_list_item_unread.xml | 2 +- qksms/src/main/res/layout/group_avatar_view.xml | 8 ++++---- .../src/main/res/layout/message_list_item_in.xml | 2 +- 40 files changed, 89 insertions(+), 88 deletions(-) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/QKApplication.kt (87%) rename qksms/src/main/java/com/moez/QKSMS/{dagger => common/di}/AppComponent.kt (60%) rename qksms/src/main/java/com/moez/QKSMS/{dagger => common/di}/AppComponentManager.kt (79%) rename qksms/src/main/java/com/moez/QKSMS/{dagger => common/di}/AppModule.kt (88%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/DateFormatter.kt (87%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/LiveRealmData.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/NotificationManager.kt (97%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/ThemeManager.kt (74%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/CalendarExtensions.kt (91%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/ContextExtensions.kt (79%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/CursorExtensions.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/NumberExtensions.kt (83%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/RealmExtensions.kt (81%) rename qksms/src/main/java/com/moez/QKSMS/{ => common}/util/extensions/ViewExtensions.kt (95%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/base/QkActivity.kt (95%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/conversations/ConversationAdapter.kt (88%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/conversations/ConversationListActivity.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/conversations/ConversationListViewModel.kt (89%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/conversations/ConversationListViewState.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/conversations/ConversationViewHolder.kt (80%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/messages/MessageAdapter.kt (93%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/messages/MessageListActivity.kt (92%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/messages/MessageListViewModel.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/messages/MessageListViewState.kt (96%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/messages/MessageViewHolder.kt (83%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/view/AvatarView.kt (91%) rename qksms/src/main/java/com/moez/QKSMS/{ui => presentation}/view/GroupAvatarView.kt (97%) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index d4877afc..65feacb7 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ @@ -44,7 +44,7 @@ - + diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt similarity index 96% rename from qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt index 974e46f6..781ae5c3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.ui.messages +package com.moez.QKSMS.presentation.messages import com.moez.QKSMS.data.model.Message import io.realm.RealmResults diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt similarity index 83% rename from qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt index 9aaf45b6..a8445aee 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt @@ -1,10 +1,10 @@ -package com.moez.QKSMS.ui.messages +package com.moez.QKSMS.presentation.messages import android.support.v7.widget.RecyclerView import android.view.View import android.widget.TextView import com.moez.QKSMS.R -import com.moez.QKSMS.ui.view.AvatarView +import com.moez.QKSMS.presentation.view.AvatarView class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt similarity index 91% rename from qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index cbc3560f..d6cafc81 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.ui.view +package com.moez.QKSMS.presentation.view import android.content.Context import android.content.res.ColorStateList @@ -6,10 +6,10 @@ import android.util.AttributeSet import android.view.View import android.widget.FrameLayout import com.moez.QKSMS.R -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.repository.ContactRepository -import com.moez.QKSMS.util.extensions.getColorCompat +import com.moez.QKSMS.common.util.extensions.getColorCompat import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.avatar_view.view.* import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt index f9fe522a..0d0eaf7f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.ui.view +package com.moez.QKSMS.presentation.view import android.content.Context import android.support.constraint.ConstraintLayout diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index d223af28..0669819d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index a1043eea..0715cbaa 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt index 80e49330..63b76728 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt @@ -6,7 +6,7 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.telephony.SmsManager -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index b69d16ce..5912e851 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -4,9 +4,9 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.support.v4.app.RemoteInput -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository -import com.moez.QKSMS.util.NotificationManager +import com.moez.QKSMS.common.util.NotificationManager import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 1c4b1096..43fd772e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.provider.Telephony.Sms -import com.moez.QKSMS.dagger.AppComponentManager +import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository import timber.log.Timber import javax.inject.Inject diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index d2d6715f..85947859 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:background="@color/list_separator" - tools:parentTag="com.moez.QKSMS.ui.view.AvatarView"> + tools:parentTag="com.moez.QKSMS.presentation.view.AvatarView"> - - + tools:parentTag="com.moez.QKSMS.presentation.view.GroupAvatarView"> - - - - Date: Fri, 29 Sep 2017 14:20:29 -0400 Subject: [PATCH 02/18] Upgrade kotlin version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1ceb7cfc..ac8f3198 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.4-3' + ext.kotlin_version = '1.1.50' repositories { maven { url 'https://maven.google.com' } jcenter() From f8743e326f5e9b5a3381a0be518c7171145beb80 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 14:20:53 -0400 Subject: [PATCH 03/18] Apply kotlin-kapt plugin --- qksms/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qksms/build.gradle b/qksms/build.gradle index 51ec3058..223e2a9c 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.application' apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' android { compileSdkVersion 26 @@ -55,7 +56,3 @@ dependencies { kapt 'io.realm:realm-annotations-processor:3.7.0' provided 'javax.annotation:jsr250-api:1.0' } - -kapt { - generateStubs = true -} From a73f8081af4972ae22bd1a99fe187901d21c7c3a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 17:16:19 -0400 Subject: [PATCH 04/18] Use @Inject constructors instead of providing deps in Module --- qksms/build.gradle | 1 - .../com/moez/QKSMS/common/di/AppModule.kt | 44 +-------------- .../moez/QKSMS/common/util/DateFormatter.kt | 5 +- .../QKSMS/common/util/NotificationManager.kt | 8 ++- .../moez/QKSMS/common/util/ThemeManager.kt | 6 ++- .../data/datasource/MessageTransaction.kt | 15 ++++++ .../native/NativeMessageTransaction.kt | 46 ++++++++++++++++ .../realm/RealmMessageTransaction.kt | 47 ++++++++++++++++ .../data/repository/ContactRepository.kt | 6 ++- .../data/repository/MessageRepository.kt | 53 +++++-------------- .../com/moez/QKSMS/data/sync/SyncManager.kt | 7 ++- .../ConversationListViewModel.kt | 2 - .../QKSMS/receiver/RemoteMessagingReceiver.kt | 2 - 13 files changed, 147 insertions(+), 95 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt diff --git a/qksms/build.gradle b/qksms/build.gradle index 223e2a9c..5758745c 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -31,7 +31,6 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt index 147cd24c..b8f89149 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt @@ -2,18 +2,12 @@ package com.moez.QKSMS.common.di import android.app.Application import android.content.Context -import com.moez.QKSMS.common.util.DateFormatter -import com.moez.QKSMS.common.util.NotificationManager -import com.moez.QKSMS.common.util.ThemeManager -import com.moez.QKSMS.data.repository.ContactRepository -import com.moez.QKSMS.data.repository.MessageRepository -import com.moez.QKSMS.data.sync.SyncManager import dagger.Module import dagger.Provides import javax.inject.Singleton @Module -class AppModule(var application: Application) { +class AppModule(private var application: Application) { @Provides @Singleton @@ -21,40 +15,4 @@ class AppModule(var application: Application) { return application } - @Provides - @Singleton - fun provideDateFormatter(context: Context): DateFormatter { - return DateFormatter(context) - } - - @Provides - @Singleton - fun provideSyncManager(context: Context, contacts: ContactRepository): SyncManager { - return SyncManager(context, contacts) - } - - @Provides - @Singleton - fun provideThemeMaager(): ThemeManager { - return ThemeManager() - } - - @Provides - @Singleton - fun provideNotificationHelper(context: Context, themeManager: ThemeManager): NotificationManager { - return NotificationManager(context, themeManager) - } - - @Singleton - @Provides - fun provideMessageRepository(context: Context, notificationManager: NotificationManager): MessageRepository { - return MessageRepository(context, notificationManager) - } - - @Provides - @Singleton - fun provideContactRepository(context: Context): ContactRepository { - return ContactRepository(context) - } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 3f67df43..1081910b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt @@ -7,8 +7,11 @@ import com.moez.QKSMS.common.util.extensions.isSameWeek import com.moez.QKSMS.common.util.extensions.isSameYear import java.text.SimpleDateFormat import java.util.* +import javax.inject.Inject +import javax.inject.Singleton -class DateFormatter(val context: Context) { +@Singleton +class DateFormatter @Inject constructor(val context: Context) { /** * Replace 12 hour format with 24 hour format if necessary diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index a6037379..881331b1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -16,9 +16,13 @@ import com.moez.QKSMS.receiver.MarkReadReceiver import com.moez.QKSMS.receiver.MarkSeenReceiver import com.moez.QKSMS.receiver.RemoteMessagingReceiver import com.moez.QKSMS.presentation.conversations.ConversationListActivity +import javax.inject.Inject +import javax.inject.Singleton - -class NotificationManager(private val context: Context, private val themeManager: ThemeManager) { +@Singleton +class NotificationManager @Inject constructor( + private val context: Context, + private val themeManager: ThemeManager) { private val notificationManager = NotificationManagerCompat.from(context) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt index 4ea12ded..8ba44f83 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt @@ -1,6 +1,10 @@ package com.moez.QKSMS.common.util -class ThemeManager { +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class ThemeManager @Inject constructor() { val color = 0xFF008389.toInt() val bubbleColor = 0xFFF4F4F4.toInt() diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt new file mode 100644 index 00000000..1f38159c --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt @@ -0,0 +1,15 @@ +package com.moez.QKSMS.data.datasource + +interface MessageTransaction { + + fun markSent(id: Long) + + fun markFailed(id: Long) + + fun markSeen() + + fun markSeen(threadId: Long) + + fun markRead(threadId: Long) + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt new file mode 100644 index 00000000..4ca558f7 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt @@ -0,0 +1,46 @@ +package com.moez.QKSMS.data.datasource.native + +import android.content.ContentValues +import android.content.Context +import android.net.Uri +import android.provider.BaseColumns +import android.provider.Telephony +import com.moez.QKSMS.common.util.extensions.asFlowable +import com.moez.QKSMS.data.datasource.MessageTransaction +import io.reactivex.schedulers.Schedulers + +class NativeMessageTransaction(private val context: Context) : MessageTransaction { + + override fun markSent(id: Long) { + } + + override fun markFailed(id: Long) { + } + + override fun markSeen() { + } + + override fun markSeen(threadId: Long) { + } + + override fun markRead(threadId: Long) { + // Messages in SMS ContentProvider + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + values.put(Telephony.Sms.READ, true) + contentResolver.update(uri, values, null, null) + } + + // TODO also need to mark MMS in ContentProvider as Read + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt new file mode 100644 index 00000000..6511a1ea --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt @@ -0,0 +1,47 @@ +package com.moez.QKSMS.data.datasource.realm + +import com.moez.QKSMS.data.datasource.MessageTransaction +import com.moez.QKSMS.data.model.Message +import io.reactivex.schedulers.Schedulers +import io.realm.Realm +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class RealmMessageTransaction @Inject constructor() : MessageTransaction { + + override fun markSent(id: Long) { + } + + override fun markFailed(id: Long) { + } + + override fun markSeen() { + } + + override fun markSeen(threadId: Long) { + } + + override fun markRead(threadId: Long) { + Schedulers.io().scheduleDirect { + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .beginGroup() + .equalTo("read", false) + .or() + .equalTo("seen", false) + .endGroup() + .findAll() + + realm.executeTransaction { + messages.forEach { message -> + message.seen = true + message.read = true + } + } + realm.close() + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt index 631aa940..947a5a9c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt @@ -12,9 +12,11 @@ import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import io.realm.Realm +import javax.inject.Inject +import javax.inject.Singleton - -class ContactRepository(val context: Context) { +@Singleton +class ContactRepository @Inject constructor(val context: Context) { /** * Uri for the MMS-SMS recipients table, where there exists only one column (address) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 8cb97653..00dce1dc 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -11,6 +11,8 @@ import android.telephony.SmsManager import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.common.util.extensions.insertOrUpdate +import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction +import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.sync.MessageColumns @@ -22,8 +24,17 @@ import io.reactivex.schedulers.Schedulers import io.realm.Realm import io.realm.RealmResults import io.realm.Sort +import javax.inject.Inject +import javax.inject.Singleton -class MessageRepository(val context: Context, val notificationManager: NotificationManager) { +@Singleton +class MessageRepository @Inject constructor( + private val context: Context, + private val notificationManager: NotificationManager, + private val realmMessageTransaction: RealmMessageTransaction) { + + // TODO figure out why injecting this in the constructor breaks Dagger + private val nativeMessageTransaction: NativeMessageTransaction = NativeMessageTransaction(context) fun getConversationMessagesAsync(): RealmResults { return Realm.getDefaultInstance() @@ -140,44 +151,8 @@ class MessageRepository(val context: Context, val notificationManager: Notificat } fun markRead(threadId: Long) { - // Messages in SMS ContentProvider - val projection = arrayOf(BaseColumns._ID) - val selection = "${Sms.THREAD_ID} = $threadId AND (${Sms.SEEN} = 0 OR ${Sms.READ} = 0)" - val contentResolver = context.contentResolver - contentResolver.query(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()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Sms.SEEN, true) - values.put(Sms.READ, true) - contentResolver.update(uri, values, null, null) - } - - // TODO also need to mark MMS in ContentProvider as Read - - // Messages in Realm - Schedulers.io().scheduleDirect { - val realm = Realm.getDefaultInstance() - val messages = realm.where(Message::class.java) - .equalTo("threadId", threadId) - .beginGroup() - .equalTo("read", false) - .or() - .equalTo("seen", false) - .endGroup() - .findAll() - - realm.executeTransaction { - messages.forEach { message -> - message.seen = true - message.read = true - } - } - realm.close() - } + nativeMessageTransaction.markRead(threadId) + realmMessageTransaction.markRead(threadId) } fun markSent(uri: Uri) { diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 03e8a4bb..90fead2e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -4,16 +4,19 @@ import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.Telephony +import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.ContactRepository -import com.moez.QKSMS.common.util.extensions.asFlowable import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import io.realm.Realm +import javax.inject.Inject +import javax.inject.Singleton -class SyncManager(val context: Context, private val contactsRepo: ContactRepository) { +@Singleton +class SyncManager @Inject constructor(val context: Context, private val contactsRepo: ContactRepository) { fun copyToRealm(completionListener: () -> Unit) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index a216d8a8..41654fe6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -6,7 +6,6 @@ import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager -import com.moez.QKSMS.common.util.NotificationManager import io.reactivex.subjects.PublishSubject import io.realm.RealmResults import javax.inject.Inject @@ -14,7 +13,6 @@ import javax.inject.Inject class ConversationListViewModel : ViewModel() { @Inject lateinit var syncManager: SyncManager - @Inject lateinit var notificationManager: NotificationManager @Inject lateinit var messageRepo: MessageRepository val state: MutableLiveData = MutableLiveData() diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index 5912e851..2c6f10d9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -6,13 +6,11 @@ import android.content.Intent import android.support.v4.app.RemoteInput import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository -import com.moez.QKSMS.common.util.NotificationManager import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { @Inject lateinit var messageRepo: MessageRepository - @Inject lateinit var notificationManager: NotificationManager override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) From 69d4e5b954335167a26c2607bd79819cd74c5749 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 18:05:56 -0400 Subject: [PATCH 05/18] Move code for changing message status into Transaction classes --- .../native/NativeMessageTransaction.kt | 32 +++++++++- .../realm/RealmMessageTransaction.kt | 20 ++++++ .../data/repository/MessageRepository.kt | 62 ++----------------- 3 files changed, 53 insertions(+), 61 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt index 4ca558f7..18c84028 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt @@ -18,13 +18,41 @@ class NativeMessageTransaction(private val context: Context) : MessageTransactio } override fun markSeen() { + // TODO also need to mark MMS in ContentProvider as Seen + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.SEEN} = 0" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + contentResolver.update(uri, values, null, null) + } } override fun markSeen(threadId: Long) { + // TODO also need to mark MMS in ContentProvider as Seen + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND ${Telephony.Sms.SEEN} = 0" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + contentResolver.update(uri, values, null, null) + } } override fun markRead(threadId: Long) { - // Messages in SMS ContentProvider + // TODO also need to mark MMS in ContentProvider as Read val projection = arrayOf(BaseColumns._ID) val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)" val contentResolver = context.contentResolver @@ -39,8 +67,6 @@ class NativeMessageTransaction(private val context: Context) : MessageTransactio values.put(Telephony.Sms.READ, true) contentResolver.update(uri, values, null, null) } - - // TODO also need to mark MMS in ContentProvider as Read } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt index 6511a1ea..f13edcd9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt @@ -17,9 +17,29 @@ class RealmMessageTransaction @Inject constructor() : MessageTransaction { } override fun markSeen() { + Schedulers.io().scheduleDirect { + 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() + } } override fun markSeen(threadId: Long) { + Schedulers.io().scheduleDirect { + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .equalTo("seen", false) + .findAll() + + realm.executeTransaction { + messages.forEach { message -> + message.seen = true + } + } + realm.close() + } } override fun markRead(threadId: Long) { diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 00dce1dc..b0d56c9e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -5,11 +5,9 @@ import android.content.ContentValues import android.content.Context import android.content.Intent import android.net.Uri -import android.provider.BaseColumns import android.provider.Telephony.Sms import android.telephony.SmsManager import com.moez.QKSMS.common.util.NotificationManager -import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction @@ -89,65 +87,13 @@ class MessageRepository @Inject constructor( } fun markAllSeen() { - // Messages in SMS ContentProvider - val projection = arrayOf(BaseColumns._ID) - val selection = "${Sms.SEEN} = 0" - val contentResolver = context.contentResolver - contentResolver.query(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()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Sms.SEEN, true) - contentResolver.update(uri, values, null, null) - } - - // TODO also need to mark MMS in ContentProvider as Seen - - // Messages in Realm - Schedulers.io().scheduleDirect { - 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() - } + nativeMessageTransaction.markSeen() + realmMessageTransaction.markSeen() } fun markSeen(threadId: Long) { - // Messages in SMS ContentProvider - val projection = arrayOf(BaseColumns._ID) - val selection = "${Sms.THREAD_ID} = $threadId AND ${Sms.SEEN} = 0" - val contentResolver = context.contentResolver - contentResolver.query(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()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Sms.SEEN, true) - contentResolver.update(uri, values, null, null) - } - - // TODO also need to mark MMS in ContentProvider as Seen - - // Messages in Realm - Schedulers.io().scheduleDirect { - val realm = Realm.getDefaultInstance() - val messages = realm.where(Message::class.java) - .equalTo("threadId", threadId) - .equalTo("seen", false) - .findAll() - - realm.executeTransaction { - messages.forEach { message -> - message.seen = true - } - } - realm.close() - } + nativeMessageTransaction.markSeen(threadId) + realmMessageTransaction.markSeen(threadId) } fun markRead(threadId: Long) { From 132654b29cc13c4b00e82e606794689554daad71 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 18:13:30 -0400 Subject: [PATCH 06/18] Use abstract references to MessageTransaction in MessageRepository --- .../java/com/moez/QKSMS/common/di/AppModule.kt | 18 ++++++++++++++++++ .../native/NativeMessageTransaction.kt | 4 +++- .../realm/RealmMessageTransaction.kt | 5 +---- .../QKSMS/data/repository/MessageRepository.kt | 10 ++++------ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt index b8f89149..a30faaa1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt @@ -2,8 +2,12 @@ package com.moez.QKSMS.common.di import android.app.Application import android.content.Context +import com.moez.QKSMS.data.datasource.MessageTransaction +import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction +import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction import dagger.Module import dagger.Provides +import javax.inject.Named import javax.inject.Singleton @Module @@ -15,4 +19,18 @@ class AppModule(private var application: Application) { return application } + @Provides + @Singleton + @Named("Realm") + fun provideRealmMessageTransaction() : MessageTransaction { + return RealmMessageTransaction() + } + + @Provides + @Singleton + @Named("Native") + fun provideNativeMessageTransaction(context: Context) : MessageTransaction { + return NativeMessageTransaction(context) + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt index 18c84028..61672619 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt @@ -8,8 +8,10 @@ import android.provider.Telephony import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.datasource.MessageTransaction import io.reactivex.schedulers.Schedulers +import javax.inject.Inject +import javax.inject.Named -class NativeMessageTransaction(private val context: Context) : MessageTransaction { +class NativeMessageTransaction @Inject @Named("Native") constructor(private val context: Context) : MessageTransaction { override fun markSent(id: Long) { } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt index f13edcd9..b937188a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt @@ -4,11 +4,8 @@ import com.moez.QKSMS.data.datasource.MessageTransaction import com.moez.QKSMS.data.model.Message import io.reactivex.schedulers.Schedulers import io.realm.Realm -import javax.inject.Inject -import javax.inject.Singleton -@Singleton -class RealmMessageTransaction @Inject constructor() : MessageTransaction { +class RealmMessageTransaction : MessageTransaction { override fun markSent(id: Long) { } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index b0d56c9e..c789e204 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -9,8 +9,7 @@ import android.provider.Telephony.Sms import android.telephony.SmsManager import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.common.util.extensions.insertOrUpdate -import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction -import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction +import com.moez.QKSMS.data.datasource.MessageTransaction import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.sync.MessageColumns @@ -23,16 +22,15 @@ import io.realm.Realm import io.realm.RealmResults import io.realm.Sort import javax.inject.Inject +import javax.inject.Named import javax.inject.Singleton @Singleton class MessageRepository @Inject constructor( private val context: Context, private val notificationManager: NotificationManager, - private val realmMessageTransaction: RealmMessageTransaction) { - - // TODO figure out why injecting this in the constructor breaks Dagger - private val nativeMessageTransaction: NativeMessageTransaction = NativeMessageTransaction(context) + @Named("Realm") private val realmMessageTransaction: MessageTransaction, + @Named("Native") private val nativeMessageTransaction: MessageTransaction) { fun getConversationMessagesAsync(): RealmResults { return Realm.getDefaultInstance() From d852349bf00751b505e93ffa8b2f244e9a8a55cb Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 29 Sep 2017 18:25:29 -0400 Subject: [PATCH 07/18] Reorder MessageTransaction functions --- .../moez/QKSMS/data/datasource/MessageTransaction.kt | 8 ++++---- .../datasource/native/NativeMessageTransaction.kt | 12 ++++++------ .../data/datasource/realm/RealmMessageTransaction.kt | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt index 1f38159c..b0c960f0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt @@ -2,14 +2,14 @@ package com.moez.QKSMS.data.datasource interface MessageTransaction { - fun markSent(id: Long) - - fun markFailed(id: Long) - fun markSeen() fun markSeen(threadId: Long) fun markRead(threadId: Long) + fun markSent(id: Long) + + fun markFailed(id: Long) + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt index 61672619..c898bd7e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt @@ -13,12 +13,6 @@ import javax.inject.Named class NativeMessageTransaction @Inject @Named("Native") constructor(private val context: Context) : MessageTransaction { - override fun markSent(id: Long) { - } - - override fun markFailed(id: Long) { - } - override fun markSeen() { // TODO also need to mark MMS in ContentProvider as Seen val projection = arrayOf(BaseColumns._ID) @@ -71,4 +65,10 @@ class NativeMessageTransaction @Inject @Named("Native") constructor(private val } } + override fun markSent(id: Long) { + } + + override fun markFailed(id: Long) { + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt index b937188a..1e3e0f54 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt @@ -7,12 +7,6 @@ import io.realm.Realm class RealmMessageTransaction : MessageTransaction { - override fun markSent(id: Long) { - } - - override fun markFailed(id: Long) { - } - override fun markSeen() { Schedulers.io().scheduleDirect { val realm = Realm.getDefaultInstance() @@ -61,4 +55,10 @@ class RealmMessageTransaction : MessageTransaction { } } + override fun markSent(id: Long) { + } + + override fun markFailed(id: Long) { + } + } \ No newline at end of file From 57d9ee1f77dafcd1bc96d2bb1115c3dc9a6d06b6 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 30 Sep 2017 13:22:32 -0400 Subject: [PATCH 08/18] Fixed blank thread opening at every launch --- .../presentation/conversations/ConversationListActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt index 9a5699d1..3839ecfa 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListActivity.kt @@ -41,7 +41,7 @@ class ConversationListActivity : QkActivity(), Observer threadId != -1L }.let { threadId -> + intent?.getLongExtra("threadId", 0)?.takeIf { threadId -> threadId > 0 }?.let { threadId -> startActivity(Intent(this, MessageListActivity::class.java).putExtra("threadId", threadId)) } } From 2cab83433e0d771c60d7c70cd90507606f6ea203 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 17:19:15 -0400 Subject: [PATCH 09/18] Create interactor for sending messages --- .../QKSMS/domain/interactor/Interactor.kt | 23 +++++++++++++++++++ .../QKSMS/domain/interactor/SendMessage.kt | 16 +++++++++++++ .../messages/MessageListViewModel.kt | 5 +++- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 4 +++- 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt new file mode 100644 index 00000000..0bebd4c8 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt @@ -0,0 +1,23 @@ +package com.moez.QKSMS.domain.interactor + +import io.reactivex.Flowable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.schedulers.Schedulers + +abstract class Interactor { + + private val disposables: CompositeDisposable = CompositeDisposable() + + abstract fun buildUseCaseObservable(params: Params): Flowable + + fun execute(observer: ((T) -> Unit), params: Params) { + disposables.add(buildUseCaseObservable(params) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(observer)) + } + + fun dispose() = disposables.dispose() + +} diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt new file mode 100644 index 00000000..68f2ea38 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -0,0 +1,16 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class SendMessage @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + data class Params(val threadId: Long, val address: String, val body: String) + + override fun buildUseCaseObservable(params: Params): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.sendMessage(params.threadId, params.address, params.body) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt index c27e7c3e..12d43d43 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt @@ -5,12 +5,14 @@ import android.arch.lifecycle.ViewModel import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.SendMessage import io.reactivex.subjects.PublishSubject import javax.inject.Inject class MessageListViewModel : ViewModel() { @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage val state: MutableLiveData = MutableLiveData() var threadId: Long = 0 @@ -48,7 +50,7 @@ class MessageListViewModel : ViewModel() { fun sendMessage(body: String) { conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation -> - messageRepo.sendMessage(threadId, conversation.contacts[0].address, body) + sendMessage.execute({}, SendMessage.Params(threadId, conversation.contacts[0].address, body)) partialStates.onNext(PartialState.TextChanged("")) } } @@ -63,6 +65,7 @@ class MessageListViewModel : ViewModel() { override fun onCleared() { super.onCleared() + sendMessage.dispose() conversation?.removeAllChangeListeners() } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index 2c6f10d9..8c82bead 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -6,11 +6,13 @@ import android.content.Intent import android.support.v4.app.RemoteInput import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.SendMessage import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) @@ -22,7 +24,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() messageRepo.markRead(threadId) - messageRepo.sendMessage(threadId, address, body) + sendMessage.execute({}, SendMessage.Params(threadId, address, body)) } } } From 4ad44c47ca61bb1d7e4d67b80ed91413394ff4a3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 18:41:01 -0400 Subject: [PATCH 10/18] Create interaction for receiving message --- .../data/repository/MessageRepository.kt | 20 ++--------- .../QKSMS/domain/interactor/ReceiveMessage.kt | 34 +++++++++++++++++++ .../com/moez/QKSMS/receiver/SmsReceiver.kt | 6 ++-- 3 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index c789e204..d24a46f2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -68,22 +68,6 @@ class MessageRepository @Inject constructor( .findAllSorted("date") } - fun insertReceivedMessage(address: String, body: String, time: Long) { - val values = ContentValues() - values.put(Sms.ADDRESS, address) - values.put(Sms.BODY, body) - values.put(Sms.DATE_SENT, time) - - val contentResolver = context.contentResolver - Flowable.just(values) - .subscribeOn(Schedulers.io()) - .map { contentResolver.insert(Sms.Inbox.CONTENT_URI, values) } - .subscribe { uri -> - copyMessageToRealm(uri) - notificationManager.update(this) - } - } - fun markAllSeen() { nativeMessageTransaction.markSeen() realmMessageTransaction.markSeen() @@ -139,7 +123,7 @@ class MessageRepository @Inject constructor( } } - private fun updateMessage(values: ContentValues, uri: Uri) { + fun updateMessage(values: ContentValues, uri: Uri) { val contentResolver = context.contentResolver Flowable.just(values) .subscribeOn(Schedulers.io()) @@ -147,7 +131,7 @@ class MessageRepository @Inject constructor( .subscribe { copyMessageToRealm(uri) } } - private fun copyMessageToRealm(uri: Uri) { + fun copyMessageToRealm(uri: Uri) { val cursor = context.contentResolver.query(uri, null, null, null, "date DESC") if (cursor.moveToFirst()) { val columns = MessageColumns(cursor) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt new file mode 100644 index 00000000..fb42d2f8 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -0,0 +1,34 @@ +package com.moez.QKSMS.domain.interactor + +import android.content.ContentValues +import android.content.Context +import android.provider.Telephony +import com.moez.QKSMS.common.util.NotificationManager +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class ReceiveMessage @Inject constructor( + val context: Context, + val messageRepo: MessageRepository, + val notificationManager: NotificationManager) : Interactor() { + + data class Params(val address: String, val body: String, val sentTime: Long) + + override fun buildUseCaseObservable(params: Params): Flowable { + val values = ContentValues() + values.put(Telephony.Sms.ADDRESS, params.address) + values.put(Telephony.Sms.BODY, params.body) + values.put(Telephony.Sms.DATE_SENT, params.sentTime) + + val contentResolver = context.contentResolver + return Flowable.just(values) + .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } + .doOnNext { uri -> + messageRepo.copyMessageToRealm(uri) + notificationManager.update(messageRepo) + } + .map { Unit } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 43fd772e..24e58abd 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -5,13 +5,13 @@ import android.content.Context import android.content.Intent import android.provider.Telephony.Sms import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.ReceiveMessage import timber.log.Timber import javax.inject.Inject class SmsReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var receiveMessage: ReceiveMessage override fun onReceive(context: Context, intent: Intent) { Timber.v("Received SMS: $intent") @@ -25,7 +25,7 @@ class SmsReceiver : BroadcastReceiver() { .map { message -> message.displayMessageBody } .reduce { body, new -> body + new } - messageRepo.insertReceivedMessage(address, body, time) + receiveMessage.execute({}, ReceiveMessage.Params(address, body, time)) } } From 81a93a53e1f702390f978b1869366ad3d788d4fe Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 19:06:20 -0400 Subject: [PATCH 11/18] Create interactors for MarkSent and MarkFailed --- .../data/repository/MessageRepository.kt | 23 ++++-------------- .../QKSMS/domain/interactor/MarkFailed.kt | 24 +++++++++++++++++++ .../moez/QKSMS/domain/interactor/MarkSent.kt | 22 +++++++++++++++++ .../QKSMS/domain/interactor/ReceiveMessage.kt | 2 +- .../QKSMS/receiver/MessageSentReceiver.kt | 10 ++++---- 5 files changed, 57 insertions(+), 24 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index d24a46f2..35d1d693 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -7,7 +7,6 @@ import android.content.Intent import android.net.Uri import android.provider.Telephony.Sms import android.telephony.SmsManager -import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.datasource.MessageTransaction import com.moez.QKSMS.data.model.Conversation @@ -28,7 +27,6 @@ import javax.inject.Singleton @Singleton class MessageRepository @Inject constructor( private val context: Context, - private val notificationManager: NotificationManager, @Named("Realm") private val realmMessageTransaction: MessageTransaction, @Named("Native") private val nativeMessageTransaction: MessageTransaction) { @@ -83,19 +81,6 @@ class MessageRepository @Inject constructor( realmMessageTransaction.markRead(threadId) } - fun markSent(uri: Uri) { - val values = ContentValues() - values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT) - updateMessage(values, uri) - } - - fun markFailed(uri: Uri, resultCode: Int) { - val values = ContentValues() - values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED) - values.put(Sms.ERROR_CODE, resultCode) - updateMessage(values, uri) - } - fun sendMessage(threadId: Long, address: String, body: String) { val values = ContentValues() values.put(Sms.ADDRESS, address) @@ -110,7 +95,7 @@ class MessageRepository @Inject constructor( .subscribeOn(Schedulers.io()) .map { contentResolver.insert(Sms.CONTENT_URI, values) } .subscribe { uri -> - copyMessageToRealm(uri) + addMessageFromUri(uri) val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString()) val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT) @@ -123,15 +108,15 @@ class MessageRepository @Inject constructor( } } - fun updateMessage(values: ContentValues, uri: Uri) { + fun updateMessageFromUri(values: ContentValues, uri: Uri) { val contentResolver = context.contentResolver Flowable.just(values) .subscribeOn(Schedulers.io()) .map { contentResolver.update(uri, values, null, null) } - .subscribe { copyMessageToRealm(uri) } + .subscribe { addMessageFromUri(uri) } } - fun copyMessageToRealm(uri: Uri) { + fun addMessageFromUri(uri: Uri) { val cursor = context.contentResolver.query(uri, null, null, null, "date DESC") if (cursor.moveToFirst()) { val columns = MessageColumns(cursor) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt new file mode 100644 index 00000000..54f9f346 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt @@ -0,0 +1,24 @@ +package com.moez.QKSMS.domain.interactor + +import android.content.ContentValues +import android.net.Uri +import android.provider.Telephony +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkFailed @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + data class Params(val uri: Uri, val resultCode: Int) + + override fun buildUseCaseObservable(params: Params): Flowable { + return Flowable.just(Unit) + .doOnNext { + val values = ContentValues() + values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_FAILED) + values.put(Telephony.Sms.ERROR_CODE, params.resultCode) + messageRepo.updateMessageFromUri(values, params.uri) + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt new file mode 100644 index 00000000..997d4df8 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt @@ -0,0 +1,22 @@ +package com.moez.QKSMS.domain.interactor + +import android.content.ContentValues +import android.net.Uri +import android.provider.Telephony +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildUseCaseObservable(params: Uri): Flowable { + return Flowable.just(params) + .doOnNext { + val values = ContentValues() + values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_SENT) + messageRepo.updateMessageFromUri(values, params) + } + .map { Unit } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index fb42d2f8..7f56019b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -25,7 +25,7 @@ class ReceiveMessage @Inject constructor( return Flowable.just(values) .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } .doOnNext { uri -> - messageRepo.copyMessageToRealm(uri) + messageRepo.addMessageFromUri(uri) notificationManager.update(messageRepo) } .map { Unit } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt index 63b76728..3b0971ab 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt @@ -7,12 +7,14 @@ import android.content.Intent import android.net.Uri import android.telephony.SmsManager import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.MarkFailed +import com.moez.QKSMS.domain.interactor.MarkSent import javax.inject.Inject class MessageSentReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markSent: MarkSent + @Inject lateinit var markFailed: MarkFailed override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) @@ -20,12 +22,12 @@ class MessageSentReceiver : BroadcastReceiver() { val uri = Uri.parse(intent.getStringExtra("uri")) when (resultCode) { - Activity.RESULT_OK -> messageRepo.markSent(uri) + Activity.RESULT_OK -> markSent.execute({}, uri) SmsManager.RESULT_ERROR_GENERIC_FAILURE, SmsManager.RESULT_ERROR_NO_SERVICE, SmsManager.RESULT_ERROR_NULL_PDU, - SmsManager.RESULT_ERROR_RADIO_OFF -> messageRepo.markFailed(uri, resultCode) + SmsManager.RESULT_ERROR_RADIO_OFF -> markFailed.execute({}, MarkFailed.Params(uri, resultCode)) } } } \ No newline at end of file From 41aea8c618b20b34916f817884d60a7ab4a8b34f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 20:08:39 -0400 Subject: [PATCH 12/18] Move message sending code into SendMessage.kt --- .../data/repository/MessageRepository.kt | 33 --------------- .../QKSMS/domain/interactor/SendMessage.kt | 40 +++++++++++++++++-- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 35d1d693..7359cc36 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -1,20 +1,14 @@ package com.moez.QKSMS.data.repository -import android.app.PendingIntent import android.content.ContentValues import android.content.Context -import android.content.Intent import android.net.Uri -import android.provider.Telephony.Sms -import android.telephony.SmsManager import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.datasource.MessageTransaction import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.sync.MessageColumns import com.moez.QKSMS.data.sync.SyncManager -import com.moez.QKSMS.receiver.MessageDeliveredReceiver -import com.moez.QKSMS.receiver.MessageSentReceiver import io.reactivex.Flowable import io.reactivex.schedulers.Schedulers import io.realm.Realm @@ -81,33 +75,6 @@ class MessageRepository @Inject constructor( realmMessageTransaction.markRead(threadId) } - fun sendMessage(threadId: Long, address: String, body: String) { - val values = ContentValues() - values.put(Sms.ADDRESS, address) - values.put(Sms.BODY, body) - values.put(Sms.DATE, System.currentTimeMillis()) - values.put(Sms.READ, true) - values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX) - values.put(Sms.THREAD_ID, threadId) - - val contentResolver = context.contentResolver - Flowable.just(values) - .subscribeOn(Schedulers.io()) - .map { contentResolver.insert(Sms.CONTENT_URI, values) } - .subscribe { uri -> - addMessageFromUri(uri) - - val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString()) - val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT) - - val deliveredIntent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("uri", uri.toString()) - val deliveredPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), deliveredIntent, PendingIntent.FLAG_UPDATE_CURRENT) - - val smsManager = SmsManager.getDefault() - smsManager.sendTextMessage(address, null, body, sentPI, deliveredPI) - } - } - fun updateMessageFromUri(values: ContentValues, uri: Uri) { val contentResolver = context.contentResolver Flowable.just(values) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt index 68f2ea38..ce610b9e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -1,16 +1,50 @@ package com.moez.QKSMS.domain.interactor +import android.app.PendingIntent +import android.content.ContentValues +import android.content.Context +import android.content.Intent +import android.provider.Telephony +import android.telephony.SmsManager import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.receiver.MessageDeliveredReceiver +import com.moez.QKSMS.receiver.MessageSentReceiver import io.reactivex.Flowable +import io.reactivex.schedulers.Schedulers import javax.inject.Inject -class SendMessage @Inject constructor(val messageRepo: MessageRepository) : Interactor() { +class SendMessage @Inject constructor( + val context: Context, + val messageRepo: MessageRepository) : Interactor() { data class Params(val threadId: Long, val address: String, val body: String) override fun buildUseCaseObservable(params: Params): Flowable { - return Flowable.just(Unit) - .doOnNext { messageRepo.sendMessage(params.threadId, params.address, params.body) } + val values = ContentValues() + values.put(Telephony.Sms.ADDRESS, params.address) + values.put(Telephony.Sms.BODY, params.body) + values.put(Telephony.Sms.DATE, System.currentTimeMillis()) + values.put(Telephony.Sms.READ, true) + values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX) + values.put(Telephony.Sms.THREAD_ID, params.threadId) + + val contentResolver = context.contentResolver + return Flowable.just(values) + .subscribeOn(Schedulers.io()) + .map { contentResolver.insert(Telephony.Sms.CONTENT_URI, values) } + .doOnNext { uri -> + messageRepo.addMessageFromUri(uri) + + val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString()) + val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT) + + val deliveredIntent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("uri", uri.toString()) + val deliveredPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), deliveredIntent, PendingIntent.FLAG_UPDATE_CURRENT) + + val smsManager = SmsManager.getDefault() + smsManager.sendTextMessage(params.address, null, params.body, sentPI, deliveredPI) + } + .map { Unit } } } \ No newline at end of file From 4e90724d66003c4c304a14fcca4045d7789752d1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 20:59:18 -0400 Subject: [PATCH 13/18] Move MarkSeen implementation to Interactors --- .../QKSMS/data/repository/MessageRepository.kt | 2 -- .../moez/QKSMS/domain/interactor/MarkAllSeen.kt | 14 ++++++++++++++ .../com/moez/QKSMS/domain/interactor/MarkSeen.kt | 14 ++++++++++++++ .../moez/QKSMS/domain/interactor/ReceiveMessage.kt | 8 ++++---- .../moez/QKSMS/domain/interactor/SendMessage.kt | 1 + .../conversations/ConversationListViewModel.kt | 4 +++- .../com/moez/QKSMS/receiver/MarkSeenReceiver.kt | 6 +++--- .../java/com/moez/QKSMS/receiver/SmsReceiver.kt | 3 ++- 8 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 7359cc36..e054cc2f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -61,12 +61,10 @@ class MessageRepository @Inject constructor( } fun markAllSeen() { - nativeMessageTransaction.markSeen() realmMessageTransaction.markSeen() } fun markSeen(threadId: Long) { - nativeMessageTransaction.markSeen(threadId) realmMessageTransaction.markSeen(threadId) } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt new file mode 100644 index 00000000..61628226 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt @@ -0,0 +1,14 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkAllSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildUseCaseObservable(params: Unit): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markAllSeen() } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt new file mode 100644 index 00000000..f16d7b2e --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt @@ -0,0 +1,14 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildUseCaseObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markSeen(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index 7f56019b..d625e05e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -20,14 +20,14 @@ class ReceiveMessage @Inject constructor( values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body) values.put(Telephony.Sms.DATE_SENT, params.sentTime) + values.put(Telephony.Sms.READ, false) + values.put(Telephony.Sms.SEEN, false) val contentResolver = context.contentResolver return Flowable.just(values) .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } - .doOnNext { uri -> - messageRepo.addMessageFromUri(uri) - notificationManager.update(messageRepo) - } + .doOnNext { uri -> messageRepo.addMessageFromUri(uri) } + .doOnNext { notificationManager.update(messageRepo) } .map { Unit } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt index ce610b9e..0da51e9f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -25,6 +25,7 @@ class SendMessage @Inject constructor( values.put(Telephony.Sms.BODY, params.body) values.put(Telephony.Sms.DATE, System.currentTimeMillis()) values.put(Telephony.Sms.READ, true) + values.put(Telephony.Sms.SEEN, true) values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX) values.put(Telephony.Sms.THREAD_ID, params.threadId) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index 41654fe6..34f40e6f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -6,6 +6,7 @@ import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager +import com.moez.QKSMS.domain.interactor.MarkAllSeen import io.reactivex.subjects.PublishSubject import io.realm.RealmResults import javax.inject.Inject @@ -14,6 +15,7 @@ class ConversationListViewModel : ViewModel() { @Inject lateinit var syncManager: SyncManager @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markAllSeen: MarkAllSeen val state: MutableLiveData = MutableLiveData() @@ -30,7 +32,7 @@ class ConversationListViewModel : ViewModel() { conversations = messageRepo.getConversationMessagesAsync() partialStates.onNext(PartialState.ConversationsLoaded(conversations)) - messageRepo.markAllSeen() + markAllSeen.execute({}, Unit) } fun onRefresh() { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index 0715cbaa..5a39b68b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -4,18 +4,18 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.MarkSeen import javax.inject.Inject class MarkSeenReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markSeen: MarkSeen override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - messageRepo.markSeen(threadId) + markSeen.execute({}, threadId) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 24e58abd..c0870912 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -25,7 +25,8 @@ class SmsReceiver : BroadcastReceiver() { .map { message -> message.displayMessageBody } .reduce { body, new -> body + new } - receiveMessage.execute({}, ReceiveMessage.Params(address, body, time)) + val pendingResult = goAsync() + receiveMessage.execute({ pendingResult.finish() }, ReceiveMessage.Params(address, body, time)) } } From 9ce6f8bc53cc7d83ccc93352907a122752557db6 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 21:05:20 -0400 Subject: [PATCH 14/18] Remove redundant datastore classes --- .../data/datasource/MessageTransaction.kt | 15 ---- .../native/NativeMessageTransaction.kt | 74 ------------------- .../realm/RealmMessageTransaction.kt | 64 ---------------- .../data/repository/MessageRepository.kt | 64 +++++++++++++--- 4 files changed, 54 insertions(+), 163 deletions(-) delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt deleted file mode 100644 index b0c960f0..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/MessageTransaction.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.moez.QKSMS.data.datasource - -interface MessageTransaction { - - fun markSeen() - - fun markSeen(threadId: Long) - - fun markRead(threadId: Long) - - fun markSent(id: Long) - - fun markFailed(id: Long) - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt deleted file mode 100644 index c898bd7e..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/native/NativeMessageTransaction.kt +++ /dev/null @@ -1,74 +0,0 @@ -package com.moez.QKSMS.data.datasource.native - -import android.content.ContentValues -import android.content.Context -import android.net.Uri -import android.provider.BaseColumns -import android.provider.Telephony -import com.moez.QKSMS.common.util.extensions.asFlowable -import com.moez.QKSMS.data.datasource.MessageTransaction -import io.reactivex.schedulers.Schedulers -import javax.inject.Inject -import javax.inject.Named - -class NativeMessageTransaction @Inject @Named("Native") constructor(private val context: Context) : MessageTransaction { - - override fun markSeen() { - // TODO also need to mark MMS in ContentProvider as Seen - val projection = arrayOf(BaseColumns._ID) - val selection = "${Telephony.Sms.SEEN} = 0" - val contentResolver = context.contentResolver - contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) - .asFlowable() - .subscribeOn(Schedulers.io()) - .map { cursor -> cursor.getLong(0) } - .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Telephony.Sms.SEEN, true) - contentResolver.update(uri, values, null, null) - } - } - - override fun markSeen(threadId: Long) { - // TODO also need to mark MMS in ContentProvider as Seen - val projection = arrayOf(BaseColumns._ID) - val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND ${Telephony.Sms.SEEN} = 0" - val contentResolver = context.contentResolver - contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) - .asFlowable() - .subscribeOn(Schedulers.io()) - .map { cursor -> cursor.getLong(0) } - .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Telephony.Sms.SEEN, true) - contentResolver.update(uri, values, null, null) - } - } - - override fun markRead(threadId: Long) { - // TODO also need to mark MMS in ContentProvider as Read - val projection = arrayOf(BaseColumns._ID) - val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)" - val contentResolver = context.contentResolver - contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) - .asFlowable() - .subscribeOn(Schedulers.io()) - .map { cursor -> cursor.getLong(0) } - .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } - .subscribe { uri -> - val values = ContentValues() - values.put(Telephony.Sms.SEEN, true) - values.put(Telephony.Sms.READ, true) - contentResolver.update(uri, values, null, null) - } - } - - override fun markSent(id: Long) { - } - - override fun markFailed(id: Long) { - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt b/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt deleted file mode 100644 index 1e3e0f54..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/datasource/realm/RealmMessageTransaction.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.moez.QKSMS.data.datasource.realm - -import com.moez.QKSMS.data.datasource.MessageTransaction -import com.moez.QKSMS.data.model.Message -import io.reactivex.schedulers.Schedulers -import io.realm.Realm - -class RealmMessageTransaction : MessageTransaction { - - override fun markSeen() { - Schedulers.io().scheduleDirect { - 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() - } - } - - override fun markSeen(threadId: Long) { - Schedulers.io().scheduleDirect { - val realm = Realm.getDefaultInstance() - val messages = realm.where(Message::class.java) - .equalTo("threadId", threadId) - .equalTo("seen", false) - .findAll() - - realm.executeTransaction { - messages.forEach { message -> - message.seen = true - } - } - realm.close() - } - } - - override fun markRead(threadId: Long) { - Schedulers.io().scheduleDirect { - val realm = Realm.getDefaultInstance() - val messages = realm.where(Message::class.java) - .equalTo("threadId", threadId) - .beginGroup() - .equalTo("read", false) - .or() - .equalTo("seen", false) - .endGroup() - .findAll() - - realm.executeTransaction { - messages.forEach { message -> - message.seen = true - message.read = true - } - } - realm.close() - } - } - - override fun markSent(id: Long) { - } - - override fun markFailed(id: Long) { - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index e054cc2f..d529029d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -3,8 +3,10 @@ package com.moez.QKSMS.data.repository import android.content.ContentValues import android.content.Context import android.net.Uri +import android.provider.BaseColumns +import android.provider.Telephony +import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.common.util.extensions.insertOrUpdate -import com.moez.QKSMS.data.datasource.MessageTransaction import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.sync.MessageColumns @@ -15,14 +17,10 @@ import io.realm.Realm import io.realm.RealmResults import io.realm.Sort import javax.inject.Inject -import javax.inject.Named import javax.inject.Singleton @Singleton -class MessageRepository @Inject constructor( - private val context: Context, - @Named("Realm") private val realmMessageTransaction: MessageTransaction, - @Named("Native") private val nativeMessageTransaction: MessageTransaction) { +class MessageRepository @Inject constructor(private val context: Context) { fun getConversationMessagesAsync(): RealmResults { return Realm.getDefaultInstance() @@ -61,16 +59,62 @@ class MessageRepository @Inject constructor( } fun markAllSeen() { - realmMessageTransaction.markSeen() + 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) { - realmMessageTransaction.markSeen(threadId) + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .equalTo("seen", false) + .findAll() + + realm.executeTransaction { + messages.forEach { message -> + message.seen = true + } + } + realm.close() } fun markRead(threadId: Long) { - nativeMessageTransaction.markRead(threadId) - realmMessageTransaction.markRead(threadId) + // TODO also need to mark MMS in ContentProvider as Read + val projection = arrayOf(BaseColumns._ID) + val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)" + val contentResolver = context.contentResolver + contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null) + .asFlowable() + .subscribeOn(Schedulers.io()) + .map { cursor -> cursor.getLong(0) } + .map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) } + .subscribe { uri -> + val values = ContentValues() + values.put(Telephony.Sms.SEEN, true) + values.put(Telephony.Sms.READ, true) + contentResolver.update(uri, values, null, null) + } + + + val realm = Realm.getDefaultInstance() + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .beginGroup() + .equalTo("read", false) + .or() + .equalTo("seen", false) + .endGroup() + .findAll() + + realm.executeTransaction { + messages.forEach { message -> + message.seen = true + message.read = true + } + } + realm.close() } fun updateMessageFromUri(values: ContentValues, uri: Uri) { From bc15464ba5342ec3dfb375bed548274c3759c4ce Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 21:14:23 -0400 Subject: [PATCH 15/18] Create interactor for marking conversation read --- .../java/com/moez/QKSMS/common/di/AppModule.kt | 18 ------------------ .../moez/QKSMS/domain/interactor/MarkRead.kt | 14 ++++++++++++++ .../conversations/ConversationListViewModel.kt | 5 +++++ .../messages/MessageListViewModel.kt | 5 ++++- .../moez/QKSMS/receiver/MarkReadReceiver.kt | 6 +++--- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 6 +++--- 6 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt index a30faaa1..b8f89149 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt @@ -2,12 +2,8 @@ package com.moez.QKSMS.common.di import android.app.Application import android.content.Context -import com.moez.QKSMS.data.datasource.MessageTransaction -import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction -import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction import dagger.Module import dagger.Provides -import javax.inject.Named import javax.inject.Singleton @Module @@ -19,18 +15,4 @@ class AppModule(private var application: Application) { return application } - @Provides - @Singleton - @Named("Realm") - fun provideRealmMessageTransaction() : MessageTransaction { - return RealmMessageTransaction() - } - - @Provides - @Singleton - @Named("Native") - fun provideNativeMessageTransaction(context: Context) : MessageTransaction { - return NativeMessageTransaction(context) - } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt new file mode 100644 index 00000000..a5a8b5c2 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt @@ -0,0 +1,14 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkRead @Inject constructor(val messageRepo: MessageRepository): Interactor() { + + override fun buildUseCaseObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markRead(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index 34f40e6f..b5bfe625 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -40,4 +40,9 @@ class ConversationListViewModel : ViewModel() { syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) } } + override fun onCleared() { + super.onCleared() + markAllSeen.dispose() + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt index 12d43d43..372e6fcf 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt @@ -5,6 +5,7 @@ import android.arch.lifecycle.ViewModel import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -13,6 +14,7 @@ class MessageListViewModel : ViewModel() { @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage + @Inject lateinit var markRead: MarkRead val state: MutableLiveData = MutableLiveData() var threadId: Long = 0 @@ -56,7 +58,7 @@ class MessageListViewModel : ViewModel() { } fun dataChanged() { - messageRepo.markRead(threadId) + markRead.execute({}, threadId) } fun textChanged(text: String) { @@ -66,6 +68,7 @@ class MessageListViewModel : ViewModel() { override fun onCleared() { super.onCleared() sendMessage.dispose() + markRead.dispose() conversation?.removeAllChangeListeners() } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 0669819d..5f7ad4e8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -4,18 +4,18 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.MarkRead import javax.inject.Inject class MarkReadReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - messageRepo.markRead(threadId) + markRead.execute({}, threadId) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index 8c82bead..dd762c09 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -5,14 +5,14 @@ import android.content.Context import android.content.Intent import android.support.v4.app.RemoteInput import com.moez.QKSMS.common.di.AppComponentManager -import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage + @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) @@ -23,7 +23,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val address = bundle.getString("address") val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() - messageRepo.markRead(threadId) + markRead.execute({}, threadId) sendMessage.execute({}, SendMessage.Params(threadId, address, body)) } } From c949a68cf5eb3f6db4a5425896be72231dda38c8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 22:03:35 -0400 Subject: [PATCH 16/18] Refactor Interactor Observable creator method --- .../main/java/com/moez/QKSMS/domain/interactor/Interactor.kt | 4 ++-- .../main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt | 2 +- .../java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt index 0bebd4c8..634e6ca1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt @@ -9,10 +9,10 @@ abstract class Interactor { private val disposables: CompositeDisposable = CompositeDisposable() - abstract fun buildUseCaseObservable(params: Params): Flowable + abstract fun buildObservable(params: Params): Flowable fun execute(observer: ((T) -> Unit), params: Params) { - disposables.add(buildUseCaseObservable(params) + disposables.add(buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(observer)) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt index 61628226..712a057c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkAllSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Unit): Flowable { + override fun buildObservable(params: Unit): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markAllSeen() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt index 54f9f346..4b98caf0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt @@ -11,7 +11,7 @@ class MarkFailed @Inject constructor(val messageRepo: MessageRepository) : Inter data class Params(val uri: Uri, val resultCode: Int) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { return Flowable.just(Unit) .doOnNext { val values = ContentValues() diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt index a5a8b5c2..9bac7258 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkRead @Inject constructor(val messageRepo: MessageRepository): Interactor() { - override fun buildUseCaseObservable(params: Long): Flowable { + override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markRead(params) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt index f16d7b2e..8ee54aeb 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Long): Flowable { + override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markSeen(params) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt index 997d4df8..3128cd30 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt @@ -9,7 +9,7 @@ import javax.inject.Inject class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Uri): Flowable { + override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) .doOnNext { val values = ContentValues() diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index d625e05e..c32586ee 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -15,7 +15,7 @@ class ReceiveMessage @Inject constructor( data class Params(val address: String, val body: String, val sentTime: Long) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { val values = ContentValues() values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt index 0da51e9f..0fbd3339 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -19,7 +19,7 @@ class SendMessage @Inject constructor( data class Params(val threadId: Long, val address: String, val body: String) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { val values = ContentValues() values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body) From 62cde39fc96871c6f05d0c437e0dbbacd5ada163 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 2 Oct 2017 10:43:46 -0400 Subject: [PATCH 17/18] Create mapper for Message -> MessageFlowable --- .../data/mapper/CursorToMessageFlowable.kt | 125 ++++++++++++++++++ .../data/repository/MessageRepository.kt | 11 +- .../moez/QKSMS/data/sync/MessageColumns.kt | 88 ------------ .../com/moez/QKSMS/data/sync/SyncManager.kt | 47 +------ 4 files changed, 132 insertions(+), 139 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt new file mode 100644 index 00000000..383687a0 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt @@ -0,0 +1,125 @@ +package com.moez.QKSMS.data.mapper + +import android.database.Cursor +import android.provider.Telephony +import com.moez.QKSMS.common.util.extensions.asFlowable +import com.moez.QKSMS.data.model.Message +import io.reactivex.Flowable +import timber.log.Timber + +object CursorToMessageFlowable { + + fun map(cursor: Cursor): Flowable { + val messageColumns = MessageColumns(cursor) + return cursor.asFlowable().map { cursor -> cursorToMessage(cursor, messageColumns) } + } + + private fun cursorToMessage(cursor: Cursor, columnsMap: MessageColumns): Message { + return Message().apply { + type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) { + -1 -> "sms" + else -> cursor.getString(columnsMap.msgType) + } + + id = cursor.getLong(columnsMap.msgId) + body = cursor.getString(columnsMap.smsBody) ?: "" + + when (type) { + "sms" -> { + threadId = cursor.getLong(columnsMap.smsThreadId) + address = cursor.getString(columnsMap.smsAddress) + boxId = cursor.getInt(columnsMap.smsType) + date = cursor.getLong(columnsMap.mmsDate) + dateSent = cursor.getLong(columnsMap.mmsDateSent) + seen = cursor.getInt(columnsMap.mmsSeen) != 0 + read = cursor.getInt(columnsMap.mmsRead) != 0 + } + + "mms" -> { + threadId = cursor.getLong(columnsMap.mmsThreadId) + boxId = cursor.getInt(columnsMap.mmsMessageBox) + date = cursor.getLong(columnsMap.smsDate) + dateSent = cursor.getLong(columnsMap.smsDateSent) + seen = cursor.getInt(columnsMap.smsSeen) != 0 + read = cursor.getInt(columnsMap.smsRead) != 0 + errorType = cursor.getInt(columnsMap.mmsErrorType) + } + } + } + } + + val CURSOR_PROJECTION = arrayOf( + Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN, + Telephony.MmsSms._ID, + + Telephony.Sms.THREAD_ID, + Telephony.Sms.ADDRESS, + Telephony.Sms.BODY, + Telephony.Sms.DATE, + Telephony.Sms.DATE_SENT, + Telephony.Sms.SEEN, + Telephony.Sms.READ, + Telephony.Sms.TYPE, + Telephony.Sms.STATUS, + Telephony.Sms.LOCKED, + Telephony.Sms.ERROR_CODE, + + Telephony.Mms.THREAD_ID, + Telephony.Mms.SUBJECT, + Telephony.Mms.SUBJECT_CHARSET, + Telephony.Mms.DATE, + Telephony.Mms.DATE_SENT, + Telephony.Mms.SEEN, + Telephony.Mms.READ, + Telephony.Mms.MESSAGE_TYPE, + Telephony.Mms.MESSAGE_BOX, + Telephony.Mms.DELIVERY_REPORT, + Telephony.Mms.READ_REPORT, + Telephony.MmsSms.PendingMessages.ERROR_TYPE, + Telephony.Mms.LOCKED, + Telephony.Mms.STATUS, + Telephony.Mms.TEXT_ONLY) + + private class MessageColumns(val cursor: Cursor) { + + val msgType by lazy { getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN) } + val msgId by lazy { getColumnIndex(Telephony.MmsSms._ID) } + + val smsThreadId by lazy { getColumnIndex(Telephony.Sms.THREAD_ID) } + val smsAddress by lazy { getColumnIndex(Telephony.Sms.ADDRESS) } + val smsBody by lazy { getColumnIndex(Telephony.Sms.BODY) } + val smsDate by lazy { getColumnIndex(Telephony.Sms.DATE) } + val smsDateSent by lazy { getColumnIndex(Telephony.Sms.DATE_SENT) } + val smsSeen by lazy { getColumnIndex(Telephony.Sms.SEEN) } + val smsRead by lazy { getColumnIndex(Telephony.Sms.READ) } + val smsType by lazy { getColumnIndex(Telephony.Sms.TYPE) } + val smsStatus by lazy { getColumnIndex(Telephony.Sms.STATUS) } + val smsLocked by lazy { getColumnIndex(Telephony.Sms.LOCKED) } + val smsErrorCode by lazy { getColumnIndex(Telephony.Sms.ERROR_CODE) } + + val mmsThreadId by lazy { getColumnIndex(Telephony.Mms.THREAD_ID) } + val mmsSubject by lazy { getColumnIndex(Telephony.Mms.SUBJECT) } + val mmsSubjectCharset by lazy { getColumnIndex(Telephony.Mms.SUBJECT_CHARSET) } + val mmsDate by lazy { getColumnIndex(Telephony.Mms.DATE) } + val mmsDateSent by lazy { getColumnIndex(Telephony.Mms.DATE_SENT) } + val mmsSeen by lazy { getColumnIndex(Telephony.Mms.SEEN) } + val mmsRead by lazy { getColumnIndex(Telephony.Mms.READ) } + val mmsMessageType by lazy { getColumnIndex(Telephony.Mms.MESSAGE_TYPE) } + val mmsMessageBox by lazy { getColumnIndex(Telephony.Mms.MESSAGE_BOX) } + val mmsDeliveryReport by lazy { getColumnIndex(Telephony.Mms.DELIVERY_REPORT) } + val mmsReadReport by lazy { getColumnIndex(Telephony.Mms.READ_REPORT) } + val mmsErrorType by lazy { getColumnIndex(Telephony.MmsSms.PendingMessages.ERROR_TYPE) } + val mmsLocked by lazy { getColumnIndex(Telephony.Mms.LOCKED) } + val mmsStatus by lazy { getColumnIndex(Telephony.Mms.STATUS) } + val mmsTextOnly by lazy { getColumnIndex(Telephony.Mms.TEXT_ONLY) } + + private fun getColumnIndex(columnsName: String): Int { + return try { + cursor.getColumnIndexOrThrow(columnsName) + } catch (e: Exception) { + Timber.w(e) + -1 + } + } + } +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index d529029d..192bc927 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -7,10 +7,9 @@ import android.provider.BaseColumns import android.provider.Telephony import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.common.util.extensions.insertOrUpdate +import com.moez.QKSMS.data.mapper.CursorToMessageFlowable import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message -import com.moez.QKSMS.data.sync.MessageColumns -import com.moez.QKSMS.data.sync.SyncManager import io.reactivex.Flowable import io.reactivex.schedulers.Schedulers import io.realm.Realm @@ -127,12 +126,8 @@ class MessageRepository @Inject constructor(private val context: Context) { fun addMessageFromUri(uri: Uri) { val cursor = context.contentResolver.query(uri, null, null, null, "date DESC") - if (cursor.moveToFirst()) { - val columns = MessageColumns(cursor) - val message = SyncManager.messageFromCursor(cursor, columns) - message.insertOrUpdate() - } - cursor.close() + CursorToMessageFlowable.map(cursor) + .subscribe { message -> message.insertOrUpdate() } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt deleted file mode 100644 index 94295eb6..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/MessageColumns.kt +++ /dev/null @@ -1,88 +0,0 @@ -package com.moez.QKSMS.data.sync - -import android.database.Cursor -import android.net.Uri -import android.provider.Telephony.* -import timber.log.Timber - -@Suppress("unused") -class MessageColumns(val cursor: Cursor) { - private val TAG = "ColumnsMap" - private val DEBUG = false - - companion object { - val URI: Uri = Uri.parse("content://mms-sms/conversations/") - val PROJECTION = arrayOf( - MmsSms.TYPE_DISCRIMINATOR_COLUMN, - MmsSms._ID, - - Sms.THREAD_ID, - Sms.ADDRESS, - Sms.BODY, - Sms.DATE, - Sms.DATE_SENT, - Sms.SEEN, - Sms.READ, - Sms.TYPE, - Sms.STATUS, - Sms.LOCKED, - Sms.ERROR_CODE, - - Mms.THREAD_ID, - Mms.SUBJECT, - Mms.SUBJECT_CHARSET, - Mms.DATE, - Mms.DATE_SENT, - Mms.SEEN, - Mms.READ, - Mms.MESSAGE_TYPE, - Mms.MESSAGE_BOX, - Mms.DELIVERY_REPORT, - Mms.READ_REPORT, - MmsSms.PendingMessages.ERROR_TYPE, - Mms.LOCKED, - Mms.STATUS, - Mms.TEXT_ONLY) - } - - val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) } - val msgId by lazy { getColumnIndex(MmsSms._ID) } - - val smsThreadId by lazy { getColumnIndex(Sms.THREAD_ID) } - val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) } - val smsBody by lazy { getColumnIndex(Sms.BODY) } - val smsDate by lazy { getColumnIndex(Sms.DATE) } - val smsDateSent by lazy { getColumnIndex(Sms.DATE_SENT) } - val smsSeen by lazy { getColumnIndex(Sms.SEEN) } - val smsRead by lazy { getColumnIndex(Sms.READ) } - val smsType by lazy { getColumnIndex(Sms.TYPE) } - val smsStatus by lazy { getColumnIndex(Sms.STATUS) } - val smsLocked by lazy { getColumnIndex(Sms.LOCKED) } - val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) } - - val mmsThreadId by lazy { getColumnIndex(Mms.THREAD_ID) } - val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) } - val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) } - val mmsDate by lazy { getColumnIndex(Mms.DATE) } - val mmsDateSent by lazy { getColumnIndex(Mms.DATE_SENT) } - val mmsSeen by lazy { getColumnIndex(Mms.SEEN) } - val mmsRead by lazy { getColumnIndex(Mms.READ) } - 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 mmsLocked by lazy { getColumnIndex(Mms.LOCKED) } - val mmsStatus by lazy { getColumnIndex(Mms.STATUS) } - val mmsTextOnly by lazy { getColumnIndex(Mms.TEXT_ONLY) } - - private fun getColumnIndex(columnsName: String): Int { - return try { - cursor.getColumnIndexOrThrow(columnsName) - } catch (e: Exception) { - Timber.w(e) - -1 - } - } - -} diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 90fead2e..e6cc9a7f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -5,8 +5,8 @@ import android.database.Cursor import android.net.Uri import android.provider.Telephony import com.moez.QKSMS.common.util.extensions.asFlowable +import com.moez.QKSMS.data.mapper.CursorToMessageFlowable import com.moez.QKSMS.data.model.Conversation -import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.ContactRepository import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers @@ -19,7 +19,6 @@ import javax.inject.Singleton class SyncManager @Inject constructor(val context: Context, private val contactsRepo: ContactRepository) { fun copyToRealm(completionListener: () -> Unit) { - val contentResolver = context.contentResolver val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc") @@ -39,10 +38,9 @@ class SyncManager @Inject constructor(val context: Context, private val contacts .doOnNext { conversation -> realm?.insertOrUpdate(conversation) } .map { conversation -> conversation.id } .flatMap { threadId -> - val uri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString()) - val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc") - val columnsMap = MessageColumns(messagesCursor) - messagesCursor.asFlowable().map { cursor -> messageFromCursor(cursor, columnsMap) } + val uri = Uri.withAppendedPath(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId.toString()) + val messagesCursor = contentResolver.query(uri, CursorToMessageFlowable.CURSOR_PROJECTION, null, null, "date desc") + CursorToMessageFlowable.map(messagesCursor) } .filter { message -> message.type == "sms" || message.type == "mms" } .distinct { message -> message.id } @@ -68,41 +66,4 @@ class SyncManager @Inject constructor(val context: Context, private val contacts .forEach { contact -> contacts.add(contact) } } } - - // TODO take this out of the companion object - companion object { - fun messageFromCursor(cursor: Cursor, columnsMap: MessageColumns): Message { - return Message().apply { - type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) { - -1 -> "sms" - else -> cursor.getString(columnsMap.msgType) - } - - id = cursor.getLong(columnsMap.msgId) - body = cursor.getString(columnsMap.smsBody) ?: "" - - when (type) { - "sms" -> { - threadId = cursor.getLong(columnsMap.smsThreadId) - address = cursor.getString(columnsMap.smsAddress) - boxId = cursor.getInt(columnsMap.smsType) - date = cursor.getLong(columnsMap.mmsDate) - dateSent = cursor.getLong(columnsMap.mmsDateSent) - seen = cursor.getInt(columnsMap.mmsSeen) != 0 - read = cursor.getInt(columnsMap.mmsRead) != 0 - } - - "mms" -> { - threadId = cursor.getLong(columnsMap.mmsThreadId) - boxId = cursor.getInt(columnsMap.mmsMessageBox) - date = cursor.getLong(columnsMap.smsDate) - dateSent = cursor.getLong(columnsMap.smsDateSent) - seen = cursor.getInt(columnsMap.smsSeen) != 0 - read = cursor.getInt(columnsMap.smsRead) != 0 - errorType = cursor.getInt(columnsMap.mmsErrorType) - } - } - } - } - } } From b18027962abfad9ab9f7040e3311e79664b4e7f8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 2 Oct 2017 11:10:25 -0400 Subject: [PATCH 18/18] Create Mapper for Conversation -> Flowable and Interactor for syncing conversations --- .../mapper/CursorToConversationFlowable.kt | 38 ++++ .../data/mapper/CursorToMessageFlowable.kt | 183 +++++++++--------- .../java/com/moez/QKSMS/data/mapper/Mapper.kt | 7 + .../data/repository/MessageRepository.kt | 2 +- .../QKSMS/data/sync/ConversationColumns.kt | 14 -- .../moez/QKSMS/data/sync/RecipientColumns.kt | 11 -- .../com/moez/QKSMS/data/sync/SyncManager.kt | 69 ------- .../domain/interactor/SyncConversations.kt | 48 +++++ .../ConversationListViewModel.kt | 6 +- 9 files changed, 190 insertions(+), 188 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversationFlowable.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationColumns.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt delete mode 100644 qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/SyncConversations.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversationFlowable.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversationFlowable.kt new file mode 100644 index 00000000..c7ca5aa1 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversationFlowable.kt @@ -0,0 +1,38 @@ +package com.moez.QKSMS.data.mapper + +import android.database.Cursor +import android.net.Uri +import android.provider.Telephony.Threads +import com.moez.QKSMS.common.util.extensions.asFlowable +import com.moez.QKSMS.data.model.Conversation +import com.moez.QKSMS.data.repository.ContactRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class CursorToConversationFlowable @Inject constructor(val contactsRepo: ContactRepository) : Mapper> { + + override fun map(from: Cursor): Flowable { + return from.asFlowable().map { cursor -> + Conversation().apply { + id = cursor.getLong(ID) + + cursor.getString(RECIPIENT_IDS).split(" ") + .map { id -> id.toLong() } + .map { id -> contactsRepo.getContactBlocking(id) } + .filter { contact -> contact.recipientId != 0L } + .forEach { contact -> contacts.add(contact) } + } + } + } + + companion object { + val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true") + val PROJECTION = arrayOf( + Threads._ID, + Threads.RECIPIENT_IDS) + + val ID = 0 + val RECIPIENT_IDS = 1 + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt index 383687a0..91ec52f9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessageFlowable.kt @@ -1,117 +1,118 @@ package com.moez.QKSMS.data.mapper import android.database.Cursor -import android.provider.Telephony +import android.provider.Telephony.* import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.model.Message import io.reactivex.Flowable import timber.log.Timber +import javax.inject.Inject -object CursorToMessageFlowable { +class CursorToMessageFlowable @Inject constructor() : Mapper> { - fun map(cursor: Cursor): Flowable { - val messageColumns = MessageColumns(cursor) - return cursor.asFlowable().map { cursor -> cursorToMessage(cursor, messageColumns) } - } - - private fun cursorToMessage(cursor: Cursor, columnsMap: MessageColumns): Message { - return Message().apply { - type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) { - -1 -> "sms" - else -> cursor.getString(columnsMap.msgType) - } - - id = cursor.getLong(columnsMap.msgId) - body = cursor.getString(columnsMap.smsBody) ?: "" - - when (type) { - "sms" -> { - threadId = cursor.getLong(columnsMap.smsThreadId) - address = cursor.getString(columnsMap.smsAddress) - boxId = cursor.getInt(columnsMap.smsType) - date = cursor.getLong(columnsMap.mmsDate) - dateSent = cursor.getLong(columnsMap.mmsDateSent) - seen = cursor.getInt(columnsMap.mmsSeen) != 0 - read = cursor.getInt(columnsMap.mmsRead) != 0 + override fun map(from: Cursor): Flowable { + val columnsMap = MessageColumns(from) + return from.asFlowable().map { cursor -> + Message().apply { + type = when (cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN)) { + -1 -> "sms" + else -> cursor.getString(columnsMap.msgType) } - "mms" -> { - threadId = cursor.getLong(columnsMap.mmsThreadId) - boxId = cursor.getInt(columnsMap.mmsMessageBox) - date = cursor.getLong(columnsMap.smsDate) - dateSent = cursor.getLong(columnsMap.smsDateSent) - seen = cursor.getInt(columnsMap.smsSeen) != 0 - read = cursor.getInt(columnsMap.smsRead) != 0 - errorType = cursor.getInt(columnsMap.mmsErrorType) + id = cursor.getLong(columnsMap.msgId) + body = cursor.getString(columnsMap.smsBody) ?: "" + + when (type) { + "sms" -> { + threadId = cursor.getLong(columnsMap.smsThreadId) + address = cursor.getString(columnsMap.smsAddress) + boxId = cursor.getInt(columnsMap.smsType) + date = cursor.getLong(columnsMap.mmsDate) + dateSent = cursor.getLong(columnsMap.mmsDateSent) + seen = cursor.getInt(columnsMap.mmsSeen) != 0 + read = cursor.getInt(columnsMap.mmsRead) != 0 + } + + "mms" -> { + threadId = cursor.getLong(columnsMap.mmsThreadId) + boxId = cursor.getInt(columnsMap.mmsMessageBox) + date = cursor.getLong(columnsMap.smsDate) + dateSent = cursor.getLong(columnsMap.smsDateSent) + seen = cursor.getInt(columnsMap.smsSeen) != 0 + read = cursor.getInt(columnsMap.smsRead) != 0 + errorType = cursor.getInt(columnsMap.mmsErrorType) + } } } } } - val CURSOR_PROJECTION = arrayOf( - Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN, - Telephony.MmsSms._ID, + companion object { + val CURSOR_PROJECTION = arrayOf( + MmsSms.TYPE_DISCRIMINATOR_COLUMN, + MmsSms._ID, - Telephony.Sms.THREAD_ID, - Telephony.Sms.ADDRESS, - Telephony.Sms.BODY, - Telephony.Sms.DATE, - Telephony.Sms.DATE_SENT, - Telephony.Sms.SEEN, - Telephony.Sms.READ, - Telephony.Sms.TYPE, - Telephony.Sms.STATUS, - Telephony.Sms.LOCKED, - Telephony.Sms.ERROR_CODE, + Sms.THREAD_ID, + Sms.ADDRESS, + Sms.BODY, + Sms.DATE, + Sms.DATE_SENT, + Sms.SEEN, + Sms.READ, + Sms.TYPE, + Sms.STATUS, + Sms.LOCKED, + Sms.ERROR_CODE, - Telephony.Mms.THREAD_ID, - Telephony.Mms.SUBJECT, - Telephony.Mms.SUBJECT_CHARSET, - Telephony.Mms.DATE, - Telephony.Mms.DATE_SENT, - Telephony.Mms.SEEN, - Telephony.Mms.READ, - Telephony.Mms.MESSAGE_TYPE, - Telephony.Mms.MESSAGE_BOX, - Telephony.Mms.DELIVERY_REPORT, - Telephony.Mms.READ_REPORT, - Telephony.MmsSms.PendingMessages.ERROR_TYPE, - Telephony.Mms.LOCKED, - Telephony.Mms.STATUS, - Telephony.Mms.TEXT_ONLY) + Mms.THREAD_ID, + Mms.SUBJECT, + Mms.SUBJECT_CHARSET, + Mms.DATE, + Mms.DATE_SENT, + Mms.SEEN, + Mms.READ, + Mms.MESSAGE_TYPE, + Mms.MESSAGE_BOX, + Mms.DELIVERY_REPORT, + Mms.READ_REPORT, + MmsSms.PendingMessages.ERROR_TYPE, + Mms.LOCKED, + Mms.STATUS, + Mms.TEXT_ONLY) + } private class MessageColumns(val cursor: Cursor) { - val msgType by lazy { getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN) } - val msgId by lazy { getColumnIndex(Telephony.MmsSms._ID) } + val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) } + val msgId by lazy { getColumnIndex(MmsSms._ID) } - val smsThreadId by lazy { getColumnIndex(Telephony.Sms.THREAD_ID) } - val smsAddress by lazy { getColumnIndex(Telephony.Sms.ADDRESS) } - val smsBody by lazy { getColumnIndex(Telephony.Sms.BODY) } - val smsDate by lazy { getColumnIndex(Telephony.Sms.DATE) } - val smsDateSent by lazy { getColumnIndex(Telephony.Sms.DATE_SENT) } - val smsSeen by lazy { getColumnIndex(Telephony.Sms.SEEN) } - val smsRead by lazy { getColumnIndex(Telephony.Sms.READ) } - val smsType by lazy { getColumnIndex(Telephony.Sms.TYPE) } - val smsStatus by lazy { getColumnIndex(Telephony.Sms.STATUS) } - val smsLocked by lazy { getColumnIndex(Telephony.Sms.LOCKED) } - val smsErrorCode by lazy { getColumnIndex(Telephony.Sms.ERROR_CODE) } + val smsThreadId by lazy { getColumnIndex(Sms.THREAD_ID) } + val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) } + val smsBody by lazy { getColumnIndex(Sms.BODY) } + val smsDate by lazy { getColumnIndex(Sms.DATE) } + val smsDateSent by lazy { getColumnIndex(Sms.DATE_SENT) } + val smsSeen by lazy { getColumnIndex(Sms.SEEN) } + val smsRead by lazy { getColumnIndex(Sms.READ) } + val smsType by lazy { getColumnIndex(Sms.TYPE) } + val smsStatus by lazy { getColumnIndex(Sms.STATUS) } + val smsLocked by lazy { getColumnIndex(Sms.LOCKED) } + val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) } - val mmsThreadId by lazy { getColumnIndex(Telephony.Mms.THREAD_ID) } - val mmsSubject by lazy { getColumnIndex(Telephony.Mms.SUBJECT) } - val mmsSubjectCharset by lazy { getColumnIndex(Telephony.Mms.SUBJECT_CHARSET) } - val mmsDate by lazy { getColumnIndex(Telephony.Mms.DATE) } - val mmsDateSent by lazy { getColumnIndex(Telephony.Mms.DATE_SENT) } - val mmsSeen by lazy { getColumnIndex(Telephony.Mms.SEEN) } - val mmsRead by lazy { getColumnIndex(Telephony.Mms.READ) } - val mmsMessageType by lazy { getColumnIndex(Telephony.Mms.MESSAGE_TYPE) } - val mmsMessageBox by lazy { getColumnIndex(Telephony.Mms.MESSAGE_BOX) } - val mmsDeliveryReport by lazy { getColumnIndex(Telephony.Mms.DELIVERY_REPORT) } - val mmsReadReport by lazy { getColumnIndex(Telephony.Mms.READ_REPORT) } - val mmsErrorType by lazy { getColumnIndex(Telephony.MmsSms.PendingMessages.ERROR_TYPE) } - val mmsLocked by lazy { getColumnIndex(Telephony.Mms.LOCKED) } - val mmsStatus by lazy { getColumnIndex(Telephony.Mms.STATUS) } - val mmsTextOnly by lazy { getColumnIndex(Telephony.Mms.TEXT_ONLY) } + val mmsThreadId by lazy { getColumnIndex(Mms.THREAD_ID) } + val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) } + val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) } + val mmsDate by lazy { getColumnIndex(Mms.DATE) } + val mmsDateSent by lazy { getColumnIndex(Mms.DATE_SENT) } + val mmsSeen by lazy { getColumnIndex(Mms.SEEN) } + val mmsRead by lazy { getColumnIndex(Mms.READ) } + 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 mmsLocked by lazy { getColumnIndex(Mms.LOCKED) } + val mmsStatus by lazy { getColumnIndex(Mms.STATUS) } + val mmsTextOnly by lazy { getColumnIndex(Mms.TEXT_ONLY) } private fun getColumnIndex(columnsName: String): Int { return try { diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt new file mode 100644 index 00000000..ecb2c74b --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt @@ -0,0 +1,7 @@ +package com.moez.QKSMS.data.mapper + +interface Mapper { + + fun map(from: From): To + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 192bc927..de1e8c69 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -126,7 +126,7 @@ class MessageRepository @Inject constructor(private val context: Context) { fun addMessageFromUri(uri: Uri) { val cursor = context.contentResolver.query(uri, null, null, null, "date DESC") - CursorToMessageFlowable.map(cursor) + CursorToMessageFlowable().map(cursor) .subscribe { message -> message.insertOrUpdate() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationColumns.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationColumns.kt deleted file mode 100644 index 2963cc86..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationColumns.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.moez.QKSMS.data.sync - -import android.net.Uri - -internal object ConversationColumns { - - val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true") - val PROJECTION = arrayOf( - android.provider.Telephony.Threads._ID, - android.provider.Telephony.Threads.RECIPIENT_IDS) - - val ID = 0 - val RECIPIENT_IDS = 1 -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt deleted file mode 100644 index e5d9b408..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/RecipientColumns.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.moez.QKSMS.data.sync - -import android.net.Uri - -class RecipientColumns { - - companion object { - val URI = Uri.parse("content://mms-sms/canonical-address/") - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt deleted file mode 100644 index e6cc9a7f..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ /dev/null @@ -1,69 +0,0 @@ -package com.moez.QKSMS.data.sync - -import android.content.Context -import android.database.Cursor -import android.net.Uri -import android.provider.Telephony -import com.moez.QKSMS.common.util.extensions.asFlowable -import com.moez.QKSMS.data.mapper.CursorToMessageFlowable -import com.moez.QKSMS.data.model.Conversation -import com.moez.QKSMS.data.repository.ContactRepository -import io.reactivex.Flowable -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers -import io.realm.Realm -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class SyncManager @Inject constructor(val context: Context, private val contactsRepo: ContactRepository) { - - fun copyToRealm(completionListener: () -> Unit) { - val contentResolver = context.contentResolver - val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc") - - var realm: Realm? = null - - Flowable.just(conversationsCursor) - .subscribeOn(Schedulers.io()) - .doOnNext { - // We need to set up realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler - realm = Realm.getDefaultInstance() - realm?.beginTransaction() - realm?.deleteAll() - } - .flatMap { cursor -> cursor.asFlowable() } - .map { cursor -> conversationFromCursor(cursor) } - .distinct { conversation -> conversation.id } - .doOnNext { conversation -> realm?.insertOrUpdate(conversation) } - .map { conversation -> conversation.id } - .flatMap { threadId -> - val uri = Uri.withAppendedPath(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId.toString()) - val messagesCursor = contentResolver.query(uri, CursorToMessageFlowable.CURSOR_PROJECTION, null, null, "date desc") - CursorToMessageFlowable.map(messagesCursor) - } - .filter { message -> message.type == "sms" || message.type == "mms" } - .distinct { message -> message.id } - .doOnNext { message -> realm?.insertOrUpdate(message) } - .count() - .toFlowable() - .doOnNext { - realm?.commitTransaction() - realm?.close() - } - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { completionListener.invoke() } - } - - private fun conversationFromCursor(cursor: Cursor): Conversation { - return Conversation().apply { - id = cursor.getLong(ConversationColumns.ID) - - cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" ") - .map { id -> id.toLong() } - .map { id -> contactsRepo.getContactBlocking(id) } - .filter { contact -> contact.recipientId != 0L } - .forEach { contact -> contacts.add(contact) } - } - } -} diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SyncConversations.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SyncConversations.kt new file mode 100644 index 00000000..faceab16 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SyncConversations.kt @@ -0,0 +1,48 @@ +package com.moez.QKSMS.domain.interactor + +import android.content.Context +import android.net.Uri +import android.provider.Telephony +import com.moez.QKSMS.data.mapper.CursorToConversationFlowable +import com.moez.QKSMS.data.mapper.CursorToMessageFlowable +import io.reactivex.Flowable +import io.realm.Realm +import javax.inject.Inject + +class SyncConversations @Inject constructor( + private val context: Context, + private val cursorToConversationFlowable: CursorToConversationFlowable, + private val cursorToMessageFlowable: CursorToMessageFlowable) : Interactor() { + + override fun buildObservable(params: Unit): Flowable { + val contentResolver = context.contentResolver + val conversationsCursor = contentResolver.query(CursorToConversationFlowable.URI, CursorToConversationFlowable.PROJECTION, null, null, "date desc") + + var realm: Realm? = null + + return Flowable.just(conversationsCursor) + .doOnNext { + // We need to set up realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler + realm = Realm.getDefaultInstance() + realm?.beginTransaction() + realm?.deleteAll() + } + .flatMap { cursor -> cursorToConversationFlowable.map(cursor) } + .distinct { conversation -> conversation.id } + .doOnNext { conversation -> realm?.insertOrUpdate(conversation) } + .map { conversation -> conversation.id } + .map { threadId -> Uri.withAppendedPath(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId.toString()) } + .map { threadUri -> contentResolver.query(threadUri, CursorToMessageFlowable.CURSOR_PROJECTION, null, null, "date desc") } + .flatMap { threadCursor -> cursorToMessageFlowable.map(threadCursor) } + .filter { message -> message.type == "sms" || message.type == "mms" } + .distinct { message -> message.id } + .doOnNext { message -> realm?.insertOrUpdate(message) } + .count() + .toFlowable() + .doOnNext { + realm?.commitTransaction() + realm?.close() + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index b5bfe625..82f7e5ac 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -7,14 +7,15 @@ import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.domain.interactor.MarkAllSeen +import com.moez.QKSMS.domain.interactor.SyncConversations import io.reactivex.subjects.PublishSubject import io.realm.RealmResults import javax.inject.Inject class ConversationListViewModel : ViewModel() { - @Inject lateinit var syncManager: SyncManager @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var syncConversations: SyncConversations @Inject lateinit var markAllSeen: MarkAllSeen val state: MutableLiveData = MutableLiveData() @@ -37,11 +38,12 @@ class ConversationListViewModel : ViewModel() { fun onRefresh() { partialStates.onNext(PartialState.Refreshing(true)) - syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) } + syncConversations.execute({ partialStates.onNext(PartialState.Refreshing(false)) }, Unit) } override fun onCleared() { super.onCleared() + syncConversations.dispose() markAllSeen.dispose() }