From 9ced706ff0a3f795548f4b595a400dc951d6a6d8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 11 Jun 2018 15:10:37 -0400 Subject: [PATCH 01/17] Use system getOrCreateThreadId if available --- data/src/main/java/compat/TelephonyCompat.kt | 81 +++++++++++++++++++ .../java/repository/MessageRepositoryImpl.kt | 21 +---- data/src/main/java/util/MessageUtils.kt | 50 ------------ 3 files changed, 84 insertions(+), 68 deletions(-) create mode 100644 data/src/main/java/compat/TelephonyCompat.kt delete mode 100644 data/src/main/java/util/MessageUtils.kt diff --git a/data/src/main/java/compat/TelephonyCompat.kt b/data/src/main/java/compat/TelephonyCompat.kt new file mode 100644 index 00000000..0eabe3a4 --- /dev/null +++ b/data/src/main/java/compat/TelephonyCompat.kt @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package compat + +import android.content.Context +import android.database.sqlite.SqliteWrapper +import android.net.Uri +import android.os.Build +import android.provider.BaseColumns +import android.provider.Telephony +import android.text.TextUtils +import android.util.Patterns +import timber.log.Timber +import java.util.regex.Pattern + +object TelephonyCompat { + + private val ID_PROJECTION = arrayOf(BaseColumns._ID) + + private val THREAD_ID_CONTENT_URI = Uri.parse("content://mms-sms/threadID") + + val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*") + + fun getOrCreateThreadId(context: Context, recipients: Set): Long { + return if (Build.VERSION.SDK_INT >= 23) { + Telephony.Threads.getOrCreateThreadId(context, recipients) + } else { + val uriBuilder = THREAD_ID_CONTENT_URI.buildUpon() + + recipients + .map { recipient -> if (isEmailAddress(recipient)) extractAddrSpec(recipient) else recipient } + .forEach { recipient -> uriBuilder.appendQueryParameter("recipient", recipient) } + + val uri = uriBuilder.build() + + SqliteWrapper.query(context, context.contentResolver, uri, ID_PROJECTION, null, null, null)?.use { cursor -> + if (cursor.moveToFirst()) { + return cursor.getLong(0) + } else { + Timber.e("getOrCreateThreadId returned no rows!") + } + } + + Timber.e("getOrCreateThreadId failed with " + recipients.size + " recipients") + throw IllegalArgumentException("Unable to find or allocate a thread ID.") + } + } + + fun extractAddrSpec(address: String): String { + val match = NAME_ADDR_EMAIL_PATTERN.matcher(address) + return if (match.matches()) { + match.group(2) + } else address + } + + fun isEmailAddress(address: String): Boolean { + if (TextUtils.isEmpty(address)) { + return false + } + val s = extractAddrSpec(address) + val match = Patterns.EMAIL_ADDRESS.matcher(s) + return match.matches() + } + +} \ No newline at end of file diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index f84c612e..85fb428c 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -24,11 +24,8 @@ import android.content.ContentUris import android.content.ContentValues import android.content.Context import android.content.Intent -import android.database.sqlite.SqliteWrapper import android.graphics.Bitmap -import android.net.Uri import android.os.Build -import android.provider.BaseColumns import android.provider.Telephony import android.telephony.PhoneNumberUtils import android.telephony.SmsManager @@ -37,6 +34,7 @@ import com.klinker.android.send_message.BroadcastUtils import com.klinker.android.send_message.Settings import com.klinker.android.send_message.StripAccents import com.klinker.android.send_message.Transaction +import compat.TelephonyCompat import filter.ConversationFilter import io.realm.Case import io.realm.Realm @@ -51,10 +49,10 @@ import model.Conversation import model.Message import model.MmsPart import model.SearchResult -import util.MessageUtils import util.Preferences import util.extensions.anyOf import util.extensions.map +import util.tryOrNull import java.io.ByteArrayOutputStream import javax.inject.Inject import javax.inject.Singleton @@ -153,20 +151,7 @@ class MessageRepositoryImpl @Inject constructor( } override fun getOrCreateConversation(addresses: List): Conversation? { - return addresses - .map { address -> - when (MessageUtils.isEmailAddress(address)) { - true -> MessageUtils.extractAddrSpec(address) - false -> address - } - } - .let { recipients -> - Uri.parse("content://mms-sms/threadID").buildUpon().apply { - recipients.forEach { recipient -> appendQueryParameter("recipient", recipient) } - }.build() - } - .let { uri -> SqliteWrapper.query(context, context.contentResolver, uri, arrayOf(BaseColumns._ID), null, null, null) } - ?.use { cursor -> if (cursor.moveToFirst()) cursor.getLong(0) else null } + return tryOrNull { TelephonyCompat.getOrCreateThreadId(context, addresses.toSet()) } ?.takeIf { threadId -> threadId != 0L } ?.let { threadId -> var conversation = getConversation(threadId) diff --git a/data/src/main/java/util/MessageUtils.kt b/data/src/main/java/util/MessageUtils.kt deleted file mode 100644 index 50598670..00000000 --- a/data/src/main/java/util/MessageUtils.kt +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package util - -import android.text.TextUtils -import android.util.Patterns -import java.util.regex.Pattern - -/** - * Utils for using Telephony functions on lower API levels - * - * Adapted from https://android.googlesource.com/platform/packages/apps/Messaging/+/master/src/com/android/messaging/sms/MmsSmsUtils.java - */ -object MessageUtils { - - val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*") - - fun extractAddrSpec(address: String): String { - val match = NAME_ADDR_EMAIL_PATTERN.matcher(address) - return if (match.matches()) { - match.group(2) - } else address - } - - fun isEmailAddress(address: String): Boolean { - if (TextUtils.isEmpty(address)) { - return false - } - val s = extractAddrSpec(address) - val match = Patterns.EMAIL_ADDRESS.matcher(s) - return match.matches() - } - -} \ No newline at end of file From 73887558fa93e0683de8a181c30e61408aec5a67 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 11 Jun 2018 20:16:16 -0400 Subject: [PATCH 02/17] Add support for Android 5.0 --- android-smsmms/build.gradle | 2 +- .../android/send_message/SmsManagerFactory.kt | 3 +- data/build.gradle | 2 +- .../java/compat/SubscriptionInfoCompat.kt | 32 +++++++++ .../java/compat/SubscriptionManagerCompat.kt | 69 +++++++++++++++++++ .../java/receiver/RemoteMessagingReceiver.kt | 6 +- .../java/util/ActiveSubscriptionObservable.kt | 43 ++++++++++++ .../main/java/util/SubscriptionUtilsImpl.kt | 69 ------------------- domain/build.gradle | 2 +- .../src/main/java/util/SubscriptionUtils.kt | 14 ---- presentation/build.gradle | 2 +- .../src/main/java/common/widget/AvatarView.kt | 22 +++--- .../java/common/widget/GroupAvatarView.kt | 6 ++ .../java/feature/compose/ComposeActivity.kt | 7 ++ .../main/java/feature/compose/ComposeState.kt | 3 +- .../java/feature/compose/ComposeViewModel.kt | 10 +-- .../java/feature/compose/MessagesAdapter.kt | 6 +- .../java/feature/qkreply/QkReplyActivity.kt | 10 +++ .../main/java/feature/qkreply/QkReplyState.kt | 4 +- .../java/feature/qkreply/QkReplyViewModel.kt | 10 +-- .../src/main/java/injection/AppModule.kt | 8 --- 21 files changed, 205 insertions(+), 125 deletions(-) create mode 100644 data/src/main/java/compat/SubscriptionInfoCompat.kt create mode 100644 data/src/main/java/compat/SubscriptionManagerCompat.kt create mode 100644 data/src/main/java/util/ActiveSubscriptionObservable.kt delete mode 100644 data/src/main/java/util/SubscriptionUtilsImpl.kt delete mode 100644 domain/src/main/java/util/SubscriptionUtils.kt diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 1c8cc0c0..8e93643e 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -23,7 +23,7 @@ android { compileSdkVersion 25 defaultConfig { - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt index 624c75b9..1f0e447c 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt @@ -1,5 +1,6 @@ package com.klinker.android.send_message +import android.os.Build import android.telephony.SmsManager object SmsManagerFactory { @@ -9,7 +10,7 @@ object SmsManagerFactory { fun createSmsManager(subscriptionId: Int): SmsManager { var manager: SmsManager? = null - if (subscriptionId != -1) { + if (subscriptionId != -1 && Build.VERSION.SDK_INT >= 22) { try { manager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId) } catch (e: Exception) { diff --git a/data/build.gradle b/data/build.gradle index 43a87db2..e58f1548 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -6,7 +6,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 27 } } diff --git a/data/src/main/java/compat/SubscriptionInfoCompat.kt b/data/src/main/java/compat/SubscriptionInfoCompat.kt new file mode 100644 index 00000000..7cce63f3 --- /dev/null +++ b/data/src/main/java/compat/SubscriptionInfoCompat.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package compat + +import android.annotation.TargetApi +import android.os.Build +import android.telephony.SubscriptionInfo + +@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1) +data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) { + + val subscriptionId get() = subscriptionInfo.subscriptionId + + val simSlotIndex get() = subscriptionInfo.simSlotIndex + +} \ No newline at end of file diff --git a/data/src/main/java/compat/SubscriptionManagerCompat.kt b/data/src/main/java/compat/SubscriptionManagerCompat.kt new file mode 100644 index 00000000..a564e242 --- /dev/null +++ b/data/src/main/java/compat/SubscriptionManagerCompat.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package compat + +import android.content.Context +import android.os.Build +import android.telephony.SubscriptionManager +import manager.PermissionManager +import javax.inject.Inject + +class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) { + + private val subscriptionManager: SubscriptionManager? + get() = field?.takeIf { permissions.hasPhone() } + + val activeSubscriptionInfoList: List + get() { + return if (Build.VERSION.SDK_INT >= 22) { + subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf() + } else listOf() + } + + init { + subscriptionManager = if (Build.VERSION.SDK_INT >= 22) SubscriptionManager.from(context) else null + } + + fun addOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) { + if (Build.VERSION.SDK_INT >= 22) { + subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener) + } + } + + fun removeOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) { + if (Build.VERSION.SDK_INT >= 22) { + subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener) + } + } + + abstract class OnSubscriptionsChangedListener { + + val listener: SubscriptionManager.OnSubscriptionsChangedListener? = if (Build.VERSION.SDK_INT >= 22) { + object : SubscriptionManager.OnSubscriptionsChangedListener() { + override fun onSubscriptionsChanged() { + this@OnSubscriptionsChangedListener.onSubscriptionsChanged() + } + } + } else null + + abstract fun onSubscriptionsChanged() + + } + +} \ No newline at end of file diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/receiver/RemoteMessagingReceiver.kt index a0b7d5d9..fde382ee 100644 --- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -22,11 +22,11 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.support.v4.app.RemoteInput +import compat.SubscriptionManagerCompat import dagger.android.AndroidInjection import interactor.MarkRead import interactor.SendMessage import repository.MessageRepository -import util.SubscriptionUtils import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { @@ -34,7 +34,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { @Inject lateinit var markRead: MarkRead @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage - @Inject lateinit var subUtils: SubscriptionUtils + @Inject lateinit var subscriptionManager: SubscriptionManagerCompat override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) @@ -47,7 +47,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { markRead.execute(threadId) val lastMessage = messageRepo.getMessages(threadId).lastOrNull() - val subId = subUtils.subscriptions.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1 + val subId = subscriptionManager.activeSubscriptionInfoList.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1 val addresses = messageRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return val pendingRepository = goAsync() diff --git a/data/src/main/java/util/ActiveSubscriptionObservable.kt b/data/src/main/java/util/ActiveSubscriptionObservable.kt new file mode 100644 index 00000000..075a57b7 --- /dev/null +++ b/data/src/main/java/util/ActiveSubscriptionObservable.kt @@ -0,0 +1,43 @@ +package util + +import compat.SubscriptionInfoCompat +import compat.SubscriptionManagerCompat +import io.reactivex.Observable +import io.reactivex.Observer +import io.reactivex.disposables.Disposable + +class ActiveSubscriptionObservable( + private val subscriptionManager: SubscriptionManagerCompat +) : Observable>() { + + override fun subscribeActual(observer: Observer>) { + observer.onNext(subscriptionManager.activeSubscriptionInfoList) + + val listener = Listener(subscriptionManager, observer) + observer.onSubscribe(listener) + subscriptionManager.addOnSubscriptionsChangedListener(listener) + } + + internal class Listener( + private val subscriptionManager: SubscriptionManagerCompat, + private val observer: Observer> + ) : Disposable, SubscriptionManagerCompat.OnSubscriptionsChangedListener() { + + private var disposed: Boolean = false + + override fun onSubscriptionsChanged() { + if (!isDisposed) { + observer.onNext(subscriptionManager.activeSubscriptionInfoList) + } + } + + override fun isDisposed(): Boolean = disposed + + override fun dispose() { + disposed = true + subscriptionManager.removeOnSubscriptionsChangedListener(this) + } + + } + +} \ No newline at end of file diff --git a/data/src/main/java/util/SubscriptionUtilsImpl.kt b/data/src/main/java/util/SubscriptionUtilsImpl.kt deleted file mode 100644 index 9fa5c2a3..00000000 --- a/data/src/main/java/util/SubscriptionUtilsImpl.kt +++ /dev/null @@ -1,69 +0,0 @@ -package util - -import android.content.Context -import android.telephony.PhoneNumberUtils -import android.telephony.SubscriptionInfo -import android.telephony.SubscriptionManager -import io.reactivex.Observable -import io.reactivex.Observer -import io.reactivex.disposables.Disposable -import manager.PermissionManager -import javax.inject.Inject - -class SubscriptionUtilsImpl @Inject constructor( - context: Context, - private val permissions: PermissionManager -) : SubscriptionUtils { - - /** - * If we don't have the phone permission, then return a null [SubscriptionManager] - */ - private val subscriptionManager: SubscriptionManager? = SubscriptionManager.from(context) - get() = field?.takeIf { permissions.hasPhone() } - - override val subscriptions: List - get() = subscriptionManager?.activeSubscriptionInfoList ?: listOf() - - override val subscriptionsObservable: Observable> = ActiveSubscriptionObservable(subscriptionManager) - - override fun getSubIdForAddress(address: String): Int { - return subscriptions.firstOrNull { PhoneNumberUtils.compare(it.number, address) }?.subscriptionId ?: -1 - } - -} - -class ActiveSubscriptionObservable( - private val subscriptionManager: SubscriptionManager? -) : Observable>() { - - override fun subscribeActual(observer: Observer>) { - observer.onNext(subscriptionManager?.activeSubscriptionInfoList ?: listOf()) - - val listener = Listener(subscriptionManager, observer) - observer.onSubscribe(listener) - subscriptionManager?.addOnSubscriptionsChangedListener(listener) - } - - internal class Listener( - private val subscriptionManager: SubscriptionManager?, - private val observer: Observer> - ) : Disposable, SubscriptionManager.OnSubscriptionsChangedListener() { - - private var disposed: Boolean = false - - override fun onSubscriptionsChanged() { - if (!isDisposed) { - observer.onNext(subscriptionManager?.activeSubscriptionInfoList ?: listOf()) - } - } - - override fun isDisposed(): Boolean = disposed - - override fun dispose() { - disposed = true - subscriptionManager?.removeOnSubscriptionsChangedListener(this) - } - - } - -} \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index f7aa73a0..e14e4f62 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,7 +7,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 27 } } diff --git a/domain/src/main/java/util/SubscriptionUtils.kt b/domain/src/main/java/util/SubscriptionUtils.kt deleted file mode 100644 index 62759c0d..00000000 --- a/domain/src/main/java/util/SubscriptionUtils.kt +++ /dev/null @@ -1,14 +0,0 @@ -package util - -import android.telephony.SubscriptionInfo -import io.reactivex.Observable - -interface SubscriptionUtils { - - val subscriptions: List - - val subscriptionsObservable: Observable> - - fun getSubIdForAddress(address: String): Int - -} \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 2fa99db0..170c67d2 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.moez.QKSMS" - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 27 versionCode 173 versionName "3.3.2" diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt index a0bf3950..73c15891 100644 --- a/presentation/src/main/java/common/widget/AvatarView.kt +++ b/presentation/src/main/java/common/widget/AvatarView.kt @@ -49,12 +49,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet set(value) { if (field == value) return field = value - - colors.theme(value).run { - setBackgroundTint(theme) - initial.setTextColor(textPrimary) - icon.setTint(textPrimary) - } + applyTheme(value) } private var lookupKey: String? = null @@ -106,16 +101,19 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet super.onFinishInflate() if (!isInEditMode) { - colors.theme(threadId).run { - setBackgroundTint(theme) - initial.setTextColor(textPrimary) - icon.setTint(textPrimary) - } - + applyTheme(threadId) updateView() } } + fun applyTheme(threadId: Long) { + colors.theme(threadId).run { + setBackgroundTint(theme) + initial.setTextColor(textPrimary) + icon.setTint(textPrimary) + } + } + private fun updateView() { if (name?.isNotEmpty() == true) { initial.text = name?.substring(0, 1) diff --git a/presentation/src/main/java/common/widget/GroupAvatarView.kt b/presentation/src/main/java/common/widget/GroupAvatarView.kt index 757b3834..2d0f3352 100644 --- a/presentation/src/main/java/common/widget/GroupAvatarView.kt +++ b/presentation/src/main/java/common/widget/GroupAvatarView.kt @@ -19,6 +19,7 @@ package common.widget import android.content.Context +import android.os.Build import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View @@ -47,6 +48,11 @@ class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: Attribu avatars.forEach { avatar -> avatar.setBackgroundResource(R.drawable.rectangle) + + // If we're on API 21 we need to reapply the tint after changing the background + if (Build.VERSION.SDK_INT < 22) { + avatar.applyTheme(0) + } } if (!isInEditMode) { diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index bd637b0a..40190bd9 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -26,6 +26,7 @@ import android.content.ContentValues import android.content.Intent import android.graphics.PorterDuff import android.net.Uri +import android.os.Build import android.os.Bundle import android.provider.MediaStore import android.support.v4.app.ActivityCompat @@ -40,6 +41,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart +import common.util.extensions.resolveThemeColor import common.util.extensions.scrapViews import common.util.extensions.setBackgroundTint import common.util.extensions.setTint @@ -134,6 +136,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .subscribe { messageList.scrapViews() } window.callback = ComposeWindowCallback(window.callback, this) + + // These theme attributes don't apply themselves on API 21 + if (Build.VERSION.SDK_INT <= 22) { + composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) + } } override fun onStart() { diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index e24c5589..14649f17 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -19,6 +19,7 @@ package feature.compose import android.telephony.SubscriptionInfo +import compat.SubscriptionInfoCompat import io.realm.RealmResults import model.Attachment import model.Contact @@ -44,6 +45,6 @@ data class ComposeState( val attachments: List = ArrayList(), val attaching: Boolean = false, val remaining: String = "", - val subscription: SubscriptionInfo? = null, + val subscription: SubscriptionInfoCompat? = null, val canSend: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 332da0ff..eacf3aa0 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -31,6 +31,7 @@ import common.Navigator import common.base.QkViewModel import common.util.ClipboardUtils import common.util.extensions.makeToast +import compat.SubscriptionManagerCompat import filter.ContactFilter import interactor.CancelDelayedMessage import interactor.ContactSync @@ -56,7 +57,7 @@ import model.Message import model.PhoneNumber import repository.ContactRepository import repository.MessageRepository -import util.SubscriptionUtils +import util.ActiveSubscriptionObservable import util.extensions.asObservable import util.extensions.isImage import util.extensions.mapNotNull @@ -80,7 +81,7 @@ class ComposeViewModel @Inject constructor( private val permissionManager: PermissionManager, private val retrySending: RetrySending, private val sendMessage: SendMessage, - private val subUtils: SubscriptionUtils, + private val subscriptionManager: SubscriptionManagerCompat, private val syncContacts: ContactSync ) : QkViewModel(ComposeState(query = intent.extras?.getString("query") ?: "")) { @@ -211,7 +212,8 @@ class ComposeViewModel @Inject constructor( .map { messages -> messages.lastOrNull()?.subId ?: -1 } .distinctUntilChanged() - disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> + val subscriptions = ActiveSubscriptionObservable(subscriptionManager) + disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs -> val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null newState { copy(subscription = sub) } }.subscribe() @@ -523,7 +525,7 @@ class ComposeViewModel @Inject constructor( // Toggle to the next sim slot view.changeSimIntent .withLatestFrom(state) { _, state -> - val subs = subUtils.subscriptions + val subs = subscriptionManager.activeSubscriptionInfoList val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId } val subscription = when { subIndex == -1 -> null diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 0a5c40e2..181eb6f5 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -48,6 +48,7 @@ import common.util.extensions.setPadding import common.util.extensions.setTint import common.util.extensions.setVisible import common.widget.BubbleImageView.Style.* +import compat.SubscriptionManagerCompat import ezvcard.Ezvcard import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -64,7 +65,6 @@ import model.Conversation import model.Message import model.Recipient import util.Preferences -import util.SubscriptionUtils import util.extensions.isImage import util.extensions.isVCard import util.extensions.isVideo @@ -78,7 +78,7 @@ class MessagesAdapter @Inject constructor( private val dateFormatter: DateFormatter, private val navigator: Navigator, private val prefs: Preferences, - private val subUtils: SubscriptionUtils + private val subscriptionManager: SubscriptionManagerCompat ) : QkRealmAdapter() { companion object { @@ -123,7 +123,7 @@ class MessagesAdapter @Inject constructor( private val contactCache = ContactCache() private val expanded = HashMap() private val disposables = CompositeDisposable() - private val subs = subUtils.subscriptions + private val subs = subscriptionManager.activeSubscriptionInfoList var theme: Colors.Theme = colors.theme() diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index bcf16622..3c820729 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -20,6 +20,7 @@ package feature.qkreply import android.arch.lifecycle.ViewModelProvider import android.arch.lifecycle.ViewModelProviders +import android.os.Build import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.view.Menu @@ -34,6 +35,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart +import common.util.extensions.resolveThemeColor import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import common.util.extensions.setVisible @@ -80,6 +82,14 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { messages.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } messages.adapter = adapter + + // These theme attributes don't apply themselves on API 21 + if (Build.VERSION.SDK_INT <= 22) { + toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary)) + background.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) + composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) + composeBackgroundGradient.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) + } } override fun render(state: QkReplyState) { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/feature/qkreply/QkReplyState.kt index 1f4a8feb..78f10196 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyState.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyState.kt @@ -18,7 +18,7 @@ */ package feature.qkreply -import android.telephony.SubscriptionInfo +import compat.SubscriptionInfoCompat import io.realm.RealmResults import model.Conversation import model.Message @@ -29,6 +29,6 @@ data class QkReplyState( val expanded: Boolean = false, val data: Pair>? = null, val remaining: String = "", - val subscription: SubscriptionInfo? = null, + val subscription: SubscriptionInfoCompat? = null, val canSend: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index d2fdb4ce..35148b1d 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -24,6 +24,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkViewModel +import compat.SubscriptionManagerCompat import interactor.MarkRead import interactor.SendMessage import io.reactivex.rxkotlin.Observables @@ -36,7 +37,7 @@ import io.realm.RealmResults import model.Conversation import model.Message import repository.MessageRepository -import util.SubscriptionUtils +import util.ActiveSubscriptionObservable import util.extensions.asObservable import util.extensions.mapNotNull import java.util.concurrent.TimeUnit @@ -49,7 +50,7 @@ class QkReplyViewModel @Inject constructor( private val messageRepo: MessageRepository, private val navigator: Navigator, private val sendMessage: SendMessage, - private val subUtils: SubscriptionUtils + private val subscriptionManager: SubscriptionManagerCompat ) : QkViewModel(QkReplyState()) { private val conversation by lazy { @@ -89,7 +90,8 @@ class QkReplyViewModel @Inject constructor( .map { messages -> messages.lastOrNull()?.subId ?: -1 } .distinctUntilChanged() - disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> + val subscriptions = ActiveSubscriptionObservable(subscriptionManager) + disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs -> val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null newState { copy(subscription = sub) } }.subscribe() @@ -189,7 +191,7 @@ class QkReplyViewModel @Inject constructor( // Toggle to the next sim slot view.changeSimIntent .withLatestFrom(state) { _, state -> - val subs = subUtils.subscriptions + val subs = subscriptionManager.activeSubscriptionInfoList val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId } val subscription = when { subIndex == -1 -> null diff --git a/presentation/src/main/java/injection/AppModule.kt b/presentation/src/main/java/injection/AppModule.kt index 4ac2bcca..1efb8016 100644 --- a/presentation/src/main/java/injection/AppModule.kt +++ b/presentation/src/main/java/injection/AppModule.kt @@ -59,8 +59,6 @@ import repository.MessageRepository import repository.MessageRepositoryImpl import repository.SyncRepository import repository.SyncRepositoryImpl -import util.SubscriptionUtils -import util.SubscriptionUtilsImpl import javax.inject.Singleton @Module @@ -139,10 +137,4 @@ class AppModule(private var application: Application) { @Provides fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository - - // Utils - - @Provides - fun provideSubscriptionUtils(utils: SubscriptionUtilsImpl): SubscriptionUtils = utils - } \ No newline at end of file From d86e6861ab3ac0b88ae0e39e988e4360437a31cf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 11 Jun 2018 23:51:00 -0400 Subject: [PATCH 03/17] Update to API 28 --- build.gradle | 4 ++-- data/build.gradle | 4 ++-- domain/build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- presentation/build.gradle | 6 +++--- .../feature/conversations/ConversationItemTouchCallback.kt | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index c26c2ad6..e83a1c7a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { ext.rxjava_version = '2.1.4' ext.rxkotlin_version = '2.1.0' ext.rx_preferences_version = '2.0.0-RC3' - ext.support_version = '27.1.0' + ext.support_version = '28.0.0-alpha1' ext.timber_version = '4.5.1' ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] @@ -29,7 +29,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0-alpha18' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:4.3.1" } diff --git a/data/build.gradle b/data/build.gradle index e58f1548..73d40b18 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 } } diff --git a/domain/build.gradle b/domain/build.gradle index e14e4f62..5980de43 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -4,11 +4,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index efc0f067..3c233b25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 27 18:57:37 EDT 2018 +#Mon Jun 11 23:33:26 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 170c67d2..e56ce245 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -5,14 +5,14 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.0" flavorDimensions "analytics" defaultConfig { applicationId "com.moez.QKSMS" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 173 versionName "3.3.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt index fd6e0a87..69e3aa03 100644 --- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt @@ -55,11 +55,11 @@ class ConversationItemTouchCallback @Inject constructor(private val context: Con .toBitmap(iconLength, iconLength) } - override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean { + override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { return false } - override fun onChildDraw(c: Canvas, recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { val itemView = viewHolder.itemView From c41d40cbd6a3e334f751b902d2dc019b845098ed Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 12 Jun 2018 12:43:17 -0400 Subject: [PATCH 04/17] Explicitly mark as group conversation for notification --- .../src/main/java/common/util/NotificationManagerImpl.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index 2fbef2ca..a7fba4f9 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -132,6 +132,7 @@ class NotificationManagerImpl @Inject constructor( val messagingStyle = NotificationCompat.MessagingStyle("Me") if (conversation.recipients.size >= 2) { + messagingStyle.isGroupConversation = true messagingStyle.conversationTitle = conversation.getTitle() } From 5ede84acf560d4b68ebb08c7c9fed13a2c66d7c1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 12 Jun 2018 13:42:23 -0400 Subject: [PATCH 05/17] #1112 - Mark conversations read/unread --- .../main/java/receiver/MarkReadReceiver.kt | 2 +- .../java/receiver/RemoteMessagingReceiver.kt | 2 +- .../java/repository/MessageRepositoryImpl.kt | 28 +++++++++++---- domain/src/main/java/interactor/MarkRead.kt | 12 +++---- domain/src/main/java/interactor/MarkUnread.kt | 36 +++++++++++++++++++ .../main/java/repository/MessageRepository.kt | 4 ++- .../java/feature/compose/ComposeViewModel.kt | 2 +- .../main/java/feature/main/MainActivity.kt | 8 +++++ .../src/main/java/feature/main/MainState.kt | 2 ++ .../main/java/feature/main/MainViewModel.kt | 28 ++++++++++++--- .../java/feature/qkreply/QkReplyViewModel.kt | 4 +-- .../res/drawable/ic_drafts_black_24dp.xml | 27 ++++++++++++++ .../res/drawable/ic_markunread_black_24dp.xml | 27 ++++++++++++++ presentation/src/main/res/menu/main.xml | 14 ++++++++ presentation/src/main/res/values/strings.xml | 2 ++ 15 files changed, 175 insertions(+), 23 deletions(-) create mode 100644 domain/src/main/java/interactor/MarkUnread.kt create mode 100644 presentation/src/main/res/drawable/ic_drafts_black_24dp.xml create mode 100644 presentation/src/main/res/drawable/ic_markunread_black_24dp.xml diff --git a/data/src/main/java/receiver/MarkReadReceiver.kt b/data/src/main/java/receiver/MarkReadReceiver.kt index 5ee03529..8a177c2f 100644 --- a/data/src/main/java/receiver/MarkReadReceiver.kt +++ b/data/src/main/java/receiver/MarkReadReceiver.kt @@ -33,7 +33,7 @@ class MarkReadReceiver : BroadcastReceiver() { AndroidInjection.inject(this, context) val threadId = intent.getLongExtra("threadId", 0) - markRead.execute(threadId) + markRead.execute(listOf(threadId)) } } \ No newline at end of file diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/receiver/RemoteMessagingReceiver.kt index fde382ee..a64f1154 100644 --- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -44,7 +44,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() - markRead.execute(threadId) + markRead.execute(listOf(threadId)) val lastMessage = messageRepo.getMessages(threadId).lastOrNull() val subId = subscriptionManager.activeSubscriptionInfoList.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1 diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 85fb428c..2b9317d2 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -49,6 +49,7 @@ import model.Conversation import model.Message import model.MmsPart import model.SearchResult +import timber.log.Timber import util.Preferences import util.extensions.anyOf import util.extensions.map @@ -351,10 +352,10 @@ class MessageRepositoryImpl @Inject constructor( realm.close() } - override fun markRead(threadId: Long) { + override fun markRead(vararg threadIds: Long) { Realm.getDefaultInstance()?.use { realm -> val messages = realm.where(Message::class.java) - .equalTo("threadId", threadId) + .anyOf("threadId", threadIds) .beginGroup() .equalTo("read", false) .or() @@ -374,11 +375,26 @@ class MessageRepositoryImpl @Inject constructor( values.put(Telephony.Sms.SEEN, true) values.put(Telephony.Sms.READ, true) - try { - val uri = ContentUris.withAppendedId(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId) - context.contentResolver.update(uri, values, "${Telephony.Sms.READ} = 0", null) - } catch (exception: Exception) { + threadIds.forEach { threadId -> + try { + val uri = ContentUris.withAppendedId(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId) + context.contentResolver.update(uri, values, "${Telephony.Sms.READ} = 0", null) + } catch (exception: Exception) { + Timber.w(exception) + } + } + } + override fun markUnread(vararg threadIds: Long) { + Realm.getDefaultInstance()?.use { realm -> + val conversation = realm.where(Conversation::class.java) + .anyOf("id", threadIds) + .equalTo("read", true) + .findAll() + + realm.executeTransaction { + conversation.forEach { it.read = false } + } } } diff --git a/domain/src/main/java/interactor/MarkRead.kt b/domain/src/main/java/interactor/MarkRead.kt index 026afa5e..4d2f10db 100644 --- a/domain/src/main/java/interactor/MarkRead.kt +++ b/domain/src/main/java/interactor/MarkRead.kt @@ -27,13 +27,13 @@ class MarkRead @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, private val updateBadge: UpdateBadge -) : Interactor() { +) : Interactor>() { - override fun buildObservable(params: Long): Flowable<*> { - return Flowable.just(Unit) - .doOnNext { messageRepo.markRead(params) } - .doOnNext { messageRepo.updateConversations(params) } // Update the conversation - .doOnNext { notificationManager.update(params) } + override fun buildObservable(params: List): Flowable<*> { + return Flowable.just(params.toLongArray()) + .doOnNext { threadIds -> messageRepo.markRead(*threadIds) } + .doOnNext { threadIds -> messageRepo.updateConversations(*threadIds) } // Update the conversation + .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) } .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } diff --git a/domain/src/main/java/interactor/MarkUnread.kt b/domain/src/main/java/interactor/MarkUnread.kt new file mode 100644 index 00000000..121f2791 --- /dev/null +++ b/domain/src/main/java/interactor/MarkUnread.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package interactor + +import io.reactivex.Flowable +import repository.MessageRepository +import javax.inject.Inject + +class MarkUnread @Inject constructor( + private val messageRepo: MessageRepository, + private val updateBadge: UpdateBadge +) : Interactor>() { + + override fun buildObservable(params: List): Flowable<*> { + return Flowable.just(params.toLongArray()) + .doOnNext { threadId -> messageRepo.markUnread(*threadId) } + .flatMap { updateBadge.buildObservable(Unit) } // Update the badge + } + +} \ No newline at end of file diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt index 7ee454e1..ced0f283 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -90,7 +90,9 @@ interface MessageRepository { fun markSeen(threadId: Long) - fun markRead(threadId: Long) + fun markRead(vararg threadIds: Long) + + fun markUnread(vararg threadIds: Long) /** * Persists the SMS and attempts to send it diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index eacf3aa0..328912df 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -441,7 +441,7 @@ class ComposeViewModel @Inject constructor( .mapNotNull { conversation -> conversation.takeIf { it.isValid }?.id } .debounce(200, TimeUnit.MILLISECONDS) .autoDisposable(view.scope()) - .subscribe { threadId -> markRead.execute(threadId) } + .subscribe { threadId -> markRead.execute(listOf(threadId)) } // Open the attachment options view.attachIntent diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index c8c4d720..69136420 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -169,6 +169,12 @@ class MainActivity : QkThemedActivity(), MainView { return } + val markRead = when (state.page) { + is Inbox -> state.page.markRead + is Archived -> state.page.markRead + else -> true + } + val selectedConversations = when (state.page) { is Inbox -> state.page.selected is Archived -> state.page.selected @@ -178,6 +184,8 @@ class MainActivity : QkThemedActivity(), MainView { toolbarSearch.setVisible(state.page is Inbox && state.page.selected == 0 || state.page is Searching) toolbarTitle.setVisible(toolbarSearch.visibility != View.VISIBLE) + toolbar.menu.findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0 + toolbar.menu.findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0 toolbar.menu.findItem(R.id.archive)?.isVisible = state.page is Inbox && selectedConversations != 0 toolbar.menu.findItem(R.id.unarchive)?.isVisible = state.page is Archived && selectedConversations != 0 toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0 diff --git a/presentation/src/main/java/feature/main/MainState.kt b/presentation/src/main/java/feature/main/MainState.kt index e621b09b..14d0cbc9 100644 --- a/presentation/src/main/java/feature/main/MainState.kt +++ b/presentation/src/main/java/feature/main/MainState.kt @@ -38,6 +38,7 @@ sealed class MainPage data class Inbox( val showClearButton: Boolean = false, + val markRead: Boolean = false, val data: RealmResults? = null, val selected: Int = 0, val showArchivedSnackbar: Boolean = false) : MainPage() @@ -49,6 +50,7 @@ data class Searching( data class Archived( val showClearButton: Boolean = false, + val markRead: Boolean = false, val data: RealmResults? = null, val selected: Int = 0) : MainPage() diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt index 57089903..0917de81 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/main/MainViewModel.kt @@ -27,7 +27,9 @@ import interactor.DeleteConversations import interactor.MarkAllSeen import interactor.MarkArchived import interactor.MarkBlocked +import interactor.MarkRead import interactor.MarkUnarchived +import interactor.MarkUnread import interactor.MigratePreferences import interactor.SyncMessages import io.reactivex.Observable @@ -50,6 +52,8 @@ class MainViewModel @Inject constructor( private val messageRepo: MessageRepository, private val markAllSeen: MarkAllSeen, private val deleteConversations: DeleteConversations, + private val markRead: MarkRead, + private val markUnread: MarkUnread, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val markBlocked: MarkBlocked, @@ -195,6 +199,16 @@ class MainViewModel @Inject constructor( view.optionsItemIntent .withLatestFrom(view.conversationsSelectedIntent, { itemId, conversations -> when (itemId) { + R.id.read -> { + markRead.execute(conversations) + view.clearSelection() + } + + R.id.unread -> { + markUnread.execute(conversations) + view.clearSelection() + } + R.id.archive -> { markArchived.execute(conversations) view.clearSelection() @@ -228,16 +242,20 @@ class MainViewModel @Inject constructor( .subscribe { ratingManager.dismiss() } view.conversationsSelectedIntent - .map { selection -> selection.size } - .withLatestFrom(state, { selected, state -> + .withLatestFrom(state, { selection, state -> + val read = selection + .mapNotNull(messageRepo::getConversation) + .sumBy { if (it.read) -1 else 1 } >= 0 + val selected = selection.size + when (state.page) { is Inbox -> { - val page = state.page.copy(selected = selected, showClearButton = selected > 0) - newState { copy(page = page) } + val page = state.page.copy(markRead = read, selected = selected, showClearButton = selected > 0) + newState { copy(page = page.copy(markRead = read, selected = selected, showClearButton = selected > 0)) } } is Archived -> { - val page = state.page.copy(selected = selected, showClearButton = selected > 0) + val page = state.page.copy(markRead = read, selected = selected, showClearButton = selected > 0) newState { copy(page = page) } } } diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index 35148b1d..8b7748fb 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -113,7 +113,7 @@ class QkReplyViewModel @Inject constructor( .map { conversation -> conversation.id } .autoDisposable(view.scope()) .subscribe { threadId -> - markRead.execute(threadId) { newState { copy(hasError = true) } } + markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } } } // Call @@ -216,7 +216,7 @@ class QkReplyViewModel @Inject constructor( threadId }) .doOnNext { threadId -> - markRead.execute(threadId) { + markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } } } diff --git a/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml b/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml new file mode 100644 index 00000000..7751006e --- /dev/null +++ b/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml b/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml new file mode 100644 index 00000000..dfccf44a --- /dev/null +++ b/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml index 46744f95..e251e409 100644 --- a/presentation/src/main/res/menu/main.xml +++ b/presentation/src/main/res/menu/main.xml @@ -19,6 +19,20 @@ + + + + %d selected Clear + Mark read + Mark unread Archive Unarchive Block From 6e14b1ab114309ec46c74e265b17d7d6561aed79 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 14 Jun 2018 20:20:14 -0400 Subject: [PATCH 06/17] Fix case where Conversation isn't returned and can't send message --- data/src/main/java/compat/TelephonyCompat.kt | 8 +- .../java/repository/MessageRepositoryImpl.kt | 49 ++++---- .../java/util/extensions/RealmExtensions.kt | 2 +- .../src/main/java/interactor/SendMessage.kt | 2 + domain/src/main/java/model/Conversation.kt | 29 ++--- domain/src/main/java/model/Recipient.kt | 12 +- .../feature/compose/ComposeActivityModule.kt | 48 +++++++- .../main/java/feature/compose/ComposeState.kt | 1 - .../java/feature/compose/ComposeViewModel.kt | 116 +++++++----------- 9 files changed, 152 insertions(+), 115 deletions(-) diff --git a/data/src/main/java/compat/TelephonyCompat.kt b/data/src/main/java/compat/TelephonyCompat.kt index 0eabe3a4..f07d50e6 100644 --- a/data/src/main/java/compat/TelephonyCompat.kt +++ b/data/src/main/java/compat/TelephonyCompat.kt @@ -37,9 +37,13 @@ object TelephonyCompat { val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*") - fun getOrCreateThreadId(context: Context, recipients: Set): Long { + fun getOrCreateThreadId(context: Context, recipient: String): Long { + return getOrCreateThreadId(context, listOf(recipient)) + } + + fun getOrCreateThreadId(context: Context, recipients: Collection): Long { return if (Build.VERSION.SDK_INT >= 23) { - Telephony.Threads.getOrCreateThreadId(context, recipients) + Telephony.Threads.getOrCreateThreadId(context, recipients.toSet()) } else { val uriBuilder = THREAD_ID_CONTENT_URI.buildUpon() diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 2b9317d2..a3fd0bc7 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -38,6 +38,7 @@ import compat.TelephonyCompat import filter.ConversationFilter import io.realm.Case import io.realm.Realm +import io.realm.RealmList import io.realm.RealmResults import io.realm.Sort import manager.KeyManager @@ -48,10 +49,13 @@ import model.Contact import model.Conversation import model.Message import model.MmsPart +import model.Recipient import model.SearchResult import timber.log.Timber import util.Preferences import util.extensions.anyOf +import util.extensions.forEach +import util.extensions.insertOrUpdate import util.extensions.map import util.tryOrNull import java.io.ByteArrayOutputStream @@ -551,6 +555,9 @@ class MessageRepositoryImpl @Inject constructor( // Update the contentId after the message has been inserted to the content provider // The message might have been deleted by now, so only proceed if it's valid + // + // We do this after inserting the message because it might be slow, and we want the message + // to be inserted into Realm immediately. We don't need to do this after receiving one realm.executeTransaction { managedMessage?.takeIf { it.isValid }?.contentId = uri.lastPathSegment.toLong() } realm.close() @@ -559,23 +566,6 @@ class MessageRepositoryImpl @Inject constructor( override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message { - // Insert the message to Realm - val message = Message().apply { - this.address = address - this.body = body - this.dateSent = sentTime - this.date = System.currentTimeMillis() - this.subId = subId - - id = messageIds.newId() - threadId = getOrCreateConversation(address)?.id ?: 0L - boxId = Telephony.Sms.MESSAGE_TYPE_INBOX - type = "sms" - } - val realm = Realm.getDefaultInstance() - var managedMessage: Message? = null - realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) } - // Insert the message to the native content provider val values = ContentValues().apply { put(Telephony.Sms.ADDRESS, address) @@ -585,11 +575,21 @@ class MessageRepositoryImpl @Inject constructor( } val uri = context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) - // Update the contentId after the message has been inserted to the content provider - realm.executeTransaction { managedMessage?.contentId = uri.lastPathSegment.toLong() } - realm.close() + // Insert the message to Realm + return Message().apply { + this.address = address + this.body = body + this.dateSent = sentTime + this.date = System.currentTimeMillis() + this.subId = subId - return message + id = messageIds.newId() + threadId = getOrCreateConversation(address)?.id ?: 0L + contentId = uri.lastPathSegment.toLong() + boxId = Telephony.Sms.MESSAGE_TYPE_INBOX + type = "sms" + insertOrUpdate() + } } /** @@ -735,6 +735,13 @@ class MessageRepositoryImpl @Inject constructor( } } + /** + * Returns a [Conversation] from the system SMS ContentProvider, based on the [threadId] + * + * It should be noted that even if we have a valid [threadId], that does not guarantee that + * we can return a [Conversation]. On some devices, the ContentProvider won't return the + * conversation unless it contains at least 1 message + */ private fun getConversationFromCp(threadId: Long): Conversation? { return cursorToConversation.getConversationCursor(threadId) ?.takeIf { cursor -> cursor.moveToFirst() } diff --git a/data/src/main/java/util/extensions/RealmExtensions.kt b/data/src/main/java/util/extensions/RealmExtensions.kt index 88d2d0a0..21e4d70b 100644 --- a/data/src/main/java/util/extensions/RealmExtensions.kt +++ b/data/src/main/java/util/extensions/RealmExtensions.kt @@ -38,7 +38,7 @@ fun Collection.insertOrUpdate() { realm.close() } -fun RealmObject.asObservable(): Observable { +fun T.asObservable(): Observable { return asFlowable().toObservable() } diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/interactor/SendMessage.kt index 5b1b574c..7d7a193e 100644 --- a/domain/src/main/java/interactor/SendMessage.kt +++ b/domain/src/main/java/interactor/SendMessage.kt @@ -39,6 +39,8 @@ class SendMessage @Inject constructor( messageRepo.sendMms(params.subId, params.threadId, params.addresses, params.body, params.attachments) } } + // If this was the first message sent in the conversation, the conversation might not exist yet + .doOnNext { messageRepo.getOrCreateConversation(params.threadId) } .doOnNext { messageRepo.updateConversations(params.threadId) } .doOnNext { messageRepo.markUnarchived(params.threadId) } } diff --git a/domain/src/main/java/model/Conversation.kt b/domain/src/main/java/model/Conversation.kt index f7d66cf9..6e9e77ae 100644 --- a/domain/src/main/java/model/Conversation.kt +++ b/domain/src/main/java/model/Conversation.kt @@ -23,23 +23,24 @@ import io.realm.RealmObject import io.realm.annotations.Index import io.realm.annotations.PrimaryKey -open class Conversation : RealmObject() { +open class Conversation( + @PrimaryKey var id: Long = 0, + @Index var archived: Boolean = false, + @Index var blocked: Boolean = false, + var recipients: RealmList = RealmList(), + var count: Int = 0, + var date: Long = 0, + var snippet: String = "", + var read: Boolean = true, + var me: Boolean = false, + var draft: String = "", - @PrimaryKey var id: Long = 0 - @Index var archived: Boolean = false - @Index var blocked: Boolean = false - var recipients: RealmList = RealmList() - var count: Int = 0 - var date: Long = 0 - var snippet: String = "" - var read: Boolean = true - var me: Boolean = false - var draft: String = "" - - // For group chats, the user is allowed to set a custom title for the conversation - var name: String = "" + // For group chats, the user is allowed to set a custom title for the conversation + var name: String = "" +) : RealmObject() { fun getTitle(): String { return name.takeIf { it.isNotBlank() } ?: recipients.joinToString { recipient -> recipient.getDisplayName() } } + } diff --git a/domain/src/main/java/model/Recipient.kt b/domain/src/main/java/model/Recipient.kt index 6f00e83d..5074c3dc 100644 --- a/domain/src/main/java/model/Recipient.kt +++ b/domain/src/main/java/model/Recipient.kt @@ -23,12 +23,12 @@ import io.realm.RealmObject import io.realm.annotations.PrimaryKey import java.util.* -open class Recipient : RealmObject() { - - @PrimaryKey var id: Long = 0 - var address: String = "" - var contact: Contact? = null - var lastUpdate: Long = 0 +open class Recipient( + @PrimaryKey var id: Long = 0, + var address: String = "", + var contact: Contact? = null, + var lastUpdate: Long = 0 +) : RealmObject() { /** * Return a string that can be displayed to represent the name of this contact diff --git a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/feature/compose/ComposeActivityModule.kt index 9c08bd4b..0a69f6b0 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivityModule.kt @@ -2,16 +2,62 @@ package feature.compose import android.arch.lifecycle.ViewModel import android.content.Intent +import android.net.Uri import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import injection.ViewModelKey +import model.Attachment +import java.net.URLDecoder +import javax.inject.Named @Module class ComposeActivityModule { @Provides - fun provideIntent(activity: ComposeActivity): Intent = activity.intent + @Named("query") + fun provideQuery(activity: ComposeActivity): String = activity.intent.extras?.getString("query") ?: "" + + @Provides + @Named("threadId") + fun provideThreadId(activity: ComposeActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L + + @Provides + @Named("address") + fun provideAddress(activity: ComposeActivity): String { + var address = "" + + activity.intent.data?.let { + val data = it.toString() + address = when { + it.scheme.startsWith("smsto") -> data.replace("smsto:", "") + it.scheme.startsWith("mmsto") -> data.replace("mmsto:", "") + it.scheme.startsWith("sms") -> data.replace("sms:", "") + it.scheme.startsWith("mms") -> data.replace("mms:", "") + else -> "" + } + + // The dialer app on Oreo sends a URL encoded string, make sure to decode it + if (address.contains('%')) address = URLDecoder.decode(address, "UTF-8") + } + + return address + } + + @Provides + @Named("text") + fun provideSharedText(activity: ComposeActivity): String { + return activity.intent.extras?.getString(Intent.EXTRA_TEXT) ?: "" + } + + @Provides + @Named("attachments") + fun provideSharedAttachments(activity: ComposeActivity): List { + val sharedImages = mutableListOf() + activity.intent.getParcelableExtra(Intent.EXTRA_STREAM)?.run(sharedImages::add) + activity.intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM)?.run(sharedImages::addAll) + return sharedImages.map { Attachment(it) } + } @Provides @IntoMap diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index 14649f17..dddd2777 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -18,7 +18,6 @@ */ package feature.compose -import android.telephony.SubscriptionInfo import compat.SubscriptionInfoCompat import io.realm.RealmResults import model.Attachment diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 328912df..edd96f37 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -19,8 +19,6 @@ package feature.compose import android.content.Context -import android.content.Intent -import android.net.Uri import android.telephony.PhoneNumberUtils import android.telephony.SmsMessage import android.view.inputmethod.EditorInfo @@ -32,6 +30,7 @@ import common.base.QkViewModel import common.util.ClipboardUtils import common.util.extensions.makeToast import compat.SubscriptionManagerCompat +import compat.TelephonyCompat import filter.ContactFilter import interactor.CancelDelayedMessage import interactor.ContactSync @@ -55,6 +54,7 @@ import model.Contact import model.Conversation import model.Message import model.PhoneNumber +import model.Recipient import repository.ContactRepository import repository.MessageRepository import util.ActiveSubscriptionObservable @@ -63,13 +63,17 @@ import util.extensions.isImage import util.extensions.mapNotNull import util.extensions.removeAccents import util.tryOrNull -import java.net.URLDecoder import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject +import javax.inject.Named class ComposeViewModel @Inject constructor( - private val intent: Intent, + @Named("query") private val query: String, + @Named("threadId") private val threadId: Long, + @Named("address") private val address: String, + @Named("text") private val sharedText: String, + @Named("attachments") private val sharedAttachments: List, private val context: Context, private val cancelMessage: CancelDelayedMessage, private val contactFilter: ContactFilter, @@ -83,81 +87,45 @@ class ComposeViewModel @Inject constructor( private val sendMessage: SendMessage, private val subscriptionManager: SubscriptionManagerCompat, private val syncContacts: ContactSync -) : QkViewModel(ComposeState(query = intent.extras?.getString("query") ?: "")) { +) : QkViewModel(ComposeState( + editingMode = threadId == 0L, + selectedConversation = threadId, + query = query) +) { - private var sharedText: String = intent.extras?.getString(Intent.EXTRA_TEXT) ?: "" - private val attachments: Subject> = BehaviorSubject.createDefault(ArrayList()) + private val attachments: Subject> = BehaviorSubject.createDefault(sharedAttachments) private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts().toObservable() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() - private val selectedContacts: Observable> + private val selectedContacts: Subject> = BehaviorSubject.create() private val searchResults: Subject> = BehaviorSubject.create() private val searchSelection: Subject = BehaviorSubject.createDefault(-1) private val conversation: Subject = BehaviorSubject.create() private val messages: Subject> = BehaviorSubject.create() init { - // If there are any image attachments, we'll set those as the initial attachments for the - // conversation - val sharedImages = mutableListOf() - intent.getParcelableExtra(Intent.EXTRA_STREAM)?.run { sharedImages += this } - intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM)?.run { sharedImages += this } - attachments.onNext(sharedImages.map { uri -> Attachment(uri) }) - - val threadId = intent.extras?.getLong("threadId") ?: 0L - var address = "" - - intent.data?.let { - val data = it.toString() - address = when { - it.scheme.startsWith("smsto") -> data.replace("smsto:", "") - it.scheme.startsWith("mmsto") -> data.replace("mmsto:", "") - it.scheme.startsWith("sms") -> data.replace("sms:", "") - it.scheme.startsWith("mms") -> data.replace("mms:", "") - else -> "" - } - - // The dialer app on Oreo sends a URL encoded string, make sure to decode it - if (address.contains('%')) address = URLDecoder.decode(address, "UTF-8") - } - - val initialConversation: Observable = when { - threadId != 0L -> { - newState { copy(selectedConversation = threadId, editingMode = false) } - messageRepo.getConversationAsync(threadId).asObservable() - } - - address.isNotBlank() -> { - newState { copy(editingMode = false) } - Observable.just(address) - .mapNotNull { messageRepo.getOrCreateConversation(it) } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - } - - else -> { - newState { copy(editingMode = true) } - Observable.empty() - } - } - - selectedContacts = contactsReducer - .scan(listOf(), { previousState, reducer -> reducer(previousState) }) - .doOnNext { contacts -> newState { copy(selectedContacts = contacts) } } + val initialConversation = threadId.takeIf { it != 0L } + ?.let(messageRepo::getConversationAsync) + ?.asObservable() + ?: Observable.empty() // Merges two potential conversation sources (threadId from constructor and contact selection) into a single // stream of conversations. If the conversation was deleted, notify the activity to shut down disposables += selectedContacts - .skipUntil(state.filter { state -> state.editingMode }) - .takeUntil(state.filter { state -> !state.editingMode }) + .skipWhile { it.isEmpty() } .map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } } - .observeOn(Schedulers.computation()) .doOnNext { newState { copy(loading = true) } } - .mapNotNull { addresses -> - val conversation = messageRepo.getOrCreateConversation(addresses) - newState { copy(loading = false) } - conversation - } + .observeOn(Schedulers.computation()) + .map { addresses -> Pair(TelephonyCompat.getOrCreateThreadId(context, addresses), addresses) } .observeOn(AndroidSchedulers.mainThread()) + .doOnNext { newState { copy(loading = false) } } + .switchMap { (threadId, addresses) -> + val recipients = RealmList(*addresses.map { address -> Recipient(address = address) }.toTypedArray()) + messageRepo.getConversations().asObservable() + .map { conversations -> conversations.filter { it.id == threadId } } + .map { conversations -> + conversations.firstOrNull() ?: Conversation(id = threadId, recipients = recipients) + } + } .mergeWith(initialConversation) .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> @@ -166,9 +134,19 @@ class ComposeViewModel @Inject constructor( } } .filter { conversation -> conversation.isValid } - .filter { conversation -> conversation.id != 0L } .subscribe(conversation::onNext) + if (address.isNotBlank()) { + selectedContacts.onNext(listOf(Contact(numbers = RealmList(PhoneNumber(address))))) + } + + disposables += contactsReducer + .scan(listOf(), { previousState, reducer -> reducer(previousState) }) + .doOnNext { contacts -> newState { copy(selectedContacts = contacts) } } + .skipUntil(state.filter { state -> state.editingMode }) + .takeUntil(state.filter { state -> !state.editingMode }) + .subscribe(selectedContacts::onNext) + // When the conversation changes, update the threadId and the messages for the adapter disposables += conversation .distinctUntilChanged { conversation -> conversation.id } @@ -553,11 +531,11 @@ class ComposeViewModel @Inject constructor( .map { contact -> contact.numbers } .mapNotNull { numbers -> numbers.firstOrNull() } .map { number -> number.address } - .mapNotNull { address -> messageRepo.getOrCreateConversation(address) } - .filter { it.recipients.isNotEmpty() } - .forEach { - val address = it.recipients.map { it.address } - sendMessage.execute(SendMessage.Params(subId, it.id, address, body, attachments)) + .forEach { addr -> + val threadId = TelephonyCompat.getOrCreateThreadId(context, addr) + val address = listOf(messageRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address + ?: addr) + sendMessage.execute(SendMessage.Params(subId, threadId, address, body, attachments)) } } From 1b022e46e342ff0d25b261b069e48bb888b25ba5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 15 Jun 2018 22:08:05 -0400 Subject: [PATCH 07/17] Divide MessageRepository into itself and Conversation Repository --- .../java/receiver/RemoteMessagingReceiver.kt | 4 +- .../repository/ConversationRepositoryImpl.kt | 275 ++++++++++++++++++ .../java/repository/MessageRepositoryImpl.kt | 250 +--------------- .../java/repository/SyncRepositoryImpl.kt | 3 +- .../java/service/HeadlessSmsSendService.kt | 6 +- .../java/interactor/DeleteConversations.kt | 6 +- .../main/java/interactor/DeleteMessages.kt | 4 +- .../src/main/java/interactor/MarkArchived.kt | 6 +- .../src/main/java/interactor/MarkBlocked.kt | 6 +- domain/src/main/java/interactor/MarkRead.kt | 4 +- .../main/java/interactor/MarkUnarchived.kt | 6 +- .../src/main/java/interactor/MarkUnblocked.kt | 6 +- domain/src/main/java/interactor/ReceiveMms.kt | 8 +- domain/src/main/java/interactor/ReceiveSms.kt | 11 +- .../src/main/java/interactor/SendMessage.kt | 8 +- .../src/main/java/interactor/SyncMessage.kt | 6 +- .../java/repository/ConversationRepository.kt | 46 +++ .../main/java/repository/MessageRepository.kt | 39 --- .../common/util/NotificationManagerImpl.kt | 10 +- .../java/feature/blocked/BlockedViewModel.kt | 6 +- .../java/feature/compose/ComposeViewModel.kt | 10 +- .../ConversationInfoViewModel.kt | 6 +- .../java/feature/gallery/GalleryViewModel.kt | 4 +- .../main/java/feature/main/MainViewModel.kt | 16 +- .../NotificationPrefsViewModel.kt | 6 +- .../java/feature/qkreply/QkReplyViewModel.kt | 6 +- .../main/java/feature/widget/WidgetAdapter.kt | 6 +- .../src/main/java/injection/AppModule.kt | 5 + 28 files changed, 418 insertions(+), 351 deletions(-) create mode 100644 data/src/main/java/repository/ConversationRepositoryImpl.kt create mode 100644 domain/src/main/java/repository/ConversationRepository.kt diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/receiver/RemoteMessagingReceiver.kt index a64f1154..698180b1 100644 --- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -26,11 +26,13 @@ import compat.SubscriptionManagerCompat import dagger.android.AndroidInjection import interactor.MarkRead import interactor.SendMessage +import repository.ConversationRepository import repository.MessageRepository import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { + @Inject lateinit var conversationRepo: ConversationRepository @Inject lateinit var markRead: MarkRead @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage @@ -48,7 +50,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val lastMessage = messageRepo.getMessages(threadId).lastOrNull() val subId = subscriptionManager.activeSubscriptionInfoList.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1 - val addresses = messageRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return + val addresses = conversationRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return val pendingRepository = goAsync() sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) { pendingRepository.finish() } diff --git a/data/src/main/java/repository/ConversationRepositoryImpl.kt b/data/src/main/java/repository/ConversationRepositoryImpl.kt new file mode 100644 index 00000000..8cb377c0 --- /dev/null +++ b/data/src/main/java/repository/ConversationRepositoryImpl.kt @@ -0,0 +1,275 @@ +package repository + +import android.content.ContentUris +import android.content.Context +import android.provider.Telephony +import android.telephony.PhoneNumberUtils +import compat.TelephonyCompat +import filter.ConversationFilter +import io.realm.Case +import io.realm.Realm +import io.realm.RealmResults +import io.realm.Sort +import mapper.CursorToConversation +import mapper.CursorToRecipient +import model.Contact +import model.Conversation +import model.Message +import model.SearchResult +import util.extensions.anyOf +import util.extensions.map +import util.tryOrNull +import javax.inject.Inject + +class ConversationRepositoryImpl @Inject constructor( + private val context: Context, + private val conversationFilter: ConversationFilter, + private val cursorToConversation: CursorToConversation, + private val cursorToRecipient: CursorToRecipient +) : ConversationRepository { + + override fun getConversations(archived: Boolean): RealmResults { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .notEqualTo("id", 0L) + .greaterThan("count", 0) + .equalTo("archived", archived) + .equalTo("blocked", false) + .isNotEmpty("recipients") + .sort("date", Sort.DESCENDING) + .findAllAsync() + } + + override fun getConversationsSnapshot(): List { + val realm = Realm.getDefaultInstance() + return realm.copyFromRealm(realm.where(Conversation::class.java) + .notEqualTo("id", 0L) + .greaterThan("count", 0) + .equalTo("archived", false) + .equalTo("blocked", false) + .isNotEmpty("recipients") + .sort("date", Sort.DESCENDING) + .findAll()) + } + + 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 searchConversations(query: String): List { + val conversations = getConversationsSnapshot() + + val messagesByConversation = Realm.getDefaultInstance() + .where(Message::class.java) + .contains("body", query, Case.INSENSITIVE) + .findAll() + .groupBy { message -> message.threadId } + .filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null } + .map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) } + .map { (conversation, messages) -> SearchResult(query, conversation, messages) } + .sortedByDescending { result -> result.messages } + + return conversations + .filter { conversation -> conversationFilter.filter(conversation, query) } + .map { conversation -> SearchResult(query, conversation, 0) } + .plus(messagesByConversation) + } + + override fun getBlockedConversations(): RealmResults { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("blocked", true) + .findAllAsync() + } + + override fun getConversationAsync(threadId: Long): Conversation { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("id", threadId) + .findFirstAsync() + } + + override fun getConversation(threadId: Long): Conversation? { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + } + + override fun getOrCreateConversation(threadId: Long): Conversation? { + return getConversation(threadId) ?: getConversationFromCp(threadId) + } + + override fun getOrCreateConversation(address: String): Conversation? { + return getOrCreateConversation(listOf(address)) + } + + override fun getOrCreateConversation(addresses: List): Conversation? { + return tryOrNull { TelephonyCompat.getOrCreateThreadId(context, addresses.toSet()) } + ?.takeIf { threadId -> threadId != 0L } + ?.let { threadId -> + var conversation = getConversation(threadId) + if (conversation != null) conversation = Realm.getDefaultInstance().copyFromRealm(conversation) + + conversation ?: getConversationFromCp(threadId) + } + } + + override fun saveDraft(threadId: Long, draft: String) { + Realm.getDefaultInstance().use { realm -> + val conversation = realm.where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + + conversation?.let { + realm.executeTransaction { + conversation.draft = draft + } + } + } + } + + override fun updateConversations(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + realm.refresh() + + threadIds.forEach { threadId -> + val conversation = realm + .where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() ?: return + + val messages = realm + .where(Message::class.java) + .equalTo("threadId", threadId) + .sort("date", Sort.DESCENDING) + .findAll() + + val message = messages.firstOrNull() + + realm.executeTransaction { + conversation.count = messages.size + conversation.date = message?.date ?: 0 + conversation.snippet = message?.getSummary() ?: "" + conversation.read = message?.read ?: true + conversation.me = message?.isMe() ?: false + } + } + } + } + + override fun markArchived(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + val conversations = realm.where(Conversation::class.java) + .anyOf("id", threadIds) + .findAll() + + realm.executeTransaction { + conversations.forEach { it.archived = true } + } + } + } + + override fun markUnarchived(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + val conversations = realm.where(Conversation::class.java) + .anyOf("id", threadIds) + .findAll() + + realm.executeTransaction { + conversations.forEach { it.archived = false } + } + } + } + + override fun markBlocked(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + val conversations = realm.where(Conversation::class.java) + .anyOf("id", threadIds) + .findAll() + + realm.executeTransaction { + conversations.forEach { it.blocked = true } + } + } + } + + override fun markUnblocked(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + val conversations = realm.where(Conversation::class.java) + .anyOf("id", threadIds) + .equalTo("archived", false) + .findAll() + + realm.executeTransaction { + conversations.forEach { it.blocked = false } + } + } + } + + override fun deleteConversations(vararg threadIds: Long) { + Realm.getDefaultInstance().use { realm -> + val conversation = realm.where(Conversation::class.java).anyOf("id", threadIds).findAll() + val messages = realm.where(Message::class.java).anyOf("threadId", threadIds).findAll() + + realm.executeTransaction { + conversation.deleteAllFromRealm() + messages.deleteAllFromRealm() + } + } + + threadIds.forEach { threadId -> + val uri = ContentUris.withAppendedId(Telephony.Threads.CONTENT_URI, threadId) + context.contentResolver.delete(uri, null, null) + } + } + + /** + * Returns a [Conversation] from the system SMS ContentProvider, based on the [threadId] + * + * It should be noted that even if we have a valid [threadId], that does not guarantee that + * we can return a [Conversation]. On some devices, the ContentProvider won't return the + * conversation unless it contains at least 1 message + */ + private fun getConversationFromCp(threadId: Long): Conversation? { + return cursorToConversation.getConversationCursor(threadId) + ?.takeIf { cursor -> cursor.moveToFirst() } + ?.use { cursor -> + val conversation = cursorToConversation.map(cursor) + + val realm = Realm.getDefaultInstance() + val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll()) + + val recipients = conversation.recipients + .map { recipient -> recipient.id } + .map { id -> cursorToRecipient.getRecipientCursor(id) } + .mapNotNull { recipientCursor -> + // Map the recipient cursor to a list of recipients + recipientCursor?.use { recipientCursor.map { cursorToRecipient.map(recipientCursor) } } + } + .flatten() + .map { recipient -> + recipient.apply { + contact = contacts.firstOrNull { + it.numbers.any { PhoneNumberUtils.compare(recipient.address, it.address) } + } + } + } + + conversation.recipients.clear() + conversation.recipients.addAll(recipients) + realm.executeTransaction { it.insertOrUpdate(conversation) } + realm.close() + + conversation + } + } + +} \ No newline at end of file diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index a3fd0bc7..8d44d262 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -66,120 +66,10 @@ import javax.inject.Singleton class MessageRepositoryImpl @Inject constructor( private val context: Context, private val messageIds: KeyManager, - private val conversationFilter: ConversationFilter, - private val cursorToConversation: CursorToConversation, - private val cursorToRecipient: CursorToRecipient, + private val conversationRepo: ConversationRepository, private val imageRepository: ImageRepository, private val prefs: Preferences) : MessageRepository { - override fun getConversations(archived: Boolean): RealmResults { - return Realm.getDefaultInstance() - .where(Conversation::class.java) - .notEqualTo("id", 0L) - .greaterThan("count", 0) - .equalTo("archived", archived) - .equalTo("blocked", false) - .isNotEmpty("recipients") - .sort("date", Sort.DESCENDING) - .findAllAsync() - } - - override fun getConversationsSnapshot(): List { - val realm = Realm.getDefaultInstance() - return realm.copyFromRealm(realm.where(Conversation::class.java) - .notEqualTo("id", 0L) - .greaterThan("count", 0) - .equalTo("archived", false) - .equalTo("blocked", false) - .isNotEmpty("recipients") - .sort("date", Sort.DESCENDING) - .findAll()) - } - - 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 searchConversations(query: String): List { - val conversations = getConversationsSnapshot() - - val messagesByConversation = Realm.getDefaultInstance() - .where(Message::class.java) - .contains("body", query, Case.INSENSITIVE) - .findAll() - .groupBy { message -> message.threadId } - .filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null } - .map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) } - .map { (conversation, messages) -> SearchResult(query, conversation, messages) } - .sortedByDescending { result -> result.messages } - - return conversations - .filter { conversation -> conversationFilter.filter(conversation, query) } - .map { conversation -> SearchResult(query, conversation, 0) } - .plus(messagesByConversation) - } - - override fun getBlockedConversations(): RealmResults { - return Realm.getDefaultInstance() - .where(Conversation::class.java) - .equalTo("blocked", true) - .findAllAsync() - } - - override fun getConversationAsync(threadId: Long): Conversation { - return Realm.getDefaultInstance() - .where(Conversation::class.java) - .equalTo("id", threadId) - .findFirstAsync() - } - - override fun getConversation(threadId: Long): Conversation? { - return Realm.getDefaultInstance() - .where(Conversation::class.java) - .equalTo("id", threadId) - .findFirst() - } - - override fun getOrCreateConversation(threadId: Long): Conversation? { - return getConversation(threadId) ?: getConversationFromCp(threadId) - } - - override fun getOrCreateConversation(address: String): Conversation? { - return getOrCreateConversation(listOf(address)) - } - - override fun getOrCreateConversation(addresses: List): Conversation? { - return tryOrNull { TelephonyCompat.getOrCreateThreadId(context, addresses.toSet()) } - ?.takeIf { threadId -> threadId != 0L } - ?.let { threadId -> - var conversation = getConversation(threadId) - if (conversation != null) conversation = Realm.getDefaultInstance().copyFromRealm(conversation) - - conversation ?: getConversationFromCp(threadId) - } - } - - override fun saveDraft(threadId: Long, draft: String) { - Realm.getDefaultInstance().use { realm -> - val conversation = realm.where(Conversation::class.java) - .equalTo("id", threadId) - .findFirst() - - conversation?.let { - realm.executeTransaction { - conversation.draft = draft - } - } - } - } - override fun getMessages(threadId: Long, query: String): RealmResults { return Realm.getDefaultInstance() .where(Message::class.java) @@ -256,84 +146,6 @@ class MessageRepositoryImpl @Inject constructor( .findAll() } - override fun updateConversations(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - realm.refresh() - - threadIds.forEach { threadId -> - val conversation = realm - .where(Conversation::class.java) - .equalTo("id", threadId) - .findFirst() ?: return - - val messages = realm - .where(Message::class.java) - .equalTo("threadId", threadId) - .sort("date", Sort.DESCENDING) - .findAll() - - val message = messages.firstOrNull() - - realm.executeTransaction { - conversation.count = messages.size - conversation.date = message?.date ?: 0 - conversation.snippet = message?.getSummary() ?: "" - conversation.read = message?.read ?: true - conversation.me = message?.isMe() ?: false - } - } - } - } - - override fun markArchived(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - val conversations = realm.where(Conversation::class.java) - .anyOf("id", threadIds) - .findAll() - - realm.executeTransaction { - conversations.forEach { it.archived = true } - } - } - } - - override fun markUnarchived(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - val conversations = realm.where(Conversation::class.java) - .anyOf("id", threadIds) - .findAll() - - realm.executeTransaction { - conversations.forEach { it.archived = false } - } - } - } - - override fun markBlocked(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - val conversations = realm.where(Conversation::class.java) - .anyOf("id", threadIds) - .findAll() - - realm.executeTransaction { - conversations.forEach { it.blocked = true } - } - } - } - - override fun markUnblocked(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - val conversations = realm.where(Conversation::class.java) - .anyOf("id", threadIds) - .equalTo("archived", false) - .findAll() - - realm.executeTransaction { - conversations.forEach { it.blocked = false } - } - } - } - override fun markAllSeen() { val realm = Realm.getDefaultInstance() val messages = realm.where(Message::class.java).equalTo("seen", false).findAll() @@ -584,7 +396,7 @@ class MessageRepositoryImpl @Inject constructor( this.subId = subId id = messageIds.newId() - threadId = getOrCreateConversation(address)?.id ?: 0L + threadId = conversationRepo.getOrCreateConversation(address)?.id ?: 0L contentId = uri.lastPathSegment.toLong() boxId = Telephony.Sms.MESSAGE_TYPE_INBOX type = "sms" @@ -718,62 +530,4 @@ class MessageRepositoryImpl @Inject constructor( } } - override fun deleteConversations(vararg threadIds: Long) { - Realm.getDefaultInstance().use { realm -> - val conversation = realm.where(Conversation::class.java).anyOf("id", threadIds).findAll() - val messages = realm.where(Message::class.java).anyOf("threadId", threadIds).findAll() - - realm.executeTransaction { - conversation.deleteAllFromRealm() - messages.deleteAllFromRealm() - } - } - - threadIds.forEach { threadId -> - val uri = ContentUris.withAppendedId(Telephony.Threads.CONTENT_URI, threadId) - context.contentResolver.delete(uri, null, null) - } - } - - /** - * Returns a [Conversation] from the system SMS ContentProvider, based on the [threadId] - * - * It should be noted that even if we have a valid [threadId], that does not guarantee that - * we can return a [Conversation]. On some devices, the ContentProvider won't return the - * conversation unless it contains at least 1 message - */ - private fun getConversationFromCp(threadId: Long): Conversation? { - return cursorToConversation.getConversationCursor(threadId) - ?.takeIf { cursor -> cursor.moveToFirst() } - ?.use { cursor -> - val conversation = cursorToConversation.map(cursor) - - val realm = Realm.getDefaultInstance() - val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll()) - - val recipients = conversation.recipients - .map { recipient -> recipient.id } - .map { id -> cursorToRecipient.getRecipientCursor(id) } - .mapNotNull { recipientCursor -> - // Map the recipient cursor to a list of recipients - recipientCursor?.use { recipientCursor.map { cursorToRecipient.map(recipientCursor) } } - } - .flatten() - .map { recipient -> - recipient.apply { - contact = contacts.firstOrNull { - it.numbers.any { PhoneNumberUtils.compare(recipient.address, it.address) } - } - } - } - - conversation.recipients.clear() - conversation.recipients.addAll(recipients) - realm.executeTransaction { it.insertOrUpdate(conversation) } - realm.close() - - conversation - } - } - } \ No newline at end of file diff --git a/data/src/main/java/repository/SyncRepositoryImpl.kt b/data/src/main/java/repository/SyncRepositoryImpl.kt index b489dce3..cb32617a 100644 --- a/data/src/main/java/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/repository/SyncRepositoryImpl.kt @@ -47,6 +47,7 @@ import javax.inject.Singleton @Singleton class SyncRepositoryImpl @Inject constructor( private val contentResolver: ContentResolver, + private val conversationRepo: ConversationRepository, private val messageRepo: MessageRepository, private val cursorToConversation: CursorToConversation, private val cursorToMessage: CursorToMessage, @@ -190,7 +191,7 @@ class SyncRepositoryImpl @Inject constructor( cursorToMessage.map(Pair(cursor, columnsMap)).apply { existingId?.let { this.id = it } - messageRepo.getOrCreateConversation(threadId) + conversationRepo.getOrCreateConversation(threadId) insertOrUpdate() } } diff --git a/data/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/service/HeadlessSmsSendService.kt index c4093b2f..64af9f6c 100644 --- a/data/src/main/java/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/service/HeadlessSmsSendService.kt @@ -24,12 +24,12 @@ import android.net.Uri import android.telephony.TelephonyManager import dagger.android.AndroidInjection import interactor.SendMessage -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var conversationRepo: ConversationRepository @Inject lateinit var sendMessage: SendMessage override fun onHandleIntent(intent: Intent?) { @@ -39,7 +39,7 @@ class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { intent.extras?.getString(Intent.EXTRA_TEXT)?.takeIf { it.isNotBlank() }?.let { body -> val intentUri = intent.data val recipients = getRecipients(intentUri).split(";") - val threadId = messageRepo.getOrCreateConversation(recipients)?.id ?: 0L + val threadId = conversationRepo.getOrCreateConversation(recipients)?.id ?: 0L sendMessage.execute(SendMessage.Params(-1, threadId, recipients, body)) } } diff --git a/domain/src/main/java/interactor/DeleteConversations.kt b/domain/src/main/java/interactor/DeleteConversations.kt index ba9bdec9..a5e7a5b5 100644 --- a/domain/src/main/java/interactor/DeleteConversations.kt +++ b/domain/src/main/java/interactor/DeleteConversations.kt @@ -19,17 +19,17 @@ package interactor import io.reactivex.Flowable -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject class DeleteConversations @Inject constructor( - private val messageRepo: MessageRepository, + private val conversationRepo: ConversationRepository, private val updateBadge: UpdateBadge ) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) - .doOnNext { threadIds -> messageRepo.deleteConversations(*threadIds) } + .doOnNext { threadIds -> conversationRepo.deleteConversations(*threadIds) } .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } diff --git a/domain/src/main/java/interactor/DeleteMessages.kt b/domain/src/main/java/interactor/DeleteMessages.kt index 1c6b6353..56a5e6b1 100644 --- a/domain/src/main/java/interactor/DeleteMessages.kt +++ b/domain/src/main/java/interactor/DeleteMessages.kt @@ -19,10 +19,12 @@ package interactor import io.reactivex.Flowable +import repository.ConversationRepository import repository.MessageRepository import javax.inject.Inject class DeleteMessages @Inject constructor( + private val conversationRepo: ConversationRepository, private val messageRepo: MessageRepository, private val updateBadge: UpdateBadge ) : Interactor() { @@ -32,7 +34,7 @@ class DeleteMessages @Inject constructor( override fun buildObservable(params: Params): Flowable<*> { return Flowable.just(params.messageIds.toLongArray()) .doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages - .doOnNext { params.threadId?.let { messageRepo.updateConversations(it) } } // Update the conversation + .doOnNext { params.threadId?.let { conversationRepo.updateConversations(it) } } // Update the conversation .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } diff --git a/domain/src/main/java/interactor/MarkArchived.kt b/domain/src/main/java/interactor/MarkArchived.kt index d8b38b9f..56aa4081 100644 --- a/domain/src/main/java/interactor/MarkArchived.kt +++ b/domain/src/main/java/interactor/MarkArchived.kt @@ -19,14 +19,14 @@ package interactor import io.reactivex.Flowable -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject -class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor>() { +class MarkArchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) - .doOnNext { threadIds -> messageRepo.markArchived(*threadIds) } + .doOnNext { threadIds -> conversationRepo.markArchived(*threadIds) } } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/MarkBlocked.kt b/domain/src/main/java/interactor/MarkBlocked.kt index a1ff6220..8b2d694c 100644 --- a/domain/src/main/java/interactor/MarkBlocked.kt +++ b/domain/src/main/java/interactor/MarkBlocked.kt @@ -19,14 +19,14 @@ package interactor import io.reactivex.Flowable -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject -class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor>() { +class MarkBlocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) - .doOnNext { threadIds -> messageRepo.markBlocked(*threadIds) } + .doOnNext { threadIds -> conversationRepo.markBlocked(*threadIds) } } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/MarkRead.kt b/domain/src/main/java/interactor/MarkRead.kt index 4d2f10db..71867b0b 100644 --- a/domain/src/main/java/interactor/MarkRead.kt +++ b/domain/src/main/java/interactor/MarkRead.kt @@ -20,10 +20,12 @@ package interactor import io.reactivex.Flowable import manager.NotificationManager +import repository.ConversationRepository import repository.MessageRepository import javax.inject.Inject class MarkRead @Inject constructor( + private val conversationRepo: ConversationRepository, private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, private val updateBadge: UpdateBadge @@ -32,7 +34,7 @@ class MarkRead @Inject constructor( override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) .doOnNext { threadIds -> messageRepo.markRead(*threadIds) } - .doOnNext { threadIds -> messageRepo.updateConversations(*threadIds) } // Update the conversation + .doOnNext { threadIds -> conversationRepo.updateConversations(*threadIds) } // Update the conversation .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) } .flatMap { updateBadge.buildObservable(Unit) } // Update the badge } diff --git a/domain/src/main/java/interactor/MarkUnarchived.kt b/domain/src/main/java/interactor/MarkUnarchived.kt index d7ce0b8c..0f7395d2 100644 --- a/domain/src/main/java/interactor/MarkUnarchived.kt +++ b/domain/src/main/java/interactor/MarkUnarchived.kt @@ -19,14 +19,14 @@ package interactor import io.reactivex.Flowable -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject -class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor>() { +class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) - .doOnNext { threadIds -> messageRepo.markUnarchived(*threadIds) } + .doOnNext { threadIds -> conversationRepo.markUnarchived(*threadIds) } } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/MarkUnblocked.kt b/domain/src/main/java/interactor/MarkUnblocked.kt index ba7b5aec..85a567ae 100644 --- a/domain/src/main/java/interactor/MarkUnblocked.kt +++ b/domain/src/main/java/interactor/MarkUnblocked.kt @@ -19,14 +19,14 @@ package interactor import io.reactivex.Flowable -import repository.MessageRepository +import repository.ConversationRepository import javax.inject.Inject -class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor>() { +class MarkUnblocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() { override fun buildObservable(params: List): Flowable<*> { return Flowable.just(params.toLongArray()) - .doOnNext { threadIds -> messageRepo.markUnblocked(*threadIds) } + .doOnNext { threadIds -> conversationRepo.markUnblocked(*threadIds) } } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/ReceiveMms.kt b/domain/src/main/java/interactor/ReceiveMms.kt index 26c5e5f3..900a6e59 100644 --- a/domain/src/main/java/interactor/ReceiveMms.kt +++ b/domain/src/main/java/interactor/ReceiveMms.kt @@ -22,6 +22,7 @@ import android.net.Uri import io.reactivex.Flowable import manager.ExternalBlockingManager import manager.NotificationManager +import repository.ConversationRepository import repository.MessageRepository import repository.SyncRepository import util.extensions.mapNotNull @@ -29,6 +30,7 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject class ReceiveMms @Inject constructor( + private val conversationRepo: ConversationRepository, private val externalBlockingManager: ExternalBlockingManager, private val syncManager: SyncRepository, private val messageRepo: MessageRepository, @@ -48,10 +50,10 @@ class ReceiveMms @Inject constructor( if (blocked) messageRepo.deleteMessages(message.id) } } - .doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation - .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } // Update the conversation + .mapNotNull { message -> conversationRepo.getOrCreateConversation(message.threadId) } // Map message to conversation .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations - .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary + .doOnNext { conversation -> if (conversation.archived) conversationRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread .delay(1, TimeUnit.SECONDS) // Wait one second before trying to notify, in case the foreground app marks it as read first .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification diff --git a/domain/src/main/java/interactor/ReceiveSms.kt b/domain/src/main/java/interactor/ReceiveSms.kt index 4ad37861..3e7f56e3 100644 --- a/domain/src/main/java/interactor/ReceiveSms.kt +++ b/domain/src/main/java/interactor/ReceiveSms.kt @@ -22,12 +22,14 @@ import android.telephony.SmsMessage import io.reactivex.Flowable import manager.ExternalBlockingManager import manager.NotificationManager +import repository.ConversationRepository import repository.MessageRepository import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject class ReceiveSms @Inject constructor( + private val conversationRepo: ConversationRepository, private val externalBlockingManager: ExternalBlockingManager, private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, @@ -39,7 +41,8 @@ class ReceiveSms @Inject constructor( override fun buildObservable(params: Params): Flowable<*> { return Flowable.just(params) .filter { it.messages.isNotEmpty() } - .filter { // Don't continue if the sender is blocked + .filter { + // Don't continue if the sender is blocked val address = it.messages[0].displayOriginatingAddress !externalBlockingManager.shouldBlock(address).blockingGet() } @@ -53,10 +56,10 @@ class ReceiveSms @Inject constructor( messageRepo.insertReceivedSms(it.subId, address, body, time) // Add the message to the db } - .doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation - .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } // Update the conversation + .mapNotNull { message -> conversationRepo.getOrCreateConversation(message.threadId) } // Map message to conversation .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations - .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary + .doOnNext { conversation -> if (conversation.archived) conversationRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread .delay(1, TimeUnit.SECONDS) // Wait one second before trying to notify, in case the foreground app marks it as read first .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/interactor/SendMessage.kt index 7d7a193e..5a75c68d 100644 --- a/domain/src/main/java/interactor/SendMessage.kt +++ b/domain/src/main/java/interactor/SendMessage.kt @@ -20,10 +20,12 @@ package interactor import io.reactivex.Flowable import model.Attachment +import repository.ConversationRepository import repository.MessageRepository import javax.inject.Inject class SendMessage @Inject constructor( + private val conversationRepo: ConversationRepository, private val messageRepo: MessageRepository ) : Interactor() { @@ -40,9 +42,9 @@ class SendMessage @Inject constructor( } } // If this was the first message sent in the conversation, the conversation might not exist yet - .doOnNext { messageRepo.getOrCreateConversation(params.threadId) } - .doOnNext { messageRepo.updateConversations(params.threadId) } - .doOnNext { messageRepo.markUnarchived(params.threadId) } + .doOnNext { conversationRepo.getOrCreateConversation(params.threadId) } + .doOnNext { conversationRepo.updateConversations(params.threadId) } + .doOnNext { conversationRepo.markUnarchived(params.threadId) } } } \ No newline at end of file diff --git a/domain/src/main/java/interactor/SyncMessage.kt b/domain/src/main/java/interactor/SyncMessage.kt index 55f6924c..57804a1b 100644 --- a/domain/src/main/java/interactor/SyncMessage.kt +++ b/domain/src/main/java/interactor/SyncMessage.kt @@ -21,20 +21,20 @@ package interactor import android.net.Uri import io.reactivex.Flowable import model.Message -import repository.MessageRepository +import repository.ConversationRepository import repository.SyncRepository import util.extensions.mapNotNull import javax.inject.Inject class SyncMessage @Inject constructor( - private val messageRepo: MessageRepository, + private val conversationRepo: ConversationRepository, private val syncManager: SyncRepository ) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) .mapNotNull { uri -> syncManager.syncMessage(uri) } - .doOnNext { message -> messageRepo.updateConversations(message.threadId) } + .doOnNext { message -> conversationRepo.updateConversations(message.threadId) } } } \ No newline at end of file diff --git a/domain/src/main/java/repository/ConversationRepository.kt b/domain/src/main/java/repository/ConversationRepository.kt new file mode 100644 index 00000000..a8e4bff1 --- /dev/null +++ b/domain/src/main/java/repository/ConversationRepository.kt @@ -0,0 +1,46 @@ +package repository + +import io.realm.RealmResults +import model.Conversation +import model.SearchResult + +interface ConversationRepository { + + fun getConversations(archived: Boolean = false): RealmResults + + fun getConversationsSnapshot(): List + + fun setConversationName(id: Long, name: String) + + fun searchConversations(query: String): List + + fun getBlockedConversations(): RealmResults + + fun getConversationAsync(threadId: Long): Conversation + + fun getConversation(threadId: Long): Conversation? + + fun getOrCreateConversation(threadId: Long): Conversation? + + fun getOrCreateConversation(address: String): Conversation? + + fun getOrCreateConversation(addresses: List): Conversation? + + fun saveDraft(threadId: Long, draft: String) + + /** + * Updates message-related fields in the conversation, like the date and snippet + */ + fun updateConversations(vararg threadIds: Long) + + fun markArchived(vararg threadIds: Long) + + fun markUnarchived(vararg threadIds: Long) + + fun markBlocked(vararg threadIds: Long) + + fun markUnblocked(vararg threadIds: Long) + + fun deleteConversations(vararg threadIds: Long) + +} \ No newline at end of file diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt index ced0f283..7d8eed5f 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -20,35 +20,11 @@ package repository import io.realm.RealmResults import model.Attachment -import model.Conversation import model.Message import model.MmsPart -import model.SearchResult interface MessageRepository { - fun getConversations(archived: Boolean = false): RealmResults - - fun getConversationsSnapshot(): List - - fun setConversationName(id: Long, name: String) - - fun searchConversations(query: String): List - - fun getBlockedConversations(): RealmResults - - fun getConversationAsync(threadId: Long): Conversation - - fun getConversation(threadId: Long): Conversation? - - fun getOrCreateConversation(threadId: Long): Conversation? - - fun getOrCreateConversation(address: String): Conversation? - - fun getOrCreateConversation(addresses: List): Conversation? - - fun saveDraft(threadId: Long, draft: String) - fun getMessages(threadId: Long, query: String = ""): RealmResults fun getMessage(id: Long): Message? @@ -73,19 +49,6 @@ interface MessageRepository { */ fun getUnreadMessages(threadId: Long): RealmResults - /** - * Updates message-related fields in the conversation, like the date and snippet - */ - fun updateConversations(vararg threadIds: Long) - - fun markArchived(vararg threadIds: Long) - - fun markUnarchived(vararg threadIds: Long) - - fun markBlocked(vararg threadIds: Long) - - fun markUnblocked(vararg threadIds: Long) - fun markAllSeen() fun markSeen(threadId: Long) @@ -130,6 +93,4 @@ interface MessageRepository { fun deleteMessages(vararg messageIds: Long) - fun deleteConversations(vararg threadIds: Long) - } \ No newline at end of file diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index a7fba4f9..ddf17cd4 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -41,6 +41,7 @@ import mapper.CursorToPartImpl import receiver.MarkReadReceiver import receiver.MarkSeenReceiver import receiver.RemoteMessagingReceiver +import repository.ConversationRepository import repository.MessageRepository import util.Preferences import util.extensions.isImage @@ -51,8 +52,9 @@ import javax.inject.Singleton @Singleton class NotificationManagerImpl @Inject constructor( private val context: Context, - private val prefs: Preferences, private val colors: Colors, + private val conversationRepo: ConversationRepository, + private val prefs: Preferences, private val messageRepo: MessageRepository ) : manager.NotificationManager { @@ -96,7 +98,7 @@ class NotificationManagerImpl @Inject constructor( return } - val conversation = messageRepo.getConversation(threadId) ?: return + val conversation = conversationRepo.getConversation(threadId) ?: return val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) val taskStackBuilder = TaskStackBuilder.create(context) @@ -221,7 +223,7 @@ class NotificationManagerImpl @Inject constructor( return } - val conversation = messageRepo.getConversation(message.threadId) ?: return + val conversation = conversationRepo.getConversation(message.threadId) ?: return val threadId = conversation.id val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) @@ -270,7 +272,7 @@ class NotificationManagerImpl @Inject constructor( // Only proceed if the android version supports notification channels if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return - messageRepo.getConversation(threadId)?.let { conversation -> + conversationRepo.getConversation(threadId)?.let { conversation -> val channelId = buildNotificationChannelId(threadId) val name = conversation.getTitle() val importance = NotificationManager.IMPORTANCE_HIGH diff --git a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt index 59749279..18a52098 100644 --- a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt @@ -26,21 +26,21 @@ import common.base.QkViewModel import interactor.MarkUnblocked import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom -import repository.MessageRepository +import repository.ConversationRepository import util.Preferences import util.tryOrNull import javax.inject.Inject class BlockedViewModel @Inject constructor( private val context: Context, + private val conversationRepo: ConversationRepository, private val markUnblocked: MarkUnblocked, - private val messageRepo: MessageRepository, private val navigator: Navigator, private val prefs: Preferences ) : QkViewModel(BlockedState()) { init { - newState { copy(data = messageRepo.getBlockedConversations()) } + newState { copy(data = conversationRepo.getBlockedConversations()) } disposables += prefs.sia.asObservable() .subscribe { enabled -> newState { copy(siaEnabled = enabled) } } diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index edd96f37..e2339928 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -56,6 +56,7 @@ import model.Message import model.PhoneNumber import model.Recipient import repository.ContactRepository +import repository.ConversationRepository import repository.MessageRepository import util.ActiveSubscriptionObservable import util.extensions.asObservable @@ -78,6 +79,7 @@ class ComposeViewModel @Inject constructor( private val cancelMessage: CancelDelayedMessage, private val contactFilter: ContactFilter, private val contactsRepo: ContactRepository, + private val conversationRepo: ConversationRepository, private val deleteMessages: DeleteMessages, private val markRead: MarkRead, private val messageRepo: MessageRepository, @@ -104,7 +106,7 @@ class ComposeViewModel @Inject constructor( init { val initialConversation = threadId.takeIf { it != 0L } - ?.let(messageRepo::getConversationAsync) + ?.let(conversationRepo::getConversationAsync) ?.asObservable() ?: Observable.empty() @@ -120,7 +122,7 @@ class ComposeViewModel @Inject constructor( .doOnNext { newState { copy(loading = false) } } .switchMap { (threadId, addresses) -> val recipients = RealmList(*addresses.map { address -> Recipient(address = address) }.toTypedArray()) - messageRepo.getConversations().asObservable() + conversationRepo.getConversations().asObservable() .map { conversations -> conversations.filter { it.id == threadId } } .map { conversations -> conversations.firstOrNull() ?: Conversation(id = threadId, recipients = recipients) @@ -407,7 +409,7 @@ class ComposeViewModel @Inject constructor( .withLatestFrom(conversation, { _, conversation -> conversation.id }) .observeOn(Schedulers.io()) .withLatestFrom(view.textChangedIntent, { threadId, draft -> - messageRepo.saveDraft(threadId, draft.toString()) + conversationRepo.saveDraft(threadId, draft.toString()) }) .autoDisposable(view.scope()) .subscribe() @@ -533,7 +535,7 @@ class ComposeViewModel @Inject constructor( .map { number -> number.address } .forEach { addr -> val threadId = TelephonyCompat.getOrCreateThreadId(context, addr) - val address = listOf(messageRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address + val address = listOf(conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address ?: addr) sendMessage.execute(SendMessage.Params(subId, threadId, address, body, attachments)) } diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt index 1ec42794..6f02dd9a 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt @@ -32,6 +32,7 @@ import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import model.Conversation +import repository.ConversationRepository import repository.MessageRepository import util.extensions.asObservable import javax.inject.Inject @@ -39,6 +40,7 @@ import javax.inject.Named class ConversationInfoViewModel @Inject constructor( @Named("threadId") threadId: Long, + private val conversationRepo: ConversationRepository, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val markBlocked: MarkBlocked, @@ -53,7 +55,7 @@ class ConversationInfoViewModel @Inject constructor( private val conversation: Subject = BehaviorSubject.create() init { - disposables += messageRepo.getConversationAsync(threadId) + disposables += conversationRepo.getConversationAsync(threadId) .asObservable() .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> @@ -109,7 +111,7 @@ class ConversationInfoViewModel @Inject constructor( // Set the conversation title view.nameChangedIntent .withLatestFrom(conversation) { name, conversation -> - messageRepo.setConversationName(conversation.id, name) + conversationRepo.setConversationName(conversation.id, name) } .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt index 0db9d00e..d174efbc 100644 --- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt @@ -29,6 +29,7 @@ import interactor.SaveImage import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import repository.ConversationRepository import repository.MessageRepository import util.extensions.mapNotNull import javax.inject.Inject @@ -36,6 +37,7 @@ import javax.inject.Inject class GalleryViewModel @Inject constructor( private val intent: Intent, private val context: Context, + private val conversationRepo: ConversationRepository, private val messageRepo: MessageRepository, private val saveImage: SaveImage ) : QkViewModel(GalleryState()) { @@ -51,7 +53,7 @@ class GalleryViewModel @Inject constructor( disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getMessageForPart(partId) } - .mapNotNull { message -> messageRepo.getConversation(message.threadId) } + .mapNotNull { message -> conversationRepo.getConversation(message.threadId) } .subscribe { conversation -> newState { copy(title = conversation.getTitle()) } } } diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt index 0917de81..ada79b3b 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/main/MainViewModel.kt @@ -42,6 +42,7 @@ import io.realm.Realm import manager.PermissionManager import manager.RatingManager import model.SyncLog +import repository.ConversationRepository import repository.MessageRepository import repository.SyncRepository import util.extensions.removeAccents @@ -51,6 +52,7 @@ import javax.inject.Inject class MainViewModel @Inject constructor( private val messageRepo: MessageRepository, private val markAllSeen: MarkAllSeen, + private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, private val markRead: MarkRead, private val markUnread: MarkUnread, @@ -63,7 +65,7 @@ class MainViewModel @Inject constructor( private val ratingManager: RatingManager, private val syncMessages: SyncMessages, private val syncRepository: SyncRepository -) : QkViewModel(MainState(page = Inbox(data = messageRepo.getConversations()))) { +) : QkViewModel(MainState(page = Inbox(data = conversationRepo.getConversations()))) { init { disposables += deleteConversations @@ -138,7 +140,7 @@ class MainViewModel @Inject constructor( .map { query -> query.removeAccents() } .withLatestFrom(state, { query, state -> if (query.isEmpty() && state.page is Searching) { - newState { copy(page = Inbox(data = messageRepo.getConversations())) } + newState { copy(page = Inbox(data = conversationRepo.getConversations())) } } query }) @@ -150,7 +152,7 @@ class MainViewModel @Inject constructor( } } .observeOn(Schedulers.io()) - .switchMap { query -> Observable.just(query).map { messageRepo.searchConversations(it) } } + .switchMap { query -> Observable.just(query).map { conversationRepo.searchConversations(it) } } .autoDisposable(view.scope()) .subscribe { data -> newState { copy(page = Searching(loading = false, data = data)) } } @@ -186,8 +188,8 @@ class MainViewModel @Inject constructor( .distinctUntilChanged() .doOnNext { when (it) { - DrawerItem.INBOX -> newState { copy(page = Inbox(data = messageRepo.getConversations())) } - DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = messageRepo.getConversations(true))) } + DrawerItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) } + DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) } DrawerItem.SCHEDULED -> newState { copy(page = Scheduled()) } else -> { } // Do nothing @@ -244,7 +246,7 @@ class MainViewModel @Inject constructor( view.conversationsSelectedIntent .withLatestFrom(state, { selection, state -> val read = selection - .mapNotNull(messageRepo::getConversation) + .mapNotNull(conversationRepo::getConversation) .sumBy { if (it.read) -1 else 1 } >= 0 val selected = selection.size @@ -321,7 +323,7 @@ class MainViewModel @Inject constructor( state.page is Archived && state.page.selected > 0 -> view.clearSelection() - state.page !is Inbox -> newState { copy(page = Inbox(data = messageRepo.getConversations())) } + state.page !is Inbox -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) } else -> newState { copy(hasError = true) } } diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index 86809f6d..dbf30608 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -31,7 +31,7 @@ import common.base.QkViewModel import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers -import repository.MessageRepository +import repository.ConversationRepository import util.Preferences import util.extensions.mapNotNull import javax.inject.Inject @@ -39,7 +39,7 @@ import javax.inject.Inject class NotificationPrefsViewModel @Inject constructor( private val intent: Intent, private val context: Context, - private val messageRepo: MessageRepository, + private val conversationRepo: ConversationRepository, private val navigator: Navigator, private val prefs: Preferences ) : QkViewModel(NotificationPrefsState()) { @@ -58,7 +58,7 @@ class NotificationPrefsViewModel @Inject constructor( ringtone = prefs.ringtone(threadId) disposables += Flowable.just(threadId) - .mapNotNull { threadId -> messageRepo.getConversation(threadId) } + .mapNotNull { threadId -> conversationRepo.getConversation(threadId) } .map { conversation -> conversation.getTitle() } .subscribeOn(Schedulers.io()) .subscribe { title -> newState { copy(conversationTitle = title) } } diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index 8b7748fb..405497c1 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -36,6 +36,7 @@ import io.reactivex.subjects.Subject import io.realm.RealmResults import model.Conversation import model.Message +import repository.ConversationRepository import repository.MessageRepository import util.ActiveSubscriptionObservable import util.extensions.asObservable @@ -46,6 +47,7 @@ import javax.inject.Named class QkReplyViewModel @Inject constructor( @Named("threadId") threadId: Long, + private val conversationRepo: ConversationRepository, private val markRead: MarkRead, private val messageRepo: MessageRepository, private val navigator: Navigator, @@ -54,7 +56,7 @@ class QkReplyViewModel @Inject constructor( ) : QkViewModel(QkReplyState()) { private val conversation by lazy { - messageRepo.getConversationAsync(threadId) + conversationRepo.getConversationAsync(threadId) .asObservable() .filter { it.isLoaded } .filter { it.isValid } @@ -183,7 +185,7 @@ class QkReplyViewModel @Inject constructor( .map { draft -> draft.toString() } .observeOn(Schedulers.io()) .withLatestFrom(conversation.map { it.id }, { draft, threadId -> - messageRepo.saveDraft(threadId, draft) + conversationRepo.saveDraft(threadId, draft) }) .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/feature/widget/WidgetAdapter.kt index ed0c3ffa..f8716147 100644 --- a/presentation/src/main/java/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/feature/widget/WidgetAdapter.kt @@ -41,7 +41,7 @@ import injection.appComponent import model.Contact import model.Conversation import model.PhoneNumber -import repository.MessageRepository +import repository.ConversationRepository import util.Preferences import javax.inject.Inject @@ -53,8 +53,8 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { @Inject lateinit var context: Context @Inject lateinit var colors: Colors + @Inject lateinit var conversationRepo: ConversationRepository @Inject lateinit var dateFormatter: DateFormatter - @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var prefs: Preferences private val appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID) @@ -83,7 +83,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { } override fun onDataSetChanged() { - conversations = messageRepo.getConversationsSnapshot() + conversations = conversationRepo.getConversationsSnapshot() val remoteViews = RemoteViews(context.packageName, R.layout.widget) appWidgetManager.partiallyUpdateAppWidget(appWidgetId, remoteViews) diff --git a/presentation/src/main/java/injection/AppModule.kt b/presentation/src/main/java/injection/AppModule.kt index 1efb8016..48544474 100644 --- a/presentation/src/main/java/injection/AppModule.kt +++ b/presentation/src/main/java/injection/AppModule.kt @@ -53,6 +53,8 @@ import mapper.CursorToRecipientImpl import mapper.RatingManagerImpl import repository.ContactRepository import repository.ContactRepositoryImpl +import repository.ConversationRepository +import repository.ConversationRepositoryImpl import repository.ImageRepository import repository.ImageRepostoryImpl import repository.MessageRepository @@ -128,6 +130,9 @@ class AppModule(private var application: Application) { @Provides fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository + @Provides + fun provideConversationRepository(repository: ConversationRepositoryImpl): ConversationRepository = repository + @Provides fun provideImageRepository(repository: ImageRepostoryImpl): ImageRepository = repository From 2606cce49a3b033a400ce46bec586ec58044d9c1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 15 Jun 2018 22:10:55 -0400 Subject: [PATCH 08/17] Fix sending not working for existing conversation --- presentation/src/main/java/feature/compose/ComposeViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index e2339928..772de969 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -98,7 +98,7 @@ class ComposeViewModel @Inject constructor( private val attachments: Subject> = BehaviorSubject.createDefault(sharedAttachments) private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts().toObservable() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() - private val selectedContacts: Subject> = BehaviorSubject.create() + private val selectedContacts: Subject> = BehaviorSubject.createDefault(listOf()) private val searchResults: Subject> = BehaviorSubject.create() private val searchSelection: Subject = BehaviorSubject.createDefault(-1) private val conversation: Subject = BehaviorSubject.create() From 126c9590158e6076d918a86055d27743f39e8e86 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Jun 2018 14:29:30 -0400 Subject: [PATCH 09/17] Mark strings as not translateable --- presentation/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index c83b849f..2edba0b4 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -18,7 +18,7 @@ --> - QKSMS + QKSMS Archived Scheduled @@ -27,7 +27,7 @@ Theme Search inbox… Type a name or number - QKSMS+ + QKSMS+ Skip Continue From 1ce5846f76de69af6f7fc8cb6b54d07cf7693899 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Jun 2018 14:59:38 -0400 Subject: [PATCH 10/17] #1176 - Fix invisible navigation bar icons on API 26 --- presentation/src/main/java/common/base/QkThemedActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 30e283e8..abfe59a9 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -73,8 +73,7 @@ abstract class QkThemedActivity : QkActivity() { // When certain preferences change, we need to recreate the activity Observable.merge( - listOf(prefs.night, prefs.black, prefs.textSize, prefs.systemFont) - .map { it.asObservable().skip(1) }) + listOf(prefs.night, prefs.black, prefs.textSize, prefs.systemFont).map { it.asObservable().skip(1) }) .autoDisposable(scope()) .subscribe { recreate() } @@ -89,7 +88,9 @@ abstract class QkThemedActivity : QkActivity() { } // Some devices don't let you modify android.R.attr.navigationBarColor - if (Build.VERSION.SDK_INT >= 27) window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + } // Set the color for the overflow and navigation icon val textTertiary = resolveThemeColor(android.R.attr.textColorTertiary) From 93448822953c3f1c1e3e2c8d295c2ae941967af9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 18 Jun 2018 20:02:57 -0400 Subject: [PATCH 11/17] #975 - Show message details --- .../main/java/common/util/DateFormatter.kt | 4 + .../common/util/MessageDetailsFormatter.kt | 87 +++++++++++++++++++ .../java/feature/compose/ComposeActivity.kt | 10 +++ .../main/java/feature/compose/ComposeView.kt | 1 + .../java/feature/compose/ComposeViewModel.kt | 12 +++ ..._black_24dp.xml => ic_info_black_24dp.xml} | 2 +- .../src/main/res/layout/settings_activity.xml | 2 +- presentation/src/main/res/menu/compose.xml | 7 ++ presentation/src/main/res/values/strings.xml | 11 +++ 9 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 presentation/src/main/java/common/util/MessageDetailsFormatter.kt rename presentation/src/main/res/drawable/{ic_info_outline_black_24dp.xml => ic_info_black_24dp.xml} (56%) diff --git a/presentation/src/main/java/common/util/DateFormatter.kt b/presentation/src/main/java/common/util/DateFormatter.kt index 8eeeaef1..430b06c2 100644 --- a/presentation/src/main/java/common/util/DateFormatter.kt +++ b/presentation/src/main/java/common/util/DateFormatter.kt @@ -41,6 +41,10 @@ class DateFormatter @Inject constructor(val context: Context) { else SimpleDateFormat(pattern, Locale.getDefault()) } + fun getDetailedTimestamp(date: Long): String { + return getFormatter("M/d/y, h:mm:ss a").format(date) + } + fun getTimestamp(date: Long): String { return getFormatter("h:mm a").format(date) } diff --git a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt b/presentation/src/main/java/common/util/MessageDetailsFormatter.kt new file mode 100644 index 00000000..c99ca29a --- /dev/null +++ b/presentation/src/main/java/common/util/MessageDetailsFormatter.kt @@ -0,0 +1,87 @@ +package common.util + +import android.content.Context +import com.google.android.mms.pdu_alt.EncodedStringValue +import com.google.android.mms.pdu_alt.MultimediaMessagePdu +import com.google.android.mms.pdu_alt.PduPersister +import com.moez.QKSMS.R +import model.Message +import util.tryOrNull +import javax.inject.Inject + +class MessageDetailsFormatter @Inject constructor( + private val context: Context, + private val dateFormatter: DateFormatter +) { + + fun format(message: Message): String { + val builder = StringBuilder() + + message.type + .takeIf { it.isNotBlank() } + ?.toUpperCase() + ?.let { context.getString(R.string.compose_details_type, it) } + ?.let(builder::appendln) + + if (message.isSms()) { + message.address + .takeIf { it.isNotBlank() && !message.isMe() } + ?.let { context.getString(R.string.compose_details_from, it) } + ?.let(builder::appendln) + + message.address + .takeIf { it.isNotBlank() && message.isMe() } + ?.let { context.getString(R.string.compose_details_to, it) } + ?.let(builder::appendln) + } else { + val pdu = tryOrNull { + PduPersister.getPduPersister(context) + .load(message.getUri()) + as MultimediaMessagePdu + } + + pdu?.from?.string + ?.takeIf { it.isNotBlank() } + ?.let { context.getString(R.string.compose_details_from, it) } + ?.let(builder::appendln) + + pdu?.to + ?.let(EncodedStringValue::concat) + ?.takeIf { it.isNotBlank() } + ?.let { context.getString(R.string.compose_details_to, it) } + ?.let(builder::appendln) + } + + message.date + .takeIf { it > 0 && message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_sent, it) } + ?.let(builder::appendln) + + message.dateSent + .takeIf { it > 0 && !message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_sent, it) } + ?.let(builder::appendln) + + message.date + .takeIf { it > 0 && !message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_received, it) } + ?.let(builder::appendln) + + message.dateSent + .takeIf { it > 0 && message.isMe() } + ?.let(dateFormatter::getDetailedTimestamp) + ?.let { context.getString(R.string.compose_details_delivered, it) } + ?.let(builder::appendln) + + message.errorCode + .takeIf { it != 0 && message.isSms() } + ?.let { context.getString(R.string.compose_details_error_code, it) } + ?.let(builder::appendln) + + return builder.toString().trim() + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 40190bd9..dd8e445a 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -30,6 +30,7 @@ import android.os.Build import android.os.Bundle import android.provider.MediaStore import android.support.v4.app.ActivityCompat +import android.support.v7.app.AlertDialog import android.support.v7.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem @@ -182,6 +183,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty() toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0 && state.query.isEmpty() toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages == 1 + toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1 toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0 toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1 toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty() @@ -225,6 +227,14 @@ class ComposeActivity : QkThemedActivity(), ComposeView { messageAdapter.clearSelection() } + override fun showDetails(details: String) { + AlertDialog.Builder(this) + .setTitle(R.string.compose_details_title) + .setMessage(details) + .setCancelable(true) + .show() + } + override fun requestStoragePermission() { ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0) } diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 101d473f..a35dba2b 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -52,6 +52,7 @@ interface ComposeView : QkView { val sendIntent: Observable fun clearSelection() + fun showDetails(details: String) fun requestStoragePermission() fun requestCamera() fun requestGallery() diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 772de969..41221125 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -28,6 +28,7 @@ import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkViewModel import common.util.ClipboardUtils +import common.util.MessageDetailsFormatter import common.util.extensions.makeToast import compat.SubscriptionManagerCompat import compat.TelephonyCompat @@ -82,6 +83,7 @@ class ComposeViewModel @Inject constructor( private val conversationRepo: ConversationRepository, private val deleteMessages: DeleteMessages, private val markRead: MarkRead, + private val messageDetailsFormatter: MessageDetailsFormatter, private val messageRepo: MessageRepository, private val navigator: Navigator, private val permissionManager: PermissionManager, @@ -315,6 +317,16 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.clearSelection() } + // Show the message details + view.optionsItemIntent + .filter { it == R.id.details } + .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages } + .mapNotNull { messages -> messages.firstOrNull().also { view.clearSelection() } } + .mapNotNull(messageRepo::getMessage) + .map(messageDetailsFormatter::format) + .autoDisposable(view.scope()) + .subscribe { view.showDetails(it) } + // Delete the messages view.optionsItemIntent .filter { it == R.id.delete } diff --git a/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml b/presentation/src/main/res/drawable/ic_info_black_24dp.xml similarity index 56% rename from presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml rename to presentation/src/main/res/drawable/ic_info_black_24dp.xml index cf53e145..cc940881 100644 --- a/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml +++ b/presentation/src/main/res/drawable/ic_info_black_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/> diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index 588de851..d1166801 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -200,7 +200,7 @@ android:id="@+id/about" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_info_outline_black_24dp" + app:icon="@drawable/ic_info_black_24dp" app:title="@string/settings_about_title" tools:summary="Version 3.0.7" /> diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index d74e426b..f7c12c89 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -40,6 +40,13 @@ android:visible="false" app:showAsAction="ifRoom" /> + + Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo From 52c99faed130c3dcce899983e24cb6354da06e98 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 03:12:44 -0400 Subject: [PATCH 12/17] #1079 - Can't send or receive new messages on HTC and Huawei devices --- .../repository/ConversationRepositoryImpl.kt | 17 ++++++++++++++ .../java/repository/ConversationRepository.kt | 4 ++++ .../java/feature/compose/ComposeViewModel.kt | 22 ++++++++++--------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/data/src/main/java/repository/ConversationRepositoryImpl.kt b/data/src/main/java/repository/ConversationRepositoryImpl.kt index 8cb377c0..04b140e5 100644 --- a/data/src/main/java/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/repository/ConversationRepositoryImpl.kt @@ -103,6 +103,23 @@ class ConversationRepositoryImpl @Inject constructor( .findFirst() } + override fun getThreadId(recipient: String): Long? { + return getThreadId(listOf(recipient)) + } + + override fun getThreadId(recipients: Collection): Long? { + return Realm.getDefaultInstance().use { realm -> + realm.where(Conversation::class.java) + .findAll() + .firstOrNull { conversation -> + conversation.recipients.size == recipients.size && conversation.recipients.map { it.address }.all { address -> + recipients.any { recipient -> PhoneNumberUtils.compare(recipient, address) } + } + } + ?.id + } + } + override fun getOrCreateConversation(threadId: Long): Conversation? { return getConversation(threadId) ?: getConversationFromCp(threadId) } diff --git a/domain/src/main/java/repository/ConversationRepository.kt b/domain/src/main/java/repository/ConversationRepository.kt index a8e4bff1..c3824a9a 100644 --- a/domain/src/main/java/repository/ConversationRepository.kt +++ b/domain/src/main/java/repository/ConversationRepository.kt @@ -20,6 +20,10 @@ interface ConversationRepository { fun getConversation(threadId: Long): Conversation? + fun getThreadId(recipient: String): Long? + + fun getThreadId(recipients: Collection): Long? + fun getOrCreateConversation(threadId: Long): Conversation? fun getOrCreateConversation(address: String): Conversation? diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 41221125..1ec67017 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -55,7 +55,6 @@ import model.Contact import model.Conversation import model.Message import model.PhoneNumber -import model.Recipient import repository.ContactRepository import repository.ConversationRepository import repository.MessageRepository @@ -101,6 +100,7 @@ class ComposeViewModel @Inject constructor( private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts().toObservable() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() private val selectedContacts: Subject> = BehaviorSubject.createDefault(listOf()) + private val threadIdSubject: Subject = BehaviorSubject.create() private val searchResults: Subject> = BehaviorSubject.create() private val searchSelection: Subject = BehaviorSubject.createDefault(-1) private val conversation: Subject = BehaviorSubject.create() @@ -119,16 +119,14 @@ class ComposeViewModel @Inject constructor( .map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } } .doOnNext { newState { copy(loading = true) } } .observeOn(Schedulers.computation()) - .map { addresses -> Pair(TelephonyCompat.getOrCreateThreadId(context, addresses), addresses) } + .map { addresses -> conversationRepo.getThreadId(addresses) ?: 0 } .observeOn(AndroidSchedulers.mainThread()) .doOnNext { newState { copy(loading = false) } } - .switchMap { (threadId, addresses) -> - val recipients = RealmList(*addresses.map { address -> Recipient(address = address) }.toTypedArray()) + .mergeWith(threadIdSubject) + .switchMap { threadId -> conversationRepo.getConversations().asObservable() .map { conversations -> conversations.filter { it.id == threadId } } - .map { conversations -> - conversations.firstOrNull() ?: Conversation(id = threadId, recipients = recipients) - } + .map { conversations -> conversations.firstOrNull() ?: Conversation(id = threadId) } } .mergeWith(initialConversation) .filter { conversation -> conversation.isLoaded } @@ -531,14 +529,18 @@ class ComposeViewModel @Inject constructor( // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent - .withLatestFrom(view.textChangedIntent, { _, body -> body }) + .withLatestFrom(view.textChangedIntent) { _, body -> body } .map { body -> body.toString() } .withLatestFrom(state, attachments, conversation, selectedContacts, { body, state, attachments, conversation, contacts -> val subId = state.subscription?.subscriptionId ?: -1 if (state.sendAsGroup) { - val threadId = conversation.id - val addresses = conversation.recipients.map { it.address } + val addresses = when (conversation.recipients.isNotEmpty()) { + true -> conversation.recipients.map { it.address } + false -> contacts.mapNotNull { it.numbers.firstOrNull()?.address } + } + val threadId = conversation.id.takeIf { it > 0 } + ?: TelephonyCompat.getOrCreateThreadId(context, addresses).also(threadIdSubject::onNext) sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments)) } else { contacts From 55c208d4430bf254995fa60685141f6624167651 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 12:33:55 -0400 Subject: [PATCH 13/17] Update ContentDescription for SIM selector --- data/src/main/java/compat/SubscriptionInfoCompat.kt | 2 ++ presentation/src/main/java/feature/compose/ComposeActivity.kt | 1 + presentation/src/main/res/layout/compose_activity.xml | 1 - presentation/src/main/res/values/strings.xml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/compat/SubscriptionInfoCompat.kt b/data/src/main/java/compat/SubscriptionInfoCompat.kt index 7cce63f3..08369c53 100644 --- a/data/src/main/java/compat/SubscriptionInfoCompat.kt +++ b/data/src/main/java/compat/SubscriptionInfoCompat.kt @@ -29,4 +29,6 @@ data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo val simSlotIndex get() = subscriptionInfo.simSlotIndex + val displayName get() = subscriptionInfo.displayName + } \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index dd8e445a..162931b6 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -217,6 +217,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { counter.setVisible(counter.text.isNotBlank()) sim.setVisible(state.subscription != null) + sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName) simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}" send.isEnabled = state.canSend diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index d1eafca1..2c7f985e 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -207,7 +207,6 @@ android:layout_height="44dp" android:layout_marginEnd="8dp" android:background="?attr/selectableItemBackground" - android:contentDescription="@string/compose_attach_cd" android:padding="10dp" android:src="@drawable/ic_sim_card_black_24dp" android:tint="?android:attr/textColorSecondary" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index eadabd0d..1014244d 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -110,6 +110,7 @@ Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… From e30783b8076848b9c616a76573bd2f946e51d717 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 12:59:03 -0400 Subject: [PATCH 14/17] Update ContentDescriptions for QK Reply and nav drawer --- presentation/src/main/java/feature/main/MainActivity.kt | 2 +- presentation/src/main/java/feature/qkreply/QkReplyActivity.kt | 1 + presentation/src/main/res/layout/qkreply_activity.xml | 2 +- presentation/src/main/res/values/strings.xml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index 69136420..4e922792 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -96,7 +96,7 @@ class MainActivity : QkThemedActivity(), MainView { override val backPressedIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] } - private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0) } + private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.main_drawer_open_cd, 0) } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE).apply { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index 3c820729..81cfa355 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -110,6 +110,7 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { counter.setVisible(counter.text.isNotBlank()) sim.setVisible(state.subscription != null) + sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName) simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}" send.isEnabled = state.canSend diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml index 14103d2a..15b05393 100644 --- a/presentation/src/main/res/layout/qkreply_activity.xml +++ b/presentation/src/main/res/layout/qkreply_activity.xml @@ -121,7 +121,6 @@ android:layout_height="44dp" android:layout_marginEnd="8dp" android:background="?attr/selectableItemBackground" - android:contentDescription="@string/compose_attach_cd" android:padding="10dp" android:src="@drawable/ic_sim_card_black_24dp" android:tint="?android:attr/textColorSecondary" @@ -163,6 +162,7 @@ android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:background="@drawable/circle" + android:contentDescription="@string/compose_send_cd" android:elevation="4dp" android:padding="10dp" android:src="@drawable/ic_send_black_24dp" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1014244d..0a298e7b 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ Details Save to gallery + Open navigation drawer %d selected Clear Mark read From 2813823b672c0f55d33f92f41fc51bd8338e3408 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 14:55:52 -0400 Subject: [PATCH 15/17] Fix multiple MMS not being displayed properly --- .../java/feature/compose/MessagesAdapter.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 181eb6f5..20eb6bc3 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -22,7 +22,6 @@ import android.animation.ObjectAnimator import android.content.ContentUris import android.content.Context import android.graphics.Typeface -import android.support.v7.widget.RecyclerView import android.telephony.PhoneNumberUtils import android.text.Spannable import android.text.SpannableStringBuilder @@ -52,7 +51,6 @@ import compat.SubscriptionManagerCompat import ezvcard.Ezvcard import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -122,7 +120,6 @@ class MessagesAdapter @Inject constructor( private val contactCache = ContactCache() private val expanded = HashMap() - private val disposables = CompositeDisposable() private val subs = subscriptionManager.activeSubscriptionInfoList var theme: Colors.Theme = colors.theme() @@ -154,11 +151,6 @@ class MessagesAdapter @Inject constructor( return QkViewHolder(view) } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { - super.onDetachedFromRecyclerView(recyclerView) - disposables.clear() - } - override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { val message = getItem(position)!! val previous = if (position == 0) null else getItem(position - 1) @@ -272,11 +264,12 @@ class MessagesAdapter @Inject constructor( media.forEachIndexed { index, part -> val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0 - val canMediaGroupWithNext = canGroup(message, next) || index < media.size && view.body.visibility == View.VISIBLE + val canMediaGroupWithNext = canGroup(message, next) || index < media.size - 1 || view.body.visibility == View.VISIBLE + val inflater = LayoutInflater.from(view.context) when { part.isImage() || part.isVideo() -> { - val mediaView = View.inflate(view.context, R.layout.mms_preview_list_item, view.attachments) + val mediaView = inflater.inflate(R.layout.mms_preview_list_item, view.attachments, false) mediaView.video.setVisible(part.isVideo()) mediaView.forwardTouches(view) mediaView.setOnClickListener { navigator.showMedia(part.id) } @@ -289,12 +282,13 @@ class MessagesAdapter @Inject constructor( } GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail) + view.attachments.addView(mediaView, index) } part.isVCard() -> { val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) - val mediaView = View.inflate(view.context, R.layout.mms_vcard_list_item, view.attachments) + val mediaView = inflater.inflate(R.layout.mms_vcard_list_item, view.attachments, false) mediaView.forwardTouches(view) mediaView.setOnClickListener { navigator.saveVcard(uri) } mediaView.vCardBackground.setBackgroundResource(getBubble(canMediaGroupWithPrevious, canMediaGroupWithNext, message.isMe())) @@ -312,6 +306,7 @@ class MessagesAdapter @Inject constructor( mediaView.name.setTextColor(theme.textPrimary) mediaView.label.setTextColor(theme.textTertiary) } + view.attachments.addView(mediaView, index) } } } From 2328382ef9cbef2e4f726ac88f7e4c6aa077438b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 14:56:09 -0400 Subject: [PATCH 16/17] Increment to 3.3.3 --- presentation/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index e56ce245..af2a8ae2 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.moez.QKSMS" minSdkVersion 21 targetSdkVersion 28 - versionCode 173 - versionName "3.3.2" + versionCode 174 + versionName "3.3.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" From b6469e55881ee2449abe26cd32c6a9ef02df165f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 14:59:29 -0400 Subject: [PATCH 17/17] Update translations --- .../src/main/res/values-ar/strings.xml | 275 ++++++++++++++ .../src/main/res/values-bn/strings.xml | 17 +- .../src/main/res/values-cs/strings.xml | 43 ++- .../src/main/res/values-da/strings.xml | 25 +- .../src/main/res/values-de/strings.xml | 25 +- .../src/main/res/values-es/strings.xml | 17 +- .../src/main/res/values-fa/strings.xml | 17 +- .../src/main/res/values-fi/strings.xml | 127 ++++--- .../src/main/res/values-fr/strings.xml | 25 +- .../src/main/res/values-hi/strings.xml | 17 +- .../src/main/res/values-hr/strings.xml | 17 +- .../src/main/res/values-hu/strings.xml | 159 ++++---- .../src/main/res/values-in/strings.xml | 17 +- .../src/main/res/values-it/strings.xml | 17 +- .../src/main/res/values-iw/strings.xml | 17 +- .../src/main/res/values-ja/strings.xml | 17 +- .../src/main/res/values-ko/strings.xml | 17 +- .../src/main/res/values-lt/strings.xml | 17 +- .../src/main/res/values-ne/strings.xml | 17 +- .../src/main/res/values-nl/strings.xml | 25 +- .../src/main/res/values-no/strings.xml | 17 +- .../src/main/res/values-pl/strings.xml | 17 +- .../src/main/res/values-pt-rBR/strings.xml | 25 +- .../src/main/res/values-pt/strings.xml | 25 +- .../src/main/res/values-ro/strings.xml | 17 +- .../src/main/res/values-ru/strings.xml | 27 +- .../src/main/res/values-sk/strings.xml | 51 ++- .../src/main/res/values-sr/strings.xml | 17 +- .../src/main/res/values-sv/strings.xml | 25 +- .../src/main/res/values-th/strings.xml | 17 +- .../src/main/res/values-tl/strings.xml | 17 +- .../src/main/res/values-tr/strings.xml | 25 +- .../src/main/res/values-uk/strings.xml | 272 ++++++++++++++ .../src/main/res/values-vi/strings.xml | 17 +- .../src/main/res/values-zh-rCN/strings.xml | 349 +++++++++--------- .../src/main/res/values-zh/strings.xml | 59 +-- 36 files changed, 1437 insertions(+), 448 deletions(-) create mode 100644 presentation/src/main/res/values-ar/strings.xml create mode 100644 presentation/src/main/res/values-uk/strings.xml diff --git a/presentation/src/main/res/values-ar/strings.xml b/presentation/src/main/res/values-ar/strings.xml new file mode 100644 index 00000000..05a1351d --- /dev/null +++ b/presentation/src/main/res/values-ar/strings.xml @@ -0,0 +1,275 @@ + + + + + أُرشفت + جُدولت + الإعدادات + الإشعارات + السمة + البحث في علبة الوارد… + أكتب اسماً أو رقماً + تخطي + متابعة + اتصال + تفاصيل + حفظ إلى المعرض + Open navigation drawer + %d محددة + مسح + Mark read + Mark unread + أرشفة + إلغاء الأرشفة + حظر + حذف + مزامنة الرسائل… + أنت: %s + النتائج في الرسائل + %d رسائل + ستظهر المحادثات الخاصة بك هنا + لا نتائج + ستظهر المحادثات المؤرشفة الخاصة بك هنا + ستظهر الرسائل المجدولة الخاصة بك هنا + بدء محادثة جديدة + ستحب المراسلة ثانية + جعل QKSMS تطبيق الرسائل النصية الافتراضي لديك + تغيير + الإذن مطلوب + QKSMS يحتاج إلى إذن لإرسال وعرض الرسائل النصية + QKSMS يحتاج إلى إذن لعرض جهات الاتصال لديك + سماح + صندوق الوارد + المؤرشفة + المجدولة + المزيد + الإعدادات + QKSMS+ + المساعدة والتواصل مع المبرمج + هل QKSMS ممتع ؟ + أظهر محبتك وقيّمنا على متجر Google Play! + حسناً + استبعاد + حذف + هل أنت متأكد من رغبتك حذف هذه المحادثة؟ + + نسخ النص + للأمام + حذف + + %d مختارة + %1$d من %2$d النتائج + إرسال رسالة جماعية + المتلقون والردود سيكونان مرئيين للجميع + هذا أول المحادثة. قل شيئا لطيفاً! + بطاقة جهة الاتصال + كتابة رسالة… + نسخ النص + للأمام + حذف + السابقة + التالية + مسح + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d + إضافة مرفق + إرفاق صورة + التقاط صورة + %s selected, change SIM card + إرسال الرسالة + الإرسال جارٍ… + تم إرسال %s + فشل الإرسال. إلمس لإعادة المحاولة + التفاصيل + عنوان المحادثة + أدخل العنوان + الإشعارات + السمة + الأرشيف + إلغاء الأرشفة + حظر + إلغاء الحظر + حذف المحادثة + تم الحفظ في المعرض + المظهر + عام + رد QK + السمة + الوضع الليلي + وضع ليلي بسوادٍ حالك + وقت البدء + وقت الانتهاء + حجم الخط + استخدم خط النظام + إيموجي تلقائية + الإشعارات + معاينات الإشعارات + الاهتزاز + الصوت + بدون نغمة + رد QK + نافذة منبثقة للرسائل الجديدة + إلمس للاستبعاد + إلمس خارج المنبثقة لإغلاقها + الحظر + + Should I Answer؟ + الترشيح التلقائي للرسائل من الأرقام غير المرغوبة باستخدام تطبيق \"Should I Answer\" + الإرسال المؤخَّر + تأكيدات الإستلام + تأكيد أنه تم إرسال الرسائل بنجاح + نزع حركات التشكيل + حذف حركات التشكيل من المحارف في الرسائل النصية الصادرة + الضغط التلقائي لمرفقات رسائل الوسائط + مزامنة الرسائل + إعادة مزامنة رسائلك مع قاعدة البيانات الأصلية للرسائل في النظام + حول QKSMS + النسخة %s + أدخل المدة (ثوان) + الحظر + المحادثات المحظورة لديك ستظهر هنا + إلغاء الحظر + هل ترغب إلغاء حظر هذه المحادثة؟ + حول + النسخة + المطوّر + الشفرة المصدر + سجل التغييرات + للاتصال + الترخيص + حقوق النسخ + دعم التطوير و فتح جميع المزايا + يمكنك إنقاذ المطوّر الجائع ب %s فقط + ترقية مدى الحياة ل %1$s%2$s + افتح + التبرع ل %1$s%2$s + شكراً لكم على دعم QKSMS! + جميع ميزات QKSMS+ متاحة لك الآن + QKSMS+ مجاني لمستخدمي متجر ف-درويد! لا تتردد في التبرع إن كنت ترغب دعم تطوير هذا التطبيق. + التبرع عن طريق بي بال + قريباً + سمات فاخرة + استفد من ألوان رائعة للسمات لاتوجد في لوح ألوان Material Design + إيموجي تلقائية ومخصصة + إنشاء اختصارات إيموجي تلقائية ومخصّصة + النسخ الاحتياطي للرسائل + النسخ الاحتياطي التلقائي لرسائلك. +لا تقلق ثانية من فقد سجلات رسائلك عندما تغير جوالك أو عند فقده + الرسائل المجدولة + جدولة الرسائل ليتم إرسالها تلقائياً في وقت وتاريخ محدد + إرسال متأخر + انتظر بضع ثوان قبل إرسال رسالتك + الوضع الليلي التلقائي + تمكين الوضع الليلي استناداً على الوقت من اليوم + الحظر المتقدم + حظر الرسائل التي تحوي كلمات أو تطابق أنماطاً + إعادة التوجيه التلقائية + أعد التوجيه تلقائياً للرسائل من مرسلين معينين + الرد التلقائي + الرد تلقائياً على الرسائل الواردة برسالة محددة مسبقاً + المزيد + أعمال تطوير QKSMS نشطة ، واشتراكك سيشمل جميع مزايا QKSMS+ المستقبلية! + تحميل… + عرض المزيد من المحادثات + علّمها مقروءة + مكالمة + إظهار المزيد + إظهار أقل + فتح المحادثة + Material + QKSMS+ + HEX + تطبيق + الرد + علّمها مقروءة + إلغاء + حذف + حفظ + المزيد + تعيين + إلغاء الحظر + تراجع + تم النسخ + تم حفظ المحادثة + استخدام هذه الميزة يتطلب فتح QKSMS+ + + لا رسائل جديدة + New message + رسالتان جديدتان + %s رسائل جديدة + %s رسائل جديدة + %s رسائل جديدة + + لم ترسَل الرسالة + فشل الإرسال إلى %s + + معطَّل + يعمل دوماً + تلقائياً + + + عرض الاسم والرسالة + عرض الاسم + إخفاء المحتويات + + + صغير + عادي + كبير + أكبر + + + دون تأخير + قصير + متوسط + طويل + + + ١٠٠ ك.ب. + ٢٠٠ ك.ب. + ٣٠٠ ك.ب. (مستحسن) + ٦٠٠ ك.ب. + ١٠٠٠ ك.ب. + ٢٠٠٠ ك.ب. + دون ضغط + + + حسنًا + أمهلني بعض الوقت + في طريقي + شكراً + يبدو جيدًا + ماذا لديك ؟ + أوافقك + لا + أحبك + آسف + ههههههه + هذا مناسب + + diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml index 4c07f5b2..39d533db 100644 --- a/presentation/src/main/res/values-bn/strings.xml +++ b/presentation/src/main/res/values-bn/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled সেটিংস @@ -27,14 +26,16 @@ Theme Search inbox… রচনা করুন - QKSMS+ Skip Continue কল করুন Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 436db6a2..bafb953e 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archivováno Naplánováno Nastavení @@ -27,14 +26,16 @@ Motiv vzhledu Hledat… Nová zpráva - QKSMS+ Přeskočit Pokračovat Volat Podrobnosti - Save to gallery + Uložit do galerie + Open navigation drawer Vybráno: %d Vymazat + Mark read + Mark unread Archivovat Obnovit z archivu Blokovat @@ -48,10 +49,10 @@ Zde se objeví Vaše archivované konverzace Zde se zobrazí vaše naplánované zprávy Zahájit novou konverzaci - Love texting again + Zamilujte si znovu psaní Nastavte si QKSMS jako výchozí SMS aplikaci Nastavit - Vyžadování oprávnění + Vyžadováno oprávnění QKSMS potřebuje oprávnění pro odesílání a zobrazení SMS zpráv QKSMS potřebuje oprávnění pro zobrazení vašich kontaktů Povolit @@ -75,10 +76,10 @@ Vybráno: %d %1$d z %2$d výsledků - Send as group message - Recipients and replies will be visible to everyone + Odeslat jako skupinovou zprávu + Příjemci a odpovědi budou viditelné všem Toto je začátek vaší konverzace. Řekněte něco hezkého! - Contact card + Karta kontaktu Napsat zprávu… Kopírovat text Přeposlat @@ -86,16 +87,28 @@ Předchozí Další Vymazat + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Připojit přílohu Připojit fotografii Fotografovat + %s selected, change SIM card Odeslat zprávu Odesílání… Doručeno %s Odeslání se nezdařilo. Klepnutím zkusíte znovu odeslat Podrobnosti - Conversation title - Enter title + Název konverzace + Vložte název Oznámení Motiv vzhledu Archivovat @@ -103,7 +116,7 @@ Blokovat Odblokovat Odstranit konverzaci - Saved to gallery + Uloženo do galerie Vzhled Obecné Rychlá odpověď @@ -119,7 +132,7 @@ Nastavení oznámení Vibrace Vyzvánění - None + Žádný Rychlá odpověď Vyskakovací okno pro nové zprávy Klepnutím zavřít @@ -167,7 +180,7 @@ Zálohování zpráv Zálohujte automaticky své zprávy. Už se nemusíte obávat ztráty historie zpráv při ztrátě nebo výměně telefonu Plánované zprávy - Schedule messages to automatically be sent at a specific time and date + Plánované zprávy budou automaticky odeslány v určené datum a čas Zpožděné odeslání Počkat několik sekund před odesláním zprávy Automatický noční režim @@ -195,7 +208,7 @@ Označit jako přečtené Zrušit Odstranit - Save + Uložit Více Nastavit Odblokovat @@ -240,7 +253,7 @@ 600 kB 1 000 kB 2 000 kB - Bez komprimace + Bez komprese OK diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index 228b339f..ce8a03f1 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arkiveret Planlagt Indstillinger @@ -27,14 +26,16 @@ Tema Søg i Indbakke… Angiv et navn eller nummer - QKSMS+ Overspring Fortsæt Opkald Oplysninger Gem til galleri + Open navigation drawer %d valgt Ryd + Mark read + Mark unread Arkivér Fjern fra arkiv Blokér @@ -78,7 +79,7 @@ Send som gruppe besked Modtagere og besvarelser vil være synlige for alle Detter er starten på den samtale. Sig noget pænt! - Contact card + Kontaktkort Skriv en besked… Kopier tekst Videresend @@ -86,16 +87,28 @@ Foregående Næste Ryd + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Tilføj en vedhæftning Vedhæft et foto Tag et foto + %s selected, change SIM card Send besked Afsender… Leveret %s Mislykkedes at afsende. Tryk for at forsøge igen Oplysninger - Conversation title - Enter title + Samtaletitel + Angiv titel Notifikationer Tema Arkiv @@ -195,7 +208,7 @@ Markér som læst Annullér Slet - Save + Gem Flere Indstil Afblokér diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index bdda56e6..dca643da 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archiviert Geplant Einstellungen @@ -27,14 +26,16 @@ Erscheinungsbild In Posteingang suchen… Verfassen - QKSMS+ Überspringen Weiter Anrufen Details In Galerie speichern + Open navigation drawer %d ausgewählt Zurücksetzen + Mark read + Mark unread Archivieren Wiederherstellen Blockieren @@ -78,7 +79,7 @@ Als Gruppennachricht senden Empfänger und Antworten werden für jeden sichtbar sein Das ist der Beginn der Unterhaltung. Sag\' etwas nettes! - Contact card + Kontaktkarte Schreibe eine Nachricht… Text kopieren Weiterleiten @@ -86,16 +87,28 @@ Vorherige Nächste Löschen + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Anhang hinzufügen Foto anhängen Foto aufnehmen + %s selected, change SIM card Nachricht senden Wird gesendet… Zugestellt %s Fehler beim Senden. Tippen, um es erneut zu versuchen Details - Conversation title - Enter title + Unterhaltungstitel + Titel eingeben Benachrichtigungen Erscheinungsbild Archivieren @@ -195,7 +208,7 @@ Als gelesen markieren Abbrechen Löschen - Save + Speichern Mehr OK Entsperren diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml index d3c37f40..f656db65 100644 --- a/presentation/src/main/res/values-es/strings.xml +++ b/presentation/src/main/res/values-es/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archivados Programar Configuración @@ -27,14 +26,16 @@ Tema Buscar mensaje… Escriba un nombre o número - QKSMS+ Omitir Continuar Llamar Detalles Save to gallery + Open navigation drawer %d Seleccionados Limpiar + Mark read + Mark unread Archivo Desarchivar Bloquear @@ -86,9 +87,21 @@ Anterior Siguiente Borrar + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Agregar un archivo adjunto Adjuntar una foto Tomar una foto + %s selected, change SIM card Enviar mensaje Enviando… Entregado %s diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml index 1d4b0020..b835857d 100644 --- a/presentation/src/main/res/values-fa/strings.xml +++ b/presentation/src/main/res/values-fa/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - پیامچه بایگانی زمانبندی تنظیمات @@ -27,14 +26,16 @@ پوسته یافتن پیامک… Compose - نسخه پیشرفته بیخیال ادامه تماس جزئیات Save to gallery + Open navigation drawer %d selected پاکسازی + Mark read + Mark unread بایگانی بیرون آوردن از بایگانی بلاک @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message فرستادن… رسیده %s diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml index 5878251d..9dba2ad5 100644 --- a/presentation/src/main/res/values-fi/strings.xml +++ b/presentation/src/main/res/values-fi/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arkistoidut Ajoitetut Asetukset @@ -27,75 +26,89 @@ Teema Search inbox… Kirjoita - QKSMS+ - Skip - Continue + Ohita + Jatka Soita Details - Save to gallery - %d selected + Tallenna galleriaan + Open navigation drawer + %d valittu Clear - Archive - Unarchive - Block - Delete - Syncing messages… - You: %s - Results in messages - %d messages - Your conversations will appear here - No results - Your archived conversations will appear here - Your scheduled messages will appear here - Start new conversation - Love texting again + Mark read + Mark unread + Arkistoi + Poista arkistosta + Estä + Poista + Synkronoidaan viestejä… + Sinä: %s + Tuloksia viesteissä + %d viestiä + Keskustelusi näkyvät tässä + Ei tuloksia + Arkistoimasi keskustelut näkyvät tässä + Ajoittamasi viestit näkyvät tässä + Aloita uusi keskustelu + Rakastu tekstaamiseen uudelleen Make QKSMS your default SMS app - Change + Muuta Permission required QKSMS needs permission to send and view SMS messages QKSMS needs permission to view your contacts - Allow - Inbox - Archived - Scheduled - More - Settings + Salli + Saapuneet + Arkistoidut + Ajoitetut + Lisää + Asetukset QKSMS+ - Help & feedback + Apu ja palaute Enjoying QKSMS? Share some love and rate us on Google Play! - OKAY! - DISMISS - Delete - Are you sure you would like to delete this conversation? + Okei! + HYLKÄÄ + Poista + Oletko varma, että haluat poistaa tämän keskustelun? - Copy text - Forward - Delete + Kopioi teksti + Välitä + Poista - %d selected + %d valittu %1$d of %2$d results - Send as group message + Lähetä ryhmäviestinä Recipients and replies will be visible to everyone This is the start of your conversation. Say something nice! Contact card - Write a message… - Copy text - Forward - Delete - Previous - Next - Clear - Add an attachment - Attach a photo - Take a photo - Send message - Sending… + Kirjoita viesti… + Kopioi teksti + Välitä + Poista + Edellinen + Seuraava + Tyhjennä + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d + Lisää liite + Liitä kuva + Ota kuva + %s selected, change SIM card + Lähetä viesti + Lähetetään… Delivered %s Failed to send. Tap to try again Details Conversation title - Enter title + Kirjoita otsikko Notifications Theme Archive @@ -134,7 +147,7 @@ Strip accents Remove accents from characters in outgoing SMS messages Auto-compress MMS attachments - Sync messages + Synkronoi viestit Re-sync your messages with the native Android SMS database About QKSMS Version %s @@ -144,12 +157,12 @@ Unblock Would you like to unblock this conversation? About - Version - Developer - Source code - Changelog + Versio + Kehittäjä + Lähdekoodi + Muutosloki Contact - License + Lisenssi Copyright Support development, unlock everything You can save a starving developer for just %s @@ -159,7 +172,7 @@ You now have access to all QKSMS+ features QKSMS+ is free for F-Droid users! If you\'d like to support development, feel free to make a donation. Donate via PayPal - Coming soon + Tulossa pian Premium themes Unlock beautiful theme colors not available on the Material Design palette Custom auto-emoji diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index 3be5715c..3851a653 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archivées Planifiés Paramètres @@ -27,14 +26,16 @@ Thème Rechercher dans les conversations… Entrer un nom ou un numéro - QKSMS+ Ignorer Continuer Appeler Détails Enregistrer dans la galerie + Open navigation drawer %d sélectionnée Effacer + Mark read + Mark unread Archiver Désarchiver Bloquer @@ -78,7 +79,7 @@ Envoyer en tant que message groupé Les destinataires et les réponses seront visibles par tout le monde C\'est le début de votre conversation. Dites quelque chose de sympa ! - Contact card + Fiche du contact Écrire un message… Copier le texte Transférer @@ -86,16 +87,28 @@ Précédent Suivant Effacer + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Ajouter une pièce jointe Joindre une photo Prendre une photo + %s selected, change SIM card Envoyer un message Envoi… Envoyé %s Échec de l\'envoi. Appuyer pour réessayer Détails - Conversation title - Enter title + Sujet de la conversation + Entrer un titre Notifications Thème Archiver @@ -195,7 +208,7 @@ Marquer comme lu Annuler Supprimer - Save + Enregistrer Plus Choisir Débloquer diff --git a/presentation/src/main/res/values-hi/strings.xml b/presentation/src/main/res/values-hi/strings.xml index 595078b8..733a2e75 100644 --- a/presentation/src/main/res/values-hi/strings.xml +++ b/presentation/src/main/res/values-hi/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled सेटिंग्स @@ -27,14 +26,16 @@ Theme Search inbox… रचना - QKSMS+ Skip Continue कॉल Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml index a7b5096e..05080c25 100644 --- a/presentation/src/main/res/values-hr/strings.xml +++ b/presentation/src/main/res/values-hr/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arhivirano Zakazano Postavke @@ -27,14 +26,16 @@ Tema Pretraži poruke… Unesite ime ili broj - QKSMS+ Preskoči Nastavi Nazovi Detalji Save to gallery + Open navigation drawer %d odabrano Očisti + Mark read + Mark unread Arhiviraj Dearhiviraj Blokiraj @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Dodaj privitak Priloži fotografiju Uslikaj fotografiju + %s selected, change SIM card Pošalji poruku Slanje… Isporučeno %s diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 6ffff7a5..f0db344e 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -19,61 +19,62 @@ ~ along with QKSMS. If not, see . --> - QKSMS - Archived - Scheduled + Archivált + Ütemezett Beállítások - Notifications - Theme - Search inbox… + Értesítések + Téma + Keresés az üzenetek között… Üzenetírás - QKSMS+ - Skip - Continue + Kihagy + Tovább Hívás - Details - Save to gallery - %d selected - Clear - Archive - Unarchive - Block - Delete - Syncing messages… - You: %s - Results in messages - %d messages - Your conversations will appear here - No results - Your archived conversations will appear here - Your scheduled messages will appear here - Start new conversation - Love texting again - Make QKSMS your default SMS app - Change - Permission required - QKSMS needs permission to send and view SMS messages - QKSMS needs permission to view your contacts - Allow - Inbox - Archived - Scheduled - More - Settings + Részletek + Mentés a galériába + Open navigation drawer + %d kijelölve + Törlés + Mark read + Mark unread + Archiválás + Törlés az archívumból + Blokkolás + Törlés + Üzenetek szinkronizálása… + Te: %s + Eredmények az üzenetek szövegében + %d üzenet + A beszélgetéseid itt jelennek meg + Nincs eredmény + Az archivált beszélgetéseid itt jelennek meg + Az ütemezett üzeneteid itt jelennek meg + Új beszélgetés kezdeményezése + Szeresd újból az SMS-ezést + A QKSMS beállítása alapértelmezett SMS alkalmazásként + Módosít + Engedély szükséges + A QKSMS-nek engedélyt kell kapnia az SMS üzenetek küldésére és megtekintésére + A QKSMS-nek engedélyt kell kapnia a kapcsolatok megtekintésére + Engedélyez + Bejövő üzenetek + Archivált + Ütemezett + Továbbiák + Beállítások QKSMS+ - Help & feedback - Enjoying QKSMS? - Share some love and rate us on Google Play! - OKAY! - DISMISS - Delete - Are you sure you would like to delete this conversation? + Súgó és visszajelzés + Tetszik a QKSMS? + Oszd meg a szeretetet és értékelj minket a Google Playen! + OKÉ! + MELLŐZÉS + Törlés + Biztosan törlöd ezt a beszélgetést? - Copy text - Forward - Delete + Szöveg másolása + Továbbítás + Törlés - %d selected + %d kijelölve %1$d of %2$d results Send as group message Recipients and replies will be visible to everyone @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s @@ -124,32 +137,32 @@ Popup for new messages Tap to dismiss Tap outside of the popup to close it - Blocking + Blokkolás Should I Answer? - Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app - Delayed sending - Delivery confirmations - Confirm that messages were sent successfully - Strip accents - Remove accents from characters in outgoing SMS messages - Auto-compress MMS attachments - Sync messages - Re-sync your messages with the native Android SMS database - About QKSMS - Version %s - Enter duration (seconds) - Blocking - Your blocked conversations will appear here - Unblock - Would you like to unblock this conversation? - About - Version - Developer - Source code - Changelog - Contact - License + Automatikusan szűrheti az üzeneteket a nem kívánt számok alapján a \"Should I Answer\" alkalmazás használatával + Késleltetett küldés + Elküldés megerősítése + Megerősíti, hogy az üzenetek sikeresen el lettek-e küldve + Ékezetek törlése + A kimenő SMS-üzenetek ékezetes karaktereinek átalakítása + MMS-mellékletek automatikus tömörítése + Üzenetek szinkronizálása + Üzenetek szinkronizálása a natív Android SMS-adatbázisban + A QKSMS-ről + %s verzió + Nyomva tartás ideje (másodpercben) + Blokkolás + A letiltott beszélgetések itt jelennek meg + Tiltás feloldása + Szeretnéd feloldani ezt a beszélgetést? + Névjegy + Verzió + Fejlesztői + Forráskód + Változások listája + Kapcsolat + Licensz Copyright Support development, unlock everything You can save a starving developer for just %s diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml index 3cbd5904..4f8740e0 100644 --- a/presentation/src/main/res/values-in/strings.xml +++ b/presentation/src/main/res/values-in/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled Setelan @@ -27,14 +26,16 @@ Tema Cari kotak masuk… Tulis Pesan baru - QKSMS+ Lewati Lanjutkan Panggil Detail Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Mengirim… Delivered %s diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index edcc9f86..cfa7c3c1 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archiviato Schedulato Impostazioni @@ -27,14 +26,16 @@ Tema Cerca posta in arrivo… Scrivi - QKSMS+ Salta Continua Chiama Dettagli Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Invio in corso… %s consegnati diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml index dc50fa4e..b4bf2c4f 100644 --- a/presentation/src/main/res/values-iw/strings.xml +++ b/presentation/src/main/res/values-iw/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled הגדרות @@ -27,14 +26,16 @@ Theme Search inbox… כתוב הודעה - QKSMS+ Skip Continue התקשר Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml index 3dee448f..439c838a 100644 --- a/presentation/src/main/res/values-ja/strings.xml +++ b/presentation/src/main/res/values-ja/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS アーカイブ済 スケジュール済 設定 @@ -27,14 +26,16 @@ テーマ 受信トレイを検索… 作成 - QKSMS+ スキップ 続行 通話 詳細 Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message 送信中… %s を配信しました diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml index 7cd527c5..34b18ee0 100644 --- a/presentation/src/main/res/values-ko/strings.xml +++ b/presentation/src/main/res/values-ko/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS 보관됨 예약됨 설정 @@ -27,14 +26,16 @@ 테마 수신함에서 찾기... 문자작성 - QKSMS+ 건너뛰기 계속 전화 자세히 Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message 전송 중... %s 전송됨 diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml index bc56d333..9960044a 100644 --- a/presentation/src/main/res/values-lt/strings.xml +++ b/presentation/src/main/res/values-lt/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archyvas Planuota Nustatymai @@ -27,14 +26,16 @@ Spalva Ieškoti žinutes… Rašyti - QKSMS+ Praleisti Tęsti Skambinti Dėtalės Save to gallery + Open navigation drawer %d pasirinkta(s) Ištrinti + Mark read + Mark unread Archyvuoti Išarchyvuoti Blokuoti @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Pridėti priedą Pridėti nuotrauką Padaryti nuotrauką + %s selected, change SIM card Siųsti žinutę Siunčiama… Nusiųsta %s diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml index 01c82444..b4791cfc 100644 --- a/presentation/src/main/res/values-ne/strings.xml +++ b/presentation/src/main/res/values-ne/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled Settings @@ -27,14 +26,16 @@ Theme Search inbox… Compose - QKSMS+ Skip Continue सम्पर्क Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml index 501b5798..64cc2b98 100644 --- a/presentation/src/main/res/values-nl/strings.xml +++ b/presentation/src/main/res/values-nl/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archief Gepland Instellingen @@ -27,14 +26,16 @@ Thema Doorzoek inbox… Type een naam of nummer - QKSMS+ Overslaan Verder Bel Details Opslaan in galerij + Open navigation drawer %d geselecteerd Wissen + Mark read + Mark unread Archiveren Terugzetten uit archief Blokkeren @@ -78,7 +79,7 @@ Versturen als groepsbericht Ontvangers en antwoorden zijn zichtbaar voor iedereen Dit is het begin van je conversatie. Zeg iets leuks! - Contact card + Contactpersoonkaart Type een bericht… Tekst kopiëren Doorsturen @@ -86,16 +87,28 @@ Vorige Volgende Wissen + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Een bijlage toevoegen Voeg een foto toe Neem een foto + %s selected, change SIM card Verstuur bericht Verzenden… Afgeleverd %s Fout bij verzenden. Tik om opnieuw te proberen Details - Conversation title - Enter title + Titel van conversatie + Titel invoeren Notificaties Thema Archief @@ -195,7 +208,7 @@ Markeren als gelezen Annuleren Verwijderen - Save + Opslaan Meer Instellen Blokkering opheffen diff --git a/presentation/src/main/res/values-no/strings.xml b/presentation/src/main/res/values-no/strings.xml index 408d85c6..64bbac6e 100644 --- a/presentation/src/main/res/values-no/strings.xml +++ b/presentation/src/main/res/values-no/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled Innstillinger @@ -27,14 +26,16 @@ Theme Search inbox… Type a name or number - QKSMS+ Skip Continue Ring Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-pl/strings.xml b/presentation/src/main/res/values-pl/strings.xml index 3dee8347..7f2fedc6 100644 --- a/presentation/src/main/res/values-pl/strings.xml +++ b/presentation/src/main/res/values-pl/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archiwum Harmonogram Ustawienia @@ -27,14 +26,16 @@ Motyw Przeszukaj skrzynkę odbiorczą… Nowa wiadomość - QKSMS+ Pomiń Kontynuuj Zadzwoń Szczegóły Save to gallery + Open navigation drawer %d wybrano Wyczyść + Mark read + Mark unread Archiwizuj Przywróć Zablokuj @@ -86,9 +87,21 @@ Poprzedni Następny Wyczyść + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Dodaj załącznik Załącz zdjęcie Zrób zdjęcie + %s selected, change SIM card Wyślij wiadomość Wysyłanie… Dostarczane %s diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml index 50819588..1d60aa37 100644 --- a/presentation/src/main/res/values-pt-rBR/strings.xml +++ b/presentation/src/main/res/values-pt-rBR/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arquivado Agendado Configurações @@ -27,14 +26,16 @@ Tema Pesquisar caixa de entrada… Nova Mensagem - QKSMS+ Pular Continuar Ligar Detalhes Guardar na galeria + Open navigation drawer %d selecionada(s) Limpar + Mark read + Mark unread Arquivar Retirar do arquivo Bloquear @@ -78,7 +79,7 @@ Enviar como mensagem de grupo Destinatários e respostas visíveis para todos Aqui é o início da sua conversa. Pode dizer algo simpático! - Contact card + Cartão do contacto Escrever uma mensagem… Copiar texto Reencaminhar @@ -86,16 +87,28 @@ Anterior Seguinte Limpar + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Adicionar anexo Anexar fotografia Tirar fotografia + %s selected, change SIM card Enviar mensagem A enviar… %s entregue Falha ao enviar. Toque para tentar novamente Detalhes - Conversation title - Enter title + Título da conversa + Digite o título Notificações Tema Arquivar @@ -195,7 +208,7 @@ Marcar como lida Cancelar Apagar - Save + Guardar Mais Definir Desbloquear diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml index 4d21a0c1..4ab06131 100644 --- a/presentation/src/main/res/values-pt/strings.xml +++ b/presentation/src/main/res/values-pt/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arquivada Agendada Definições @@ -27,14 +26,16 @@ Tema Pesquisar caixa de entrada… Nova mensagem - QKSMS+ Ignorar Continuar Ligar Detalhes Guardar na galeria + Open navigation drawer %d selecionada(s) Limpar + Mark read + Mark unread Arquivar Retirar do arquivo Bloquear @@ -78,7 +79,7 @@ Enviar como mensagem de grupo Destinatários e respostas visíveis para todos Aqui é o início da sua conversa. Pode dizer algo simpático! - Contact card + Cartão do contacto Escrever uma mensagem… Copiar texto Reencaminhar @@ -86,16 +87,28 @@ Anterior Seguinte Limpar + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Adicionar anexo Anexar fotografia Tirar fotografia + %s selected, change SIM card Enviar mensagem A enviar… %s entregue Falha ao enviar. Toque para tentar novamente Detalhes - Conversation title - Enter title + Título da conversa + Digite o título Notificações Tema Arquivar @@ -195,7 +208,7 @@ Marcar como lida Cancelar Apagar - Save + Guardar Mais Definir Desbloquear diff --git a/presentation/src/main/res/values-ro/strings.xml b/presentation/src/main/res/values-ro/strings.xml index ab7ecb1f..41ace09c 100644 --- a/presentation/src/main/res/values-ro/strings.xml +++ b/presentation/src/main/res/values-ro/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arhivate Programată Setări @@ -27,14 +26,16 @@ Teme Caută în inbox... Compune - QKSMS+ Sari Continue Apel Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml index 755fa674..6cc20f15 100644 --- a/presentation/src/main/res/values-ru/strings.xml +++ b/presentation/src/main/res/values-ru/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS В архиве Запланировано Настройки @@ -27,14 +26,16 @@ Тема Поиск во входящих… Написать - QKSMS+ Пропустить Продолжить Позвонить Подробности Сохранить в галерее + Open navigation drawer %d выбран(о) Очистить + Mark read + Mark unread Архивировать Разархивировать Блокировать @@ -78,7 +79,7 @@ Отправить как групповое сообщение Получатели и ответы будут видны всем Это начало Вашей беседы. Скажите что-нибудь приятное! - Contact card + Карточка контакта Написать сообщение… Скопировать текст Переслать @@ -86,16 +87,28 @@ Назад Вперед Очистить + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Добавить вложение Прикрепить фото Сделать снимок + %s selected, change SIM card Отправить сообщение Отправка… Доставлено %s Не удалось отправить. Коснитесь, чтобы попробовать ещё раз. Подробности - Conversation title - Enter title + Название разговора + Введите название Уведомления Тема Архивировать @@ -161,7 +174,7 @@ Пожертвовать через PayPal Скоро Премиум темы - Unlock beautiful theme colors not available on the Material Design palette + Разблокируйте красивые цвета темы, недоступные в палитре Material Design Пользовательские авто-эмодзи Создайте ярлык пользовательских авто-эмодзи Бэкап сообщений @@ -195,7 +208,7 @@ Пометить прочитанным Отмена Удалить - Save + Сохранить Еще Задать Разблокировать diff --git a/presentation/src/main/res/values-sk/strings.xml b/presentation/src/main/res/values-sk/strings.xml index 12606323..35095cbc 100644 --- a/presentation/src/main/res/values-sk/strings.xml +++ b/presentation/src/main/res/values-sk/strings.xml @@ -19,46 +19,47 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived - Scheduled + Naplánované Nastavenia - Notifications - Theme - Search inbox… + Upozornenia + Téma + Hľadať správu… Nová správa - QKSMS+ - Skip - Continue + Preskočiť + Pokračovať Volať - Details - Save to gallery - %d selected - Clear - Archive + Podrobnosti + Uložiť do galérie + Open navigation drawer + %d vybraných + Vymazať + Mark read + Mark unread + Archivovať Unarchive Block - Delete - Syncing messages… + Odstrániť + Synchronizácia správ… You: %s Results in messages %d messages Your conversations will appear here - No results + Žiadne výsledky Your archived conversations will appear here Your scheduled messages will appear here - Start new conversation + Začať novú konverzáciu Love texting again Make QKSMS your default SMS app Change Permission required QKSMS needs permission to send and view SMS messages QKSMS needs permission to view your contacts - Allow + Povoliť Inbox Archived Scheduled - More + Viac Settings QKSMS+ Help & feedback @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-sr/strings.xml b/presentation/src/main/res/values-sr/strings.xml index 99f23cba..c57bc5ca 100644 --- a/presentation/src/main/res/values-sr/strings.xml +++ b/presentation/src/main/res/values-sr/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled Подешавања @@ -27,14 +26,16 @@ Theme Search inbox… Састављање - QKSMS+ Skip Continue Позови Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-sv/strings.xml b/presentation/src/main/res/values-sv/strings.xml index f85cf3db..6cedd6fc 100644 --- a/presentation/src/main/res/values-sv/strings.xml +++ b/presentation/src/main/res/values-sv/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arkiverat Schemalagt Inställningar @@ -27,14 +26,16 @@ Tema Sök i inkorg… Ange ett namn eller nummer - QKSMS+ Hoppa över Fortsätt Ring Detaljer Spara till galleri + Open navigation drawer %d vald Rensa + Mark read + Mark unread Arkiv Avarkivera Blockera @@ -78,7 +79,7 @@ Skicka som ett grupp-meddelande Mottagare och svar kommer att vara synligt för alla Det här är början på din konversation. Säg något snällt! - Contact card + Kontaktkort Skriv ett meddelande… Kopiera text Vidarebefordra @@ -86,16 +87,28 @@ Föregående Nästa Rensa + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Lägg till en bilaga Bifoga en bild Ta en bild + %s selected, change SIM card Skicka meddelandet Skickar… Levererade %s Misslyckades med att skicka. Knacka för att försöka igen Detaljer - Conversation title - Enter title + Titel för konversation + Fyll i titel Aviseringar Tema Arkivera @@ -195,7 +208,7 @@ Markera som läst Avbryt Radera - Save + Spara Mer Ställ in Avblockera diff --git a/presentation/src/main/res/values-th/strings.xml b/presentation/src/main/res/values-th/strings.xml index 376e280b..fbd27838 100644 --- a/presentation/src/main/res/values-th/strings.xml +++ b/presentation/src/main/res/values-th/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS จัดเก็บ กำหนดเวลา การตั้งค่า @@ -27,14 +26,16 @@ รูปแบบการแสดงผล ค้นหากล่องขาเข้า… พิมพ์ชื่อหรือหมายเลข - QKSMS + ข้าม ทำต่อ โทร รายละเอียด บันทึกรูปภาพ + Open navigation drawer %d ถูกเลือก ลบออก + Mark read + Mark unread จัดเก็บ ยกเลิกการเก็บ ปิดกั้น @@ -86,9 +87,21 @@ ก่อนหน้านี้ ถัดไป ล้าง + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d เพิ่มสิ่งที่แนบ แนบรูปภาพ ถ่ายภาพ + %s selected, change SIM card ส่งข้อความ กำลังส่ง... %s ถูกส่งแล้ว diff --git a/presentation/src/main/res/values-tl/strings.xml b/presentation/src/main/res/values-tl/strings.xml index 3a3ce9a0..0c0c265d 100644 --- a/presentation/src/main/res/values-tl/strings.xml +++ b/presentation/src/main/res/values-tl/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Archived Scheduled Mga setting @@ -27,14 +26,16 @@ Theme Search inbox… Sumulat - QKSMS+ Skip Continue Tawagan Details Save to gallery + Open navigation drawer %d selected Clear + Mark read + Mark unread Archive Unarchive Block @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml index a9bcb42f..c37878b5 100644 --- a/presentation/src/main/res/values-tr/strings.xml +++ b/presentation/src/main/res/values-tr/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Arşivlenmiş Zamanlanmış Ayarlar @@ -27,14 +26,16 @@ Tema Gelen mesajlarda ara... Bir isme veya numaraya yazın - QKSMS+ Atla Devam Ara Ayrıntılar Galeriye Kaydet + Open navigation drawer %d Seçili Temizle + Mark read + Mark unread Arşiv Arşivden çıkar Engelle @@ -78,7 +79,7 @@ Grup mesajı gönder Alıcılar ve yanıtlar herkese görünür olacak Senin konuşma başlıyor. Güzel bir şey söyle! - Contact card + Kişi Kartı Mesaj Yaz... Metni kopyala Yönlendir @@ -86,16 +87,28 @@ Önceki Sonraki Temizle + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Dosya Ekle Bir fotoğraf eklemek Fotoğraf Çek + %s selected, change SIM card Mesaj gönder Gönderiliyor... Teslim Edildi %s Gönderilemedi. Yeniden denemek için dokunun Ayrıntılar - Conversation title - Enter title + Konuşma başlığı + Başlık girin Bildirimler Tema Arşivle @@ -195,7 +208,7 @@ Okundu olarak işaretle İptal Sil - Save + Kaydet Daha fazla Ayarla Engelini kaldır diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml new file mode 100644 index 00000000..d36c3ec8 --- /dev/null +++ b/presentation/src/main/res/values-uk/strings.xml @@ -0,0 +1,272 @@ + + + + + Заархівовані + Заплановано + Налаштування + Сповіщення + Тема + Пошук у вхідних… + Кому: ім\'я або номер + Пропустити + Продовжити + Зателефонувати + Деталі + Зберегти в галерії + Open navigation drawer + Обрано: %d + Очистити + Mark read + Mark unread + Архівувати + Розархівувати + Блокувати + Видалити + Синхронізація повідомлень… + Ви: %s + Результати в повідомленнях + Повідомлень: %d + Ваші бесіди з\'являтимуться тут + Результатів немає + Ваші архівовані бесіди з\'являтимуться тут + Ваші заплановані повідомлення з\'являтимуться тут + Почати нову бесіду + Знову полюбите писати + Зробити QKSMS початковою програмою SMS + Змінити + Вимагається дозвіл + Для надсилання та перегляду SMS-повідомлень QKSMS потрібен дозвіл + Для перегляду ваших контактів QKSMS потрібен дозвіл + Дозволити + Вхідні + Заархівовано + Заплановані + Більше + Налаштування + QKSMS+ + Допомога та зворотній зв\'язок + Подобається QKSMS? + Поділись любов\'ю та оціни нас на Google Play! + Добре! + ВІДХИЛИТИ + Видалити + Ви впевнені, що хочете видалити цю розмову? + + Скопіювати текст + Переслати + Видалити + + Обрано: %d + %1$d із %2$d результатів + Надіслати як групове повідомлення + Отримувачі та відповіді будуть видимі для всіх + Це початок вашої бесіди. Скажіть, що-небудь приємне! + Картка контакту + Написати повідомлення… + Скопіювати текст + Переслати + Видалити + Назад + Далі + Очистити + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d + Додати вкладення + Прикріпити фотографію + Сфотографувати + %s selected, change SIM card + Надіслати повідомлення + Надсилання… + Доставлено %s + Не вдалося надіслати. Торкніться, щоб повторити спробу + Деталі + Заголовок бесіди + Введіть заголовок + Сповіщення + Тема + Архівувати + Розархівувати + Заблокувати + Розблокувати + Видалити бесіду + Зберегти до галереї + Зовнішній вигляд + Загальні + QK Відповідь + Тема + Нічний режим + Повністю чорний нічний режим + Час початку + Час завершення + Розмір шрифта + Використовувати системний шрифт + Автоматичні emoji + Сповіщення + Попередній перегляд сповіщень + Вібро + Звук + Ні + QK Відповідь + Виринаюче вікно для нових повідомлень + Торкніться, щоб вимкнути + Торкніться за межами виринаючого вікна, щоб закрити його + Блокування + + Should I Answer? + Автоматично фільтрувати повідомлення від небажаних номерів, використовуючи додаток «Should I Answer» + Затримка відправлення + Звіти про доставку + Підтвердження успішного надсилання повідомлень + Видалити акценти + Видалення акцентів з символів у вихідних SMS-повідомленнях + Автоматичне стиснення MMS-вкладень + Синхронізація повідомлень + Повторна синхронізація ваших повідомлень з власною базою даних SMS Android + Про QKSMS + Версія %s + Введіть тривалість (у секундах) + Блокування + Ваші розблоковані розмови з\'являтимуться тут + Розблокувати + Бажаєте розблокувати цю бесіду? + Про додаток + Версія + Розробник + Вихідний код + Журнал змін + Контакт + Ліцензія + Авторське право + Підтримати подальший розвиток, розблокувати все + Ви можете врятувати голодуючого розробника всього за %s + Довічне оновлення для %1$s %2$s + Розблокувати + пожертвувати для %1$s %2$s + Дякуємо вам за підтримку QKSMS! + Тепер у вас є доступ до всіх функцій QKSMS+ + QKSMS+ є безкоштовним для користувачів F-Droid! Якщо ви хочете підтримати подальший розвиток програми, зробіть пожертву. + Пожертвування через PayPal + Незабаром + Преміум теми + Розблокуйте гарні кольори теми, недоступні в палітрі Material Design + Власні авто-emoji + Створюйте ярлик власних авто-emoji + Резерв. копіювання + Автоматично створюйте резервні копії ваших повідомлень. Не переймайтеся, що втратите історію, якщо ви зміните або загубите телефон + Заплановані повідомлення + Заплановані повідомлення для надсилання у визначений час та дату + Відкладене надсилання + Зачекайте кілька секунд, перш ніж надсилати повідомлення + Автоматичне нічний режим + Увімкнути нічний режим на основі часу доби + Розширене блокування + Блокувати повідомлення, які містять ключові слова або відповідають шаблонам + Автоматичне пересилання + Автоматичне пересилання повідомлень від певних відправників + Автоматична відповідь + Автоматично відповідати на вхідні повідомлення за допомогою попередньо налаштованих шаблонів + Ще + QKSMS перебуває у активній розробці, і ваша підписка буде включати в себе всі майбутні можливості QKSMS +! + Завантаження… + Переглянути більше бесід + Позначити як прочитане + Зателефонувати + Показати більше + Показати меньше + Відкрити бесіду + Material + QKSMS + + HEX + Застосувати + Відповісти + Позначити як прочитане + Скасувати + Видалити + Зберегти + Більше + Задати + Розблокувати + Скасувати + Скопійовано + Архівована бесіда + Ви повинні розблокувати QKSMS + для використання + + Нове повідомлення + %s нових повідомлень + %s нових повідомлень + %s нових повідомлень + + Повідомлення не надіслано + Не вдалося надіслати повідомлення для %s + + Вимкнений + Завжди увімкнений + Автоматично + + + Показати ім\'я та повідомлення + Показати ім\'я + Приховати вміст + + + Малий + Нормальний + Великий + Більший + + + Без затримок + Коротка + Середня + Довга + + + 100 Кб + 200 Кб + 300 Кб (рекомендовано) + 600 Кб + 1000 Кб + 2000 Кб + Без стиснення + + + Добре + Одну хвилинку + Мені по дорозі + Дякую + Звучить цікаво + Що сталося? + Згода + Ні + Кохаю тебе + Вибач + LOL + Це нормально + + diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index 6e128eac..790953dd 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -19,7 +19,6 @@ ~ along with QKSMS. If not, see . --> - QKSMS Đã được lưu trữ Lịch gửi Cài đặt @@ -27,14 +26,16 @@ Chủ đề Tìm kiếm các tin đã nhận… Nhập tên hoặc số điện thoại - QKSMS+ Bỏ qua Tiếp tục Cuộc gọi Chi tiết Save to gallery + Open navigation drawer %d đã chọn Dọn sạch + Mark read + Mark unread Lưu trữ Hủy lưu trữ Block @@ -86,9 +87,21 @@ Trước đó Tiếp theo Xóa + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Thêm tập tin đính kèm Đính kèm ảnh Chụp ảnh + %s selected, change SIM card Gửi tin nhắn Đang gửi… Đã chuyển %s diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index 81065dc8..f46fc336 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -19,225 +19,238 @@ ~ along with QKSMS. If not, see . --> - QKSMS 已存档 - Scheduled + 已计划 設定 通知 主题 搜索收件箱… 撰写 - QKSMS+ 跳过 继续 致電 详情 - Save to gallery + 保存到图库 + Open navigation drawer 已选择 %d 项 清除 + Mark read + Mark unread 存档 取消存档 - 屏蔽 + 拦截 删除 正在同步信息… 你:%s 信息中的结果 %d 条信息 - Your conversations will appear here - No results - Your archived conversations will appear here - Your scheduled messages will appear here - Start new conversation - Love texting again - Make QKSMS your default SMS app - Change - Permission required - QKSMS needs permission to send and view SMS messages - QKSMS needs permission to view your contacts - Allow + 对话会在这里显示 + 无结果 + 存档的对话会出现在这里 + 定时短信会出现在这里 + 开始新对话 + 再次爱上发短信 + 将QKSMS设为默认短信应用 + 更改 + 需要权限 + QKSMS需要权限来发送和查看短信 + QKSMS需要权限来查看联系人 + 允许 收件箱 - Archived - Scheduled + 已存档 + 已计划 更多 设置 QKSMS+ 帮助及反馈 - Enjoying QKSMS? - Share some love and rate us on Google Play! - OKAY! - DISMISS + 喜欢QKSMS? + 在Google Play分享你的感受,并给我们评分! + 好的! + 放弃 删除 - Are you sure you would like to delete this conversation? + 你确定要删除这个对话吗? - Copy text - Forward - Delete + 复制 + 转发 + 删除 - %d selected - %1$d of %2$d results - Send as group message - Recipients and replies will be visible to everyone - This is the start of your conversation. Say something nice! - Contact card - Write a message… - Copy text - Forward - Delete - Previous - Next - Clear - Add an attachment - Attach a photo - Take a photo - Send message - Sending… - Delivered %s + 已选择%d个项目 + 已显示%2$d中的%1$d条结果 + 群发消息 + 收件人和回复将对所有人可见 + 对话从这里开始,说些什么吧! + 联系人卡片 + 写一条消息... + 复制 + 转发 + 删除 + 上一个 + 下一个 + 清除 + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d + 添加附件 + 添加照片 + 拍照 + %s selected, change SIM card + 发送消息 + 正在发送... + 已送达 %s 发送失败。点击再试一次 - Details - Conversation title - Enter title + 详情 + 对话标题 + 输入标题 通知 - Theme - Archive - Unarchive - Block - Unblock - Delete conversation - Saved to gallery - Appearance - General - QK Reply - Theme + 主题 + 存档 + 取消存档 + 拦截 + 取消拦截 + 删除对话 + 保存到图库 + 外观 + 通用 + 快速回复 + 主题 夜间模式 - Pure black night mode - Start time - End time - Font size - Use system font - Automatic emoji - Notifications - Notification previews - Vibration - Sound - None - QK Reply - Popup for new messages - Tap to dismiss - Tap outside of the popup to close it - Blocking + 纯黑夜间模式 + 开始时间 + 结束时间 + 字体大小 + 使用系统字体 + 自动颜文字 + 通知 + 通知预览 + 振动 + 铃声 + 无 + 快速回复 + 弹出新消息 + 点击忽略 + 点击弹窗外部以关闭 + 拦截 Should I Answer? - Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app - Delayed sending - Delivery confirmations - Confirm that messages were sent successfully - Strip accents - Remove accents from characters in outgoing SMS messages - Auto-compress MMS attachments - Sync messages - Re-sync your messages with the native Android SMS database - About QKSMS - Version %s - Enter duration (seconds) - Blocking - Your blocked conversations will appear here - Unblock - Would you like to unblock this conversation? - About - Version - Developer - Source code - Changelog - Contact - License - Copyright - Support development, unlock everything - You can save a starving developer for just %s - Lifetime upgrade for %1$s %2$s - Unlock + donate for %1$s %2$s - Thank you for supporting QKSMS! - You now have access to all QKSMS+ features - QKSMS+ is free for F-Droid users! If you\'d like to support development, feel free to make a donation. - Donate via PayPal - Coming soon - Premium themes - Unlock beautiful theme colors not available on the Material Design palette - Custom auto-emoji - Create custom auto-emoji shortcuts - Message backup - Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost - Scheduled messages - Schedule messages to automatically be sent at a specific time and date - Delayed sending - Wait a few seconds before sending your message - Automatic night mode - Enable night mode based on the time of day - Advanced blocking - Block messages that contain keywords or match patterns - Auto-forward - Automatically forward messages from certain senders - Auto-respond - Automatically respond to incoming messages with a preset response - More - QKSMS is under active development, and your subscription will include all future QKSMS+ features! - Loading… - View more conversations - Mark read - Call - Show more - Show less - Open conversation + 使用\"Should I Answer\"应用过滤未知号码的消息 + 延迟发送 + 送达确认 + 确认短信已成功送达 + 删除读音符号 + 删除短信中字母上的读音符号 + 自动压缩彩信附件 + 同步消息 + 重新与安卓原生短信数据库进行同步 + 关于 QKSMS + 版本 %s + 输入时长 (秒) + 拦截 + 被拦截的对话将出现在这里 + 取消拦截 + 确定不再拦截这个对话吗? + 关于 + 版本 + 开发人员 + 源代码 + 更新日志 + 联系人 + 许可证 + 版权 + 支持开发,解锁全部功能 + 你可以支付%s来拯救一个饥渴的程序猿 + 终身升级只需 %1$s %2$s + 解锁并捐赠只需 %1$s %2$s + 感谢你对QKSMS的支持! + 现在你可以使用QKSMS+的全部功能! + QKSMS+对F-Droid用户免费!如果您想支持开发,可以随意捐款。 + 使用PayPal捐赠 + 即将推出 + 高级主题 + 解锁 \"Material Design\" 调色板中不可用的美丽彩色主题 + 自定义自动颜文字 + 创建自定义自动颜文字的快捷方式 + 消息备份 + 自动备份短信,再也不用担心更换或丢失手机后会丢掉短信记录。 + 定时消息 + 安排一个时间来自动发送短信 + 延迟发送 + 发送短信前,稍等几秒 + 自动夜间模式 + 根据时间自动启用夜间模式 + 高级拦截选项 + 根据关键字或匹配模式拦截消息 + 自动转发 + 自动转发特定发件人的短信 + 自动回复 + 使用预设文本自动回复短信 + 更多 + QKSMS正在积极开发中,你的订阅包含未来所有的QKSMS+功能! + 载入中... + 查看更多对话 + 标记为已读 + 致电 + 显示更多 + 收起 + 打开会话 Material QKSMS+ HEX - Apply - Reply - Mark read - Cancel - Delete - Save - More - Set - Unblock - Undo - Copied - Archived conversation - You must unlock QKSMS+ to use this + 应用 + 回复 + 标记为已读 + 取消 + 删除 + 保存 + 更多 + 设置 + 取消拦截 + 撤销 + 已复制 + 已存档的对话 + 您必须解锁QKSMS+才能使用此功能 - %s new messages + %s条新信息 - Message not sent - The message to %s failed to send + 消息未发送 + 给%s的短信发送失败 - Disabled - Always on - Automatic + 禁用 + 保持打开 + 自动 - Show name and message - Show name - Hide contents + 显示姓名和消息 + 只显示姓名 + 隐藏内容 - Small - Normal - Large - Larger + 小 + 正常 + 大 + 更大 - No delay - Short - Medium - Long + 无延迟 + 短 + 中 + 长 100KB 200KB - 300KB (Recommended) + 300KB (推荐) 600KB 1000KB 2000KB - No compression + 不压缩 好的 diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml index 09217736..53dd4b6e 100644 --- a/presentation/src/main/res/values-zh/strings.xml +++ b/presentation/src/main/res/values-zh/strings.xml @@ -19,32 +19,33 @@ ~ along with QKSMS. If not, see . --> - QKSMS - Archived - Scheduled + 封存 + 已計劃 設定 - Notifications - Theme - Search inbox… + 通知 + 主題 + 在收件箱中搜索 編輯 - QKSMS+ - Skip - Continue + 跳过 + 繼續 致電 - Details - Save to gallery - %d selected - Clear - Archive - Unarchive - Block - Delete - Syncing messages… - You: %s - Results in messages - %d messages - Your conversations will appear here - No results + 詳細資訊 + 保存到圖庫 + Open navigation drawer + 已選擇%d項 + 清除 + Mark read + Mark unread + 封存 + 取消封存 + 攔截 + 刪除 + 正在同步... + 你:%s + 信息中的結果 + %d 條信息 + 對話會在這裡顯示 + 無結果 Your archived conversations will appear here Your scheduled messages will appear here Start new conversation @@ -86,9 +87,21 @@ Previous Next Clear + Message details + Type: %s + From: %s + To: %s + Subject: %s + Priority: %s + Size: %s + Sent: %s + Received: %s + Delivered: %s + Error code: %d Add an attachment Attach a photo Take a photo + %s selected, change SIM card Send message Sending… Delivered %s