forked from upstream-mirrors/quik
Fix branch name in actions
This commit is contained in:
@@ -23,7 +23,7 @@ import com.bumptech.glide.load.engine.GlideException
|
||||
import com.bumptech.glide.request.RequestListener
|
||||
import com.bumptech.glide.request.target.Target
|
||||
|
||||
class GlideCompletionListener<T>(private val listener: () -> Unit) : RequestListener<T> {
|
||||
class GlideCompletionListener<T : Any>(private val listener: () -> Unit) : RequestListener<T> {
|
||||
override fun onLoadFailed(
|
||||
e: GlideException?,
|
||||
model: Any?,
|
||||
|
||||
@@ -70,6 +70,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn
|
||||
@Inject lateinit var realmMigration: QkRealmMigration
|
||||
@Inject lateinit var referralManager: ReferralManager
|
||||
@Inject lateinit var workerFactory: WorkerFactory
|
||||
@Inject lateinit var messageRepository: dev.octoshrimpy.quik.repository.MessageRepository
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
@@ -80,6 +81,44 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn
|
||||
AppComponentManager.init(this)
|
||||
appComponent.inject(this)
|
||||
|
||||
// Setup matrix bridge
|
||||
ch.skew.remotrix.bridge.MatrixBridgeProvider.bridge = object : ch.skew.remotrix.bridge.MatrixBridge {
|
||||
override suspend fun sendNewMessages(toAddress: String, body: String, fromMatrix: Boolean) {
|
||||
messageRepository.sendNewMessages(
|
||||
subId = -1,
|
||||
toAddresses = listOf(toAddress),
|
||||
body = body,
|
||||
attachments = listOf(),
|
||||
sendAsGroup = false,
|
||||
delayMs = 0,
|
||||
fromMatrix = fromMatrix
|
||||
)
|
||||
}
|
||||
override suspend fun getBackfillMessages(limit: Int): List<Triple<String, String, Boolean>> {
|
||||
val messagesToSend = mutableListOf<Triple<String, String, Boolean>>()
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
val threads = realm.where(dev.octoshrimpy.quik.model.Conversation::class.java).findAll()
|
||||
for (thread in threads) {
|
||||
val threadAddress = thread.recipients.firstOrNull()?.address ?: thread.lastMessage?.address ?: ""
|
||||
val threadMessages = realm.where(dev.octoshrimpy.quik.model.Message::class.java)
|
||||
.equalTo("threadId", thread.id)
|
||||
.sort("date", io.realm.Sort.DESCENDING)
|
||||
.limit(limit.toLong())
|
||||
.findAll()
|
||||
|
||||
threadMessages.reversed().forEach { msg ->
|
||||
val msgAddress = msg.address.takeIf { it.isNotBlank() } ?: threadAddress
|
||||
val msgBody = msg.getText(withSubject = false)
|
||||
if (msgAddress.isNotBlank() && msgBody.isNotBlank()) {
|
||||
messagesToSend.add(Triple(msgAddress, msgBody, msg.isMe()))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return messagesToSend
|
||||
}
|
||||
}
|
||||
|
||||
Realm.init(this)
|
||||
Realm.setDefaultConfiguration(RealmConfiguration.Builder()
|
||||
.compactOnLaunch()
|
||||
|
||||
@@ -28,7 +28,7 @@ import androidx.viewbinding.ViewBinding
|
||||
import com.bluelinelabs.conductor.archlifecycle.LifecycleController
|
||||
import dev.octoshrimpy.quik.R
|
||||
|
||||
abstract class QkController<VB : ViewBinding, ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : LifecycleController() {
|
||||
abstract class QkController<VB : ViewBinding, ViewContract : QkViewContract<State>, State : Any, Presenter : QkPresenter<ViewContract, State>> : LifecycleController() {
|
||||
|
||||
abstract var presenter: Presenter
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
abstract class QkPresenter<View : QkViewContract<State>, State>(initialState: State) {
|
||||
abstract class QkPresenter<View : QkViewContract<State>, State : Any>(initialState: State) {
|
||||
|
||||
protected val disposables = CompositeDisposable()
|
||||
protected val state: Subject<State> = BehaviorSubject.createDefault(initialState)
|
||||
@@ -41,7 +41,7 @@ abstract class QkPresenter<View : QkViewContract<State>, State>(initialState: St
|
||||
disposables += stateReducer
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.scan(initialState) { state, reducer -> reducer(state) }
|
||||
.subscribe(state::onNext)
|
||||
.subscribe { state.onNext(it) }
|
||||
}
|
||||
|
||||
@CallSuper
|
||||
|
||||
@@ -626,6 +626,7 @@ class ComposeViewModel @Inject constructor(
|
||||
.observeOn(Schedulers.io())
|
||||
.withLatestFrom(conversation) { newSendAsGroup, conversation ->
|
||||
conversationRepo.updateSendAsGroup(conversation.id, newSendAsGroup)
|
||||
Unit
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
@@ -71,6 +71,7 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
@Inject lateinit var messageLinkHandlingDialog: QkDialog
|
||||
|
||||
@Inject override lateinit var presenter: SettingsPresenter
|
||||
@Inject lateinit var prefs: Preferences
|
||||
|
||||
private val signatureDialog: TextInputDialog by lazy {
|
||||
TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
|
||||
@@ -80,6 +81,16 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
private val signatureSubject: Subject<String> = PublishSubject.create()
|
||||
|
||||
private val matrixManagerIdSubject: Subject<String> = PublishSubject.create()
|
||||
private val matrixBackfillSubject: Subject<String> = PublishSubject.create()
|
||||
|
||||
private val matrixManagerIdDialog: TextInputDialog by lazy {
|
||||
TextInputDialog(activity!!, "Manager ID", matrixManagerIdSubject::onNext)
|
||||
}
|
||||
private val matrixBackfillDialog: TextInputDialog by lazy {
|
||||
TextInputDialog(activity!!, "Backfill Limit", matrixBackfillSubject::onNext)
|
||||
}
|
||||
|
||||
private val progressAnimator by lazy { ObjectAnimator.ofInt(binding.syncingProgress, "progress", 0, 0) }
|
||||
|
||||
@@ -187,6 +198,10 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
messageLinkHandlingDialog.adapter.selectedItem = state.messageLinkHandlingId
|
||||
|
||||
binding.disableScreenshots.checkbox?.isChecked = state.disableScreenshotsEnabled
|
||||
|
||||
binding.matrixManagerId.summary = state.matrixManagerId.takeIf { it.isNotBlank() } ?: "@username:matrix.org"
|
||||
binding.matrixLogin.summary = state.matrixAccount
|
||||
binding.matrixBackfill.summary = state.matrixBackfillLimit
|
||||
|
||||
when (state.syncProgress) {
|
||||
is SyncRepository.SyncProgress.Idle -> binding.syncingProgress.isVisible = false
|
||||
@@ -237,6 +252,68 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
|
||||
override fun showDelayDurationDialog() = sendDelayDialog.show(activity!!)
|
||||
|
||||
override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
|
||||
|
||||
override fun matrixManagerIdChanged(): Observable<String> = matrixManagerIdSubject
|
||||
override fun matrixBackfillChanged(): Observable<String> = matrixBackfillSubject
|
||||
|
||||
override fun showMatrixManagerIdDialog(managerId: String) = matrixManagerIdDialog.setText(managerId).show()
|
||||
override fun showMatrixBackfillDialog(limit: String) = matrixBackfillDialog.setText(limit).show()
|
||||
|
||||
override fun showMatrixLoginDialog() {
|
||||
val dialogView = LayoutInflater.from(activity).inflate(R.layout.matrix_login_dialog, null)
|
||||
val builder = androidx.appcompat.app.AlertDialog.Builder(activity!!)
|
||||
builder.setTitle("Matrix Login")
|
||||
builder.setView(dialogView)
|
||||
builder.setPositiveButton("Log in", null) // Handled later to prevent auto-close
|
||||
builder.setNegativeButton("Cancel", null)
|
||||
val dialog = builder.create()
|
||||
dialog.setOnShowListener {
|
||||
val loginBtn = dialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE)
|
||||
loginBtn.setOnClickListener {
|
||||
val username = dialogView.findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.matrixUsername).text.toString()
|
||||
val password = dialogView.findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.matrixPassword).text.toString()
|
||||
val url = dialogView.findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.matrixUrl).text.toString()
|
||||
val status = dialogView.findViewById<android.widget.TextView>(R.id.matrixStatus)
|
||||
status.visibility = View.VISIBLE
|
||||
status.text = "Logging in..."
|
||||
|
||||
val currentManagerId = prefs.matrixManagerId.get()
|
||||
if (currentManagerId.isNullOrBlank()) {
|
||||
status.text = "Please set Manager ID first!"
|
||||
return@setOnClickListener
|
||||
}
|
||||
|
||||
ch.skew.remotrix.onLoginClick(
|
||||
context = activity!!,
|
||||
scope = kotlinx.coroutines.CoroutineScope(kotlinx.coroutines.Dispatchers.IO),
|
||||
username = username,
|
||||
password = password,
|
||||
inputUrl = url,
|
||||
managerId = currentManagerId!!,
|
||||
managementSpaceId = null,
|
||||
messagingSpaceInput = null,
|
||||
abort = { errorMsg ->
|
||||
activity?.runOnUiThread {
|
||||
status.text = "Error: $errorMsg"
|
||||
}
|
||||
},
|
||||
onClickGoBack = {
|
||||
activity?.runOnUiThread {
|
||||
dialog.dismiss()
|
||||
val accountName = Regex("@([a-z0-9_.-]+):").find(username.lowercase())?.value ?: username.lowercase()
|
||||
prefs.matrixAccount.set(accountName)
|
||||
}
|
||||
},
|
||||
update = { step ->
|
||||
activity?.runOnUiThread {
|
||||
status.text = step.name
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
dialog.show()
|
||||
}
|
||||
|
||||
override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
|
||||
|
||||
|
||||
@@ -34,6 +34,9 @@ import dev.octoshrimpy.quik.repository.SyncRepository
|
||||
import dev.octoshrimpy.quik.util.NightModeManager
|
||||
import dev.octoshrimpy.quik.util.Preferences
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.launch
|
||||
import timber.log.Timber
|
||||
import java.util.Calendar
|
||||
import java.util.concurrent.TimeUnit
|
||||
@@ -145,6 +148,15 @@ class SettingsPresenter @Inject constructor(
|
||||
disposables += prefs.disableScreenshots.asObservable()
|
||||
.subscribe { enabled -> newState { copy(disableScreenshotsEnabled = enabled) } }
|
||||
|
||||
disposables += prefs.matrixManagerId.asObservable()
|
||||
.subscribe { managerId -> newState { copy(matrixManagerId = managerId) } }
|
||||
|
||||
disposables += prefs.matrixAccount.asObservable()
|
||||
.subscribe { account -> newState { copy(matrixAccount = account) } }
|
||||
|
||||
disposables += prefs.matrixBackfillLimit.asObservable()
|
||||
.subscribe { limit -> newState { copy(matrixBackfillLimit = limit) } }
|
||||
|
||||
disposables += syncRepo.syncProgress
|
||||
.sample(16, TimeUnit.MILLISECONDS)
|
||||
.distinctUntilChanged()
|
||||
@@ -218,6 +230,12 @@ class SettingsPresenter @Inject constructor(
|
||||
|
||||
R.id.disableScreenshots -> prefs.disableScreenshots.set(!prefs.disableScreenshots.get())
|
||||
|
||||
R.id.matrixManagerId -> view.showMatrixManagerIdDialog(prefs.matrixManagerId.get())
|
||||
|
||||
R.id.matrixLogin -> view.showMatrixLoginDialog()
|
||||
|
||||
R.id.matrixBackfill -> view.showMatrixBackfillDialog(prefs.matrixBackfillLimit.get())
|
||||
|
||||
R.id.sync -> syncMessages.execute(Unit)
|
||||
|
||||
R.id.about -> view.showAbout()
|
||||
@@ -285,6 +303,28 @@ class SettingsPresenter @Inject constructor(
|
||||
view.messageLinkHandlingSelected()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe(prefs.messageLinkHandling::set)
|
||||
|
||||
view.matrixManagerIdChanged()
|
||||
.doOnNext { managerId ->
|
||||
prefs.matrixManagerId.set(managerId)
|
||||
GlobalScope.launch(Dispatchers.IO) {
|
||||
ch.skew.remotrix.data.RemotrixSettings(context).saveManagerId(managerId)
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.matrixBackfillChanged()
|
||||
.doOnNext { limit ->
|
||||
prefs.matrixBackfillLimit.set(limit)
|
||||
GlobalScope.launch(Dispatchers.IO) {
|
||||
val settings = ch.skew.remotrix.data.RemotrixSettings(context)
|
||||
settings.saveBackfillLimit(limit.toIntOrNull() ?: 100)
|
||||
settings.saveBackfillDone(false)
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -51,5 +51,8 @@ data class SettingsState(
|
||||
val messageLinkHandlingSummary: String = "Ask before opening",
|
||||
val messageLinkHandlingId: Int = 2,
|
||||
val disableScreenshotsEnabled: Boolean = false,
|
||||
val matrixManagerId: String = "",
|
||||
val matrixAccount: String = "Not logged in",
|
||||
val matrixBackfillLimit: String = "100",
|
||||
val syncProgress: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle
|
||||
)
|
||||
@@ -34,6 +34,8 @@ interface SettingsView : QkViewContract<SettingsState> {
|
||||
fun signatureChanged(): Observable<String>
|
||||
fun mmsSizeSelected(): Observable<Int>
|
||||
fun messageLinkHandlingSelected(): Observable<Int>
|
||||
fun matrixManagerIdChanged(): Observable<String>
|
||||
fun matrixBackfillChanged(): Observable<String>
|
||||
|
||||
fun showQksmsPlusSnackbar()
|
||||
fun showNightModeDialog()
|
||||
@@ -44,6 +46,9 @@ interface SettingsView : QkViewContract<SettingsState> {
|
||||
fun showSignatureDialog(signature: String)
|
||||
fun showMmsSizePicker()
|
||||
fun showMessageLinkHandlingDialogPicker()
|
||||
fun showMatrixManagerIdDialog(managerId: String)
|
||||
fun showMatrixLoginDialog()
|
||||
fun showMatrixBackfillDialog(limit: String)
|
||||
fun showSwipeActions()
|
||||
fun showThemePicker()
|
||||
fun showAbout()
|
||||
|
||||
@@ -40,4 +40,8 @@ abstract class ServiceBuilderModule {
|
||||
@ContributesAndroidInjector
|
||||
abstract fun bindRestoreBackupService(): RestoreBackupService
|
||||
|
||||
@ActivityScope
|
||||
@ContributesAndroidInjector
|
||||
abstract fun bindCommandService(): ch.skew.remotrix.background.CommandService
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="Matrix Username (@user:example.com)">
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/matrixUsername"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textEmailAddress" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:hint="Password">
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/matrixPassword"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:hint="Homeserver URL (optional)">
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/matrixUrl"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textUri" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/matrixStatus"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:textAlignment="center"
|
||||
android:visibility="gone" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -237,6 +237,44 @@
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
style="@style/PreferenceCategory"
|
||||
android:text="Matrix Sync" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/matrixManagerId"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_person_black_24dp"
|
||||
app:title="Manager ID"
|
||||
tools:summary="@username:matrix.org" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/matrixLogin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:title="Matrix Account"
|
||||
tools:summary="Not logged in" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/matrixBackfill"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:icon="@drawable/ic_sync_black_24dp"
|
||||
app:title="Backfill Limit"
|
||||
tools:summary="100" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="?android:attr/divider" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
style="@style/PreferenceCategory"
|
||||
android:text="@string/settings_category_general" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.PreferenceView
|
||||
android:id="@+id/sync"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
Reference in New Issue
Block a user