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()