forked from upstream-mirrors/quik
Merge pull request #58 from octoshrimpy/develop
feat: rename group conversations
This commit is contained in:
+1
-1
@@ -43,7 +43,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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.firebase:firebase-crashlytics-gradle:2.5.2'
|
||||||
classpath 'com.google.gms:google-services:4.3.14'
|
classpath 'com.google.gms:google-services:4.3.14'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import dev.octoshrimpy.quik.model.Recipient
|
|||||||
import dev.octoshrimpy.quik.model.SearchResult
|
import dev.octoshrimpy.quik.model.SearchResult
|
||||||
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
import dev.octoshrimpy.quik.util.PhoneNumberUtils
|
||||||
import dev.octoshrimpy.quik.util.tryOrNull
|
import dev.octoshrimpy.quik.util.tryOrNull
|
||||||
|
import io.reactivex.Completable
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
@@ -118,16 +119,28 @@ class ConversationRepositoryImpl @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setConversationName(id: Long, name: String) {
|
// override fun setConversationName(id: Long, name: String) {
|
||||||
Realm.getDefaultInstance().use { realm ->
|
// Realm.getDefaultInstance().use { realm ->
|
||||||
realm.executeTransaction {
|
// realm.executeTransaction {
|
||||||
realm.where(Conversation::class.java)
|
// realm.where(Conversation::class.java)
|
||||||
.equalTo("id", id)
|
// .equalTo("id", id)
|
||||||
.findFirst()
|
// .findFirst()
|
||||||
?.name = name
|
// ?.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<SearchResult> {
|
override fun searchConversations(query: CharSequence): List<SearchResult> {
|
||||||
val realm = Realm.getDefaultInstance()
|
val realm = Realm.getDefaultInstance()
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.repository
|
|||||||
import dev.octoshrimpy.quik.model.Conversation
|
import dev.octoshrimpy.quik.model.Conversation
|
||||||
import dev.octoshrimpy.quik.model.Recipient
|
import dev.octoshrimpy.quik.model.Recipient
|
||||||
import dev.octoshrimpy.quik.model.SearchResult
|
import dev.octoshrimpy.quik.model.SearchResult
|
||||||
|
import io.reactivex.Completable
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ interface ConversationRepository {
|
|||||||
*/
|
*/
|
||||||
fun getTopConversations(): List<Conversation>
|
fun getTopConversations(): List<Conversation>
|
||||||
|
|
||||||
fun setConversationName(id: Long, name: String)
|
fun setConversationName(id: Long, name: String): Completable
|
||||||
|
|
||||||
fun searchConversations(query: CharSequence): List<SearchResult>
|
fun searchConversations(query: CharSequence): List<SearchResult>
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|||||||
+4
@@ -42,6 +42,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
|
|||||||
import io.reactivex.rxkotlin.Observables
|
import io.reactivex.rxkotlin.Observables
|
||||||
import io.reactivex.rxkotlin.plusAssign
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
import io.reactivex.rxkotlin.withLatestFrom
|
import io.reactivex.rxkotlin.withLatestFrom
|
||||||
|
import io.reactivex.schedulers.Schedulers
|
||||||
import io.reactivex.subjects.BehaviorSubject
|
import io.reactivex.subjects.BehaviorSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -145,7 +146,10 @@ class ConversationInfoPresenter @Inject constructor(
|
|||||||
view.nameChanges()
|
view.nameChanges()
|
||||||
.withLatestFrom(conversation) { name, conversation ->
|
.withLatestFrom(conversation) { name, conversation ->
|
||||||
conversationRepo.setConversationName(conversation.id, name)
|
conversationRepo.setConversationName(conversation.id, name)
|
||||||
|
.subscribeOn(Schedulers.io())
|
||||||
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
}
|
}
|
||||||
|
.flatMapCompletable { it }
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe()
|
.subscribe()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user