diff --git a/build.gradle b/build.gradle index cce22af0..7d38272b 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' classpath 'com.google.gms:google-services:4.3.14' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 7c5f9408..634b9868 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -36,6 +36,7 @@ import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SearchResult import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull +import io.reactivex.Completable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -118,16 +119,28 @@ class ConversationRepositoryImpl @Inject constructor( } } - override fun setConversationName(id: Long, name: String) { - Realm.getDefaultInstance().use { realm -> - realm.executeTransaction { - realm.where(Conversation::class.java) - .equalTo("id", id) - .findFirst() - ?.name = name - } +// override fun setConversationName(id: Long, name: String) { +// Realm.getDefaultInstance().use { realm -> +// realm.executeTransaction { +// realm.where(Conversation::class.java) +// .equalTo("id", id) +// .findFirst() +// ?.name = name +// } +// } +// } + override fun setConversationName(id: Long, name: String): Completable { + return Completable.fromAction { + Realm.getDefaultInstance().use { realm -> + realm.executeTransaction { + realm.where(Conversation::class.java) + .equalTo("id", id) + .findFirst() + ?.name = name + } + } + }.subscribeOn(Schedulers.io()) // Ensure the operation is performed on a background thread } - } override fun searchConversations(query: CharSequence): List { val realm = Realm.getDefaultInstance() diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt index 38c48c9a..57d1a177 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.repository import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SearchResult +import io.reactivex.Completable import io.reactivex.Observable import io.realm.RealmResults @@ -35,7 +36,7 @@ interface ConversationRepository { */ fun getTopConversations(): List - fun setConversationName(id: Long, name: String) + fun setConversationName(id: Long, name: String): Completable fun searchConversations(query: CharSequence): List diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2466a6b3..42fab6ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index cf3c9bac..fcd3a6c5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -42,6 +42,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import javax.inject.Inject @@ -145,7 +146,10 @@ class ConversationInfoPresenter @Inject constructor( view.nameChanges() .withLatestFrom(conversation) { name, conversation -> conversationRepo.setConversationName(conversation.id, name) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) } + .flatMapCompletable { it } .autoDisposable(view.scope()) .subscribe()