From c0968e4b42be069b6f736f8930520067b9d1132a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 29 May 2018 11:11:38 -0400 Subject: [PATCH 01/31] Migrate services and receivers to data package --- data/build.gradle | 1 + .../receiver/DefaultSmsChangedReceiver.kt | 4 +- .../main/java/receiver/MarkReadReceiver.kt | 4 +- .../main/java/receiver/MarkSeenReceiver.kt | 4 +- .../main/java/receiver/MmsReceivedReceiver.kt | 11 +- .../src/main/java/receiver/MmsReceiver.kt | 0 .../src/main/java/receiver/MmsSentReceiver.kt | 4 +- .../main/java/receiver/MmsUpdatedReceiver.kt | 5 +- .../main/java/receiver/NightModeReceiver.kt | 10 +- .../java/receiver/RemoteMessagingReceiver.kt | 4 +- .../src/main/java/receiver/SendSmsReceiver.kt | 4 +- .../java/receiver/SmsDeliveredReceiver.kt | 8 +- .../receiver/SmsProviderChangedReceiver.kt | 4 +- .../src/main/java/receiver/SmsReceiver.kt | 4 +- .../src/main/java/receiver/SmsSentReceiver.kt | 4 +- .../java/repository/MessageRepositoryImpl.kt | 63 +++++++++- .../java/service/HeadlessSmsSendService.kt | 4 +- .../src/main/java}/util/NightModeManager.kt | 4 +- .../src/main/java/interactor/SendMessage.kt | 46 +++++++ .../src/main/java/model}/Attachment.kt | 7 +- .../main/java/repository/MessageRepository.kt | 3 + .../src/main/java/common/QKApplication.kt | 22 +++- .../java/feature/compose/AttachmentAdapter.kt | 1 + .../java/feature/compose/ComposeActivity.kt | 1 + .../main/java/feature/compose/ComposeState.kt | 1 + .../main/java/feature/compose/ComposeView.kt | 1 + .../java/feature/compose/ComposeViewModel.kt | 1 + .../feature/settings/SettingsViewModel.kt | 2 +- .../java/feature/widget/WidgetProvider.kt | 8 +- ...dersModule.kt => ActivityBuilderModule.kt} | 2 +- .../src/main/java/injection/AppComponent.kt | 38 +----- .../BroadcastReceiverBuilderModule.kt | 102 ++++++++++++++++ .../java/injection/ServiceBuilderModule.kt | 32 +++++ .../java/interactor/MigratePreferences.kt | 2 +- .../src/main/java/interactor/SendMessage.kt | 112 ------------------ 35 files changed, 323 insertions(+), 200 deletions(-) rename {presentation => data}/src/main/java/receiver/DefaultSmsChangedReceiver.kt (94%) rename {presentation => data}/src/main/java/receiver/MarkReadReceiver.kt (93%) rename {presentation => data}/src/main/java/receiver/MarkSeenReceiver.kt (93%) rename {presentation => data}/src/main/java/receiver/MmsReceivedReceiver.kt (82%) rename {presentation => data}/src/main/java/receiver/MmsReceiver.kt (100%) rename {presentation => data}/src/main/java/receiver/MmsSentReceiver.kt (97%) rename {presentation => data}/src/main/java/receiver/MmsUpdatedReceiver.kt (93%) rename {presentation => data}/src/main/java/receiver/NightModeReceiver.kt (90%) rename {presentation => data}/src/main/java/receiver/RemoteMessagingReceiver.kt (95%) rename {presentation => data}/src/main/java/receiver/SendSmsReceiver.kt (94%) rename {presentation => data}/src/main/java/receiver/SmsDeliveredReceiver.kt (95%) rename {presentation => data}/src/main/java/receiver/SmsProviderChangedReceiver.kt (95%) rename {presentation => data}/src/main/java/receiver/SmsReceiver.kt (93%) rename {presentation => data}/src/main/java/receiver/SmsSentReceiver.kt (95%) rename {presentation => data}/src/main/java/service/HeadlessSmsSendService.kt (96%) rename {presentation/src/main/java/common => data/src/main/java}/util/NightModeManager.kt (98%) create mode 100644 domain/src/main/java/interactor/SendMessage.kt rename {presentation/src/main/java/feature/compose => domain/src/main/java/model}/Attachment.kt (86%) rename presentation/src/main/java/injection/{BuildersModule.kt => ActivityBuilderModule.kt} (98%) create mode 100644 presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt create mode 100644 presentation/src/main/java/injection/ServiceBuilderModule.kt delete mode 100644 presentation/src/main/java/interactor/SendMessage.kt diff --git a/data/build.gradle b/data/build.gradle index f5018630..e58f1548 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -19,6 +19,7 @@ dependencies { // dagger implementation "com.google.dagger:dagger:$dagger_version" + implementation "com.google.dagger:dagger-android-support:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" compileOnly "javax.annotation:jsr250-api:1.0" diff --git a/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt similarity index 94% rename from presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt rename to data/src/main/java/receiver/DefaultSmsChangedReceiver.kt index 36d15591..edbf9276 100644 --- a/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt +++ b/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt @@ -24,7 +24,7 @@ import android.content.Intent import android.os.Build import android.provider.Telephony import android.support.annotation.RequiresApi -import injection.appComponent +import dagger.android.AndroidInjection import interactor.SyncMessages import util.Preferences import javax.inject.Inject @@ -36,7 +36,7 @@ class DefaultSmsChangedReceiver : BroadcastReceiver() { @RequiresApi(Build.VERSION_CODES.N) override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) if (intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)) { val pendingResult = goAsync() diff --git a/presentation/src/main/java/receiver/MarkReadReceiver.kt b/data/src/main/java/receiver/MarkReadReceiver.kt similarity index 93% rename from presentation/src/main/java/receiver/MarkReadReceiver.kt rename to data/src/main/java/receiver/MarkReadReceiver.kt index 60e165ed..5ee03529 100644 --- a/presentation/src/main/java/receiver/MarkReadReceiver.kt +++ b/data/src/main/java/receiver/MarkReadReceiver.kt @@ -21,7 +21,7 @@ package receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent +import dagger.android.AndroidInjection import interactor.MarkRead import javax.inject.Inject @@ -30,7 +30,7 @@ class MarkReadReceiver : BroadcastReceiver() { @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) val threadId = intent.getLongExtra("threadId", 0) markRead.execute(threadId) diff --git a/presentation/src/main/java/receiver/MarkSeenReceiver.kt b/data/src/main/java/receiver/MarkSeenReceiver.kt similarity index 93% rename from presentation/src/main/java/receiver/MarkSeenReceiver.kt rename to data/src/main/java/receiver/MarkSeenReceiver.kt index 25c5623f..b7fc71e5 100644 --- a/presentation/src/main/java/receiver/MarkSeenReceiver.kt +++ b/data/src/main/java/receiver/MarkSeenReceiver.kt @@ -21,7 +21,7 @@ package receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent +import dagger.android.AndroidInjection import interactor.MarkSeen import javax.inject.Inject @@ -30,7 +30,7 @@ class MarkSeenReceiver : BroadcastReceiver() { @Inject lateinit var markSeen: MarkSeen override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) val threadId = intent.getLongExtra("threadId", 0) markSeen.execute(threadId) diff --git a/presentation/src/main/java/receiver/MmsReceivedReceiver.kt b/data/src/main/java/receiver/MmsReceivedReceiver.kt similarity index 82% rename from presentation/src/main/java/receiver/MmsReceivedReceiver.kt rename to data/src/main/java/receiver/MmsReceivedReceiver.kt index b682ade2..44fd84c7 100644 --- a/presentation/src/main/java/receiver/MmsReceivedReceiver.kt +++ b/data/src/main/java/receiver/MmsReceivedReceiver.kt @@ -18,9 +18,11 @@ */ package receiver +import android.content.Context +import android.content.Intent import android.net.Uri import com.klinker.android.send_message.MmsReceivedReceiver -import injection.appComponent +import dagger.android.AndroidInjection import interactor.ReceiveMms import javax.inject.Inject @@ -28,9 +30,12 @@ class MmsReceivedReceiver : MmsReceivedReceiver() { @Inject lateinit var receiveMms: ReceiveMms - override fun onMessageReceived(messageUri: Uri?) { - appComponent.inject(this) + override fun onReceive(context: Context?, intent: Intent?) { + AndroidInjection.inject(this, context) + super.onReceive(context, intent) + } + override fun onMessageReceived(messageUri: Uri?) { messageUri?.let { uri -> val pendingResult = goAsync() receiveMms.execute(uri) { pendingResult.finish() } diff --git a/presentation/src/main/java/receiver/MmsReceiver.kt b/data/src/main/java/receiver/MmsReceiver.kt similarity index 100% rename from presentation/src/main/java/receiver/MmsReceiver.kt rename to data/src/main/java/receiver/MmsReceiver.kt diff --git a/presentation/src/main/java/receiver/MmsSentReceiver.kt b/data/src/main/java/receiver/MmsSentReceiver.kt similarity index 97% rename from presentation/src/main/java/receiver/MmsSentReceiver.kt rename to data/src/main/java/receiver/MmsSentReceiver.kt index bfb6870c..e3ba7959 100644 --- a/presentation/src/main/java/receiver/MmsSentReceiver.kt +++ b/data/src/main/java/receiver/MmsSentReceiver.kt @@ -29,7 +29,7 @@ import android.provider.Telephony import com.google.android.mms.MmsException import com.google.android.mms.util_alt.SqliteWrapper import com.klinker.android.send_message.Transaction -import injection.appComponent +import dagger.android.AndroidInjection import interactor.SyncMessage import timber.log.Timber import java.io.File @@ -40,7 +40,7 @@ class MmsSentReceiver : BroadcastReceiver() { @Inject lateinit var syncMessage: SyncMessage override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) Timber.v("MMS sending result: $resultCode") val uri = Uri.parse(intent.getStringExtra(Transaction.EXTRA_CONTENT_URI)) diff --git a/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/receiver/MmsUpdatedReceiver.kt similarity index 93% rename from presentation/src/main/java/receiver/MmsUpdatedReceiver.kt rename to data/src/main/java/receiver/MmsUpdatedReceiver.kt index 0bb21384..42bba4c3 100644 --- a/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt +++ b/data/src/main/java/receiver/MmsUpdatedReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.net.Uri -import injection.appComponent +import dagger.android.AndroidInjection import interactor.SyncMessage import javax.inject.Inject @@ -35,7 +35,8 @@ class MmsUpdatedReceiver : BroadcastReceiver() { @Inject lateinit var syncMessage: SyncMessage override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) + intent.getStringExtra(URI)?.let { uriString -> val pendingResult = goAsync() syncMessage.execute(Uri.parse(uriString)) { pendingResult.finish() } diff --git a/presentation/src/main/java/receiver/NightModeReceiver.kt b/data/src/main/java/receiver/NightModeReceiver.kt similarity index 90% rename from presentation/src/main/java/receiver/NightModeReceiver.kt rename to data/src/main/java/receiver/NightModeReceiver.kt index ef5e4f65..c8e09819 100644 --- a/presentation/src/main/java/receiver/NightModeReceiver.kt +++ b/data/src/main/java/receiver/NightModeReceiver.kt @@ -21,19 +21,17 @@ package receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent -import common.util.NightModeManager +import dagger.android.AndroidInjection +import util.NightModeManager import javax.inject.Inject class NightModeReceiver : BroadcastReceiver() { @Inject lateinit var nightModeManager: NightModeManager - init { - appComponent.inject(this) - } - override fun onReceive(context: Context, intent: Intent) { + AndroidInjection.inject(this, context) + nightModeManager.updateCurrentTheme() } } \ No newline at end of file diff --git a/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/receiver/RemoteMessagingReceiver.kt similarity index 95% rename from presentation/src/main/java/receiver/RemoteMessagingReceiver.kt rename to data/src/main/java/receiver/RemoteMessagingReceiver.kt index 6ef06b8e..fa725eb2 100644 --- a/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.support.v4.app.RemoteInput -import injection.appComponent +import dagger.android.AndroidInjection import interactor.MarkRead import interactor.SendMessage import javax.inject.Inject @@ -33,7 +33,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) val remoteInput = RemoteInput.getResultsFromIntent(intent) val bundle = intent.extras diff --git a/presentation/src/main/java/receiver/SendSmsReceiver.kt b/data/src/main/java/receiver/SendSmsReceiver.kt similarity index 94% rename from presentation/src/main/java/receiver/SendSmsReceiver.kt rename to data/src/main/java/receiver/SendSmsReceiver.kt index 9b9c830e..9f6c154a 100644 --- a/presentation/src/main/java/receiver/SendSmsReceiver.kt +++ b/data/src/main/java/receiver/SendSmsReceiver.kt @@ -21,7 +21,7 @@ package receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent +import dagger.android.AndroidInjection import interactor.RetrySending import repository.MessageRepository import javax.inject.Inject @@ -32,7 +32,7 @@ class SendSmsReceiver : BroadcastReceiver() { @Inject lateinit var retrySending: RetrySending override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) val id = intent.getLongExtra("id", 0L) messageRepo.getMessage(id)?.let { message -> diff --git a/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/receiver/SmsDeliveredReceiver.kt similarity index 95% rename from presentation/src/main/java/receiver/SmsDeliveredReceiver.kt rename to data/src/main/java/receiver/SmsDeliveredReceiver.kt index cd5eaaaf..41f4675d 100644 --- a/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt +++ b/data/src/main/java/receiver/SmsDeliveredReceiver.kt @@ -22,7 +22,7 @@ import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent +import dagger.android.AndroidInjection import interactor.MarkDelivered import interactor.MarkDeliveryFailed import javax.inject.Inject @@ -32,11 +32,9 @@ class SmsDeliveredReceiver : BroadcastReceiver() { @Inject lateinit var markDelivered: MarkDelivered @Inject lateinit var markDeliveryFailed: MarkDeliveryFailed - init { - appComponent.inject(this) - } - override fun onReceive(context: Context, intent: Intent) { + AndroidInjection.inject(this, context) + val id = intent.getLongExtra("id", 0L) when (resultCode) { diff --git a/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/receiver/SmsProviderChangedReceiver.kt similarity index 95% rename from presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt rename to data/src/main/java/receiver/SmsProviderChangedReceiver.kt index fb73813c..877abe56 100644 --- a/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt +++ b/data/src/main/java/receiver/SmsProviderChangedReceiver.kt @@ -21,7 +21,7 @@ package receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import injection.appComponent +import dagger.android.AndroidInjection import interactor.SyncMessage import javax.inject.Inject @@ -41,7 +41,7 @@ class SmsProviderChangedReceiver : BroadcastReceiver() { @Inject lateinit var syncMessage: SyncMessage override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) // Obtain the uri for the changed data // If the value is null, don't continue diff --git a/presentation/src/main/java/receiver/SmsReceiver.kt b/data/src/main/java/receiver/SmsReceiver.kt similarity index 93% rename from presentation/src/main/java/receiver/SmsReceiver.kt rename to data/src/main/java/receiver/SmsReceiver.kt index 14198360..9c1b0644 100644 --- a/presentation/src/main/java/receiver/SmsReceiver.kt +++ b/data/src/main/java/receiver/SmsReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.provider.Telephony.Sms -import injection.appComponent +import dagger.android.AndroidInjection import interactor.ReceiveSms import javax.inject.Inject @@ -31,7 +31,7 @@ class SmsReceiver : BroadcastReceiver() { @Inject lateinit var receiveMessage: ReceiveSms override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) Sms.Intents.getMessagesFromIntent(intent)?.let { messages -> val pendingResult = goAsync() diff --git a/presentation/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/receiver/SmsSentReceiver.kt similarity index 95% rename from presentation/src/main/java/receiver/SmsSentReceiver.kt rename to data/src/main/java/receiver/SmsSentReceiver.kt index e610e5df..733fec75 100644 --- a/presentation/src/main/java/receiver/SmsSentReceiver.kt +++ b/data/src/main/java/receiver/SmsSentReceiver.kt @@ -23,7 +23,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.telephony.SmsManager -import injection.appComponent +import dagger.android.AndroidInjection import interactor.MarkFailed import interactor.MarkSent import javax.inject.Inject @@ -34,7 +34,7 @@ class SmsSentReceiver : BroadcastReceiver() { @Inject lateinit var markFailed: MarkFailed override fun onReceive(context: Context, intent: Intent) { - appComponent.inject(this) + AndroidInjection.inject(this, context) val id = intent.getLongExtra("id", 0L) diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 93ae7e23..0852831f 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -24,14 +24,18 @@ import android.content.ContentUris import android.content.ContentValues import android.content.Context import android.content.Intent +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 +import com.google.android.mms.ContentType 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 filter.ConversationFilter import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers @@ -43,6 +47,7 @@ import io.realm.Sort import manager.KeyManager import mapper.CursorToConversation import mapper.CursorToRecipient +import model.Attachment import model.Contact import model.Conversation import model.Message @@ -54,6 +59,7 @@ import util.extensions.anyOf import util.extensions.asMaybe import util.extensions.insertOrUpdate import util.extensions.map +import java.io.ByteArrayOutputStream import javax.inject.Inject import javax.inject.Singleton @@ -64,6 +70,7 @@ class MessageRepositoryImpl @Inject constructor( private val conversationFilter: ConversationFilter, private val cursorToConversation: CursorToConversation, private val cursorToRecipient: CursorToRecipient, + private val imageRepository: ImageRepository, private val prefs: Preferences) : MessageRepository { override fun getConversations(archived: Boolean): RealmResults { @@ -104,7 +111,7 @@ class MessageRepositoryImpl @Inject constructor( .sortedByDescending { result -> result.messages } return conversations - .filter { conversation -> conversationFilter.filter(conversation, query) } + .filter { conversation -> conversationFilter.filter(conversation, query) } .map { conversation -> SearchResult(query, conversation, 0) } .plus(messagesByConversation) } @@ -436,6 +443,60 @@ class MessageRepositoryImpl @Inject constructor( smsManager.sendMultipartTextMessage(message.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents)) } + override fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) { + val settings = Settings() + val message = com.klinker.android.send_message.Message(body, addresses.toTypedArray()) + + // Add the GIFs as attachments. The app currently can't compress them, which may result + // in a lot of these messages failing to send + // TODO Add support for GIF compression + attachments + .filter { attachment -> attachment.isGif(context) } + .map { attachment -> attachment.getUri() } + .map { uri -> context.contentResolver.openInputStream(uri) } + .map { inputStream -> inputStream.readBytes() } + .forEach { bitmap -> message.addMedia(bitmap, ContentType.IMAGE_GIF) } + + // Compress the images and add them as attachments + var totalImageBytes = 0 + attachments + .filter { attachment -> !attachment.isGif(context) } + .mapNotNull { attachment -> attachment.getUri() } + .mapNotNull { uri -> imageRepository.loadImage(uri) } + .also { totalImageBytes = it.sumBy { it.allocationByteCount } } + .map { bitmap -> + val byteRatio = bitmap.allocationByteCount / totalImageBytes.toFloat() + shrink(bitmap, (prefs.mmsSize.get() * 1024 * byteRatio).toInt()) + } + .forEach { bitmap -> message.addMedia(bitmap, ContentType.IMAGE_JPEG) } + + val transaction = Transaction(context, settings) + transaction.sendNewMessage(message, threadId) + } + + private fun shrink(src: Bitmap, maxBytes: Int): ByteArray { + var step = 0.0 + val factor = 0.5 + val quality = 60 + + val height = src.height + val width = src.width + + val stream = ByteArrayOutputStream() + src.compress(Bitmap.CompressFormat.JPEG, 100, stream) + + while (maxBytes > 0 && stream.size() > maxBytes) { + step++ + val scale = Math.pow(factor, step) + + stream.reset() + Bitmap.createScaledBitmap(src, (width * scale).toInt(), (height * scale).toInt(), false) + .compress(Bitmap.CompressFormat.JPEG, quality, stream) + } + + return stream.toByteArray() + } + override fun cancelDelayedSms(id: Long) { val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager alarmManager.cancel(getIntentForDelayedSms(id)) diff --git a/presentation/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/service/HeadlessSmsSendService.kt similarity index 96% rename from presentation/src/main/java/service/HeadlessSmsSendService.kt rename to data/src/main/java/service/HeadlessSmsSendService.kt index 43996552..e2c66610 100644 --- a/presentation/src/main/java/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/service/HeadlessSmsSendService.kt @@ -22,7 +22,7 @@ import android.app.IntentService import android.content.Intent import android.net.Uri import android.telephony.TelephonyManager -import injection.appComponent +import dagger.android.AndroidInjection import interactor.SendMessage import repository.MessageRepository import javax.inject.Inject @@ -35,7 +35,7 @@ class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { override fun onHandleIntent(intent: Intent?) { if (intent?.action != TelephonyManager.ACTION_RESPOND_VIA_MESSAGE) return - appComponent.inject(this) + AndroidInjection.inject(this) intent.extras?.getString(Intent.EXTRA_TEXT)?.takeIf { it.isNotBlank() }?.let { body -> val intentUri = intent.data val recipients = getRecipients(intentUri).split(";") diff --git a/presentation/src/main/java/common/util/NightModeManager.kt b/data/src/main/java/util/NightModeManager.kt similarity index 98% rename from presentation/src/main/java/common/util/NightModeManager.kt rename to data/src/main/java/util/NightModeManager.kt index e3e156bd..9c7a8e0f 100644 --- a/presentation/src/main/java/common/util/NightModeManager.kt +++ b/data/src/main/java/util/NightModeManager.kt @@ -16,15 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.util +package util import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent import receiver.NightModeReceiver -import util.Preferences -import util.tryOrNull import java.text.SimpleDateFormat import java.util.* import java.util.concurrent.TimeUnit diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/interactor/SendMessage.kt new file mode 100644 index 00000000..e03e24ae --- /dev/null +++ b/domain/src/main/java/interactor/SendMessage.kt @@ -0,0 +1,46 @@ +/* + * 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 model.Attachment +import repository.MessageRepository +import javax.inject.Inject + +class SendMessage @Inject constructor( + private val messageRepo: MessageRepository +) : Interactor() { + + data class Params(val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) + + override fun buildObservable(params: Params): Flowable { + return Flowable.just(Unit) + .filter { params.addresses.isNotEmpty() } + .doOnNext { + if (params.addresses.size == 1 && params.attachments.isEmpty()) { + messageRepo.sendSmsAndPersist(params.threadId, params.addresses.first(), params.body) + } else { + messageRepo.sendMms(params.threadId, params.addresses, params.body, params.attachments) + } + } + .doOnNext { messageRepo.updateConversations(params.threadId) } + .doOnNext { messageRepo.markUnarchived(params.threadId) } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/Attachment.kt b/domain/src/main/java/model/Attachment.kt similarity index 86% rename from presentation/src/main/java/feature/compose/Attachment.kt rename to domain/src/main/java/model/Attachment.kt index 0a5654c9..f7401ec4 100644 --- a/presentation/src/main/java/feature/compose/Attachment.kt +++ b/domain/src/main/java/model/Attachment.kt @@ -16,13 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package feature.compose +package model import android.content.Context import android.net.Uri import android.os.Build import android.support.v13.view.inputmethod.InputContentInfoCompat -import com.google.android.mms.ContentType data class Attachment(private val uri: Uri? = null, private val inputContent: InputContentInfoCompat? = null) { @@ -36,9 +35,9 @@ data class Attachment(private val uri: Uri? = null, private val inputContent: In fun isGif(context: Context): Boolean { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && inputContent != null) { - inputContent.description.hasMimeType(ContentType.IMAGE_GIF) + inputContent.description.hasMimeType("image/gif") } else { - context.contentResolver.getType(uri) == ContentType.IMAGE_GIF + context.contentResolver.getType(uri) == "image/gif" } } diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt index fc313ffc..bd76cc3e 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -20,6 +20,7 @@ package repository import io.reactivex.Maybe import io.realm.RealmResults +import model.Attachment import model.Conversation import model.Message import model.MmsPart @@ -100,6 +101,8 @@ interface MessageRepository { */ fun sendSms(message: Message) + fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) + /** * Attempts to cancel sending the message with the given id */ diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt index 059da7f6..5322e85b 100644 --- a/presentation/src/main/java/common/QKApplication.kt +++ b/presentation/src/main/java/common/QKApplication.kt @@ -20,6 +20,8 @@ package common */ import android.app.Activity import android.app.Application +import android.app.Service +import android.content.BroadcastReceiver import android.support.text.emoji.EmojiCompat import android.support.text.emoji.FontRequestEmojiCompatConfig import android.support.v4.provider.FontRequest @@ -27,10 +29,12 @@ import com.bugsnag.android.Bugsnag import com.bugsnag.android.Configuration import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import common.util.NightModeManager +import util.NightModeManager import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector +import dagger.android.HasBroadcastReceiverInjector +import dagger.android.HasServiceInjector import injection.AppComponentManager import injection.appComponent import io.realm.Realm @@ -40,7 +44,7 @@ import migration.QkRealmMigration import timber.log.Timber import javax.inject.Inject -class QKApplication : Application(), HasActivityInjector { +class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector { /** * Inject this so that it is forced to initialize @@ -48,7 +52,9 @@ class QKApplication : Application(), HasActivityInjector { @Suppress("unused") @Inject lateinit var analyticsManager: AnalyticsManager - @Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector + @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector + @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector + @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector @Inject lateinit var nightModeManager: NightModeManager private val packages = arrayOf("common", "feature", "injection", "filter", "interactor", "manager", "mapper", @@ -88,7 +94,15 @@ class QKApplication : Application(), HasActivityInjector { } override fun activityInjector(): AndroidInjector { - return dispatchingAndroidInjector + return dispatchingActivityInjector + } + + override fun broadcastReceiverInjector(): AndroidInjector { + return dispatchingBroadcastReceiverInjector + } + + override fun serviceInjector(): AndroidInjector { + return dispatchingServiceInjector } } \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/feature/compose/AttachmentAdapter.kt index 09bf5cd5..903d8a56 100644 --- a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt +++ b/presentation/src/main/java/feature/compose/AttachmentAdapter.kt @@ -31,6 +31,7 @@ import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.attachment_list_item.view.* +import model.Attachment import javax.inject.Inject class AttachmentAdapter @Inject constructor( diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 1594b717..0bf5ea52 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -50,6 +50,7 @@ import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.* +import model.Attachment import model.Contact import model.Message import java.text.SimpleDateFormat diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index 5ed38897..7c3a9186 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 io.realm.RealmResults +import model.Attachment import model.Contact import model.Conversation import model.Message diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 25e29af1..21455250 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -23,6 +23,7 @@ import android.support.v13.view.inputmethod.InputContentInfoCompat import common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject +import model.Attachment import model.Contact import model.Message diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 480ae84a..bed6ab45 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -49,6 +49,7 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmList import manager.PermissionManager +import model.Attachment import model.Contact import model.Conversation import model.Message diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 04eb024f..87cbe866 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -27,7 +27,7 @@ import common.base.QkViewModel import common.util.BillingManager import common.util.Colors import common.util.DateFormatter -import common.util.NightModeManager +import util.NightModeManager import interactor.SyncMessages import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/feature/widget/WidgetProvider.kt b/presentation/src/main/java/feature/widget/WidgetProvider.kt index 60509555..d88478c6 100644 --- a/presentation/src/main/java/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/feature/widget/WidgetProvider.kt @@ -31,9 +31,9 @@ import android.widget.RemoteViews import com.moez.QKSMS.R import common.util.Colors import common.util.extensions.getColorCompat +import dagger.android.AndroidInjection import feature.compose.ComposeActivity import feature.main.MainActivity -import injection.appComponent import manager.WidgetManager import timber.log.Timber import util.Preferences @@ -44,11 +44,9 @@ class WidgetProvider : AppWidgetProvider() { @Inject lateinit var colors: Colors @Inject lateinit var prefs: Preferences - init { - appComponent.inject(this) - } - override fun onReceive(context: Context, intent: Intent) { + AndroidInjection.inject(this, context) + when (intent.action) { WidgetManager.ACTION_NOTIFY_DATASET_CHANGED -> updateData(context) else -> super.onReceive(context, intent) diff --git a/presentation/src/main/java/injection/BuildersModule.kt b/presentation/src/main/java/injection/ActivityBuilderModule.kt similarity index 98% rename from presentation/src/main/java/injection/BuildersModule.kt rename to presentation/src/main/java/injection/ActivityBuilderModule.kt index a9ec9ac6..52f3f57f 100644 --- a/presentation/src/main/java/injection/BuildersModule.kt +++ b/presentation/src/main/java/injection/ActivityBuilderModule.kt @@ -26,7 +26,7 @@ import feature.themepicker.ThemePickerActivity import feature.themepicker.ThemePickerActivityModule @Module -abstract class BuildersModule { +abstract class ActivityBuilderModule { @ActivityScope @ContributesAndroidInjector(modules = [MainActivityModule::class]) diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt index 86300ce8..3f8eefcd 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -31,25 +31,15 @@ import dagger.Component import dagger.android.support.AndroidSupportInjectionModule import feature.compose.DetailedChipView import feature.widget.WidgetAdapter -import feature.widget.WidgetProvider -import receiver.DefaultSmsChangedReceiver -import receiver.MarkReadReceiver -import receiver.MarkSeenReceiver -import receiver.MmsReceivedReceiver -import receiver.MmsSentReceiver -import receiver.MmsUpdatedReceiver -import receiver.NightModeReceiver -import receiver.RemoteMessagingReceiver -import receiver.SendSmsReceiver -import receiver.SmsDeliveredReceiver -import receiver.SmsProviderChangedReceiver -import receiver.SmsReceiver -import receiver.SmsSentReceiver -import service.HeadlessSmsSendService import javax.inject.Singleton @Singleton -@Component(modules = [AndroidSupportInjectionModule::class, AppModule::class, BuildersModule::class]) +@Component(modules = [ + AndroidSupportInjectionModule::class, + AppModule::class, + ActivityBuilderModule::class, + BroadcastReceiverBuilderModule::class, + ServiceBuilderModule::class]) interface AppComponent { fun inject(application: QKApplication) @@ -58,22 +48,6 @@ interface AppComponent { fun inject(fetcher: ContactImageLoader.ContactImageFetcher) - fun inject(receiver: DefaultSmsChangedReceiver) - fun inject(receiver: SmsDeliveredReceiver) - fun inject(receiver: SmsSentReceiver) - fun inject(receiver: MarkSeenReceiver) - fun inject(receiver: MarkReadReceiver) - fun inject(receiver: MmsReceivedReceiver) - fun inject(receiver: MmsSentReceiver) - fun inject(receiver: MmsUpdatedReceiver) - fun inject(receiver: NightModeReceiver) - fun inject(receiver: RemoteMessagingReceiver) - fun inject(receiver: SendSmsReceiver) - fun inject(receiver: SmsProviderChangedReceiver) - fun inject(receiver: SmsReceiver) - fun inject(receiver: WidgetProvider) - - fun inject(service: HeadlessSmsSendService) fun inject(service: WidgetAdapter) fun inject(view: AvatarView) diff --git a/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt new file mode 100644 index 00000000..e173bce2 --- /dev/null +++ b/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt @@ -0,0 +1,102 @@ +/* + * 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 injection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import feature.widget.WidgetProvider +import receiver.DefaultSmsChangedReceiver +import receiver.MarkReadReceiver +import receiver.MarkSeenReceiver +import receiver.MmsReceivedReceiver +import receiver.MmsReceiver +import receiver.MmsSentReceiver +import receiver.MmsUpdatedReceiver +import receiver.NightModeReceiver +import receiver.RemoteMessagingReceiver +import receiver.SendSmsReceiver +import receiver.SmsDeliveredReceiver +import receiver.SmsProviderChangedReceiver +import receiver.SmsReceiver +import receiver.SmsSentReceiver + +@Module +abstract class BroadcastReceiverBuilderModule { + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindDefaultSmsChangedReceiver(): DefaultSmsChangedReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMarkReadReceiver(): MarkReadReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMarkSeenReceiver(): MarkSeenReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMmsReceivedReceiver(): MmsReceivedReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMmsReceiver(): MmsReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMmsSentReceiver(): MmsSentReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindMmsUpdatedReceiver(): MmsUpdatedReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindNightModeReceiver(): NightModeReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSendSmsReceiver(): SendSmsReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSmsProviderChangedReceiver(): SmsProviderChangedReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSmsReceiver(): SmsReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindSmsSentReceiver(): SmsSentReceiver + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindWidgetProvider(): WidgetProvider + +} \ No newline at end of file diff --git a/presentation/src/main/java/injection/ServiceBuilderModule.kt b/presentation/src/main/java/injection/ServiceBuilderModule.kt new file mode 100644 index 00000000..208b1772 --- /dev/null +++ b/presentation/src/main/java/injection/ServiceBuilderModule.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 injection + +import dagger.Module +import dagger.android.ContributesAndroidInjector +import service.HeadlessSmsSendService + +@Module +abstract class ServiceBuilderModule { + + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService + +} \ No newline at end of file diff --git a/presentation/src/main/java/interactor/MigratePreferences.kt b/presentation/src/main/java/interactor/MigratePreferences.kt index 701e4ee2..ba91bfcc 100644 --- a/presentation/src/main/java/interactor/MigratePreferences.kt +++ b/presentation/src/main/java/interactor/MigratePreferences.kt @@ -19,8 +19,8 @@ package interactor import com.f2prateek.rx.preferences2.RxSharedPreferences -import common.util.NightModeManager import io.reactivex.Flowable +import util.NightModeManager import util.Preferences import javax.inject.Inject diff --git a/presentation/src/main/java/interactor/SendMessage.kt b/presentation/src/main/java/interactor/SendMessage.kt deleted file mode 100644 index 13741b49..00000000 --- a/presentation/src/main/java/interactor/SendMessage.kt +++ /dev/null @@ -1,112 +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 interactor - -import android.content.Context -import android.graphics.Bitmap -import com.google.android.mms.ContentType -import com.klinker.android.send_message.Message -import com.klinker.android.send_message.Settings -import com.klinker.android.send_message.Transaction -import feature.compose.Attachment -import io.reactivex.Flowable -import repository.ImageRepository -import repository.MessageRepository -import util.Preferences -import java.io.ByteArrayOutputStream -import javax.inject.Inject - -class SendMessage @Inject constructor( - private val context: Context, - private val imageRepository: ImageRepository, - private val prefs: Preferences, - private val messageRepo: MessageRepository -) : Interactor() { - - data class Params(val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) - - override fun buildObservable(params: Params): Flowable { - return Flowable.just(Unit) - .filter { params.addresses.isNotEmpty() } - .doOnNext { - if (params.addresses.size == 1 && params.attachments.isEmpty()) { - messageRepo.sendSmsAndPersist(params.threadId, params.addresses.first(), params.body) - } else { - sendMms(params.threadId, params.addresses, params.body, params.attachments) - } - } - .doOnNext { messageRepo.updateConversations(params.threadId) } - .doOnNext { messageRepo.markUnarchived(params.threadId) } - } - - private fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) { - val settings = Settings() - val message = Message(body, addresses.toTypedArray()) - - // Add the GIFs as attachments. The app currently can't compress them, which may result - // in a lot of these messages failing to send - // TODO Add support for GIF compression - attachments - .filter { attachment -> attachment.isGif(context) } - .map { attachment -> attachment.getUri() } - .map { uri -> context.contentResolver.openInputStream(uri) } - .map { inputStream -> inputStream.readBytes() } - .forEach { bitmap -> message.addMedia(bitmap, ContentType.IMAGE_GIF) } - - // Compress the images and add them as attachments - var totalImageBytes = 0 - attachments - .filter { attachment -> !attachment.isGif(context) } - .mapNotNull { attachment -> attachment.getUri() } - .mapNotNull { uri -> imageRepository.loadImage(uri) } - .also { totalImageBytes = it.sumBy { it.allocationByteCount } } - .map { bitmap -> - val byteRatio = bitmap.allocationByteCount / totalImageBytes.toFloat() - shrink(bitmap, (prefs.mmsSize.get() * 1024 * byteRatio).toInt()) - } - .forEach { bitmap -> message.addMedia(bitmap, ContentType.IMAGE_JPEG) } - - val transaction = Transaction(context, settings) - transaction.sendNewMessage(message, threadId) - } - - private fun shrink(src: Bitmap, maxBytes: Int): ByteArray { - var step = 0.0 - val factor = 0.5 - val quality = 60 - - val height = src.height - val width = src.width - - val stream = ByteArrayOutputStream() - src.compress(Bitmap.CompressFormat.JPEG, 100, stream) - - while (maxBytes > 0 && stream.size() > maxBytes) { - step++ - val scale = Math.pow(factor, step) - - stream.reset() - Bitmap.createScaledBitmap(src, (width * scale).toInt(), (height * scale).toInt(), false) - .compress(Bitmap.CompressFormat.JPEG, quality, stream) - } - - return stream.toByteArray() - } - -} \ No newline at end of file From f71d2564b2fbea6991f9db1750972fd7014fd465 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 30 May 2018 12:17:16 -0400 Subject: [PATCH 02/31] Sync subId when syncing message --- android-smsmms/build.gradle | 2 +- data/build.gradle | 2 +- data/src/main/java/mapper/CursorToMessageImpl.kt | 2 ++ data/src/main/java/migration/QkRealmMigration.kt | 11 +++++++++++ domain/build.gradle | 2 +- domain/src/main/java/mapper/CursorToMessage.kt | 1 + domain/src/main/java/model/Message.kt | 1 + presentation/build.gradle | 2 +- presentation/src/main/java/common/QKApplication.kt | 4 ++-- 9 files changed, 21 insertions(+), 6 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 8e93643e..1c8cc0c0 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -23,7 +23,7 @@ android { compileSdkVersion 25 defaultConfig { - minSdkVersion 21 + minSdkVersion 22 targetSdkVersion 25 versionCode 1 versionName "1.0" diff --git a/data/build.gradle b/data/build.gradle index e58f1548..43a87db2 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -6,7 +6,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 21 + minSdkVersion 22 targetSdkVersion 27 } } diff --git a/data/src/main/java/mapper/CursorToMessageImpl.kt b/data/src/main/java/mapper/CursorToMessageImpl.kt index ddb1e268..040a3a9c 100644 --- a/data/src/main/java/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/mapper/CursorToMessageImpl.kt @@ -46,6 +46,7 @@ class CursorToMessageImpl @Inject constructor( Mms.READ, Mms.THREAD_ID, Mms.LOCKED, + Mms.SUBSCRIPTION_ID, Sms.ADDRESS, Sms.BODY, @@ -84,6 +85,7 @@ class CursorToMessageImpl @Inject constructor( dateSent = cursor.getLong(columnsMap.dateSent) read = cursor.getInt(columnsMap.read) != 0 locked = cursor.getInt(columnsMap.locked) != 0 + subId = cursor.getInt(columnsMap.subId) when (type) { "sms" -> { diff --git a/data/src/main/java/migration/QkRealmMigration.kt b/data/src/main/java/migration/QkRealmMigration.kt index b93b7160..eb3fb10a 100644 --- a/data/src/main/java/migration/QkRealmMigration.kt +++ b/data/src/main/java/migration/QkRealmMigration.kt @@ -24,6 +24,10 @@ import io.realm.RealmMigration class QkRealmMigration : RealmMigration { + companion object { + const val SCHEMA_VERSION: Long = 2 + } + override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) { var version = oldVersion @@ -34,6 +38,13 @@ class QkRealmMigration : RealmMigration { version++ } + if (version == 1L) { + realm.schema.get("Message") + ?.addField("subId", Int::class.java) + + version++ + } + if (version < newVersion) { throw IllegalStateException("Migration missing from v$oldVersion to v$newVersion") } diff --git a/domain/build.gradle b/domain/build.gradle index e14e4f62..f7aa73a0 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,7 +7,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 21 + minSdkVersion 22 targetSdkVersion 27 } } diff --git a/domain/src/main/java/mapper/CursorToMessage.kt b/domain/src/main/java/mapper/CursorToMessage.kt index 5b00bf5c..4ed8df2c 100644 --- a/domain/src/main/java/mapper/CursorToMessage.kt +++ b/domain/src/main/java/mapper/CursorToMessage.kt @@ -39,6 +39,7 @@ interface CursorToMessage : Mapper, val read by lazy { getColumnIndex(Mms.READ) } val threadId by lazy { getColumnIndex(Mms.THREAD_ID) } val locked by lazy { getColumnIndex(Mms.LOCKED) } + val subId by lazy { getColumnIndex(Mms.SUBSCRIPTION_ID) } val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) } val smsBody by lazy { getColumnIndex(Sms.BODY) } diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/model/Message.kt index 9c05a223..6e48a7b7 100644 --- a/domain/src/main/java/model/Message.kt +++ b/domain/src/main/java/model/Message.kt @@ -47,6 +47,7 @@ open class Message : RealmObject() { var seen: Boolean = false var read: Boolean = false var locked: Boolean = false + var subId: Int = -1 // SMS only var body: String = "" diff --git a/presentation/build.gradle b/presentation/build.gradle index 76075d38..ed99b9ad 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.moez.QKSMS" - minSdkVersion 21 + minSdkVersion 22 targetSdkVersion 27 versionCode 170 versionName "3.2.2" diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt index 5322e85b..e044a15c 100644 --- a/presentation/src/main/java/common/QKApplication.kt +++ b/presentation/src/main/java/common/QKApplication.kt @@ -29,7 +29,6 @@ import com.bugsnag.android.Bugsnag import com.bugsnag.android.Configuration import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import util.NightModeManager import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector @@ -42,6 +41,7 @@ import io.realm.RealmConfiguration import manager.AnalyticsManager import migration.QkRealmMigration import timber.log.Timber +import util.NightModeManager import javax.inject.Inject class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector { @@ -74,7 +74,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn Realm.setDefaultConfiguration(RealmConfiguration.Builder() .compactOnLaunch() .migration(QkRealmMigration()) - .schemaVersion(1) + .schemaVersion(QkRealmMigration.SCHEMA_VERSION) .build()) AppComponentManager.init(this) From 1f345da92067e39d9200e9a74cd27ad21c70f48e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 2 Jun 2018 02:58:42 -0400 Subject: [PATCH 03/31] #207 - Dual SIM support commit c3dc3ada558c466be5115cd7ddbf9651a229c217 Author: Moez Bhatti Date: Sat Jun 2 02:54:06 2018 -0400 Dual SIM support for QK Reply commit 48688dd4720bd1b3abc049d365e208e1dfe5ccb8 Author: Moez Bhatti Date: Sat Jun 2 00:37:08 2018 -0400 #1172 - Load all recipients and subId from threadId when sending message from notification reply bar commit 0b7195fb134c0a9f2a6b551176c6c25a26bf5838 Author: Moez Bhatti Date: Fri Jun 1 23:43:30 2018 -0400 Fix missing subId for RetrySending params commit 0d3ec43c0e60bab4acc293947ea9f6d2228c1b19 Author: Moez Bhatti Date: Fri Jun 1 23:27:56 2018 -0400 Switch to appropriate SIM when new message is received commit 1ae883af890104cf1da9e970571371c95666db66 Author: Moez Bhatti Date: Fri Jun 1 23:07:16 2018 -0400 Fix message grouping for incoming messages commit 2bf7b2d99ddbfdcafff873f305180d6d38c37d65 Author: Moez Bhatti Date: Fri Jun 1 22:56:31 2018 -0400 Correctly assign subId for incoming SMS commit 1f6028f8921320358a3053a2dbc2c6e05410964b Author: Moez Bhatti Date: Fri Jun 1 20:52:01 2018 -0400 Abstract SubscriptionManager usage behind SubscriptionUtils commit 8b18f16271f19a42800c737cfbd867365c4aa781 Author: Moez Bhatti Date: Fri Jun 1 20:05:52 2018 -0400 Store subId when receiving SMS commit f0e4ffdf15eb54d8ef78adfe244943ef4cb95d4e Author: Moez Bhatti Date: Fri Jun 1 19:52:40 2018 -0400 Use appropriate SIM card based on last message commit b7893d69891e4fb61755b0733a5fab561e86bbf3 Author: Moez Bhatti Date: Thu May 31 00:20:42 2018 -0400 Fix crash when device doesn't support multi-sim commit bb038068129227e931167976628e1a535efb09a0 Author: Moez Bhatti Date: Wed May 30 23:54:14 2018 -0400 Show sim indicator when subId changes in conversation commit 952f15f7ebfb85a03feef51373ef30568b76d5eb Author: Moez Bhatti Date: Wed May 30 22:13:57 2018 -0400 Send message from selected SIM commit 4cfab7ca9ec9bd9c7ce82b3eb5f228cf511a7c7b Author: Moez Bhatti Date: Wed May 30 21:46:01 2018 -0400 Fix filename for ActiveSubscriptionObservable commit 720cb79cb4fbfb98b10e169f2fea84be02fd2f91 Author: Moez Bhatti Date: Wed May 30 20:35:30 2018 -0400 Allow cycling through inserted sims commit fa95980e9bc8e8c01dab7b4b8e4ed3a1c9a0f0b0 Author: Moez Bhatti Date: Wed May 30 18:26:44 2018 -0400 Show sim card slot in compose bar --- .../klinker/android/send_message/Settings.kt | 20 +----- .../android/send_message/SmsManagerFactory.kt | 3 +- .../main/java/mapper/CursorToMessageImpl.kt | 2 +- .../java/receiver/RemoteMessagingReceiver.kt | 28 +++++--- data/src/main/java/receiver/SmsReceiver.kt | 4 +- .../java/repository/MessageRepositoryImpl.kt | 20 +++--- .../java/service/HeadlessSmsSendService.kt | 2 +- .../java/util/ActiveSubscriptionObservable.kt | 59 ++++++++++++++++ .../main/java/util/SubscriptionUtilsImpl.kt | 23 ++++++ domain/src/main/java/interactor/ReceiveSms.kt | 17 +++-- .../src/main/java/interactor/RetrySending.kt | 1 + .../src/main/java/interactor/SendMessage.kt | 6 +- domain/src/main/java/model/Message.kt | 6 +- .../main/java/repository/MessageRepository.kt | 8 +-- .../src/main/java/util/SubscriptionUtils.kt | 14 ++++ .../common/util/NotificationManagerImpl.kt | 8 +-- .../java/feature/compose/ComposeActivity.kt | 6 +- .../main/java/feature/compose/ComposeState.kt | 2 + .../main/java/feature/compose/ComposeView.kt | 1 + .../java/feature/compose/ComposeViewModel.kt | 31 +++++++- .../java/feature/compose/MessagesAdapter.kt | 24 +++---- .../java/feature/qkreply/QkReplyActivity.kt | 5 +- .../feature/qkreply/QkReplyActivityModule.kt | 5 +- .../main/java/feature/qkreply/QkReplyState.kt | 2 + .../main/java/feature/qkreply/QkReplyView.kt | 1 + .../java/feature/qkreply/QkReplyViewModel.kt | 68 ++++++++++++------ .../src/main/java/injection/AppModule.kt | 8 +++ .../res/drawable/ic_sim_card_black_24dp.xml | 9 +++ .../src/main/res/layout/compose_activity.xml | 33 ++++++++- .../main/res/layout/message_list_item_in.xml | 27 ++++++- .../main/res/layout/message_list_item_out.xml | 27 ++++++- .../src/main/res/layout/qkreply_activity.xml | 70 ++++++++++++++++--- 32 files changed, 424 insertions(+), 116 deletions(-) create mode 100644 data/src/main/java/util/ActiveSubscriptionObservable.kt create mode 100644 data/src/main/java/util/SubscriptionUtilsImpl.kt create mode 100644 domain/src/main/java/util/SubscriptionUtils.kt create mode 100644 presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt index 1cfb823e..b6bc1a89 100755 --- a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt +++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt @@ -16,8 +16,6 @@ package com.klinker.android.send_message -import android.os.Build - /** * Class to house all of the settings that can be used to send a message */ @@ -39,20 +37,4 @@ class Settings @JvmOverloads constructor( var preText: String? = null, var sendLongAsMms: Boolean = true, var sendLongAsMmsAfter: Int = 3, - subscriptionId: Int = DEFAULT_SUBSCRIPTION_ID) { - - // SIM options - var subscriptionId: Int = subscriptionId - set(value) { - // we won't allow you to go away from the default if your device doesn't support it - field = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1 || false) { - DEFAULT_SUBSCRIPTION_ID - } else { - value - } - } - - companion object { - const val DEFAULT_SUBSCRIPTION_ID = -1 - } -} + var subscriptionId: Int = -1) 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 5f320469..624c75b9 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,6 +1,5 @@ package com.klinker.android.send_message -import android.os.Build import android.telephony.SmsManager object SmsManagerFactory { @@ -10,7 +9,7 @@ object SmsManagerFactory { fun createSmsManager(subscriptionId: Int): SmsManager { var manager: SmsManager? = null - if (subscriptionId != Settings.DEFAULT_SUBSCRIPTION_ID && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { + if (subscriptionId != -1) { try { manager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId) } catch (e: Exception) { diff --git a/data/src/main/java/mapper/CursorToMessageImpl.kt b/data/src/main/java/mapper/CursorToMessageImpl.kt index 040a3a9c..3d956962 100644 --- a/data/src/main/java/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/mapper/CursorToMessageImpl.kt @@ -85,7 +85,7 @@ class CursorToMessageImpl @Inject constructor( dateSent = cursor.getLong(columnsMap.dateSent) read = cursor.getInt(columnsMap.read) != 0 locked = cursor.getInt(columnsMap.locked) != 0 - subId = cursor.getInt(columnsMap.subId) + subId = if (columnsMap.subId != -1) cursor.getInt(columnsMap.subId) else -1 when (type) { "sms" -> { diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/receiver/RemoteMessagingReceiver.kt index fa725eb2..a0b7d5d9 100644 --- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -25,24 +25,32 @@ import android.support.v4.app.RemoteInput import dagger.android.AndroidInjection import interactor.MarkRead import interactor.SendMessage +import repository.MessageRepository +import util.SubscriptionUtils import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { - @Inject lateinit var sendMessage: SendMessage @Inject lateinit var markRead: MarkRead + @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage + @Inject lateinit var subUtils: SubscriptionUtils override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) - val remoteInput = RemoteInput.getResultsFromIntent(intent) - val bundle = intent.extras - if (remoteInput != null && bundle != null) { - val address = bundle.getString("address") - val threadId = bundle.getLong("threadId") - val body = remoteInput.getCharSequence("body").toString() - markRead.execute(threadId) - sendMessage.execute(SendMessage.Params(threadId, listOf(address), body)) - } + val remoteInput = RemoteInput.getResultsFromIntent(intent) ?: return + val bundle = intent.extras ?: return + + val threadId = bundle.getLong("threadId") + val body = remoteInput.getCharSequence("body").toString() + markRead.execute(threadId) + + val lastMessage = messageRepo.getMessages(threadId).lastOrNull() + val subId = subUtils.subscriptions.firstOrNull { it.subscriptionId == lastMessage?.subId }?.subscriptionId ?: -1 + val addresses = messageRepo.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/receiver/SmsReceiver.kt b/data/src/main/java/receiver/SmsReceiver.kt index 9c1b0644..18ec968b 100644 --- a/data/src/main/java/receiver/SmsReceiver.kt +++ b/data/src/main/java/receiver/SmsReceiver.kt @@ -34,8 +34,10 @@ class SmsReceiver : BroadcastReceiver() { AndroidInjection.inject(this, context) Sms.Intents.getMessagesFromIntent(intent)?.let { messages -> + val subId = intent.extras?.getInt("subscription", -1) ?: -1 + val pendingResult = goAsync() - receiveMessage.execute(messages, { pendingResult.finish() }) + receiveMessage.execute(ReceiveSms.Params(subId, messages), { pendingResult.finish() }) } } diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 0852831f..0088289e 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -393,7 +393,7 @@ class MessageRepositoryImpl @Inject constructor( } } - override fun sendSmsAndPersist(threadId: Long, address: String, body: String) { + override fun sendSmsAndPersist(subId: Int, threadId: Long, address: String, body: String) { if (prefs.sendDelay.get() != Preferences.SEND_DELAY_NONE) { val delay = when (prefs.sendDelay.get()) { Preferences.SEND_DELAY_SHORT -> 3000 @@ -403,7 +403,7 @@ class MessageRepositoryImpl @Inject constructor( } val sendTime = System.currentTimeMillis() + delay - val message = insertSentSms(threadId, address, body, sendTime) + val message = insertSentSms(subId, threadId, address, body, sendTime) val intent = getIntentForDelayedSms(message.id) @@ -414,13 +414,13 @@ class MessageRepositoryImpl @Inject constructor( alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent) } } else { - val message = insertSentSms(threadId, address, body, System.currentTimeMillis()) + val message = insertSentSms(subId, threadId, address, body, System.currentTimeMillis()) sendSms(message) } } override fun sendSms(message: Message) { - val smsManager = SmsManager.getDefault() + val smsManager = SmsManager.getSmsManagerForSubscriptionId(message.subId) val parts = smsManager.divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body) ?: arrayListOf() @@ -443,8 +443,8 @@ class MessageRepositoryImpl @Inject constructor( smsManager.sendMultipartTextMessage(message.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents)) } - override fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) { - val settings = Settings() + override fun sendMms(subId: Int, threadId: Long, addresses: List, body: String, attachments: List) { + val settings = Settings().apply { subscriptionId = subId } val message = com.klinker.android.send_message.Message(body, addresses.toTypedArray()) // Add the GIFs as attachments. The app currently can't compress them, which may result @@ -509,7 +509,7 @@ class MessageRepositoryImpl @Inject constructor( return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT) } - override fun insertSentSms(threadId: Long, address: String, body: String, date: Long): Message { + override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message { // Insert the message to Realm val message = Message().apply { @@ -517,6 +517,7 @@ class MessageRepositoryImpl @Inject constructor( this.address = address this.body = body this.date = date + this.subId = subId id = messageIds.newId() boxId = Telephony.Sms.MESSAGE_TYPE_OUTBOX @@ -537,6 +538,7 @@ class MessageRepositoryImpl @Inject constructor( put(Telephony.Sms.SEEN, true) put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX) put(Telephony.Sms.THREAD_ID, threadId) + put(Telephony.Sms.SUBSCRIPTION_ID, subId) } val uri = context.contentResolver.insert(Telephony.Sms.CONTENT_URI, values) @@ -548,7 +550,7 @@ class MessageRepositoryImpl @Inject constructor( return message } - override fun insertReceivedSms(address: String, body: String, sentTime: Long): Message { + override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message { // Insert the message to Realm val message = Message().apply { @@ -556,6 +558,7 @@ class MessageRepositoryImpl @Inject constructor( this.body = body this.dateSent = sentTime this.date = System.currentTimeMillis() + this.subId = subId id = messageIds.newId() threadId = getOrCreateConversation(address).blockingGet().id @@ -571,6 +574,7 @@ class MessageRepositoryImpl @Inject constructor( put(Telephony.Sms.ADDRESS, address) put(Telephony.Sms.BODY, body) put(Telephony.Sms.DATE_SENT, sentTime) + put(Telephony.Sms.SUBSCRIPTION_ID, subId) } val uri = context.contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) diff --git a/data/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/service/HeadlessSmsSendService.kt index e2c66610..15e498a6 100644 --- a/data/src/main/java/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/service/HeadlessSmsSendService.kt @@ -40,7 +40,7 @@ class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { val intentUri = intent.data val recipients = getRecipients(intentUri).split(";") val threadId = messageRepo.getOrCreateConversation(recipients).blockingGet()?.id ?: 0L - sendMessage.execute(SendMessage.Params(threadId, recipients, body)) + sendMessage.execute(SendMessage.Params(-1, threadId, recipients, body)) } } diff --git a/data/src/main/java/util/ActiveSubscriptionObservable.kt b/data/src/main/java/util/ActiveSubscriptionObservable.kt new file mode 100644 index 00000000..9f2792c3 --- /dev/null +++ b/data/src/main/java/util/ActiveSubscriptionObservable.kt @@ -0,0 +1,59 @@ +/* + * 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.telephony.SubscriptionInfo +import android.telephony.SubscriptionManager +import io.reactivex.Observable +import io.reactivex.Observer +import io.reactivex.disposables.Disposable + +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/data/src/main/java/util/SubscriptionUtilsImpl.kt b/data/src/main/java/util/SubscriptionUtilsImpl.kt new file mode 100644 index 00000000..4356272a --- /dev/null +++ b/data/src/main/java/util/SubscriptionUtilsImpl.kt @@ -0,0 +1,23 @@ +package util + +import android.content.Context +import android.telephony.PhoneNumberUtils +import android.telephony.SubscriptionInfo +import android.telephony.SubscriptionManager +import io.reactivex.Observable +import javax.inject.Inject + +class SubscriptionUtilsImpl @Inject constructor(context: Context) : SubscriptionUtils { + + private val subscriptionManager = SubscriptionManager.from(context) + + 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 + } + +} \ No newline at end of file diff --git a/domain/src/main/java/interactor/ReceiveSms.kt b/domain/src/main/java/interactor/ReceiveSms.kt index 411951fd..4ad37861 100644 --- a/domain/src/main/java/interactor/ReceiveSms.kt +++ b/domain/src/main/java/interactor/ReceiveSms.kt @@ -32,23 +32,26 @@ class ReceiveSms @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, private val updateBadge: UpdateBadge -) : Interactor>() { +) : Interactor() { - override fun buildObservable(params: Array): Flowable<*> { + class Params(val subId: Int, val messages: Array) + + override fun buildObservable(params: Params): Flowable<*> { return Flowable.just(params) - .filter { it.isNotEmpty() } - .filter { messages -> // Don't continue if the sender is blocked - val address = messages[0].displayOriginatingAddress + .filter { it.messages.isNotEmpty() } + .filter { // Don't continue if the sender is blocked + val address = it.messages[0].displayOriginatingAddress !externalBlockingManager.shouldBlock(address).blockingGet() } - .map { messages -> + .map { + val messages = it.messages val address = messages[0].displayOriginatingAddress val time = messages[0].timestampMillis val body: String = messages .map { message -> message.displayMessageBody } .reduce { body, new -> body + new } - messageRepo.insertReceivedSms(address, body, time) // Add the message to the db + 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 diff --git a/domain/src/main/java/interactor/RetrySending.kt b/domain/src/main/java/interactor/RetrySending.kt index 05541b25..2ffb52f5 100644 --- a/domain/src/main/java/interactor/RetrySending.kt +++ b/domain/src/main/java/interactor/RetrySending.kt @@ -34,6 +34,7 @@ class RetrySending @Inject constructor(private val messageRepo: MessageRepositor type = params.type address = params.address body = params.body + subId = params.subId } return Flowable.just(message) diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/interactor/SendMessage.kt index e03e24ae..5b1b574c 100644 --- a/domain/src/main/java/interactor/SendMessage.kt +++ b/domain/src/main/java/interactor/SendMessage.kt @@ -27,16 +27,16 @@ class SendMessage @Inject constructor( private val messageRepo: MessageRepository ) : Interactor() { - data class Params(val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) + data class Params(val subId: Int, val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) override fun buildObservable(params: Params): Flowable { return Flowable.just(Unit) .filter { params.addresses.isNotEmpty() } .doOnNext { if (params.addresses.size == 1 && params.attachments.isEmpty()) { - messageRepo.sendSmsAndPersist(params.threadId, params.addresses.first(), params.body) + messageRepo.sendSmsAndPersist(params.subId, params.threadId, params.addresses.first(), params.body) } else { - messageRepo.sendMms(params.threadId, params.addresses, params.body, params.attachments) + messageRepo.sendMms(params.subId, params.threadId, params.addresses, params.body, params.attachments) } } .doOnNext { messageRepo.updateConversations(params.threadId) } diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/model/Message.kt index 6e48a7b7..7dd55823 100644 --- a/domain/src/main/java/model/Message.kt +++ b/domain/src/main/java/model/Message.kt @@ -154,7 +154,9 @@ open class Message : RealmObject() { return isFailedMms || isFailedSms } - fun compareSender(other: Message): Boolean { - return isMe() && other.isMe() || (!isMe() && !other.isMe() && address == other.address) + fun compareSender(other: Message): Boolean = when { + isMe() && other.isMe() -> subId == other.subId + !isMe() && !other.isMe() -> subId == other.subId && address == other.address + else -> false } } \ 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 bd76cc3e..e2d39fcf 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -94,23 +94,23 @@ interface MessageRepository { /** * Persists the SMS and attempts to send it */ - fun sendSmsAndPersist(threadId: Long, address: String, body: String) + fun sendSmsAndPersist(subId: Int, threadId: Long, address: String, body: String) /** * Attempts to send the SMS message. This can be called if the message has already been persisted */ fun sendSms(message: Message) - fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) + fun sendMms(subId: Int, threadId: Long, addresses: List, body: String, attachments: List) /** * Attempts to cancel sending the message with the given id */ fun cancelDelayedSms(id: Long) - fun insertSentSms(threadId: Long, address: String, body: String, date: Long): Message + fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message - fun insertReceivedSms(address: String, body: String, sentTime: Long): Message + fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message /** * Marks the message as sending, in case we need to retry sending it diff --git a/domain/src/main/java/util/SubscriptionUtils.kt b/domain/src/main/java/util/SubscriptionUtils.kt new file mode 100644 index 00000000..62759c0d --- /dev/null +++ b/domain/src/main/java/util/SubscriptionUtils.kt @@ -0,0 +1,14 @@ +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/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index b85a5da7..d63a4092 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -172,7 +172,7 @@ class NotificationManagerImpl @Inject constructor( .forEach { uri -> notification.addPerson(uri) } if (Build.VERSION.SDK_INT >= 24) { - notification.addAction(getReplyAction(conversation.recipients[0]?.address.orEmpty(), threadId)) + notification.addAction(getReplyAction(threadId)) } else { val replyIntent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId) val replyPI = PendingIntent.getActivity(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) @@ -224,10 +224,8 @@ class NotificationManagerImpl @Inject constructor( notificationManager.notify(threadId.toInt() + 50000, notification.build()) } - private fun getReplyAction(address: String, threadId: Long): NotificationCompat.Action { - val replyIntent = Intent(context, RemoteMessagingReceiver::class.java) - .putExtra("address", address) - .putExtra("threadId", threadId) + private fun getReplyAction(threadId: Long): NotificationCompat.Action { + val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId) val replyPI = PendingIntent.getBroadcast(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) val responseSet = context.resources.getStringArray(R.array.qk_responses) diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 0bf5ea52..80dbe375 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -89,12 +89,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val galleryIntent by lazy { gallery.clicks() } override val attachmentSelectedIntent: Subject = PublishSubject.create() override val inputContentIntent by lazy { message.inputContentSelected } + override val changeSimIntent by lazy { sim.clicks() } override val sendIntent by lazy { send.clicks() } override val backPressedIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] } - var cameraDestination: Uri? = null + private var cameraDestination: Uri? = null override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) @@ -197,6 +198,9 @@ class ComposeActivity : QkThemedActivity(), ComposeView { counter.text = state.remaining counter.setVisible(counter.text.isNotBlank()) + sim.setVisible(state.subscription != null) + simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}" + send.isEnabled = state.canSend send.imageAlpha = if (state.canSend) 255 else 128 } diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index 7c3a9186..4ddfca2a 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -18,6 +18,7 @@ */ package feature.compose +import android.telephony.SubscriptionInfo import io.realm.RealmResults import model.Attachment import model.Contact @@ -41,5 +42,6 @@ data class ComposeState( val attachments: List = ArrayList(), val attaching: Boolean = false, val remaining: String = "", + val subscription: SubscriptionInfo? = null, val canSend: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 21455250..28186229 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -47,6 +47,7 @@ interface ComposeView : QkView { val galleryIntent: Observable<*> val attachmentSelectedIntent: Observable val inputContentIntent: Observable + val changeSimIntent: Observable<*> val sendIntent: Observable fun clearSelection() diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index bed6ab45..67f9c61a 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 repository.ContactRepository import repository.MessageRepository +import util.SubscriptionUtils import util.extensions.asObservable import util.extensions.isImage import util.extensions.mapNotNull @@ -79,6 +80,7 @@ class ComposeViewModel @Inject constructor( private val permissionManager: PermissionManager, private val retrySending: RetrySending, private val sendMessage: SendMessage, + private val subUtils: SubscriptionUtils, private val syncContacts: ContactSync ) : QkViewModel(ComposeState(query = intent.extras?.getString("query") ?: "")) { @@ -196,6 +198,15 @@ class ComposeViewModel @Inject constructor( } }.subscribe() + val latestSubId = messages + .map { messages -> messages.lastOrNull()?.subId ?: -1 } + .distinctUntilChanged() + + disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> + val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null + newState { it.copy(subscription = sub) } + }.subscribe() + if (threadId == 0L) { syncContacts.execute(Unit) } @@ -494,14 +505,30 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { remaining -> newState { it.copy(remaining = remaining) } } + // Toggle to the next sim slot + view.changeSimIntent + .withLatestFrom(state) { _, state -> + val subs = subUtils.subscriptions + val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId } + val subscription = when { + subIndex == -1 -> null + subIndex < subs.size - 1 -> subs[subIndex + 1] + else -> subs[0] + } + newState { it.copy(subscription = subscription) } + } + .autoDisposable(view.scope()) + .subscribe() + // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent .withLatestFrom(view.textChangedIntent, { _, body -> body }) .map { body -> body.toString() } - .withLatestFrom(attachments, conversation, { body, attachments, conversation -> + .withLatestFrom(state, attachments, conversation, { body, state, attachments, conversation -> + val subId = state.subscription?.subscriptionId ?: -1 val threadId = conversation.id val addresses = conversation.recipients.map { it.address } - sendMessage.execute(SendMessage.Params(threadId, addresses, body, attachments)) + sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments)) view.setDraft("") this.attachments.onNext(ArrayList()) }) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 6974ec91..168c2605 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -21,7 +21,6 @@ package feature.compose import android.animation.ObjectAnimator import android.content.Context import android.graphics.Typeface -import android.os.Build import android.support.v7.widget.RecyclerView import android.telephony.PhoneNumberUtils import android.text.Spannable @@ -43,7 +42,6 @@ import common.util.DateFormatter import common.util.GlideApp import common.util.extensions.dpToPx import common.util.extensions.forwardTouches -import common.util.extensions.resolveThemeColor import common.util.extensions.setBackgroundTint import common.util.extensions.setPadding import common.util.extensions.setTint @@ -59,6 +57,7 @@ import model.Conversation import model.Message import model.Recipient import util.Preferences +import util.SubscriptionUtils import util.extensions.hasThumbnails import util.extensions.isImage import util.extensions.isVideo @@ -70,7 +69,8 @@ class MessagesAdapter @Inject constructor( private val colors: Colors, private val dateFormatter: DateFormatter, private val navigator: Navigator, - private val prefs: Preferences + private val prefs: Preferences, + private val subUtils: SubscriptionUtils ) : QkRealmAdapter() { companion object { @@ -116,6 +116,7 @@ class MessagesAdapter @Inject constructor( private val contactCache = ContactCache() private val expanded = HashMap() private val disposables = CompositeDisposable() + private val subs = subUtils.subscriptions var theme: Colors.Theme = colors.theme() @@ -206,8 +207,14 @@ class MessagesAdapter @Inject constructor( // Bind the timestamp val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0)) + val simIndex = subs.takeIf { it.size > 1 }?.indexOfFirst { it.subscriptionId == message.subId } ?: -1 + view.timestamp.text = dateFormatter.getMessageTimestamp(message.date) - view.timestamp.visibility = if (timeSincePrevious < TIMESTAMP_THRESHOLD) View.GONE else View.VISIBLE + view.simIndex.text = "${simIndex + 1}" + + view.timestamp.setVisible(timeSincePrevious >= TIMESTAMP_THRESHOLD || message.subId != previous?.subId && simIndex != -1) + view.sim.setVisible(message.subId != previous?.subId && simIndex != -1) + view.simIndex.setVisible(message.subId != previous?.subId && simIndex != -1) // Bind the grouping @@ -283,15 +290,6 @@ class MessagesAdapter @Inject constructor( GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail) view.attachments.addView(mediaView) } - - - // If we're on API 21, we need to re-tint the background - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - view.body.setBackgroundTint(when (message.isMe()) { - true -> context.resolveThemeColor(R.attr.bubbleColor) - false -> theme.theme - }) - } } private fun bindStatus(viewHolder: QkViewHolder, message: Message, next: Message?) { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index d05aaee1..bcf16622 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -30,7 +30,6 @@ import android.view.WindowManager import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R -import com.moez.QKSMS.R.id.* import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.base.QkThemedActivity @@ -52,6 +51,7 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { override val menuItemIntent: Subject = PublishSubject.create() override val textChangedIntent by lazy { message.textChanges() } + override val changeSimIntent by lazy { sim.clicks() } override val sendIntent by lazy { send.clicks() } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] } @@ -99,6 +99,9 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { counter.text = state.remaining counter.setVisible(counter.text.isNotBlank()) + sim.setVisible(state.subscription != null) + simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}" + send.isEnabled = state.canSend send.imageAlpha = if (state.canSend) 255 else 128 } diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt index f57e8982..24dbad95 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt @@ -1,17 +1,18 @@ package feature.qkreply import android.arch.lifecycle.ViewModel -import android.content.Intent import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import injection.ViewModelKey +import javax.inject.Named @Module class QkReplyActivityModule { @Provides - fun provideIntent(activity: QkReplyActivity): Intent = activity.intent + @Named("threadId") + fun provideThreadId(activity: QkReplyActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L @Provides @IntoMap diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/feature/qkreply/QkReplyState.kt index f4cc4cd6..1f4a8feb 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyState.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyState.kt @@ -18,6 +18,7 @@ */ package feature.qkreply +import android.telephony.SubscriptionInfo import io.realm.RealmResults import model.Conversation import model.Message @@ -28,5 +29,6 @@ data class QkReplyState( val expanded: Boolean = false, val data: Pair>? = null, val remaining: String = "", + val subscription: SubscriptionInfo? = null, val canSend: Boolean = false ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/feature/qkreply/QkReplyView.kt index ebe565b9..5a31fc74 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyView.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyView.kt @@ -25,6 +25,7 @@ interface QkReplyView : QkView { val menuItemIntent: Observable val textChangedIntent: Observable + val changeSimIntent: Observable<*> val sendIntent: Observable fun setDraft(draft: String) diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index a591b1d0..a35c81eb 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -18,7 +18,6 @@ */ package feature.qkreply -import android.content.Intent import android.telephony.SmsMessage import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope @@ -27,37 +26,42 @@ import common.Navigator import common.base.QkViewModel import interactor.MarkRead import interactor.SendMessage +import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers -import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.RealmResults import model.Conversation import model.Message import repository.MessageRepository +import util.SubscriptionUtils import util.extensions.asObservable import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject +import javax.inject.Named class QkReplyViewModel @Inject constructor( - private val intent: Intent, + @Named("threadId") threadId: Long, private val markRead: MarkRead, private val messageRepo: MessageRepository, private val navigator: Navigator, - private val sendMessage: SendMessage + private val sendMessage: SendMessage, + private val subUtils: SubscriptionUtils ) : QkViewModel(QkReplyState()) { private val conversation by lazy { - messageRepo.getConversationAsync(intent.getLongExtra("threadId", -1)) + messageRepo.getConversationAsync(threadId) .asObservable() .filter { it.isLoaded } .filter { it.isValid } .distinctUntilChanged() } - private val messages: Subject> = PublishSubject.create() + private val messages: Subject> = + BehaviorSubject.createDefault(messageRepo.getUnreadMessages(threadId)) init { disposables += markRead @@ -65,10 +69,11 @@ class QkReplyViewModel @Inject constructor( // When the set of messages changes, update the state // If we're ever showing an empty set of messages, then it's time to shut down to activity - disposables += messages - .withLatestFrom(conversation, { messages, conversation -> Pair(conversation, messages) }) - .doOnNext { data -> newState { it.copy(data = data) } } - .map { data -> data.second } + disposables += Observables + .combineLatest(messages, conversation) { messages, conversation -> + newState { it.copy(data = Pair(conversation, messages)) } + messages + } .switchMap { messages -> messages.asObservable() } .filter { it.isLoaded } .filter { it.isValid } @@ -76,10 +81,18 @@ class QkReplyViewModel @Inject constructor( .subscribe { newState { it.copy(hasError = true) } } disposables += conversation - .doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } } - .distinctUntilChanged { conversation -> conversation.id } // We only need to set the messages once - .map { conversation -> messageRepo.getUnreadMessages(conversation.id) } - .subscribe { messages.onNext(it) } + .map { conversation -> conversation.getTitle() } + .distinctUntilChanged() + .subscribe { title -> newState { it.copy(title = title) } } + + val latestSubId = messages + .map { messages -> messages.lastOrNull()?.subId ?: -1 } + .distinctUntilChanged() + + disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> + val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null + newState { it.copy(subscription = sub) } + }.subscribe() } override fun bindView(view: QkReplyView) { @@ -115,7 +128,7 @@ class QkReplyViewModel @Inject constructor( .filter { id -> id == R.id.expand } .withLatestFrom(conversation, { _, conversation -> conversation }) .map { conversation -> messageRepo.getMessages(conversation.id) } - .doOnNext { messages.onNext(it) } + .doOnNext(messages::onNext) .autoDisposable(view.scope()) .subscribe { newState { it.copy(expanded = true) } } @@ -124,7 +137,7 @@ class QkReplyViewModel @Inject constructor( .filter { id -> id == R.id.collapse } .withLatestFrom(conversation, { _, conversation -> conversation }) .map { conversation -> messageRepo.getUnreadMessages(conversation.id) } - .doOnNext { messages.onNext(it) } + .doOnNext(messages::onNext) .autoDisposable(view.scope()) .subscribe { newState { it.copy(expanded = false) } } @@ -173,18 +186,31 @@ class QkReplyViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() + // Toggle to the next sim slot + view.changeSimIntent + .withLatestFrom(state) { _, state -> + val subs = subUtils.subscriptions + val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId } + val subscription = when { + subIndex == -1 -> null + subIndex < subs.size - 1 -> subs[subIndex + 1] + else -> subs[0] + } + newState { it.copy(subscription = subscription) } + } + .autoDisposable(view.scope()) + .subscribe() + // Send a message when the send button is clicked, and disable editing mode if it's enabled view.sendIntent .withLatestFrom(view.textChangedIntent, { _, body -> body }) .map { body -> body.toString() } - .withLatestFrom(conversation, { body, conversation -> + .withLatestFrom(state, conversation, { body, state, conversation -> + val subId = state.subscription?.subscriptionId ?: -1 val threadId = conversation.id val addresses = conversation.recipients.map { it.address } - + sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) view.setDraft("") - sendMessage.execute(SendMessage.Params(threadId, addresses, body, listOf())) { - } - threadId }) .doOnNext { threadId -> diff --git a/presentation/src/main/java/injection/AppModule.kt b/presentation/src/main/java/injection/AppModule.kt index 1efb8016..4ac2bcca 100644 --- a/presentation/src/main/java/injection/AppModule.kt +++ b/presentation/src/main/java/injection/AppModule.kt @@ -59,6 +59,8 @@ import repository.MessageRepository import repository.MessageRepositoryImpl import repository.SyncRepository import repository.SyncRepositoryImpl +import util.SubscriptionUtils +import util.SubscriptionUtilsImpl import javax.inject.Singleton @Module @@ -137,4 +139,10 @@ 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 diff --git a/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml b/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml new file mode 100644 index 00000000..071707fe --- /dev/null +++ b/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index d8ceaa78..318f46de 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -1,4 +1,5 @@ - + + + app:layout_constraintBottom_toBottomOf="@id/messageBackground" + app:layout_constraintEnd_toStartOf="@id/sim" + app:layout_constraintStart_toStartOf="@id/messageBackground" /> + + + + Date: Mon, 4 Jun 2018 15:15:33 -0400 Subject: [PATCH 04/31] #1166 - Fix add contact not working --- presentation/src/main/java/common/Navigator.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index 8707e2df..8015e323 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -211,8 +211,9 @@ class Navigator @Inject constructor(private val context: Context, private val no } fun addContact(address: String) { - val uri = Uri.parse("tel: $address") - val intent = Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT, uri) + val intent = Intent(Intent.ACTION_INSERT) + .setType(ContactsContract.Contacts.CONTENT_TYPE) + .putExtra(ContactsContract.Intents.Insert.PHONE, address) startActivityExternal(intent) } From 7aceba0b5150dc2805cb445b7e9e7c141faede57 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Jun 2018 15:49:36 -0400 Subject: [PATCH 05/31] Fix amplitude identify usage --- .../java/common/util/AnalyticsManagerImpl.kt | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt index 2f9a65b1..bf647155 100644 --- a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt +++ b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt @@ -61,22 +61,24 @@ class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsMana mixpanel.registerSuperProperties(properties) // Set the value in Amplitude + val identify = Identify() when (value) { - is Boolean -> Identify().set(key, value) - is BooleanArray -> Identify().set(key, value) - is Double -> Identify().set(key, value) - is DoubleArray -> Identify().set(key, value) - is Float -> Identify().set(key, value) - is FloatArray -> Identify().set(key, value) - is Int -> Identify().set(key, value) - is IntArray -> Identify().set(key, value) - is Long -> Identify().set(key, value) - is LongArray -> Identify().set(key, value) - is String -> Identify().set(key, value) - is JSONArray -> Identify().set(key, value) - is JSONObject -> Identify().set(key, value) + is Boolean -> identify.set(key, value) + is BooleanArray -> identify.set(key, value) + is Double -> identify.set(key, value) + is DoubleArray -> identify.set(key, value) + is Float -> identify.set(key, value) + is FloatArray -> identify.set(key, value) + is Int -> identify.set(key, value) + is IntArray -> identify.set(key, value) + is Long -> identify.set(key, value) + is LongArray -> identify.set(key, value) + is String -> identify.set(key, value) + is JSONArray -> identify.set(key, value) + is JSONObject -> identify.set(key, value) else -> Timber.e("Value of type ${value::class.java} not supported") } + amplitude.identify(identify) } } From 11880a9f995b1782e9f458aaaa2f795724a0d52d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jun 2018 16:35:40 -0400 Subject: [PATCH 06/31] Fix EditMode preview for QkTextView and QkEditTextView --- .../main/java/common/util/TextViewStyler.kt | 129 +++++++++++------- .../src/main/java/common/widget/QkEditText.kt | 2 + .../src/main/java/common/widget/QkTextView.kt | 2 + 3 files changed, 80 insertions(+), 53 deletions(-) diff --git a/presentation/src/main/java/common/util/TextViewStyler.kt b/presentation/src/main/java/common/util/TextViewStyler.kt index d5693402..c7bf34d0 100644 --- a/presentation/src/main/java/common/util/TextViewStyler.kt +++ b/presentation/src/main/java/common/util/TextViewStyler.kt @@ -22,6 +22,10 @@ import android.graphics.Typeface import android.util.AttributeSet import android.widget.TextView import com.moez.QKSMS.R +import common.util.TextViewStyler.Companion.SIZE_PRIMARY +import common.util.TextViewStyler.Companion.SIZE_SECONDARY +import common.util.TextViewStyler.Companion.SIZE_TERTIARY +import common.util.TextViewStyler.Companion.SIZE_TOOLBAR import common.util.extensions.getColorCompat import common.util.extensions.resolveThemeColor import common.widget.QkEditText @@ -48,72 +52,91 @@ class TextViewStyler @Inject constructor( const val SIZE_SECONDARY = 1 const val SIZE_TERTIARY = 2 const val SIZE_TOOLBAR = 3 - } - fun applyAttributes(textView: TextView, attrs: AttributeSet?) { - textView.run { - when (this) { - is QkTextView -> context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run { - val colorAttr = getInt(R.styleable.QkTextView_textColor, -1) - val textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1) - applyAttributes(textView, colorAttr, textSizeAttr) - recycle() + fun applyEditModeAttributes(textView: TextView, attrs: AttributeSet?) { + textView.run { + var colorAttr = 0 + var textSizeAttr = 0 + + when (this) { + is QkTextView -> context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run { + colorAttr = getInt(R.styleable.QkTextView_textColor, -1) + textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1) + recycle() + } + + is QkEditText -> context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run { + colorAttr = getInt(R.styleable.QkEditText_textColor, -1) + textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1) + recycle() + } + + else -> return } - - is QkEditText -> context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run { - val colorAttr = getInt(R.styleable.QkEditText_textColor, -1) - val textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1) - applyAttributes(textView, colorAttr, textSizeAttr) - recycle() - } - } - - if (!prefs.systemFont.get()) { - fontProvider.getLato { lato -> - setTypeface(lato, typeface?.style ?: Typeface.NORMAL) - } - } - } - } - - private fun applyAttributes(textView: TextView, colorAttr: Int, textSizeAttr: Int) { - textView.run { - if (isInEditMode) { - setTextColor(context.getColorCompat(when (colorAttr) { - COLOR_PRIMARY -> R.color.textPrimary - COLOR_SECONDARY -> R.color.textSecondary - COLOR_TERTIARY -> R.color.textTertiary - COLOR_PRIMARY_ON_THEME -> R.color.textPrimaryDark - COLOR_SECONDARY_ON_THEME -> R.color.textSecondaryDark - COLOR_TERTIARY_ON_THEME -> R.color.textTertiaryDark - COLOR_THEME -> R.color.tools_theme - else -> R.color.textPrimary - })) + setTextColor(when (colorAttr) { + COLOR_PRIMARY -> context.getColorCompat(R.color.textPrimary) + COLOR_SECONDARY -> context.getColorCompat(R.color.textSecondary) + COLOR_TERTIARY -> context.getColorCompat(R.color.textTertiary) + COLOR_PRIMARY_ON_THEME -> context.getColorCompat(R.color.textPrimaryDark) + COLOR_SECONDARY_ON_THEME -> context.getColorCompat(R.color.textSecondaryDark) + COLOR_TERTIARY_ON_THEME -> context.getColorCompat(R.color.textTertiaryDark) + COLOR_THEME -> context.getColorCompat(R.color.tools_theme) + else -> currentTextColor + }) textSize = when (textSizeAttr) { SIZE_PRIMARY -> 16f SIZE_SECONDARY -> 14f SIZE_TERTIARY -> 12f SIZE_TOOLBAR -> 20f - else -> textSize + else -> textSize / paint.density } - } else { - setTextColor(when (colorAttr) { - COLOR_PRIMARY -> context.resolveThemeColor(android.R.attr.textColorPrimary) - COLOR_SECONDARY -> context.resolveThemeColor(android.R.attr.textColorSecondary) - COLOR_TERTIARY -> context.resolveThemeColor(android.R.attr.textColorTertiary) - COLOR_PRIMARY_ON_THEME -> colors.theme().textPrimary - COLOR_SECONDARY_ON_THEME -> colors.theme().textSecondary - COLOR_TERTIARY_ON_THEME -> colors.theme().textTertiary - COLOR_THEME -> colors.theme().theme - else -> currentTextColor - }) - - setTextSize(textView, textSizeAttr) } } } + fun applyAttributes(textView: TextView, attrs: AttributeSet?) { + textView.run { + var colorAttr = 0 + var textSizeAttr = 0 + + if (!prefs.systemFont.get()) { + fontProvider.getLato { lato -> + setTypeface(lato, typeface?.style ?: Typeface.NORMAL) + } + } + + when (this) { + is QkTextView -> context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run { + colorAttr = getInt(R.styleable.QkTextView_textColor, -1) + textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1) + recycle() + } + + is QkEditText -> context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run { + colorAttr = getInt(R.styleable.QkEditText_textColor, -1) + textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1) + recycle() + } + + else -> return + } + + setTextColor(when (colorAttr) { + COLOR_PRIMARY -> context.resolveThemeColor(android.R.attr.textColorPrimary) + COLOR_SECONDARY -> context.resolveThemeColor(android.R.attr.textColorSecondary) + COLOR_TERTIARY -> context.resolveThemeColor(android.R.attr.textColorTertiary) + COLOR_PRIMARY_ON_THEME -> colors.theme().textPrimary + COLOR_SECONDARY_ON_THEME -> colors.theme().textSecondary + COLOR_TERTIARY_ON_THEME -> colors.theme().textTertiary + COLOR_THEME -> colors.theme().theme + else -> currentTextColor + }) + + setTextSize(textView, textSizeAttr) + } + } + /** * @see SIZE_PRIMARY * @see SIZE_SECONDARY diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/common/widget/QkEditText.kt index f3baa1b7..0259710f 100644 --- a/presentation/src/main/java/common/widget/QkEditText.kt +++ b/presentation/src/main/java/common/widget/QkEditText.kt @@ -56,6 +56,8 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet if (!isInEditMode) { appComponent.inject(this) textViewStyler.applyAttributes(this, attrs) + } else { + TextViewStyler.applyEditModeAttributes(this, attrs) } } diff --git a/presentation/src/main/java/common/widget/QkTextView.kt b/presentation/src/main/java/common/widget/QkTextView.kt index c7f06202..171b5c68 100644 --- a/presentation/src/main/java/common/widget/QkTextView.kt +++ b/presentation/src/main/java/common/widget/QkTextView.kt @@ -34,6 +34,8 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu if (!isInEditMode) { appComponent.inject(this) textViewStyler.applyAttributes(this, attrs) + } else { + TextViewStyler.applyEditModeAttributes(this, attrs) } } From fc99ae83ad98229cb72ea199faebb7bb4f13ffe0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jun 2018 19:45:42 -0400 Subject: [PATCH 07/31] #678 - Allow deciding between sending as group or individual --- .../database/sqlite/SqliteWrapper.java | 13 +--- .../java/repository/MessageRepositoryImpl.kt | 45 ++++++-------- .../java/service/HeadlessSmsSendService.kt | 2 +- .../main/java/repository/MessageRepository.kt | 5 +- .../java/feature/compose/ComposeActivity.kt | 6 ++ .../main/java/feature/compose/ComposeState.kt | 1 + .../main/java/feature/compose/ComposeView.kt | 1 + .../java/feature/compose/ComposeViewModel.kt | 41 ++++++++++--- .../src/main/res/layout/compose_activity.xml | 61 ++++++++++++++++++- presentation/src/main/res/values/strings.xml | 2 + 10 files changed, 123 insertions(+), 54 deletions(-) diff --git a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java index e0a5439f..508ea26c 100755 --- a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java +++ b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java @@ -24,6 +24,7 @@ import android.database.Cursor; import android.net.Uri; import android.widget.Toast; import com.klinker.android.logger.Log; +import org.jetbrains.annotations.Nullable; /** * @hide @@ -52,6 +53,7 @@ public final class SqliteWrapper { } } + @Nullable public static Cursor query(Context context, ContentResolver resolver, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { try { @@ -63,17 +65,6 @@ public final class SqliteWrapper { } } - @SuppressWarnings("deprecation") - public static boolean requery(Context context, Cursor cursor) { - try { - return cursor.requery(); - } catch (SQLiteException e) { - Log.e(TAG, "Catch a SQLiteException when requery: ", e); - checkSQLiteException(context, e); - return false; - } - } - public static int update(Context context, ContentResolver resolver, Uri uri, ContentValues values, String where, String[] selectionArgs) { try { diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 0088289e..f82aec85 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -24,6 +24,7 @@ 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 @@ -37,9 +38,6 @@ import com.klinker.android.send_message.Settings import com.klinker.android.send_message.StripAccents import com.klinker.android.send_message.Transaction import filter.ConversationFilter -import io.reactivex.Maybe -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers import io.realm.Case import io.realm.Realm import io.realm.RealmResults @@ -56,8 +54,6 @@ import model.SearchResult import util.MessageUtils import util.Preferences import util.extensions.anyOf -import util.extensions.asMaybe -import util.extensions.insertOrUpdate import util.extensions.map import java.io.ByteArrayOutputStream import javax.inject.Inject @@ -141,39 +137,32 @@ class MessageRepositoryImpl @Inject constructor( return getConversation(threadId) ?: getConversationFromCp(threadId) } - override fun getOrCreateConversation(address: String): Maybe { + override fun getOrCreateConversation(address: String): Conversation? { return getOrCreateConversation(listOf(address)) } - override fun getOrCreateConversation(addresses: List): Maybe { - return Maybe.just(addresses) - .map { recipients -> - recipients.map { address -> - when (MessageUtils.isEmailAddress(address)) { - true -> MessageUtils.extractAddrSpec(address) - false -> address - } + override fun getOrCreateConversation(addresses: List): Conversation? { + return addresses + .map { address -> + when (MessageUtils.isEmailAddress(address)) { + true -> MessageUtils.extractAddrSpec(address) + false -> address } } - .map { recipients -> + .let { recipients -> Uri.parse("content://mms-sms/threadID").buildUpon().apply { recipients.forEach { recipient -> appendQueryParameter("recipient", recipient) } - } + }.build() } - .flatMap { uriBuilder -> - context.contentResolver.query(uriBuilder.build(), arrayOf(BaseColumns._ID), null, null, null).asMaybe() - } - .map { cursor -> cursor.getLong(0) } - .filter { threadId -> threadId != 0L } - .map { threadId -> + .let { uri -> SqliteWrapper.query(context, context.contentResolver, uri, arrayOf(BaseColumns._ID), null, null, null) } + ?.use { cursor -> if (cursor.moveToFirst()) cursor.getLong(0) else null } + ?.takeIf { threadId -> threadId != 0L } + ?.let { threadId -> var conversation = getConversation(threadId) if (conversation != null) conversation = Realm.getDefaultInstance().copyFromRealm(conversation) - conversation ?: getConversationFromCp(threadId)?.apply { insertOrUpdate() } ?: Conversation() + conversation ?: getConversationFromCp(threadId) } - .onErrorReturn { Conversation() } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) } override fun saveDraft(threadId: Long, draft: String) { @@ -561,7 +550,7 @@ class MessageRepositoryImpl @Inject constructor( this.subId = subId id = messageIds.newId() - threadId = getOrCreateConversation(address).blockingGet().id + threadId = getOrCreateConversation(address)?.id ?: 0L boxId = Telephony.Sms.MESSAGE_TYPE_INBOX type = "sms" } @@ -755,7 +744,7 @@ class MessageRepositoryImpl @Inject constructor( conversation.recipients.clear() conversation.recipients.addAll(recipients) - conversation.insertOrUpdate() + realm.executeTransaction { it.insertOrUpdate(conversation) } realm.close() conversation diff --git a/data/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/service/HeadlessSmsSendService.kt index 15e498a6..c4093b2f 100644 --- a/data/src/main/java/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/service/HeadlessSmsSendService.kt @@ -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).blockingGet()?.id ?: 0L + val threadId = messageRepo.getOrCreateConversation(recipients)?.id ?: 0L sendMessage.execute(SendMessage.Params(-1, threadId, recipients, body)) } } diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt index e2d39fcf..1789a727 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -18,7 +18,6 @@ */ package repository -import io.reactivex.Maybe import io.realm.RealmResults import model.Attachment import model.Conversation @@ -42,9 +41,9 @@ interface MessageRepository { fun getOrCreateConversation(threadId: Long): Conversation? - fun getOrCreateConversation(address: String): Maybe + fun getOrCreateConversation(address: String): Conversation? - fun getOrCreateConversation(addresses: List): Maybe + fun getOrCreateConversation(addresses: List): Conversation? fun saveDraft(threadId: Long, draft: String) diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 80dbe375..8a9771b4 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -79,6 +79,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val menuReadyIntent: Observable = menu.map { Unit } override val optionsItemIntent: Subject = PublishSubject.create() + override val sendAsGroupIntent by lazy { sendAsGroupBackground.clicks() } override val messageClickIntent: Subject by lazy { messageAdapter.clicks } override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges } override val cancelSendingIntent: Subject by lazy { messageAdapter.cancelSending } @@ -185,6 +186,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView { chipsAdapter.data = state.selectedContacts contactsAdapter.data = state.contacts + + sendAsGroup.setVisible(state.editingMode && state.selectedContacts.size >= 2) + sendAsGroupSwitch.isChecked = state.sendAsGroup + + messageList.setVisible(state.sendAsGroup) messageAdapter.data = state.messages messageAdapter.highlight = state.searchSelectionId diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index 4ddfca2a..ec101be7 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -32,6 +32,7 @@ data class ComposeState( val contactsVisible: Boolean = false, val selectedConversation: Long = 0, val selectedContacts: List = ArrayList(), + val sendAsGroup: Boolean = true, val conversationtitle: String = "", val query: String = "", val searchSelectionId: Long = -1, diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 28186229..101d473f 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -37,6 +37,7 @@ interface ComposeView : QkView { val chipDeletedIntent: Subject val menuReadyIntent: Observable val optionsItemIntent: Observable + val sendAsGroupIntent: Observable<*> val messageClickIntent: Subject val messagesSelectedIntent: Observable> val cancelSendingIntent: Subject diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 67f9c61a..b29e79e4 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -127,7 +127,10 @@ class ComposeViewModel @Inject constructor( address.isNotBlank() -> { newState { it.copy(editingMode = false) } - messageRepo.getOrCreateConversation(address).toObservable() + Observable.just(address) + .mapNotNull { messageRepo.getOrCreateConversation(it) } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) } else -> { @@ -146,7 +149,7 @@ class ComposeViewModel @Inject constructor( .skipUntil(state.filter { state -> state.editingMode }) .takeUntil(state.filter { state -> !state.editingMode }) .map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } } - .flatMapMaybe { addresses -> messageRepo.getOrCreateConversation(addresses) } + .mapNotNull { addresses -> messageRepo.getOrCreateConversation(addresses) } .mergeWith(initialConversation) .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> @@ -379,6 +382,12 @@ class ComposeViewModel @Inject constructor( .subscribe { newState { it.copy(query = "", searchSelectionId = -1) } } + // Toggle the group sending mode + view.sendAsGroupIntent + .autoDisposable(view.scope()) + .subscribe { newState { it.copy(sendAsGroup = !it.sendAsGroup) } } + + // Scroll to search position searchSelection .filter { id -> id != -1L } @@ -524,17 +533,31 @@ class ComposeViewModel @Inject constructor( view.sendIntent .withLatestFrom(view.textChangedIntent, { _, body -> body }) .map { body -> body.toString() } - .withLatestFrom(state, attachments, conversation, { body, state, attachments, conversation -> + .withLatestFrom(state, attachments, conversation, selectedContacts, { body, state, attachments, conversation, contacts -> val subId = state.subscription?.subscriptionId ?: -1 - val threadId = conversation.id - val addresses = conversation.recipients.map { it.address } - sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments)) + + if (state.sendAsGroup) { + val threadId = conversation.id + val addresses = conversation.recipients.map { it.address } + sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body, attachments)) + } else { + contacts + .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)) + } + } + view.setDraft("") this.attachments.onNext(ArrayList()) - }) - .withLatestFrom(state, { _, state -> + if (state.editingMode) { - newState { it.copy(editingMode = false) } + newState { it.copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) } } }) .autoDisposable(view.scope()) diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 318f46de..6c301993 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -287,12 +287,69 @@ + + + + + + + + + + + + %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! Write a message… Copy text From 1aeddec7bd1c59d014d0d3f14d43ef92f8a11359 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jun 2018 19:56:34 -0400 Subject: [PATCH 08/31] Update newState signature to not require calling it.copy() --- .../src/main/java/common/base/QkViewModel.kt | 2 +- .../java/feature/blocked/BlockedViewModel.kt | 4 +- .../java/feature/compose/ComposeViewModel.kt | 48 +++++++++---------- .../ConversationInfoViewModel.kt | 8 ++-- .../java/feature/gallery/GalleryViewModel.kt | 6 +-- .../main/java/feature/main/MainViewModel.kt | 42 ++++++++-------- .../NotificationPrefsViewModel.kt | 14 +++--- .../main/java/feature/plus/PlusViewModel.kt | 4 +- .../java/feature/qkreply/QkReplyViewModel.kt | 26 +++++----- .../feature/settings/SettingsViewModel.kt | 32 ++++++------- .../themepicker/ThemePickerViewModel.kt | 6 +-- 11 files changed, 96 insertions(+), 96 deletions(-) diff --git a/presentation/src/main/java/common/base/QkViewModel.kt b/presentation/src/main/java/common/base/QkViewModel.kt index 7854e484..eae23d7a 100644 --- a/presentation/src/main/java/common/base/QkViewModel.kt +++ b/presentation/src/main/java/common/base/QkViewModel.kt @@ -40,7 +40,7 @@ abstract class QkViewModel, State>(initialState: State) .subscribe { view.render(it) } } - protected fun newState(reducer: (State) -> State) { + protected fun newState(reducer: State.() -> State) { state.value?.let { state.onNext(reducer(it)) } } diff --git a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt index 10abd3af..59749279 100644 --- a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt @@ -40,10 +40,10 @@ class BlockedViewModel @Inject constructor( ) : QkViewModel(BlockedState()) { init { - newState { it.copy(data = messageRepo.getBlockedConversations()) } + newState { copy(data = messageRepo.getBlockedConversations()) } disposables += prefs.sia.asObservable() - .subscribe { enabled -> newState { it.copy(siaEnabled = enabled) } } + .subscribe { enabled -> newState { copy(siaEnabled = enabled) } } } override fun bindView(view: BlockedView) { diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index b29e79e4..d453baa1 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -121,12 +121,12 @@ class ComposeViewModel @Inject constructor( val initialConversation: Observable = when { threadId != 0L -> { - newState { it.copy(selectedConversation = threadId, editingMode = false) } + newState { copy(selectedConversation = threadId, editingMode = false) } messageRepo.getConversationAsync(threadId).asObservable() } address.isNotBlank() -> { - newState { it.copy(editingMode = false) } + newState { copy(editingMode = false) } Observable.just(address) .mapNotNull { messageRepo.getOrCreateConversation(it) } .subscribeOn(Schedulers.io()) @@ -134,14 +134,14 @@ class ComposeViewModel @Inject constructor( } else -> { - newState { it.copy(editingMode = true) } + newState { copy(editingMode = true) } Observable.empty() } } selectedContacts = contactsReducer .scan(listOf(), { previousState, reducer -> reducer(previousState) }) - .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } + .doOnNext { contacts -> newState { copy(selectedContacts = contacts) } } // 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 @@ -154,7 +154,7 @@ class ComposeViewModel @Inject constructor( .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> if (!conversation.isValid) { - newState { it.copy(hasError = true) } + newState { copy(hasError = true) } } } .filter { conversation -> conversation.isValid } @@ -168,7 +168,7 @@ class ComposeViewModel @Inject constructor( .observeOn(AndroidSchedulers.mainThread()) .map { conversation -> val messages = messageRepo.getMessages(conversation.id) - newState { it.copy(selectedConversation = conversation.id, messages = Pair(conversation, messages)) } + newState { copy(selectedConversation = conversation.id, messages = Pair(conversation, messages)) } messages } .switchMap { messages -> messages.asObservable() } @@ -177,10 +177,10 @@ class ComposeViewModel @Inject constructor( disposables += conversation .map { conversation -> conversation.getTitle() } .distinctUntilChanged() - .subscribe { title -> newState { it.copy(conversationtitle = title) } } + .subscribe { title -> newState { copy(conversationtitle = title) } } disposables += attachments - .subscribe { attachments -> newState { it.copy(attachments = attachments) } } + .subscribe { attachments -> newState { copy(attachments = attachments) } } disposables += conversation .map { conversation -> conversation.id } @@ -197,7 +197,7 @@ class ComposeViewModel @Inject constructor( messages.lastOrNull()?.let { message -> searchSelection.onNext(message.id) } } else { val position = messages.indexOfFirst { it.id == selected } + 1 - newState { it.copy(searchSelectionPosition = position, searchResults = messages.size) } + newState { copy(searchSelectionPosition = position, searchResults = messages.size) } } }.subscribe() @@ -207,7 +207,7 @@ class ComposeViewModel @Inject constructor( disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null - newState { it.copy(subscription = sub) } + newState { copy(subscription = sub) } }.subscribe() if (threadId == 0L) { @@ -228,7 +228,7 @@ class ComposeViewModel @Inject constructor( .takeUntil(state.filter { state -> !state.editingMode }) .distinctUntilChanged() .autoDisposable(view.scope()) - .subscribe { contactsVisible -> newState { it.copy(contactsVisible = contactsVisible && it.editingMode) } } + .subscribe { contactsVisible -> newState { copy(contactsVisible = contactsVisible && editingMode) } } // Update the list of contact suggestions based on the query input, while also filtering out any contacts // that have already been selected @@ -257,7 +257,7 @@ class ComposeViewModel @Inject constructor( .takeUntil(state.filter { state -> !state.editingMode }) .subscribeOn(Schedulers.computation()) .autoDisposable(view.scope()) - .subscribe { contacts -> newState { it.copy(contacts = contacts) } } + .subscribe { contacts -> newState { copy(contacts = contacts) } } // Backspaces should delete the most recent contact if there's no text input // Close the activity if user presses back @@ -297,7 +297,7 @@ class ComposeViewModel @Inject constructor( // When the menu is loaded, trigger a new state so that the menu options can be rendered correctly view.menuReadyIntent .autoDisposable(view.scope()) - .subscribe { newState { it.copy() } } + .subscribe { newState { copy() } } // Open the phone dialer if the call button is clicked view.optionsItemIntent @@ -379,19 +379,19 @@ class ComposeViewModel @Inject constructor( view.optionsItemIntent .filter { it == R.id.clear } .autoDisposable(view.scope()) - .subscribe { newState { it.copy(query = "", searchSelectionId = -1) } } + .subscribe { newState { copy(query = "", searchSelectionId = -1) } } // Toggle the group sending mode view.sendAsGroupIntent .autoDisposable(view.scope()) - .subscribe { newState { it.copy(sendAsGroup = !it.sendAsGroup) } } + .subscribe { newState { copy(sendAsGroup = !sendAsGroup) } } // Scroll to search position searchSelection .filter { id -> id != -1L } - .doOnNext { id -> newState { it.copy(searchSelectionId = id) } } + .doOnNext { id -> newState { copy(searchSelectionId = id) } } .autoDisposable(view.scope()) .subscribe(view::scrollToMessage) @@ -407,7 +407,7 @@ class ComposeViewModel @Inject constructor( view.messagesSelectedIntent .map { selection -> selection.size } .autoDisposable(view.scope()) - .subscribe { messages -> newState { it.copy(selectedMessages = messages, editingMode = false) } } + .subscribe { messages -> newState { copy(selectedMessages = messages, editingMode = false) } } // Cancel sending a message view.cancelSendingIntent @@ -438,7 +438,7 @@ class ComposeViewModel @Inject constructor( // Open the attachment options view.attachIntent .autoDisposable(view.scope()) - .subscribe { newState { it.copy(attaching = !it.attaching) } } + .subscribe { newState { copy(attaching = !attaching) } } // Attach a photo from camera view.cameraIntent @@ -462,7 +462,7 @@ class ComposeViewModel @Inject constructor( .withLatestFrom(attachments, { attachment, attachments -> attachments + attachment }) .doOnNext { attachments.onNext(it) } .autoDisposable(view.scope()) - .subscribe { newState { it.copy(attaching = false) } } + .subscribe { newState { copy(attaching = false) } } // Detach a photo view.attachmentDeletedIntent @@ -494,7 +494,7 @@ class ComposeViewModel @Inject constructor( text.isNotBlank() || attachments.isNotEmpty() }) .autoDisposable(view.scope()) - .subscribe { canSend -> newState { it.copy(canSend = canSend) } } + .subscribe { canSend -> newState { copy(canSend = canSend) } } // Show the remaining character counter when necessary view.textChangedIntent @@ -512,7 +512,7 @@ class ComposeViewModel @Inject constructor( } .distinctUntilChanged() .autoDisposable(view.scope()) - .subscribe { remaining -> newState { it.copy(remaining = remaining) } } + .subscribe { remaining -> newState { copy(remaining = remaining) } } // Toggle to the next sim slot view.changeSimIntent @@ -524,7 +524,7 @@ class ComposeViewModel @Inject constructor( subIndex < subs.size - 1 -> subs[subIndex + 1] else -> subs[0] } - newState { it.copy(subscription = subscription) } + newState { copy(subscription = subscription) } } .autoDisposable(view.scope()) .subscribe() @@ -557,7 +557,7 @@ class ComposeViewModel @Inject constructor( this.attachments.onNext(ArrayList()) if (state.editingMode) { - newState { it.copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) } + newState { copy(editingMode = false, sendAsGroup = true, hasError = !state.sendAsGroup) } } }) .autoDisposable(view.scope()) @@ -571,7 +571,7 @@ class ComposeViewModel @Inject constructor( .withLatestFrom(state, { _, state -> when { state.selectedMessages > 0 -> view.clearSelection() - else -> newState { it.copy(hasError = true) } + else -> newState { copy(hasError = true) } } }) .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt index 68261db8..836ff528 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt @@ -57,7 +57,7 @@ class ConversationInfoViewModel @Inject constructor( .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> if (!conversation.isValid) { - newState { it.copy(hasError = true) } + newState { copy(hasError = true) } } } .filter { conversation -> conversation.isValid } @@ -73,19 +73,19 @@ class ConversationInfoViewModel @Inject constructor( disposables += conversation .map { conversation -> conversation.recipients } .distinctUntilChanged() - .subscribe { recipients -> newState { it.copy(recipients = recipients) } } + .subscribe { recipients -> newState { copy(recipients = recipients) } } // Update the view's archived state whenever it changes disposables += conversation .map { conversation -> conversation.archived } .distinctUntilChanged() - .subscribe { archived -> newState { it.copy(archived = archived) } } + .subscribe { archived -> newState { copy(archived = archived) } } // Update the view's blocked state whenever it changes disposables += conversation .map { conversation -> conversation.blocked } .distinctUntilChanged() - .subscribe { blocked -> newState { it.copy(blocked = blocked) } } + .subscribe { blocked -> newState { copy(blocked = blocked) } } } override fun bindView(view: ConversationInfoView) { diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt index 7207073d..ee0bade1 100644 --- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt @@ -48,12 +48,12 @@ class GalleryViewModel @Inject constructor( disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getPart(partId) } .mapNotNull { part -> part.getUri() } - .subscribe { uri -> newState { it.copy(imageUri = uri) } } + .subscribe { uri -> newState { copy(imageUri = uri) } } disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getMessageForPart(partId) } .mapNotNull { message -> messageRepo.getConversation(message.threadId) } - .subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } } + .subscribe { conversation -> newState { copy(title = conversation.getTitle()) } } } override fun bindView(view: GalleryView) { @@ -64,7 +64,7 @@ class GalleryViewModel @Inject constructor( .withLatestFrom(state, { _, state -> state.navigationVisible }) .map { navigationVisible -> !navigationVisible } .autoDisposable(view.scope()) - .subscribe { navigationVisible -> newState { it.copy(navigationVisible = navigationVisible) } } + .subscribe { navigationVisible -> newState { copy(navigationVisible = navigationVisible) } } // Save image to device view.optionsItemSelectedIntent diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt index 6f9f01b3..57089903 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/main/MainViewModel.kt @@ -72,12 +72,12 @@ class MainViewModel @Inject constructor( // Show the syncing UI disposables += syncRepository.syncProgress .distinctUntilChanged() - .subscribe { syncing -> newState { it.copy(syncing = syncing) } } + .subscribe { syncing -> newState { copy(syncing = syncing) } } // Show the rating UI disposables += ratingManager.shouldShowRating - .subscribe { show -> newState { it.copy(showRating = show) } } + .subscribe { show -> newState { copy(showRating = show) } } // Migrate the preferences from 2.7.3 @@ -108,7 +108,7 @@ class MainViewModel @Inject constructor( view.activityResumedIntent.map { permissionManager.hasSms() }.distinctUntilChanged(), view.activityResumedIntent.map { permissionManager.hasContacts() }.distinctUntilChanged(), { defaultSms, smsPermission, contactPermission -> - newState { it.copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } + newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } }) .autoDisposable(view.scope()) .subscribe() @@ -134,21 +134,21 @@ class MainViewModel @Inject constructor( .map { query -> query.removeAccents() } .withLatestFrom(state, { query, state -> if (query.isEmpty() && state.page is Searching) { - newState { it.copy(page = Inbox(data = messageRepo.getConversations())) } + newState { copy(page = Inbox(data = messageRepo.getConversations())) } } query }) .filter { query -> query.length >= 2 } .doOnNext { - newState { state -> - val page = (state.page as? Searching) ?: Searching() - state.copy(page = page.copy(loading = true)) + newState { + val page = (page as? Searching) ?: Searching() + copy(page = page.copy(loading = true)) } } .observeOn(Schedulers.io()) .switchMap { query -> Observable.just(query).map { messageRepo.searchConversations(it) } } .autoDisposable(view.scope()) - .subscribe { data -> newState { it.copy(page = Searching(loading = false, data = data)) } } + .subscribe { data -> newState { copy(page = Searching(loading = false, data = data)) } } view.composeIntent .autoDisposable(view.scope()) @@ -164,7 +164,7 @@ class MainViewModel @Inject constructor( state.page is Archived && state.page.selected > 0 -> view.clearSelection() - else -> newState { it.copy(drawerOpen = true) } + else -> newState { copy(drawerOpen = true) } } }) .autoDisposable(view.scope()) @@ -172,19 +172,19 @@ class MainViewModel @Inject constructor( view.drawerOpenIntent .autoDisposable(view.scope()) - .subscribe { open -> newState { it.copy(drawerOpen = open) } } + .subscribe { open -> newState { copy(drawerOpen = open) } } view.drawerItemIntent - .doOnNext { newState { it.copy(drawerOpen = false) } } + .doOnNext { newState { copy(drawerOpen = false) } } .doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() } .doOnNext { if (it == DrawerItem.PLUS) navigator.showQksmsPlusActivity() } .doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() } .distinctUntilChanged() .doOnNext { when (it) { - DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = messageRepo.getConversations())) } - DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(data = messageRepo.getConversations(true))) } - DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } + DrawerItem.INBOX -> newState { copy(page = Inbox(data = messageRepo.getConversations())) } + DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = messageRepo.getConversations(true))) } + DrawerItem.SCHEDULED -> newState { copy(page = Scheduled()) } else -> { } // Do nothing } @@ -233,12 +233,12 @@ class MainViewModel @Inject constructor( when (state.page) { is Inbox -> { val page = state.page.copy(selected = selected, showClearButton = selected > 0) - newState { it.copy(page = page) } + newState { copy(page = page) } } is Archived -> { val page = state.page.copy(selected = selected, showClearButton = selected > 0) - newState { it.copy(page = page) } + newState { copy(page = page) } } } }) @@ -259,7 +259,7 @@ class MainViewModel @Inject constructor( markArchived.execute(listOf(threadId)) { if (state.page is Inbox) { val page = state.page.copy(showArchivedSnackbar = true) - newState { it.copy(page = page) } + newState { copy(page = page) } } } }) @@ -268,7 +268,7 @@ class MainViewModel @Inject constructor( markArchived.execute(listOf(threadId)) { if (state.page is Inbox) { val page = state.page.copy(showArchivedSnackbar = false) - newState { it.copy(page = page) } + newState { copy(page = page) } } } }) @@ -294,7 +294,7 @@ class MainViewModel @Inject constructor( view.backPressedIntent .withLatestFrom(state, { _, state -> when { - state.drawerOpen -> newState { it.copy(drawerOpen = false) } + state.drawerOpen -> newState { copy(drawerOpen = false) } state.page is Searching -> view.clearSearch() @@ -303,9 +303,9 @@ class MainViewModel @Inject constructor( state.page is Archived && state.page.selected > 0 -> view.clearSelection() - state.page !is Inbox -> newState { it.copy(page = Inbox(data = messageRepo.getConversations())) } + state.page !is Inbox -> newState { copy(page = Inbox(data = messageRepo.getConversations())) } - else -> newState { it.copy(hasError = true) } + else -> newState { copy(hasError = true) } } }) .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index ef0b07ca..86809f6d 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -61,19 +61,19 @@ class NotificationPrefsViewModel @Inject constructor( .mapNotNull { threadId -> messageRepo.getConversation(threadId) } .map { conversation -> conversation.getTitle() } .subscribeOn(Schedulers.io()) - .subscribe { title -> newState { it.copy(conversationTitle = title) } } + .subscribe { title -> newState { copy(conversationTitle = title) } } disposables += notifications.asObservable() - .subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } } + .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } } val previewLabels = context.resources.getStringArray(R.array.notification_preview_options) disposables += previews.asObservable() .subscribe { previewId -> - newState { it.copy(previewSummary = previewLabels[previewId], previewId = previewId) } + newState { copy(previewSummary = previewLabels[previewId], previewId = previewId) } } disposables += vibration.asObservable() - .subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } } + .subscribe { enabled -> newState { copy(vibrationEnabled = enabled) } } disposables += ringtone.asObservable() .map { uriString -> @@ -82,13 +82,13 @@ class NotificationPrefsViewModel @Inject constructor( ?.let { uri -> RingtoneManager.getRingtone(context, uri) }?.getTitle(context) ?: context.getString(R.string.settings_ringtone_none) } - .subscribe { title -> newState { it.copy(ringtoneName = title) } } + .subscribe { title -> newState { copy(ringtoneName = title) } } disposables += prefs.qkreply.asObservable() - .subscribe { enabled -> newState { it.copy(qkReplyEnabled = enabled) } } + .subscribe { enabled -> newState { copy(qkReplyEnabled = enabled) } } disposables += prefs.qkreplyTapDismiss.asObservable() - .subscribe { enabled -> newState { it.copy(qkReplyTapDismiss = enabled) } } + .subscribe { enabled -> newState { copy(qkReplyTapDismiss = enabled) } } } override fun bindView(view: NotificationPrefsView) { diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/feature/plus/PlusViewModel.kt index e99f59b8..75bb2f50 100644 --- a/presentation/src/main/java/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/feature/plus/PlusViewModel.kt @@ -38,14 +38,14 @@ class PlusViewModel @Inject constructor( analyticsManager.track("Viewed QKSMS+") disposables += billingManager.upgradeStatus - .subscribe { upgraded -> newState { it.copy(upgraded = upgraded) } } + .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } disposables += billingManager.products .subscribe { products -> newState { val upgrade = products.firstOrNull { it.sku == BillingManager.SKU_PLUS } val upgradeDonate = products.firstOrNull { it.sku == BillingManager.SKU_PLUS_DONATE } - it.copy(upgradePrice = upgrade?.price ?: "", upgradeDonatePrice = upgradeDonate?.price ?: "", + copy(upgradePrice = upgrade?.price ?: "", upgradeDonatePrice = upgradeDonate?.price ?: "", currency = upgrade?.priceCurrencyCode ?: upgradeDonate?.priceCurrencyCode ?: "") } } diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt index a35c81eb..d2fdb4ce 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -71,19 +71,19 @@ class QkReplyViewModel @Inject constructor( // If we're ever showing an empty set of messages, then it's time to shut down to activity disposables += Observables .combineLatest(messages, conversation) { messages, conversation -> - newState { it.copy(data = Pair(conversation, messages)) } + newState { copy(data = Pair(conversation, messages)) } messages } .switchMap { messages -> messages.asObservable() } .filter { it.isLoaded } .filter { it.isValid } .filter { it.isEmpty() } - .subscribe { newState { it.copy(hasError = true) } } + .subscribe { newState { copy(hasError = true) } } disposables += conversation .map { conversation -> conversation.getTitle() } .distinctUntilChanged() - .subscribe { title -> newState { it.copy(title = title) } } + .subscribe { title -> newState { copy(title = title) } } val latestSubId = messages .map { messages -> messages.lastOrNull()?.subId ?: -1 } @@ -91,7 +91,7 @@ class QkReplyViewModel @Inject constructor( disposables += Observables.combineLatest(latestSubId, subUtils.subscriptionsObservable) { subId, subs -> val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null - newState { it.copy(subscription = sub) } + newState { copy(subscription = sub) } }.subscribe() } @@ -111,7 +111,7 @@ class QkReplyViewModel @Inject constructor( .map { conversation -> conversation.id } .autoDisposable(view.scope()) .subscribe { threadId -> - markRead.execute(threadId) { newState { it.copy(hasError = true) } } + markRead.execute(threadId) { newState { copy(hasError = true) } } } // Call @@ -121,7 +121,7 @@ class QkReplyViewModel @Inject constructor( .mapNotNull { conversation -> conversation.recipients.first()?.address } .doOnNext { address -> navigator.makePhoneCall(address) } .autoDisposable(view.scope()) - .subscribe { newState { it.copy(hasError = true) } } + .subscribe { newState { copy(hasError = true) } } // Show all messages view.menuItemIntent @@ -130,7 +130,7 @@ class QkReplyViewModel @Inject constructor( .map { conversation -> messageRepo.getMessages(conversation.id) } .doOnNext(messages::onNext) .autoDisposable(view.scope()) - .subscribe { newState { it.copy(expanded = true) } } + .subscribe { newState { copy(expanded = true) } } // Show unread messages only view.menuItemIntent @@ -139,7 +139,7 @@ class QkReplyViewModel @Inject constructor( .map { conversation -> messageRepo.getUnreadMessages(conversation.id) } .doOnNext(messages::onNext) .autoDisposable(view.scope()) - .subscribe { newState { it.copy(expanded = false) } } + .subscribe { newState { copy(expanded = false) } } // View conversation view.menuItemIntent @@ -148,14 +148,14 @@ class QkReplyViewModel @Inject constructor( .map { conversation -> conversation.id } .doOnNext { threadId -> navigator.showConversation(threadId) } .autoDisposable(view.scope()) - .subscribe { newState { it.copy(hasError = true) } } + .subscribe { newState { copy(hasError = true) } } // Enable the send button when there is text input into the new message body or there's // an attachment, disable otherwise view.textChangedIntent .map { text -> text.isNotBlank() } .autoDisposable(view.scope()) - .subscribe { canSend -> newState { it.copy(canSend = canSend) } } + .subscribe { canSend -> newState { copy(canSend = canSend) } } // Show the remaining character counter when necessary view.textChangedIntent @@ -173,7 +173,7 @@ class QkReplyViewModel @Inject constructor( } .distinctUntilChanged() .autoDisposable(view.scope()) - .subscribe { remaining -> newState { it.copy(remaining = remaining) } } + .subscribe { remaining -> newState { copy(remaining = remaining) } } // Update the draft whenever the text is changed view.textChangedIntent @@ -196,7 +196,7 @@ class QkReplyViewModel @Inject constructor( subIndex < subs.size - 1 -> subs[subIndex + 1] else -> subs[0] } - newState { it.copy(subscription = subscription) } + newState { copy(subscription = subscription) } } .autoDisposable(view.scope()) .subscribe() @@ -215,7 +215,7 @@ class QkReplyViewModel @Inject constructor( }) .doOnNext { threadId -> markRead.execute(threadId) { - newState { it.copy(hasError = true) } + newState { copy(hasError = true) } } } .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 87cbe866..64d05988 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -27,11 +27,11 @@ import common.base.QkViewModel import common.util.BillingManager import common.util.Colors import common.util.DateFormatter -import util.NightModeManager import interactor.SyncMessages import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import timber.log.Timber +import util.NightModeManager import util.Preferences import java.util.* import javax.inject.Inject @@ -49,60 +49,60 @@ class SettingsViewModel @Inject constructor( init { - newState { it.copy(theme = colors.theme().theme) } + newState { copy(theme = colors.theme().theme) } val nightModeLabels = context.resources.getStringArray(R.array.night_modes) disposables += prefs.nightMode.asObservable() .subscribe { nightMode -> - newState { it.copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) } + newState { copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) } } disposables += prefs.nightStart.asObservable() .map { time -> nightModeManager.parseTime(time) } .map { calendar -> calendar.timeInMillis } .map { millis -> dateFormatter.getTimestamp(millis) } - .subscribe { nightStart -> newState { it.copy(nightStart = nightStart) } } + .subscribe { nightStart -> newState { copy(nightStart = nightStart) } } disposables += prefs.nightEnd.asObservable() .map { time -> nightModeManager.parseTime(time) } .map { calendar -> calendar.timeInMillis } .map { millis -> dateFormatter.getTimestamp(millis) } - .subscribe { nightEnd -> newState { it.copy(nightEnd = nightEnd) } } + .subscribe { nightEnd -> newState { copy(nightEnd = nightEnd) } } disposables += prefs.black.asObservable() - .subscribe { black -> newState { it.copy(black = black) } } + .subscribe { black -> newState { copy(black = black) } } disposables += prefs.notifications().asObservable() - .subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } } + .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } } disposables += prefs.autoEmoji.asObservable() - .subscribe { enabled -> newState { it.copy(autoEmojiEnabled = enabled) } } + .subscribe { enabled -> newState { copy(autoEmojiEnabled = enabled) } } val delayedSendingLabels = context.resources.getStringArray(R.array.delayed_sending_labels) disposables += prefs.sendDelay.asObservable() - .subscribe { id -> newState { it.copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } } + .subscribe { id -> newState { copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } } disposables += prefs.delivery.asObservable() - .subscribe { enabled -> newState { it.copy(deliveryEnabled = enabled) } } + .subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } } val textSizeLabels = context.resources.getStringArray(R.array.text_sizes) disposables += prefs.textSize.asObservable() .subscribe { textSize -> - newState { it.copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) } + newState { copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) } } disposables += prefs.systemFont.asObservable() - .subscribe { enabled -> newState { it.copy(systemFontEnabled = enabled) } } + .subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } } disposables += prefs.unicode.asObservable() - .subscribe { enabled -> newState { it.copy(stripUnicodeEnabled = enabled) } } + .subscribe { enabled -> newState { copy(stripUnicodeEnabled = enabled) } } val mmsSizeLabels = context.resources.getStringArray(R.array.mms_sizes) val mmsSizeIds = context.resources.getIntArray(R.array.mms_sizes_ids) disposables += prefs.mmsSize.asObservable() .subscribe { maxMmsSize -> val index = mmsSizeIds.indexOf(maxMmsSize) - newState { it.copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) } + newState { copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) } } disposables += syncMessages @@ -152,9 +152,9 @@ class SettingsViewModel @Inject constructor( R.id.mmsSize -> view.showMmsSizePicker() R.id.sync -> { - newState { it.copy(syncing = true) } + newState { copy(syncing = true) } syncMessages.execute(Unit, { - newState { it.copy(syncing = false) } + newState { copy(syncing = false) } }) } diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt index 8884e580..7e3a6283 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt @@ -55,16 +55,16 @@ class ThemePickerViewModel @Inject constructor( // Update the color of the apply button view.hsvThemeSelectedIntent - .doOnNext { color -> newState { it.copy(newColor = color) } } + .doOnNext { color -> newState { copy(newColor = color) } } .map { color -> colors.textPrimaryOnThemeForColor(color) } - .doOnNext { color -> newState { it.copy(newTextColor = color) } } + .doOnNext { color -> newState { copy(newTextColor = color) } } .autoDisposable(view.scope()) .subscribe() // Toggle the visibility of the apply group Observables.combineLatest(theme.asObservable(), view.hsvThemeSelectedIntent, { old, new -> old != new }) .autoDisposable(view.scope()) - .subscribe { themeChanged -> newState { it.copy(applyThemeVisible = themeChanged) } } + .subscribe { themeChanged -> newState { copy(applyThemeVisible = themeChanged) } } // Update the theme, when apply is clicked view.hsvThemeAppliedIntent From d6fa04f56d4e42718efc22b1ae9cd4b6d329cb47 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Jun 2018 13:47:41 -0400 Subject: [PATCH 09/31] Show progress when conversation is loading Potentially related to #1079 --- .../java/common/util/extensions/ViewExtensions.kt | 1 + .../main/java/feature/compose/ComposeActivity.kt | 5 ++++- .../src/main/java/feature/compose/ComposeState.kt | 1 + .../main/java/feature/compose/ComposeViewModel.kt | 9 ++++++++- .../src/main/res/layout/compose_activity.xml | 13 +++++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt index d994a133..ed1b67e0 100644 --- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt @@ -41,6 +41,7 @@ fun ImageView.setTint(color: Int) { } fun ProgressBar.setTint(color: Int) { + indeterminateTintList = ColorStateList.valueOf(color) progressTintList = ColorStateList.valueOf(color) } diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 8a9771b4..bd637b0a 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -126,6 +126,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { message.supportsInputContent = true theme + .doOnNext { loading.setTint(it.theme) } .doOnNext { send.setBackgroundTint(it.theme) } .doOnNext { send.setTint(it.textPrimary) } .doOnNext { messageAdapter.theme = it } @@ -165,7 +166,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { toolbarTitle.setVisible(!state.editingMode) chips.setVisible(state.editingMode) contacts.setVisible(state.contactsVisible) - composeBar.setVisible(!state.contactsVisible) + composeBar.setVisible(!state.contactsVisible && !state.loading) // Don't set the adapters unless needed if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter @@ -187,6 +188,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { chipsAdapter.data = state.selectedContacts contactsAdapter.data = state.contacts + loading.setVisible(state.loading) + sendAsGroup.setVisible(state.editingMode && state.selectedContacts.size >= 2) sendAsGroupSwitch.isChecked = state.sendAsGroup diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index ec101be7..e24c5589 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -34,6 +34,7 @@ data class ComposeState( val selectedContacts: List = ArrayList(), val sendAsGroup: Boolean = true, val conversationtitle: String = "", + val loading: Boolean = false, val query: String = "", val searchSelectionId: Long = -1, val searchSelectionPosition: Int = 0, diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index d453baa1..6e8cef1e 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -149,7 +149,14 @@ class ComposeViewModel @Inject constructor( .skipUntil(state.filter { state -> state.editingMode }) .takeUntil(state.filter { state -> !state.editingMode }) .map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } } - .mapNotNull { addresses -> messageRepo.getOrCreateConversation(addresses) } + .observeOn(Schedulers.computation()) + .doOnNext { newState { copy(loading = true) } } + .mapNotNull { addresses -> + val conversation = messageRepo.getOrCreateConversation(addresses) + newState { copy(loading = false) } + conversation + } + .observeOn(AndroidSchedulers.mainThread()) .mergeWith(initialConversation) .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 6c301993..4c7d1afc 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -54,6 +54,19 @@ app:textColor="tertiary" app:textSize="secondary" /> + + Date: Wed, 6 Jun 2018 15:52:19 -0400 Subject: [PATCH 10/31] #1076 - Video playback support --- build.gradle | 2 + .../java/repository/MessageRepositoryImpl.kt | 4 ++ presentation/build.gradle | 4 ++ .../src/main/java/common/Navigator.kt | 9 +--- .../java/feature/compose/MessagesAdapter.kt | 5 +- .../ConversationMediaAdapter.kt | 12 ++++- .../java/feature/gallery/GalleryActivity.kt | 50 ++++++++++++++++++- .../main/java/feature/gallery/GalleryState.kt | 3 +- .../java/feature/gallery/GalleryViewModel.kt | 3 +- .../layout/conversation_media_list_item.xml | 26 ++++++++-- .../src/main/res/layout/gallery_activity.xml | 5 ++ presentation/src/main/res/values/strings.xml | 4 +- 12 files changed, 102 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 6ce554a1..c26c2ad6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { ext.autodispose_version = '0.5.1' ext.constraintlayout_version = '1.1.0-beta5' ext.dagger_version = "2.16" + ext.exoplayer_version = "2.8.1" ext.glide_version = "4.3.0" ext.kotlin_version = '1.2.31' ext.ktx_version = "0.2" @@ -36,6 +37,7 @@ buildscript { allprojects { repositories { + google() jcenter() maven { url "https://jitpack.io" } maven { url 'https://maven.google.com' } diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index f82aec85..bf5140c3 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -222,7 +222,11 @@ class MessageRepositoryImpl @Inject constructor( return Realm.getDefaultInstance() .where(MmsPart::class.java) .equalTo("messages.threadId", threadId) + .beginGroup() .contains("type", "image/") + .or() + .contains("type", "video/") + .endGroup() .sort("id", Sort.DESCENDING) .findAllAsync() } diff --git a/presentation/build.gradle b/presentation/build.gradle index ed99b9ad..e289709e 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -92,6 +92,10 @@ dependencies { implementation "com.github.bumptech.glide:glide:$glide_version" kapt "com.github.bumptech.glide:compiler:$glide_version" + // exoplayer + implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version" + implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version" + // rxbinding implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxbinding_version" implementation "com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:$rxbinding_version" diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index 8015e323..026eff1a 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -97,19 +97,12 @@ class Navigator @Inject constructor(private val context: Context, private val no startActivity(intent) } - fun showImage(partId: Long) { + fun showMedia(partId: Long) { val intent = Intent(context, GalleryActivity::class.java) intent.putExtra("partId", partId) startActivity(intent) } - fun showVideo(uri: Uri, type: String) { - val intent = Intent(Intent.ACTION_VIEW, uri) - .setDataAndType(uri, type) - - startActivityExternal(intent) - } - /** * Shows the attachment full-screen * The transitionName for the view should be the id of the image being displayed diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 168c2605..7112aa47 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -272,10 +272,7 @@ class MessagesAdapter @Inject constructor( mediaView.video.setVisible(part.isVideo()) mediaView.forwardTouches(view) mediaView.clicks().subscribe { - when { - part.isImage() -> navigator.showImage(part.id) - part.isVideo() -> navigator.showVideo(part.getUri(), part.type) - } + if (part.isImage() || part.isVideo()) navigator.showMedia(part.id) } val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0 diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt index e5e2805f..afeda1dd 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt @@ -24,17 +24,22 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.moez.QKSMS.R +import common.Navigator import common.base.QkRealmAdapter import common.base.QkViewHolder import common.util.GlideApp +import common.util.extensions.setVisible import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_media_list_item.view.* import model.MmsPart +import util.extensions.isImage +import util.extensions.isVideo import javax.inject.Inject class ConversationMediaAdapter @Inject constructor( - private val context: Context + private val context: Context, + private val navigator: Navigator ) : QkRealmAdapter() { val thumbnailClicks: PublishSubject = PublishSubject.create() @@ -55,8 +60,11 @@ class ConversationMediaAdapter @Inject constructor( .fitCenter() .into(view.thumbnail) + view.video.setVisible(part.isVideo()) view.thumbnail.transitionName = part.id.toString() - view.thumbnail.setOnClickListener { thumbnailClicks.onNext(it) } + view.thumbnail.setOnClickListener { + if (part.isImage()) thumbnailClicks.onNext(it) else navigator.showMedia(part.id) + } } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { diff --git a/presentation/src/main/java/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/feature/gallery/GalleryActivity.kt index 82e58428..3b19defa 100644 --- a/presentation/src/main/java/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/feature/gallery/GalleryActivity.kt @@ -20,12 +20,21 @@ package feature.gallery import android.arch.lifecycle.ViewModelProvider import android.arch.lifecycle.ViewModelProviders +import android.net.Uri import android.os.Bundle import android.transition.ChangeBounds import android.transition.ChangeImageTransform import android.transition.TransitionSet import android.view.Menu import android.view.MenuItem +import com.google.android.exoplayer2.ExoPlayerFactory +import com.google.android.exoplayer2.SimpleExoPlayer +import com.google.android.exoplayer2.source.ExtractorMediaSource +import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection +import com.google.android.exoplayer2.trackselection.DefaultTrackSelector +import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory +import com.google.android.exoplayer2.util.Util +import com.google.android.mms.ContentType import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.GlideCompletionListener @@ -38,6 +47,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.gallery_activity.* import javax.inject.Inject + class GalleryActivity : QkActivity(), GalleryView { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory @@ -47,6 +57,8 @@ class GalleryActivity : QkActivity(), GalleryView { private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] } + private var exoPlayer: SimpleExoPlayer? = null + override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) @@ -91,9 +103,19 @@ class GalleryActivity : QkActivity(), GalleryView { title = state.title + when { + ContentType.isImageType(state.type) -> showImage(state.uri) + ContentType.isVideoType(state.type) -> showVideo(state.uri) + else -> hideMedia() + } + } + + private fun showImage(uri: Uri?) { + image.setVisible(true) + video.setVisible(false) if (image.drawable == null) { GlideApp.with(this) - .load(state.imageUri) + .load(uri) .dontAnimate() .listener(GlideCompletionListener { startPostponedEnterTransition() @@ -102,6 +124,27 @@ class GalleryActivity : QkActivity(), GalleryView { } } + private fun showVideo(uri: Uri?) { + image.setVisible(false) + video.setVisible(true) + + if (video.player == null) { + val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null) + val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory) + exoPlayer = ExoPlayerFactory.newSimpleInstance(this, trackSelector) + video.player = exoPlayer + + val dataSourceFactory = DefaultDataSourceFactory(this, Util.getUserAgent(this, "QKSMS")) + val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri) + exoPlayer?.prepare(videoSource) + } + } + + private fun hideMedia() { + image.setVisible(false) + video.setVisible(false) + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.gallery, menu) return super.onCreateOptionsMenu(menu) @@ -115,4 +158,9 @@ class GalleryActivity : QkActivity(), GalleryView { return true } + override fun onDestroy() { + super.onDestroy() + exoPlayer?.release() + } + } \ No newline at end of file diff --git a/presentation/src/main/java/feature/gallery/GalleryState.kt b/presentation/src/main/java/feature/gallery/GalleryState.kt index 08726bc2..b65dcd12 100644 --- a/presentation/src/main/java/feature/gallery/GalleryState.kt +++ b/presentation/src/main/java/feature/gallery/GalleryState.kt @@ -23,5 +23,6 @@ import android.net.Uri data class GalleryState( val navigationVisible: Boolean = true, val title: String = "", - val imageUri: Uri? = null + val uri: Uri? = null, + val type: String = "" ) \ No newline at end of file diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt index ee0bade1..0db9d00e 100644 --- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt @@ -47,8 +47,7 @@ class GalleryViewModel @Inject constructor( init { disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getPart(partId) } - .mapNotNull { part -> part.getUri() } - .subscribe { uri -> newState { copy(imageUri = uri) } } + .subscribe { part -> newState { copy(uri = part.getUri(), type = part.type) } } disposables += partIdFlowable .mapNotNull { partId -> messageRepo.getMessageForPart(partId) } diff --git a/presentation/src/main/res/layout/conversation_media_list_item.xml b/presentation/src/main/res/layout/conversation_media_list_item.xml index cb7d5954..61c758dd 100644 --- a/presentation/src/main/res/layout/conversation_media_list_item.xml +++ b/presentation/src/main/res/layout/conversation_media_list_item.xml @@ -17,11 +17,27 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - \ No newline at end of file + android:layout_height="wrap_content"> + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/gallery_activity.xml b/presentation/src/main/res/layout/gallery_activity.xml index 8b822bbc..8505c7ac 100644 --- a/presentation/src/main/res/layout/gallery_activity.xml +++ b/presentation/src/main/res/layout/gallery_activity.xml @@ -30,6 +30,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + Call Details - Save image + Save to gallery %d selected Clear @@ -111,7 +111,7 @@ Unblock Delete conversation - Saved image + Saved to gallery Appearance General From 5ef65c614f746742fdb7132bc1bb91ff8b1f0ea3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Jun 2018 16:28:23 -0400 Subject: [PATCH 11/31] Increment to 3.3.0 --- presentation/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index e289709e..8d4a9e25 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.moez.QKSMS" minSdkVersion 22 targetSdkVersion 27 - versionCode 170 - versionName "3.2.2" + versionCode 171 + versionName "3.3.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" From f7fca34efa6ffa6247a13cda36142bd99527fb60 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 04:23:11 -0400 Subject: [PATCH 12/31] Improve logging for failed messages --- .../src/main/java/receiver/SmsSentReceiver.kt | 8 ++++++- .../src/main/java/common/QKApplication.kt | 3 ++- .../src/main/java/common/util/BugsnagTree.kt | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 presentation/src/main/java/common/util/BugsnagTree.kt diff --git a/data/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/receiver/SmsSentReceiver.kt index 733fec75..7797505f 100644 --- a/data/src/main/java/receiver/SmsSentReceiver.kt +++ b/data/src/main/java/receiver/SmsSentReceiver.kt @@ -26,6 +26,7 @@ import android.telephony.SmsManager import dagger.android.AndroidInjection import interactor.MarkFailed import interactor.MarkSent +import timber.log.Timber import javax.inject.Inject class SmsSentReceiver : BroadcastReceiver() { @@ -48,9 +49,14 @@ class SmsSentReceiver : BroadcastReceiver() { SmsManager.RESULT_ERROR_NO_SERVICE, SmsManager.RESULT_ERROR_NULL_PDU, SmsManager.RESULT_ERROR_RADIO_OFF -> { + Timber.w(SmsFailedException(resultCode, intent.getIntExtra("errorCode", -1))) + val pendingResult = goAsync() markFailed.execute(MarkFailed.Params(id, resultCode)) { pendingResult.finish() } } } } -} \ No newline at end of file +} + +private class SmsFailedException(resultCode: Int, errorCode: Int) + : Exception("Message failed to send with resultCode: $resultCode and errorCode: $errorCode") \ No newline at end of file diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt index e044a15c..85b12d46 100644 --- a/presentation/src/main/java/common/QKApplication.kt +++ b/presentation/src/main/java/common/QKApplication.kt @@ -29,6 +29,7 @@ import com.bugsnag.android.Bugsnag import com.bugsnag.android.Configuration import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R +import common.util.BugsnagTree import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector @@ -90,7 +91,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) - Timber.plant(Timber.DebugTree()) + Timber.plant(Timber.DebugTree(), BugsnagTree()) } override fun activityInjector(): AndroidInjector { diff --git a/presentation/src/main/java/common/util/BugsnagTree.kt b/presentation/src/main/java/common/util/BugsnagTree.kt new file mode 100644 index 00000000..b811cb7a --- /dev/null +++ b/presentation/src/main/java/common/util/BugsnagTree.kt @@ -0,0 +1,23 @@ +package common.util + +import android.util.Log +import com.bugsnag.android.Bugsnag +import com.bugsnag.android.Severity +import timber.log.Timber + +/** + * If an exception is logged with the [Log.WARN] or [Log.ERROR] priority, the exception will be + * sent to Bugsnag + */ +class BugsnagTree : Timber.Tree() { + + override fun isLoggable(tag: String?, priority: Int): Boolean { + return priority == Log.WARN || priority == Log.ERROR + } + + override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { + val severity = if (priority == Log.ERROR) Severity.ERROR else Severity.WARNING + throwable?.run { Bugsnag.notify(this, severity) } + } + +} \ No newline at end of file From 6385a5707020e6fd64e8d47c8e73dbd7cfd48073 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 14:23:07 -0400 Subject: [PATCH 13/31] Fix crash when phone permission not granted --- .../java/manager/PermissionManagerImpl.kt | 2 + .../java/util/ActiveSubscriptionObservable.kt | 59 ------------------- .../main/java/util/SubscriptionUtilsImpl.kt | 52 +++++++++++++++- .../main/java/manager/PermissionManager.kt | 2 + 4 files changed, 53 insertions(+), 62 deletions(-) delete mode 100644 data/src/main/java/util/ActiveSubscriptionObservable.kt diff --git a/data/src/main/java/manager/PermissionManagerImpl.kt b/data/src/main/java/manager/PermissionManagerImpl.kt index c4d6c066..8b7dc578 100644 --- a/data/src/main/java/manager/PermissionManagerImpl.kt +++ b/data/src/main/java/manager/PermissionManagerImpl.kt @@ -39,6 +39,8 @@ class PermissionManagerImpl @Inject constructor(private val context: Context) : override fun hasContacts(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PERMISSION_GRANTED + override fun hasPhone(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PERMISSION_GRANTED + override fun hasStorage(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PERMISSION_GRANTED } \ No newline at end of file diff --git a/data/src/main/java/util/ActiveSubscriptionObservable.kt b/data/src/main/java/util/ActiveSubscriptionObservable.kt deleted file mode 100644 index 9f2792c3..00000000 --- a/data/src/main/java/util/ActiveSubscriptionObservable.kt +++ /dev/null @@ -1,59 +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.telephony.SubscriptionInfo -import android.telephony.SubscriptionManager -import io.reactivex.Observable -import io.reactivex.Observer -import io.reactivex.disposables.Disposable - -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/data/src/main/java/util/SubscriptionUtilsImpl.kt b/data/src/main/java/util/SubscriptionUtilsImpl.kt index 4356272a..9fa5c2a3 100644 --- a/data/src/main/java/util/SubscriptionUtilsImpl.kt +++ b/data/src/main/java/util/SubscriptionUtilsImpl.kt @@ -5,14 +5,24 @@ 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) : SubscriptionUtils { +class SubscriptionUtilsImpl @Inject constructor( + context: Context, + private val permissions: PermissionManager +) : SubscriptionUtils { - private val subscriptionManager = SubscriptionManager.from(context) + /** + * 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() + get() = subscriptionManager?.activeSubscriptionInfoList ?: listOf() override val subscriptionsObservable: Observable> = ActiveSubscriptionObservable(subscriptionManager) @@ -20,4 +30,40 @@ class SubscriptionUtilsImpl @Inject constructor(context: Context) : Subscription 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/src/main/java/manager/PermissionManager.kt b/domain/src/main/java/manager/PermissionManager.kt index c0716299..b1a98aca 100644 --- a/domain/src/main/java/manager/PermissionManager.kt +++ b/domain/src/main/java/manager/PermissionManager.kt @@ -28,6 +28,8 @@ interface PermissionManager { fun hasContacts(): Boolean + fun hasPhone(): Boolean + fun hasStorage(): Boolean } \ No newline at end of file From 85f8376f8d37a9302793bc9e0329e2e91bd5f651 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 14:24:45 -0400 Subject: [PATCH 14/31] Fix compose toolbar momentarily showing with the wrong size --- presentation/src/main/res/layout/compose_activity.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 4c7d1afc..d1eafca1 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -304,7 +304,9 @@ android:id="@+id/sendAsGroup" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:constraint_referenced_ids="sendAsGroupBackground, sendAsGroupTitle, sendAsGroupSummary, sendAsGroupSwitch, sendAsGroupShadow" /> + android:visibility="gone" + app:constraint_referenced_ids="sendAsGroupBackground, sendAsGroupTitle, sendAsGroupSummary, sendAsGroupSwitch, sendAsGroupShadow" + tools:visibility="visible" /> Date: Thu, 7 Jun 2018 14:36:54 -0400 Subject: [PATCH 15/31] Use default SmsManager when subId is -1 --- data/src/main/java/receiver/SmsSentReceiver.kt | 8 +------- data/src/main/java/repository/MessageRepositoryImpl.kt | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/receiver/SmsSentReceiver.kt index 7797505f..733fec75 100644 --- a/data/src/main/java/receiver/SmsSentReceiver.kt +++ b/data/src/main/java/receiver/SmsSentReceiver.kt @@ -26,7 +26,6 @@ import android.telephony.SmsManager import dagger.android.AndroidInjection import interactor.MarkFailed import interactor.MarkSent -import timber.log.Timber import javax.inject.Inject class SmsSentReceiver : BroadcastReceiver() { @@ -49,14 +48,9 @@ class SmsSentReceiver : BroadcastReceiver() { SmsManager.RESULT_ERROR_NO_SERVICE, SmsManager.RESULT_ERROR_NULL_PDU, SmsManager.RESULT_ERROR_RADIO_OFF -> { - Timber.w(SmsFailedException(resultCode, intent.getIntExtra("errorCode", -1))) - val pendingResult = goAsync() markFailed.execute(MarkFailed.Params(id, resultCode)) { pendingResult.finish() } } } } -} - -private class SmsFailedException(resultCode: Int, errorCode: Int) - : Exception("Message failed to send with resultCode: $resultCode and errorCode: $errorCode") \ No newline at end of file +} \ 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 bf5140c3..3e80ef9d 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -413,7 +413,9 @@ class MessageRepositoryImpl @Inject constructor( } override fun sendSms(message: Message) { - val smsManager = SmsManager.getSmsManagerForSubscriptionId(message.subId) + val smsManager = message.subId.takeIf { it != -1 } + ?.let(SmsManager::getSmsManagerForSubscriptionId) + ?: SmsManager.getDefault() val parts = smsManager.divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body) ?: arrayListOf() From 3fbf6dfa3ae8f536c3b6d6537d5cb1133634d59c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 14:37:39 -0400 Subject: [PATCH 16/31] Increment to 3.3.1 --- presentation/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index 8d4a9e25..8f89576a 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.moez.QKSMS" minSdkVersion 22 targetSdkVersion 27 - versionCode 171 - versionName "3.3.0" + versionCode 172 + versionName "3.3.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" From 81b82ac819c46a67f9e6b7ed492418f7f8496621 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 22:46:54 -0400 Subject: [PATCH 17/31] #1176 - Fix invisible navigation bar icons in light theme for some devices --- presentation/src/main/java/common/base/QkThemedActivity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 3bdf4591..832f6a36 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -88,6 +88,9 @@ abstract class QkThemedActivity : QkActivity() { else -> View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR } + // Some devices don't let you modify android.R.attr.navigationBarColor + window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + // Set the color for the overflow and navigation icon val textTertiary = resolveThemeColor(android.R.attr.textColorTertiary) toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(textTertiary) } From f410ae939cf97528b66599e1f332f61b17d83554 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 23:25:13 -0400 Subject: [PATCH 18/31] Only set navigationBarColor manually for API 27+ --- presentation/src/main/java/common/base/QkThemedActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 832f6a36..30e283e8 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -89,7 +89,7 @@ abstract class QkThemedActivity : QkActivity() { } // Some devices don't let you modify android.R.attr.navigationBarColor - window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) + if (Build.VERSION.SDK_INT >= 27) window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground) // Set the color for the overflow and navigation icon val textTertiary = resolveThemeColor(android.R.attr.textColorTertiary) From 8777722df42b3601a7d8a14281aaa7a7ce1b9ec4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jun 2018 23:55:37 -0400 Subject: [PATCH 19/31] Don't animate for initial view setup in settings screens --- .../main/java/common/util/extensions/ViewExtensions.kt | 9 +++++++++ .../feature/conversationinfo/ConversationInfoActivity.kt | 3 +++ .../notificationprefs/NotificationPrefsActivity.kt | 3 +++ .../src/main/java/feature/settings/SettingsActivity.kt | 4 ++++ .../src/main/res/layout/conversation_info_activity.xml | 2 +- .../src/main/res/layout/notification_prefs_activity.xml | 1 - presentation/src/main/res/layout/settings_activity.xml | 1 - 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt index ed1b67e0..8f51b614 100644 --- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/common/util/extensions/ViewExtensions.kt @@ -18,6 +18,7 @@ */ package common.util.extensions +import android.animation.LayoutTransition import android.content.Context import android.content.res.ColorStateList import android.graphics.PorterDuff @@ -25,11 +26,19 @@ import android.os.Build import android.support.v7.widget.RecyclerView import android.view.MotionEvent import android.view.View +import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ImageView import android.widget.ProgressBar +var ViewGroup.animateLayoutChanges: Boolean + get() = layoutTransition != null + set(value) { + layoutTransition = if (value) LayoutTransition() else null + } + + fun EditText.showKeyboard() { requestFocus() val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index be4709e3..47cd03c2 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -28,6 +28,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.scrapViews import common.util.extensions.setVisible import dagger.android.AndroidInjection @@ -60,6 +61,8 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { viewModel.bindView(this) setTitle(R.string.info_title) + items.postDelayed({ items.animateLayoutChanges = true }, 100) + mediaAdapter.thumbnailClicks .autoDisposable(scope()) .subscribe { view -> navigator.showImageAnimated(this, view) } diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index b03ba4cb..ebf78c33 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -30,6 +30,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.QkDialog import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.setVisible import common.widget.PreferenceView import dagger.android.AndroidInjection @@ -58,6 +59,8 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView { showBackButton(true) viewModel.bindView(this) + preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100) + val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O notificationsO.setVisible(hasOreo) diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index ee64e6b5..499a9341 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -18,6 +18,7 @@ */ package feature.settings +import android.animation.LayoutTransition import android.app.ProgressDialog import android.app.TimePickerDialog import android.arch.lifecycle.ViewModelProvider @@ -33,6 +34,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.QkDialog import common.base.QkThemedActivity +import common.util.extensions.animateLayoutChanges import common.util.extensions.setBackgroundTint import common.util.extensions.setVisible import common.widget.PreferenceView @@ -81,6 +83,8 @@ class SettingsActivity : QkThemedActivity(), SettingsView { showBackButton(true) viewModel.bindView(this) + preferences.postDelayed({ preferences.animateLayoutChanges = true }, 100) + nightModeDialog.adapter.setData(R.array.night_modes) textSizeDialog.adapter.setData(R.array.text_sizes) sendDelayDialog.adapter.setData(R.array.delayed_sending_labels) diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml index bf61ca0f..c1c74b30 100644 --- a/presentation/src/main/res/layout/conversation_info_activity.xml +++ b/presentation/src/main/res/layout/conversation_info_activity.xml @@ -40,9 +40,9 @@ app:layout_constraintTop_toBottomOf="@id/toolbar"> diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index e279b8ba..588de851 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -50,7 +50,6 @@ android:id="@+id/preferences" android:layout_width="match_parent" android:layout_height="wrap_content" - android:animateLayoutChanges="true" android:orientation="vertical" android:paddingBottom="8dp" android:paddingTop="8dp"> From 18feee7c0199271bb2963f095e20f378890fbd03 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Jun 2018 13:32:34 -0400 Subject: [PATCH 20/31] Add "" to useless subject filter --- domain/src/main/java/model/Message.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/model/Message.kt index 7dd55823..414cb364 100644 --- a/domain/src/main/java/model/Message.kt +++ b/domain/src/main/java/model/Message.kt @@ -133,7 +133,7 @@ open class Message : RealmObject() { * Cleanses the subject in case it's useless, so that the UI doesn't have to show it */ fun getCleansedSubject(): String { - val uselessSubjects = listOf("no subject", "NoSubject") + val uselessSubjects = listOf("no subject", "NoSubject", "") return if (uselessSubjects.contains(subject)) "" else subject } From 69392e10a30363f066663dcd04afc21ce6729dec Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Jun 2018 22:53:33 -0400 Subject: [PATCH 21/31] #763 - Support viewing vCard attachments --- .../java/util/extensions/MmsPartExtensions.kt | 2 +- presentation/build.gradle | 1 + .../src/main/java/common/Navigator.kt | 7 ++ .../java/feature/compose/MessagesAdapter.kt | 88 ++++++++++++------- .../main/res/layout/mms_preview_list_item.xml | 2 +- .../main/res/layout/mms_vcard_list_item.xml | 72 +++++++++++++++ presentation/src/main/res/values/strings.xml | 1 + 7 files changed, 141 insertions(+), 32 deletions(-) create mode 100644 presentation/src/main/res/layout/mms_vcard_list_item.xml diff --git a/data/src/main/java/util/extensions/MmsPartExtensions.kt b/data/src/main/java/util/extensions/MmsPartExtensions.kt index 76245839..192f1716 100644 --- a/data/src/main/java/util/extensions/MmsPartExtensions.kt +++ b/data/src/main/java/util/extensions/MmsPartExtensions.kt @@ -29,4 +29,4 @@ fun MmsPart.isVideo() = ContentType.isVideoType(type) fun MmsPart.isText() = ContentType.isTextType(type) -fun MmsPart.hasThumbnails() = isImage() || isVideo() \ No newline at end of file +fun MmsPart.isVCard() = ContentType.TEXT_VCARD == type \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 8f89576a..dacaf012 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -139,6 +139,7 @@ dependencies { implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" + implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.4' implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation project(":android-smsmms") diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index 026eff1a..b4b4f608 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -210,6 +210,13 @@ class Navigator @Inject constructor(private val context: Context, private val no startActivityExternal(intent) } + fun saveVcard(uri: Uri) { + val intent = Intent(Intent.ACTION_VIEW) + .setDataAndType(uri, "text/x-vcard") + + startActivityExternal(intent) + } + fun showNotificationSettings(threadId: Long = 0) { val intent = Intent(context, NotificationPrefsActivity::class.java) intent.putExtra("threadId", threadId) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 7112aa47..8779adae 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -19,6 +19,7 @@ package feature.compose import android.animation.ObjectAnimator +import android.content.ContentUris import android.content.Context import android.graphics.Typeface import android.support.v7.widget.RecyclerView @@ -47,19 +48,22 @@ import common.util.extensions.setPadding import common.util.extensions.setTint import common.util.extensions.setVisible import common.widget.BubbleImageView.Style.* +import ezvcard.Ezvcard import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.view.* import kotlinx.android.synthetic.main.mms_preview_list_item.view.* +import kotlinx.android.synthetic.main.mms_vcard_list_item.view.* +import mapper.CursorToPartImpl import model.Conversation import model.Message import model.Recipient import util.Preferences import util.SubscriptionUtils -import util.extensions.hasThumbnails import util.extensions.isImage +import util.extensions.isVCard import util.extensions.isVideo import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -112,7 +116,6 @@ class MessagesAdapter @Inject constructor( notifyDataSetChanged() } - private val layoutInflater = LayoutInflater.from(context) private val contactCache = ContactCache() private val expanded = HashMap() private val disposables = CompositeDisposable() @@ -218,7 +221,7 @@ class MessagesAdapter @Inject constructor( // Bind the grouping - val media = message.parts.filter { it.hasThumbnails() } + val media = message.parts.filter { it.isImage() || it.isVideo() || it.isVCard() } view.setPadding(bottom = if (canGroup(message, next)) 0 else 16.dpToPx(context)) @@ -238,9 +241,10 @@ class MessagesAdapter @Inject constructor( subject.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE) val body = message.parts - .mapNotNull { it.text } - .filter { it.isNotBlank() } - .joinToString("\n") { text -> text } + .filter { part -> !part.isVCard() } + .mapNotNull { part -> part.text } + .filter { part -> part.isNotBlank() } + .joinToString("\n") when { subject.isNotBlank() && body.isNotBlank() -> subject.append("\n$body") @@ -250,15 +254,10 @@ class MessagesAdapter @Inject constructor( } } view.body.setVisible(message.isSms() || view.body.text.isNotBlank()) - - val canBodyGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty() - val canBodyGroupWithNext = canGroup(message, next) - view.body.setBackgroundResource(when { - !canBodyGroupWithPrevious && canBodyGroupWithNext -> if (message.isMe()) R.drawable.message_out_first else R.drawable.message_in_first - canBodyGroupWithPrevious && canBodyGroupWithNext -> if (message.isMe()) R.drawable.message_out_middle else R.drawable.message_in_middle - canBodyGroupWithPrevious && !canBodyGroupWithNext -> if (message.isMe()) R.drawable.message_out_last else R.drawable.message_in_last - else -> R.drawable.message_only - }) + view.body.setBackgroundResource(getBubble( + canGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty(), + canGroupWithNext = canGroup(message, next), + isMe = message.isMe())) // Bind the attachments @@ -268,24 +267,44 @@ class MessagesAdapter @Inject constructor( } media.forEachIndexed { index, part -> - val mediaView = layoutInflater.inflate(R.layout.mms_preview_list_item, view.attachments, false) - mediaView.video.setVisible(part.isVideo()) - mediaView.forwardTouches(view) - mediaView.clicks().subscribe { - if (part.isImage() || part.isVideo()) navigator.showMedia(part.id) - } - val canMediaGroupWithPrevious = canGroup(message, previous) || index > 0 val canMediaGroupWithNext = canGroup(message, next) || index < media.size && view.body.visibility == View.VISIBLE - mediaView.thumbnail.bubbleStyle = when { - !canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_FIRST else IN_FIRST - canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_MIDDLE else IN_MIDDLE - canMediaGroupWithPrevious && !canMediaGroupWithNext -> if (message.isMe()) OUT_LAST else IN_LAST - else -> ONLY - } - GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail) - view.attachments.addView(mediaView) + when { + part.isImage() || part.isVideo() -> { + val mediaView = View.inflate(view.context, R.layout.mms_preview_list_item, view.attachments) + mediaView.video.setVisible(part.isVideo()) + mediaView.forwardTouches(view) + mediaView.setOnClickListener { navigator.showMedia(part.id) } + + mediaView.thumbnail.bubbleStyle = when { + !canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_FIRST else IN_FIRST + canMediaGroupWithPrevious && canMediaGroupWithNext -> if (message.isMe()) OUT_MIDDLE else IN_MIDDLE + canMediaGroupWithPrevious && !canMediaGroupWithNext -> if (message.isMe()) OUT_LAST else IN_LAST + else -> ONLY + } + + GlideApp.with(context).load(part.getUri()).fitCenter().into(mediaView.thumbnail) + } + + part.isVCard() -> { + val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) + val vcard = context.contentResolver.openInputStream(uri).use { Ezvcard.parse(it).first() } + + val mediaView = View.inflate(view.context, R.layout.mms_vcard_list_item, view.attachments) + mediaView.forwardTouches(view) + mediaView.setOnClickListener { navigator.saveVcard(uri) } + mediaView.name.text = vcard?.formattedName?.value + mediaView.vCardBackground.setBackgroundResource(getBubble(canMediaGroupWithPrevious, canMediaGroupWithNext, message.isMe())) + + if (!message.isMe()) { + mediaView.vCardBackground.setBackgroundTint(theme.theme) + mediaView.vCardAvatar.setTint(theme.textPrimary) + mediaView.name.setTextColor(theme.textPrimary) + mediaView.label.setTextColor(theme.textTertiary) + } + } + } } } @@ -314,6 +333,15 @@ class MessagesAdapter @Inject constructor( }) } + private fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int { + return when { + !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first + canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle + canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last + else -> R.drawable.message_only + } + } + private fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) diff --git a/presentation/src/main/res/layout/mms_preview_list_item.xml b/presentation/src/main/res/layout/mms_preview_list_item.xml index ca69eba7..fa0d5948 100644 --- a/presentation/src/main/res/layout/mms_preview_list_item.xml +++ b/presentation/src/main/res/layout/mms_preview_list_item.xml @@ -21,7 +21,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="2dp"> + android:layout_marginTop="2dp"> + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1334666d..1855da60 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ 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 From 9df79c0ded70bea4497ae4fdc1c4187a13a32e39 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Jun 2018 23:20:15 -0400 Subject: [PATCH 22/31] Load vCard asychronously --- .../main/java/feature/compose/MessagesAdapter.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 8779adae..d28ee2bc 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -49,7 +49,10 @@ import common.util.extensions.setTint import common.util.extensions.setVisible import common.widget.BubbleImageView.Style.* 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 import io.realm.RealmResults @@ -65,6 +68,7 @@ import util.SubscriptionUtils import util.extensions.isImage import util.extensions.isVCard import util.extensions.isVideo +import util.extensions.mapNotNull import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -289,14 +293,20 @@ class MessagesAdapter @Inject constructor( part.isVCard() -> { val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id) - val vcard = context.contentResolver.openInputStream(uri).use { Ezvcard.parse(it).first() } val mediaView = View.inflate(view.context, R.layout.mms_vcard_list_item, view.attachments) mediaView.forwardTouches(view) mediaView.setOnClickListener { navigator.saveVcard(uri) } - mediaView.name.text = vcard?.formattedName?.value mediaView.vCardBackground.setBackgroundResource(getBubble(canMediaGroupWithPrevious, canMediaGroupWithNext, message.isMe())) + Observable.just(uri) + .map(context.contentResolver::openInputStream) + .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } + .subscribeOn(Schedulers.computation()) + .observeOn(AndroidSchedulers.mainThread()) + .filter { mediaView.isAttachedToWindow } + .subscribe { vcard -> mediaView.name.text = vcard.formattedName.value } + if (!message.isMe()) { mediaView.vCardBackground.setBackgroundTint(theme.theme) mediaView.vCardAvatar.setTint(theme.textPrimary) From 87e35604fafe5bf48d13780aad79cca815740aa2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Jun 2018 23:20:59 -0400 Subject: [PATCH 23/31] Fix scrolling jank when viewing images --- .../src/main/res/layout/mms_preview_list_item.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/presentation/src/main/res/layout/mms_preview_list_item.xml b/presentation/src/main/res/layout/mms_preview_list_item.xml index fa0d5948..db3b68b8 100644 --- a/presentation/src/main/res/layout/mms_preview_list_item.xml +++ b/presentation/src/main/res/layout/mms_preview_list_item.xml @@ -19,18 +19,16 @@ --> Date: Fri, 8 Jun 2018 23:28:14 -0400 Subject: [PATCH 24/31] Fix vCard sometimes not being bound --- presentation/src/main/java/feature/compose/MessagesAdapter.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index d28ee2bc..0a5c40e2 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -304,8 +304,7 @@ class MessagesAdapter @Inject constructor( .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } } .subscribeOn(Schedulers.computation()) .observeOn(AndroidSchedulers.mainThread()) - .filter { mediaView.isAttachedToWindow } - .subscribe { vcard -> mediaView.name.text = vcard.formattedName.value } + .subscribe { vcard -> mediaView?.name?.text = vcard.formattedName.value } if (!message.isMe()) { mediaView.vCardBackground.setBackgroundTint(theme.theme) From d4093cc8ff2b7cc7877c31488113e89d1bc3348f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Jun 2018 00:24:24 -0400 Subject: [PATCH 25/31] Load maxValue in KeyManager lazily --- data/src/main/java/manager/KeyManagerImpl.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/data/src/main/java/manager/KeyManagerImpl.kt b/data/src/main/java/manager/KeyManagerImpl.kt index a62a2851..3ec85f3e 100644 --- a/data/src/main/java/manager/KeyManagerImpl.kt +++ b/data/src/main/java/manager/KeyManagerImpl.kt @@ -26,18 +26,14 @@ import javax.inject.Singleton @Singleton class KeyManagerImpl @Inject constructor() : KeyManager { - private var maxValue: Long = 0L - - init { - val realm = Realm.getDefaultInstance() - maxValue = realm.where(Message::class.java).max("id")?.toLong() ?: 0L - realm.close() - } + private var initialized = false + private var maxValue: Long = 0 /** * Should be called when a new sync is being started */ override fun reset() { + initialized = true maxValue = 0L } @@ -45,6 +41,13 @@ class KeyManagerImpl @Inject constructor() : KeyManager { * Returns a valid ID that can be used to store a new message */ override fun newId(): Long { + if (!initialized) { + maxValue = Realm.getDefaultInstance().use { realm -> + realm.where(Message::class.java).max("id")?.toLong() ?: 0L + } + initialized = true + } + maxValue++ return maxValue } From bd6c5ca5e549760c0e3d40346ae06221db9934c3 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Jun 2018 01:23:22 -0400 Subject: [PATCH 26/31] #45 - Rename group chats --- .../main/java/migration/QkRealmMigration.kt | 10 +++++- .../java/repository/MessageRepositoryImpl.kt | 11 +++++++ .../java/repository/SyncRepositoryImpl.kt | 13 ++++++-- domain/src/main/java/model/Conversation.kt | 7 ++++- .../main/java/repository/MessageRepository.kt | 2 ++ .../java/feature/compose/ComposeViewModel.kt | 3 +- .../ConversationInfoActivity.kt | 31 +++++++++++++++++++ .../conversationinfo/ConversationInfoState.kt | 1 + .../conversationinfo/ConversationInfoView.kt | 5 ++- .../ConversationInfoViewModel.kt | 31 ++++++++++++++++--- .../res/drawable/ic_people_black_24dp.xml | 27 ++++++++++++++++ .../res/layout/conversation_info_activity.xml | 8 +++++ presentation/src/main/res/values/strings.xml | 3 ++ 13 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_people_black_24dp.xml diff --git a/data/src/main/java/migration/QkRealmMigration.kt b/data/src/main/java/migration/QkRealmMigration.kt index eb3fb10a..24cc0598 100644 --- a/data/src/main/java/migration/QkRealmMigration.kt +++ b/data/src/main/java/migration/QkRealmMigration.kt @@ -19,13 +19,14 @@ package migration import io.realm.DynamicRealm +import io.realm.FieldAttribute import io.realm.RealmMigration class QkRealmMigration : RealmMigration { companion object { - const val SCHEMA_VERSION: Long = 2 + const val SCHEMA_VERSION: Long = 3 } override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) { @@ -45,6 +46,13 @@ class QkRealmMigration : RealmMigration { version++ } + if (version == 2L) { + realm.schema.get("Conversation") + ?.addField("name", String::class.java, FieldAttribute.REQUIRED) + + version++ + } + if (version < newVersion) { throw IllegalStateException("Migration missing from v$oldVersion to v$newVersion") } diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt index 3e80ef9d..f84c612e 100644 --- a/data/src/main/java/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/repository/MessageRepositoryImpl.kt @@ -93,6 +93,17 @@ class MessageRepositoryImpl @Inject constructor( .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() diff --git a/data/src/main/java/repository/SyncRepositoryImpl.kt b/data/src/main/java/repository/SyncRepositoryImpl.kt index 0acd67be..b489dce3 100644 --- a/data/src/main/java/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/repository/SyncRepositoryImpl.kt @@ -59,7 +59,11 @@ class SyncRepositoryImpl @Inject constructor( /** * Holds data that should be persisted across full syncs */ - private data class PersistedData(val id: Long, val archived: Boolean, val blocked: Boolean) + private data class PersistedData( + val id: Long, + val archived: Boolean, + val blocked: Boolean, + val name: String) override val syncProgress: Subject = BehaviorSubject.createDefault(SyncRepository.SyncProgress.Idle()) @@ -77,9 +81,11 @@ class SyncRepositoryImpl @Inject constructor( .equalTo("archived", true) .or() .equalTo("blocked", true) + .or() + .isNotEmpty("name") .endGroup() .findAll() - .map { PersistedData(it.id, it.archived, it.blocked) } + .map { PersistedData(it.id, it.archived, it.blocked, it.name) } realm.delete(Contact::class.java) realm.delete(Conversation::class.java) @@ -102,7 +108,7 @@ class SyncRepositoryImpl @Inject constructor( persistedData += oldBlockedSenders.get() .map { threadIdString -> threadIdString.toLong() } .filter { threadId -> persistedData.none { it.id == threadId } } - .map { threadId -> PersistedData(threadId, false, true) } + .map { threadId -> PersistedData(threadId, false, true, "") } // Sync conversations cursorToConversation.getConversationsCursor()?.use { conversationCursor -> @@ -113,6 +119,7 @@ class SyncRepositoryImpl @Inject constructor( val conversation = conversations.firstOrNull { conversation -> conversation.id == data.id } conversation?.archived = data.archived conversation?.blocked = data.blocked + conversation?.name = data.name } realm.insertOrUpdate(conversations) diff --git a/domain/src/main/java/model/Conversation.kt b/domain/src/main/java/model/Conversation.kt index e4ac36c1..f7d66cf9 100644 --- a/domain/src/main/java/model/Conversation.kt +++ b/domain/src/main/java/model/Conversation.kt @@ -36,5 +36,10 @@ open class Conversation : RealmObject() { var me: Boolean = false var draft: String = "" - fun getTitle() = recipients.joinToString { recipient -> recipient.getDisplayName() } + // For group chats, the user is allowed to set a custom title for the conversation + var name: String = "" + + fun getTitle(): String { + return name.takeIf { it.isNotBlank() } ?: recipients.joinToString { recipient -> recipient.getDisplayName() } + } } diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/repository/MessageRepository.kt index 1789a727..7ee454e1 100644 --- a/domain/src/main/java/repository/MessageRepository.kt +++ b/domain/src/main/java/repository/MessageRepository.kt @@ -31,6 +31,8 @@ interface MessageRepository { fun getConversationsSnapshot(): List + fun setConversationName(id: Long, name: String) + fun searchConversations(query: String): List fun getBlockedConversations(): RealmResults diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index 6e8cef1e..332da0ff 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -166,8 +166,7 @@ class ComposeViewModel @Inject constructor( } .filter { conversation -> conversation.isValid } .filter { conversation -> conversation.id != 0L } - .distinctUntilChanged() - .subscribe { conversation.onNext(it) } + .subscribe(conversation::onNext) // When the conversation changes, update the threadId and the messages for the adapter disposables += conversation diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index 47cd03c2..f8e8284c 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -22,6 +22,7 @@ import android.arch.lifecycle.ViewModelProvider import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v7.app.AlertDialog +import android.text.InputFilter import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope @@ -29,10 +30,14 @@ import com.uber.autodispose.kotlin.autoDisposable import common.Navigator import common.base.QkThemedActivity import common.util.extensions.animateLayoutChanges +import common.util.extensions.dpToPx +import common.util.extensions.resolveThemeColor import common.util.extensions.scrapViews import common.util.extensions.setVisible +import common.widget.QkEditText import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.conversation_info_activity.* import javax.inject.Inject @@ -44,6 +49,8 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { @Inject lateinit var itemDecoration: GridSpacingItemDecoration @Inject lateinit var viewModelFactory: ViewModelProvider.Factory + override val nameIntent by lazy { name.clicks() } + override val nameChangedIntent: Subject = PublishSubject.create() override val notificationsIntent by lazy { notifications.clicks() } override val themeIntent by lazy { themePrefs.clicks() } override val archiveIntent by lazy { archive.clicks() } @@ -87,6 +94,9 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { recipientAdapter.threadId = state.threadId recipientAdapter.updateData(state.recipients) + name.setVisible(state.recipients?.size ?: 0 >= 2) + name.summary = state.name + notifications.setVisible(!state.blocked) archive.setVisible(!state.blocked) @@ -103,6 +113,27 @@ class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { mediaAdapter.updateData(state.media) } + override fun showNameDialog(name: String) { + val editText = QkEditText(this).apply { + val padding = 8.dpToPx(this@ConversationInfoActivity) + setPadding(padding * 3, padding, padding * 3, padding) + setSingleLine(true) + setHint(R.string.info_name_hint) + setText(name) + setHintTextColor(context.resolveThemeColor(android.R.attr.textColorTertiary)) + setTextColor(context.resolveThemeColor(android.R.attr.textColorPrimary)) + filters = arrayOf(InputFilter.LengthFilter(30)) + background = null + } + + AlertDialog.Builder(this) + .setTitle(R.string.info_name) + .setView(editText) + .setPositiveButton(R.string.button_save, { _, _ -> nameChangedIntent.onNext(editText.text.toString()) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + override fun showDeleteDialog() { AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt index 6cbacc28..eeedb5e0 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt @@ -24,6 +24,7 @@ import model.MmsPart import model.Recipient data class ConversationInfoState( + val name: String = "", val recipients: RealmList? = null, val threadId: Long = 0, val archived: Boolean = false, diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt index e556b000..3425fd9a 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt @@ -18,11 +18,13 @@ */ package feature.conversationinfo -import io.reactivex.Observable import common.base.QkView +import io.reactivex.Observable interface ConversationInfoView : QkView { + val nameIntent: Observable<*> + val nameChangedIntent: Observable val notificationsIntent: Observable val themeIntent: Observable val archiveIntent: Observable @@ -30,6 +32,7 @@ interface ConversationInfoView : QkView { val deleteIntent: Observable val confirmDeleteIntent: Observable + fun showNameDialog(name: String) fun showDeleteDialog() } \ No newline at end of file diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt index 836ff528..1ec42794 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt @@ -27,9 +27,10 @@ import interactor.MarkArchived import interactor.MarkBlocked import interactor.MarkUnarchived import interactor.MarkUnblocked -import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject import model.Conversation import repository.MessageRepository import util.extensions.asObservable @@ -38,21 +39,21 @@ import javax.inject.Named class ConversationInfoViewModel @Inject constructor( @Named("threadId") threadId: Long, - messageRepo: MessageRepository, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val markBlocked: MarkBlocked, private val markUnblocked: MarkUnblocked, + private val messageRepo: MessageRepository, private val navigator: Navigator, private val deleteConversations: DeleteConversations ) : QkViewModel( ConversationInfoState(threadId = threadId, media = messageRepo.getPartsForConversation(threadId)) ) { - private val conversation: Observable + private val conversation: Subject = BehaviorSubject.create() init { - conversation = messageRepo.getConversationAsync(threadId) + disposables += messageRepo.getConversationAsync(threadId) .asObservable() .filter { conversation -> conversation.isLoaded } .doOnNext { conversation -> @@ -62,6 +63,7 @@ class ConversationInfoViewModel @Inject constructor( } .filter { conversation -> conversation.isValid } .filter { conversation -> conversation.id != 0L } + .subscribe(conversation::onNext) disposables += markArchived disposables += markUnarchived @@ -75,6 +77,12 @@ class ConversationInfoViewModel @Inject constructor( .distinctUntilChanged() .subscribe { recipients -> newState { copy(recipients = recipients) } } + // Update conversation title whenever it changes + disposables += conversation + .map { conversation -> conversation.name } + .distinctUntilChanged() + .subscribe { name -> newState { copy(name = name) } } + // Update the view's archived state whenever it changes disposables += conversation .map { conversation -> conversation.archived } @@ -91,6 +99,21 @@ class ConversationInfoViewModel @Inject constructor( override fun bindView(view: ConversationInfoView) { super.bindView(view) + // Show the conversation title dialog + view.nameIntent + .withLatestFrom(conversation) { _, conversation -> conversation } + .map { conversation -> conversation.name } + .autoDisposable(view.scope()) + .subscribe(view::showNameDialog) + + // Set the conversation title + view.nameChangedIntent + .withLatestFrom(conversation) { name, conversation -> + messageRepo.setConversationName(conversation.id, name) + } + .autoDisposable(view.scope()) + .subscribe() + // Show the notifications settings for the conversation view.notificationsIntent .withLatestFrom(conversation, { _, conversation -> conversation }) diff --git a/presentation/src/main/res/drawable/ic_people_black_24dp.xml b/presentation/src/main/res/drawable/ic_people_black_24dp.xml new file mode 100644 index 00000000..0f4e3b15 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_people_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml index c1c74b30..174acdd4 100644 --- a/presentation/src/main/res/layout/conversation_info_activity.xml +++ b/presentation/src/main/res/layout/conversation_info_activity.xml @@ -61,6 +61,14 @@ android:layout_marginBottom="8dp" android:background="?android:attr/divider" /> + + Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -215,6 +217,7 @@ Cancel Delete + Save More Set Unblock From c2836775ad8c341132e007931bd57a3ca70a4c7e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Jun 2018 01:31:52 -0400 Subject: [PATCH 27/31] Add default error handler for Interactors --- domain/src/main/java/interactor/Interactor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/domain/src/main/java/interactor/Interactor.kt b/domain/src/main/java/interactor/Interactor.kt index a76ef5e1..913aedf4 100644 --- a/domain/src/main/java/interactor/Interactor.kt +++ b/domain/src/main/java/interactor/Interactor.kt @@ -24,8 +24,9 @@ import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers +import timber.log.Timber -abstract class Interactor: Disposable { +abstract class Interactor : Disposable { private val disposables: CompositeDisposable = CompositeDisposable() @@ -36,7 +37,7 @@ abstract class Interactor: Disposable { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .doOnComplete(onComplete) - .subscribe() + .subscribe({}, Timber::w) } override fun dispose() { From a4b82bca0a750778d613635253f3a09d3a0910e5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Jun 2018 16:07:55 -0400 Subject: [PATCH 28/31] #835 & #1100 - Show group chat info and message attachment in notification --- .../common/util/NotificationManagerImpl.kt | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index d63a4092..2fbef2ca 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent +import android.content.ContentUris import android.content.Context import android.content.Intent import android.graphics.Color @@ -36,11 +37,13 @@ import com.moez.QKSMS.R import common.util.extensions.dpToPx import feature.compose.ComposeActivity import feature.qkreply.QkReplyActivity +import mapper.CursorToPartImpl import receiver.MarkReadReceiver import receiver.MarkSeenReceiver import receiver.RemoteMessagingReceiver import repository.MessageRepository import util.Preferences +import util.extensions.isImage import util.tryOrNull import javax.inject.Inject import javax.inject.Singleton @@ -128,9 +131,26 @@ class NotificationManagerImpl @Inject constructor( .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0)) val messagingStyle = NotificationCompat.MessagingStyle("Me") + if (conversation.recipients.size >= 2) { + messagingStyle.conversationTitle = conversation.getTitle() + } + messages.forEach { message -> - val name = if (message.isMe()) null else conversation.getTitle() - messagingStyle.addMessage(message.getSummary(), message.date, name) + val name = when { + message.isMe() -> null + conversation.recipients.size < 2 -> conversation.getTitle() + else -> conversation.recipients + .firstOrNull { PhoneNumberUtils.compare(it.address, message.address) } + ?.getDisplayName() + ?: message.address + } + + NotificationCompat.MessagingStyle.Message(message.getSummary(), message.date, name).apply { + message.parts.firstOrNull { it.isImage() }?.let { part -> + setData(part.type, ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id)) + } + messagingStyle.addMessage(this) + } } val avatar = conversation.recipients.takeIf { it.size == 1 } From a29e81bcc970827c77b6cd09f336badfcf259c1a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Jun 2018 19:06:43 -0400 Subject: [PATCH 29/31] Increment to 3.3.2 --- presentation/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index dacaf012..1fe5f2fe 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.moez.QKSMS" minSdkVersion 22 targetSdkVersion 27 - versionCode 172 - versionName "3.3.1" + versionCode 173 + versionName "3.3.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" From a2d82dce2ad9c0f217a8f9d68d67d48fa1f3741c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jun 2018 22:39:07 -0400 Subject: [PATCH 30/31] Update translations --- .../src/main/res/values-bn/strings.xml | 12 +- .../src/main/res/values-cs/strings.xml | 12 +- .../src/main/res/values-da/strings.xml | 14 +- .../src/main/res/values-de/strings.xml | 14 +- .../src/main/res/values-es/strings.xml | 12 +- .../src/main/res/values-fa/strings.xml | 12 +- .../src/main/res/values-fi/strings.xml | 12 +- .../src/main/res/values-fr/strings.xml | 12 +- .../src/main/res/values-hi/strings.xml | 12 +- .../src/main/res/values-hr/strings.xml | 12 +- .../src/main/res/values-hu/strings.xml | 12 +- .../src/main/res/values-in/strings.xml | 12 +- .../src/main/res/values-it/strings.xml | 12 +- .../src/main/res/values-iw/strings.xml | 12 +- .../src/main/res/values-ja/strings.xml | 12 +- .../src/main/res/values-ko/strings.xml | 12 +- .../src/main/res/values-lt/strings.xml | 12 +- .../src/main/res/values-ne/strings.xml | 12 +- .../src/main/res/values-nl/strings.xml | 14 +- .../src/main/res/values-no/strings.xml | 12 +- .../src/main/res/values-pl/strings.xml | 122 +++++++++--------- .../src/main/res/values-pt-rBR/strings.xml | 14 +- .../src/main/res/values-pt/strings.xml | 14 +- .../src/main/res/values-ro/strings.xml | 12 +- .../src/main/res/values-ru/strings.xml | 50 +++---- .../src/main/res/values-sk/strings.xml | 12 +- .../src/main/res/values-sr/strings.xml | 12 +- .../src/main/res/values-sv/strings.xml | 48 ++++--- .../src/main/res/values-th/strings.xml | 14 +- .../src/main/res/values-tl/strings.xml | 12 +- .../src/main/res/values-tr/strings.xml | 20 ++- .../src/main/res/values-vi/strings.xml | 12 +- .../src/main/res/values-zh-rCN/strings.xml | 40 +++--- .../src/main/res/values-zh/strings.xml | 12 +- .../src/main/res/values/font_certs.xml | 4 +- 35 files changed, 424 insertions(+), 220 deletions(-) diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml index bfb13e5e..4c07f5b2 100644 --- a/presentation/src/main/res/values-bn/strings.xml +++ b/presentation/src/main/res/values-bn/strings.xml @@ -32,7 +32,7 @@ Continue কল করুন Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 7308ad84..436db6a2 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -32,7 +32,7 @@ Pokračovat Volat Podrobnosti - Uložit obrázek + Save to gallery Vybráno: %d Vymazat Archivovat @@ -75,7 +75,10 @@ Vybráno: %d %1$d z %2$d výsledků + Send as group message + Recipients and replies will be visible to everyone Toto je začátek vaší konverzace. Řekněte něco hezkého! + Contact card Napsat zprávu… Kopírovat text Přeposlat @@ -91,6 +94,8 @@ Doručeno %s Odeslání se nezdařilo. Klepnutím zkusíte znovu odeslat Podrobnosti + Conversation title + Enter title Oznámení Motiv vzhledu Archivovat @@ -98,7 +103,7 @@ Blokovat Odblokovat Odstranit konverzaci - Obrázek uložen + Saved to gallery Vzhled Obecné Rychlá odpověď @@ -162,7 +167,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 - Počkat několik sekund před odesláním zprávy + Schedule messages to automatically be sent at a specific time and date Zpožděné odeslání Počkat několik sekund před odesláním zprávy Automatický noční režim @@ -190,6 +195,7 @@ Označit jako přečtené Zrušit Odstranit + Save Více Nastavit Odblokovat diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index 8978425c..228b339f 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -32,7 +32,7 @@ Fortsæt Opkald Oplysninger - Gem billede + Gem til galleri %d valgt Ryd Arkivér @@ -41,7 +41,7 @@ Slet Synkroniserer beskeder… Dig: %s - Resultater i meddelelser + Resultater i beskeder %d beskeder Dine samtaler vil fremgå her Ingen resultater @@ -75,7 +75,10 @@ %d valgt %1$d af %2$d resultater + 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 Skriv en besked… Kopier tekst Videresend @@ -91,6 +94,8 @@ Leveret %s Mislykkedes at afsende. Tryk for at forsøge igen Oplysninger + Conversation title + Enter title Notifikationer Tema Arkiv @@ -98,7 +103,7 @@ Blokér Afblokér Slet samtale - Foto gemt + Gemt til galleri Udseende Generelt QK-svar @@ -162,7 +167,7 @@ Beskedsikkerhedskopiering Sikkerhedskopiér automatisk dine beskeder. Ikke flere bekymringer over tab af din historik, hvis du udskifter eller mister din mobil Planlagte beskeder - Vent et par sekunder før du afsender beskeden + Planlæg beskeder til automatisk at blive sendt på et specifikt tidspunkt og dato Forsinket afsendelse Vent et par sekunder før du afsender beskeden Automatisk nattilstand @@ -190,6 +195,7 @@ Markér som læst Annullér Slet + Save 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 972b37f3..bdda56e6 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -32,7 +32,7 @@ Weiter Anrufen Details - Bild speichern + In Galerie speichern %d ausgewählt Zurücksetzen Archivieren @@ -75,7 +75,10 @@ %d ausgewählt %1$d von %2$d Ergebnissen + Als Gruppennachricht senden + Empfänger und Antworten werden für jeden sichtbar sein Das ist der Beginn der Unterhaltung. Sag\' etwas nettes! + Contact card Schreibe eine Nachricht… Text kopieren Weiterleiten @@ -91,6 +94,8 @@ Zugestellt %s Fehler beim Senden. Tippen, um es erneut zu versuchen Details + Conversation title + Enter title Benachrichtigungen Erscheinungsbild Archivieren @@ -98,7 +103,7 @@ Blockieren Entsperren Unterhaltung löschen - Bild gespeichert + In Galerie gespeichert Aussehen Allgemein Schnellantwort @@ -114,7 +119,7 @@ Benachrichtigungsvorschau Vibration Ton - None + Keine Schnellantwort Popup für neue Nachrichten Zum Verwerfen tippen @@ -162,7 +167,7 @@ Nachrichtensicherung Sichere Deine Nachrichten automatisch. Solltest Du Dein Handy wechseln oder es verlieren, musst Du Dir keine Sorgen mehr machen Geplante Nachrichten - Wartet einige Sekunden, bevor deine Nachricht gesendet wird + Den automatischen Versand von Nachrichten zu einem bestimmen Zeitpunkt planen Verzögertes Senden Wartet einige Sekunden, bevor deine Nachricht gesendet wird Automatischer Nachtmodus @@ -190,6 +195,7 @@ Als gelesen markieren Abbrechen Löschen + Save Mehr OK Entsperren diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml index 25cc7a6d..d3c37f40 100644 --- a/presentation/src/main/res/values-es/strings.xml +++ b/presentation/src/main/res/values-es/strings.xml @@ -32,7 +32,7 @@ Continuar Llamar Detalles - Guardar imagen + Save to gallery %d Seleccionados Limpiar Archivo @@ -75,7 +75,10 @@ %d seleccionados %1$d de %2$d resultados + Send as group message + Recipients and replies will be visible to everyone Este es el comienzo de su conversación. ¡Di algo bonito! + Contact card Escribir mensaje… Copiar texto Reenviar @@ -91,6 +94,8 @@ Entregado %s No se envió. Pulse para volver a intentarlo Detalles + Conversation title + Enter title Notificaciones Tema Archivar @@ -98,7 +103,7 @@ Bloquear Desbloquear Borrar conversación - Guardar imagen + Saved to gallery Apariencia General Responder vía QKSMS @@ -162,7 +167,7 @@ Copia de seguridad de mensajes Copia de seguridad automática de tus mensajes. Nunca más se preocupe por perder su historial si cambia o pierde su teléfono Mensajes programados - Espere unos segundos antes de enviar su mensaje + Schedule messages to automatically be sent at a specific time and date Retraso en el envío Espere unos segundos antes de enviar su mensaje Modo nocturno automático @@ -190,6 +195,7 @@ Marcar como leído Cancelar Eliminar + Save Más Establecer Desbloquear diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml index b120cc69..1d4b0020 100644 --- a/presentation/src/main/res/values-fa/strings.xml +++ b/presentation/src/main/res/values-fa/strings.xml @@ -32,7 +32,7 @@ ادامه تماس جزئیات - ذخیره عکس + Save to gallery %d selected پاکسازی بایگانی @@ -75,7 +75,10 @@ %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 نوشتن پیام… Copy text Forward @@ -91,6 +94,8 @@ رسیده %s اوپس، دوباره ارسال کن جزئیات + Conversation title + Enter title اعلانها پوسته بایگانی @@ -98,7 +103,7 @@ بلاک آنبلاک حذف مکالمه - عکسای ذخیره + Saved to gallery ظاهر عمومی QK Reply @@ -162,7 +167,7 @@ بکاپ پیامها بکاپ خودکار.دیگر نگران از دست دادن پیام ها نباشید.حتی با عوض کردن تلفن همراه پیام های برنامه ریزی شده - لطفا چند ثانیه صبر کنید + Schedule messages to automatically be sent at a specific time and date تاخیر در ارسال لطفا چند ثانیه صبر کنید حالت شب اتوماتیک @@ -190,6 +195,7 @@ خوانده شده کنسل حذف + Save بيشتر Set آنبلاک diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml index 1500c73e..5878251d 100644 --- a/presentation/src/main/res/values-fi/strings.xml +++ b/presentation/src/main/res/values-fi/strings.xml @@ -32,7 +32,7 @@ Continue Soita Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index 6a88ae01..3be5715c 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -32,7 +32,7 @@ Continuer Appeler Détails - Enregistrer l\'image + Enregistrer dans la galerie %d sélectionnée Effacer Archiver @@ -75,7 +75,10 @@ %d sélectionnée %1$d sur %2$d résultats + 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 Écrire un message… Copier le texte Transférer @@ -91,6 +94,8 @@ Envoyé %s Échec de l\'envoi. Appuyer pour réessayer Détails + Conversation title + Enter title Notifications Thème Archiver @@ -98,7 +103,7 @@ Bloquer Débloquer Supprimer la conversation - Image enregistrée + Enregistré dans la galerie Apparence Général Réponse QK @@ -162,7 +167,7 @@ Sauvegarde de message Sauvegarder automatiquement vos messages. Plus de soucis de perdre son historique en cas de changement de téléphone ou de perte Messages planifiés - Attendre quelques secondes avant d’envoyer votre message + Messages programmés pour être automatiquement envoyés à une date et une heure spécifiques Envoi retardé Attendre quelques secondes avant d’envoyer votre message Mode nuit automatique @@ -190,6 +195,7 @@ Marquer comme lu Annuler Supprimer + Save 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 243eab6d..595078b8 100644 --- a/presentation/src/main/res/values-hi/strings.xml +++ b/presentation/src/main/res/values-hi/strings.xml @@ -32,7 +32,7 @@ Continue कॉल Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml index 55e358f2..a7b5096e 100644 --- a/presentation/src/main/res/values-hr/strings.xml +++ b/presentation/src/main/res/values-hr/strings.xml @@ -32,7 +32,7 @@ Nastavi Nazovi Detalji - Spremi sliku + Save to gallery %d odabrano Očisti Arhiviraj @@ -75,7 +75,10 @@ %d odabrano %1$d of %2$d results + Send as group message + Recipients and replies will be visible to everyone Ovo je početak vašeg razgovora. Recite nešto lijepo! + Contact card Napiši poruku… Kopiraj tekst Proslijedi @@ -91,6 +94,8 @@ Isporučeno %s Slanje nije uspjelo. Dodirnite da biste pokušali ponovno Detalji + Conversation title + Enter title Obavijesti Tema Arhiva @@ -98,7 +103,7 @@ Blokiraj Deblokiraj Izbriši razgovor - Slika je spremljena + Saved to gallery Izgled Općenito QK odgovor @@ -162,7 +167,7 @@ Sigurnosno kopiranje poruka Automatski sigurnosno kopirajte svoje poruke. Nikad više nemojte brinuti zbog gubitka povijesti ako promijenite telefon ili ga izgubite Zakazane poruke - Pričekajte nekoliko sekundi prije slanja poruke + Schedule messages to automatically be sent at a specific time and date Odgođeno slanje Pričekajte nekoliko sekundi prije slanja poruke Automatski noćni način @@ -190,6 +195,7 @@ Označi kao pročitano Odustani Izbriši + Save  Više Set Unblock diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 1da96bcb..6ffff7a5 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -32,7 +32,7 @@ Continue Hívás Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml index 47364073..3cbd5904 100644 --- a/presentation/src/main/res/values-in/strings.xml +++ b/presentation/src/main/res/values-in/strings.xml @@ -32,7 +32,7 @@ Lanjutkan Panggil Detail - Simpan gambar + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 Tulis pesan… Copy text Forward @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Detail + Conversation title + Enter title Notifikasi Tema Arsip @@ -98,7 +103,7 @@ Blokir Buka blokir Hapus percakapan - Saved image + Saved to gallery Appearance Umum QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Tandai sudah dibaca Batal Hapus + Save More Set Buka blokir diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index 8d26fe6c..edcc9f86 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -32,7 +32,7 @@ Continua Chiama Dettagli - Salva immagine + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 Scrivi un messaggio… Copy text Forward @@ -91,6 +94,8 @@ %s consegnati Impossibile inviare. Tocca per riprovare Dettagli + Conversation title + Enter title Notifiche Tema Archivia @@ -98,7 +103,7 @@ Blocca Sblocca Elimina la conversazione - Immagine salvata + Saved to gallery Aspetto Generale QK Reply @@ -162,7 +167,7 @@ Message backup Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost Messaggi pianificati - Wait a few seconds before sending your message + Schedule messages to automatically be sent at a specific time and date Invio differito Wait a few seconds before sending your message Modalità notturna automatica @@ -190,6 +195,7 @@ Segna come \"letto\" Annulla Elimina + Save More Set Sblocca diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml index 7f04e951..dc50fa4e 100644 --- a/presentation/src/main/res/values-iw/strings.xml +++ b/presentation/src/main/res/values-iw/strings.xml @@ -32,7 +32,7 @@ Continue התקשר Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml index 81901ce7..3dee448f 100644 --- a/presentation/src/main/res/values-ja/strings.xml +++ b/presentation/src/main/res/values-ja/strings.xml @@ -32,7 +32,7 @@ 続行 通話 詳細 - 画像を保存 + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %d selected %1$d of %2$d results + Send as group message + Recipients and replies will be visible to everyone これが会話の始まりです。 何か素敵なことを言ってください! + Contact card メッセージを書く… テキストのコピー 転送 @@ -91,6 +94,8 @@ %s を配信しました 送信に失敗しました。タップすると、もう一度やり直します 詳細 + Conversation title + Enter title 通知 テーマ アーカイブ @@ -98,7 +103,7 @@ ブロック ブロックを解除 会話を削除 - 画像を保存しました + Saved to gallery 外観 全般 QK 返信 @@ -162,7 +167,7 @@ メッセージのバックアップ メッセージを自動的にバックアップします。携帯電話を変更したり、お使いの携帯電話をなくしても、もう二度と履歴がなくなる心配はいりません。 スケジュールされたメッセージ - メッセージを送信する前に、数秒間待ちます + Schedule messages to automatically be sent at a specific time and date 送信の遅延 メッセージを送信する前に、数秒間待ちます 自動夜間モード @@ -190,6 +195,7 @@ 既読にする キャンセル 削除 + Save さらに Set ブロックを解除 diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml index 764d88af..7cd527c5 100644 --- a/presentation/src/main/res/values-ko/strings.xml +++ b/presentation/src/main/res/values-ko/strings.xml @@ -32,7 +32,7 @@ 계속 전화 자세히 - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 메시지 작성 중... Copy text Forward @@ -91,6 +94,8 @@ %s 전송됨 전송 실패, 눌러서 다시 시도하세요 자세히 + Conversation title + Enter title 알림 Theme 보관 @@ -98,7 +103,7 @@ Block Unblock 대화 삭제 - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml index 410979ac..bc56d333 100644 --- a/presentation/src/main/res/values-lt/strings.xml +++ b/presentation/src/main/res/values-lt/strings.xml @@ -32,7 +32,7 @@ Tęsti Skambinti Dėtalės - Išsaugoti nuotrauką + Save to gallery %d pasirinkta(s) Ištrinti Archyvuoti @@ -75,7 +75,10 @@ %d parinktas %1$d of %2$d results + Send as group message + Recipients and replies will be visible to everyone Čia jūsų pokalbio pradžios. Pasakykite kažką gražaus! + Contact card Rašyti žinutę... Kopijuoti tekstą Persiųsti @@ -91,6 +94,8 @@ Nusiųsta %s Nepavyko nusiųsti. Spausk dar kartą norint persiųsti Dėtalės + Conversation title + Enter title Pranešimai Tema Archyvuoti @@ -98,7 +103,7 @@ Blokuoti Atblokuoti Ištrinti pokalbį - Išsaugotas vaizdas + Saved to gallery Išvaizda Bendra Greitas atsakas @@ -162,7 +167,7 @@ Žinučių atsarginis kopijavimas Automatinis atsarginių pranešimų kopijavimas. Niekada nerimaukite, kad prarasite žinutes, jei pakeisite telefonus arba pamesite telefoną Planuotos žinutės - Palaukti kelias sekundes prieš išsiunčiant pranešimą + Schedule messages to automatically be sent at a specific time and date Atidėtas siuntimas Palaukti kelias sekundes prieš išsiųntant pranešimą Automatinė nakties tema @@ -190,6 +195,7 @@ Žymėti kaip skaitytą Atšaukti Ištrinti + Save Daugiau Padaryti Atblokuoti diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml index 9c5ec38b..01c82444 100644 --- a/presentation/src/main/res/values-ne/strings.xml +++ b/presentation/src/main/res/values-ne/strings.xml @@ -32,7 +32,7 @@ Continue सम्पर्क Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml index c280c8b4..501b5798 100644 --- a/presentation/src/main/res/values-nl/strings.xml +++ b/presentation/src/main/res/values-nl/strings.xml @@ -32,7 +32,7 @@ Verder Bel Details - Afbeelding opslaan + Opslaan in galerij %d geselecteerd Wissen Archiveren @@ -75,7 +75,10 @@ %d geselecteerd %1$d van de %2$d resultaten + Versturen als groepsbericht + Ontvangers en antwoorden zijn zichtbaar voor iedereen Dit is het begin van je conversatie. Zeg iets leuks! + Contact card Type een bericht… Tekst kopiëren Doorsturen @@ -91,6 +94,8 @@ Afgeleverd %s Fout bij verzenden. Tik om opnieuw te proberen Details + Conversation title + Enter title Notificaties Thema Archief @@ -98,7 +103,7 @@ Blokkeren Blokkering opheffen Conversatie verwijderen - Afbeelding opgeslagen + Opgeslagen in galerij Uiterlijk Algemeen QK Reply @@ -114,7 +119,7 @@ Notificatievoorbeeld Trillen Geluid - None + Geen QK Reply Popup voor nieuwe berichten Tik om te sluiten @@ -162,7 +167,7 @@ Berichtenback-up Automatische back-up van jouw berichten. Geen zorgen meer over het kwijtraken van jouw berichten bij het verlies van je telefoon of het overschakelen naar een nieuwe telefoon Geplande berichten - Wacht enkele seconden voor het versturen van je bericht + Berichten worden automatisch verzonden op de ingestelde tijd Vertraagd verzenden Wacht enkele seconden voor het versturen van je bericht Automatische nachtmodus @@ -190,6 +195,7 @@ Markeren als gelezen Annuleren Verwijderen + Save 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 0cefb18e..408d85c6 100644 --- a/presentation/src/main/res/values-no/strings.xml +++ b/presentation/src/main/res/values-no/strings.xml @@ -32,7 +32,7 @@ Continue Ring Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-pl/strings.xml b/presentation/src/main/res/values-pl/strings.xml index b8364386..3dee8347 100644 --- a/presentation/src/main/res/values-pl/strings.xml +++ b/presentation/src/main/res/values-pl/strings.xml @@ -32,7 +32,7 @@ Kontynuuj Zadzwoń Szczegóły - Zapisz obraz + Save to gallery %d wybrano Wyczyść Archiwizuj @@ -49,12 +49,12 @@ Twoje zaplanowane wiadomości pojawią się tutaj Rozpocznij nową konwersację Znów kocham pisać wiadomości - 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 + Ustaw QKSMS jako domyślną aplikację do osbługi SMSów i MMSów + Zmień + Wymagane uprawnienie + QKSMS wymaga uprawnień do wysyłania i przeglądania wiadomości + QKSMS wymaga uprawnień do przeglądania kontaktów + Zezwól Skrzynka odbiorcza Archiwizowane Harmonogram @@ -73,24 +73,29 @@ Przekaż dalej Usuń - %d selected - %1$d of %2$d results + wybrano %d + Wyniki: %1$d z %2$d + Send as group message + Recipients and replies will be visible to everyone To jest początek konwersacji. Powiedz coś miłego! + Contact card Napisz wiadomość… Kopiuj tekst Przekaż dalej Usuń - Previous - Next - Clear - Add an attachment - Attach a photo - Take a photo - Send message + Poprzedni + Następny + Wyczyść + Dodaj załącznik + Załącz zdjęcie + Zrób zdjęcie + Wyślij wiadomość Wysyłanie… Dostarczane %s Nie udało się wysłać. Dotknij, aby spróbować ponownie Szczegóły + Conversation title + Enter title Powiadomienia Motyw Archiwum @@ -98,7 +103,7 @@ Zablokuj Odblokuj Usuń konwersację - Zapisz obraz + Saved to gallery Wygląd Ogólne QK Odpowiedź @@ -108,37 +113,37 @@ Czas rozpoczęcia Czas zakończenia Rozmiar czcionki - Użyj czcionki systemowej + Używaj czcionki systemowej Automatyczne emoji Powiadomienia Podgląd powiadomień Wibracje - Dźwięk - None + Dźwięki + Brak QK odpowiedź - Popup dla nowych wiadomości + Powiadomienia o nowych wiadomościach Dotknij, aby odrzucić Dotknij gdziekolwiek poza okienkiem, aby zamknąć - Blokuj + Blokowanie - Powinienem odpowiedzieć? - Automatycznie filtruj wiadomości od niechcianych numerów za pomocą aplikacji \"Powinien odpowiedzieć\" - Delayed sending + Should I Answer? + Automatycznie filtruj wiadomości od niechcianych numerów za pomocą aplikacji \"Should I Answer?\" + Opóźnione wysyłanie Potwierdzenie dostarczenia Potwierdzaj dostarczenie każdej wysłanej wiadomości Usuwaj ogonki - Usuwaj ogonki z znaków w wychodzących wiadomości SMS - Auto-compress MMS attachments + Usuwaj ogonki ze znaków w wiadomościach + Automatyczna kompresja załączników MMSów Synchronizuj wiadomości - Ponownie synchronizuj wiadomości z bazą danych natywną Android SMS - O QKSMS + Zsynchronizuj wiadomości z systemową bazą danych + O aplikacji Wersja %s - Enter duration (seconds) - Zablokuj + Wprowadź czas (w sekundach) + Blokowanie Zablokowane konwersacje pojawią się tutaj Odblokuj Czy chcesz odblokować tę konwersację? - O programie + O aplikacji Wersja Deweloper Kod źródłowy @@ -146,33 +151,33 @@ Kontakt Licencja Prawa autorskie - Wspierać rozwój, odblokuj wszystko - Możesz wesprzeć autora za jedyne %s + Wesprzyj rozwój, odblokuj wszystko + Możesz wesprzeć głodującego dewelopera za jedyne %s Dożywotnie aktualizacja za %1$s %2$s - Odblokuj + darowizna za %1$s %2$s - Dziękujemy za wsparcie QKSMS! + Odblokuj i wesprzyj (%1$s %2$s) + Dziękujemy za wsparcie aplikacji QKSMS! Masz teraz dostęp do wszystkich funkcji QKSMS+ - QKSMS + jest bezpłatny dla użytkowników F-Droid! Jeśli chcesz wesprzeć rozwój, nie krępuj się przekazać dotacji. - Darowizna za pośrednictwem serwisu PayPal + Aplikacja QKSMS+ jest bezpłatna dla użytkowników F-Droid! Jeśli chcesz wesprzeć jej rozwój, rzuć pieniążka. + Wsparcie za pośrednictwem serwisu PayPal Już wkrótce Motywy premium - Odblokować piękne kolorowe motywy które nie są dostępne na Material Design + Odblokuj piękne kolorowe motywy, które nie są dostępne w palecie Material Design Własne automatyczne emoji - Utwórz skróty niestandardowe automatyczne emoji - Kopia zapasowa wiadomości - Automatycznie wykonuj kopie zapasowe wiadomości. Nie martw się o utratę historii, jeśli zmienisz telefon lub zaginie w telefonie + Twórz niestandardowe skróty do automatycznych emoji + Kopie zapasowe wiadomości + Automatycznie wykonuj kopie zapasowe wiadomości. Nie martw się o ich utratę, jeśli zmienisz lub zgubisz urządzenie. Zaplanowane wiadomości - Poczekaj kilka sekund przed wysłaniem wiadomości + Schedule messages to automatically be sent at a specific time and date Opóźnione wysyłanie Poczekaj kilka sekund przed wysłaniem wiadomości Automatyczny tryb nocny - Włącz tryb nocny, w oparciu o porę dnia + Włączaj tryb nocny w oparciu o porę dnia. Zaawansowane, blokowanie - Blokuj wiadomości, które zawierają słowa kluczowe lub dopasowane wzorce + Blokuj wiadomości, które zawierają słowa kluczowe lub dopasowane wzorce. Automatyczne przekazywanie - Automatyczne przekazuj wiadomości od określonych nadawców - Auto odpowiedzi - Automatyczne odpowiadaj na przychodzące wiadomości korzystając z gotowych odpowiedzi + Automatyczne przekazuj wiadomości od określonych nadawców. + Automatyczne odpowiedzi + Automatyczne odpowiadaj na przychodzące wiadomości korzystając z gotowych odpowiedzi. Więcej QKSMS jest wciąż rozwijany, a Twoja subskrypcja będzie zawierać wszystkie przyszłe funkcje QKSMS+! Ładowanie… @@ -182,24 +187,25 @@ Pokaż więcej Pokaż mniej Otwórz konwersację - Materiał + Material QKSMS+ HEX Zastosuj - Odpowiedź + Odpowiedz Oznacz jako przeczytane Anuluj Usuń + Save Więcej - Set + Ustaw Odblokuj Cofnij Skopiowane Zarchiwizowana konwersacja - Musisz odblokować QKSMS+, aby używać tego + Musisz odblokować QKSMS+, aby używać tej funkcji Nowa wiadomość - %s nowych wiadomości + %s nowe wiadomości %s nowych wiadomości %s nowych wiadomości @@ -207,7 +213,7 @@ Wiadomość %s nie została wysłana Wyłącz - Zawsze włącz + Zawsze włączony Automatycznie @@ -222,10 +228,10 @@ Większy - No delay - Short - Medium - Long + Bez opóźnienia + Krótki + Średni + Długi 100KB diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml index f40b853b..50819588 100644 --- a/presentation/src/main/res/values-pt-rBR/strings.xml +++ b/presentation/src/main/res/values-pt-rBR/strings.xml @@ -32,7 +32,7 @@ Continuar Ligar Detalhes - Salvar imagem + Guardar na galeria %d selecionada(s) Limpar Arquivar @@ -75,7 +75,10 @@ %d selecionada(s) %1$d de %2$d resultados + 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 Escrever uma mensagem… Copiar texto Reencaminhar @@ -91,6 +94,8 @@ %s entregue Falha ao enviar. Toque para tentar novamente Detalhes + Conversation title + Enter title Notificações Tema Arquivar @@ -98,7 +103,7 @@ Bloquear Desbloquear Apagar conversa - Imagem salva + Guardada na galeria Aparência Geral QK Reply @@ -114,7 +119,7 @@ Pré-visualização de notificações Vibração Som - None + Nenhum QK Reply Alerta para novas mensagens Toque para fechar @@ -162,7 +167,7 @@ Backup de mensagens Backup automático das mensagens. Nunca mais terá que se preocupar com o histórico caso troque de telefone. Mensagens agendadas - Esperar alguns segundos antes de enviar a mensagem + Agendar mensagens para envio automático à hora/data especificada Atrasar envio Esperar alguns segundos antes de enviar a mensagem Modo noturno automático @@ -190,6 +195,7 @@ Marcar como lida Cancelar Apagar + Save Mais Definir Desbloquear diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml index a80784f7..4d21a0c1 100644 --- a/presentation/src/main/res/values-pt/strings.xml +++ b/presentation/src/main/res/values-pt/strings.xml @@ -32,7 +32,7 @@ Continuar Ligar Detalhes - Guardar imagem + Guardar na galeria %d selecionada(s) Limpar Arquivar @@ -75,7 +75,10 @@ %d selecionada(s) %1$d de %2$d resultados + 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 Escrever uma mensagem… Copiar texto Reencaminhar @@ -91,6 +94,8 @@ %s entregue Falha ao enviar. Toque para tentar novamente Detalhes + Conversation title + Enter title Notificações Tema Arquivar @@ -98,7 +103,7 @@ Bloquear Desbloquear Apagar conversa - Imagem guardada + Guardada na galeria Aparência Geral QK Reply @@ -114,7 +119,7 @@ Pré-visualização de notificações Vibração Som - None + Nenhum QK Reply Alerta para novas mensagens Toque para fechar @@ -162,7 +167,7 @@ Backup de mensagens Backup automático das mensagens. Nunca mais terá que se preocupar com o histórico caso troque de telefone. Mensagens agendadas - Esperar alguns segundos antes de enviar a mensagem + Agendar mensagens para envio automático à hora/data especificada Atrasar envio Esperar alguns segundos antes de enviar a mensagem Modo noturno automático @@ -190,6 +195,7 @@ Marcar como lida Cancelar Apagar + Save Mais Definir Desbloquear diff --git a/presentation/src/main/res/values-ro/strings.xml b/presentation/src/main/res/values-ro/strings.xml index 898ff94d..ab7ecb1f 100644 --- a/presentation/src/main/res/values-ro/strings.xml +++ b/presentation/src/main/res/values-ro/strings.xml @@ -32,7 +32,7 @@ Continue Apel Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml index b4cf6525..755fa674 100644 --- a/presentation/src/main/res/values-ru/strings.xml +++ b/presentation/src/main/res/values-ru/strings.xml @@ -32,29 +32,29 @@ Продолжить Позвонить Подробности - Сохранить изображение + Сохранить в галерее %d выбран(о) Очистить Архивировать Разархивировать Блокировать Удалить - Syncing messages… + Синхронизация сообщений… Вы: %s - Results in messages - %d messages + Результаты в сообщениях + %d сообщений Ваши беседы будут появляться здесь Нет результатов Ваши архивированные беседы будут появляться здесь Ваши запланированные сообщения будут появляться здесь Начать новую беседу - 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 приложением SMS по умолчанию + Изменить + Требуется разрешение + QKSMS необходимо разрешение для отправки и просмотра SMS сообщений + QKSMS необходимо разрешение для просмотра контактов + Разрешить Входящие Архив Запланированные @@ -74,15 +74,18 @@ Удалить %d выбран(о) - %1$d of %2$d results + %1$d из %2$d результатов + Отправить как групповое сообщение + Получатели и ответы будут видны всем Это начало Вашей беседы. Скажите что-нибудь приятное! + Contact card Написать сообщение… Скопировать текст Переслать Удалить - Previous - Next - Clear + Назад + Вперед + Очистить Добавить вложение Прикрепить фото Сделать снимок @@ -91,6 +94,8 @@ Доставлено %s Не удалось отправить. Коснитесь, чтобы попробовать ещё раз. Подробности + Conversation title + Enter title Уведомления Тема Архивировать @@ -98,7 +103,7 @@ Заблокировать Разблокировать Удалить беседу - Сохраненное изображение + Сохранено в галерее Внешний вид Общее QK Ответ @@ -114,7 +119,7 @@ Предпросмотр уведомлений Вибросигнал Звук - None + Нет QK Ответ Всплывающее окно для новых сообщений Нажмите, чтобы отклонить @@ -128,7 +133,7 @@ Подтверждение успешной отправки сообщений Удалить акценты Удаление акцентов с символов в исходящих SMS-сообщениях - Auto-compress MMS attachments + Автоматически сжимать MMS вложения Синхронизация сообщений Повторная синхронизация ваших сообщений с собственной базой данных SMS Android О QKSMS @@ -145,7 +150,7 @@ История изменений Контакт Лицензия - Copyright + Авторское право Поддержать развитие, разблокировать все Вы можете спасти голодающего разработчика всего за %s Пожизненное обновление для %1$s %2$s @@ -162,7 +167,7 @@ Бэкап сообщений Автоматически создавайте резервные копии сообщений. Не беспокойтесь о потере истории, если Вы поменяете или потеряете телефон Запланированные сообщения - Подождите несколько секунд перед отправкой сообщения + Запланированные сообщения для автоматической отправки в определенное время и дату Отложенная отправка Подождите несколько секунд перед отправкой сообщения Автоматический ночной режим @@ -190,6 +195,7 @@ Пометить прочитанным Отмена Удалить + Save Еще Задать Разблокировать @@ -230,11 +236,11 @@ 100КБ 200КБ - 300KB (Recommended) + 300 КБ (рекомендуется) 600КБ 1000КБ 2000КБ - No compression + Без сжатия Хорошо diff --git a/presentation/src/main/res/values-sk/strings.xml b/presentation/src/main/res/values-sk/strings.xml index bf356791..12606323 100644 --- a/presentation/src/main/res/values-sk/strings.xml +++ b/presentation/src/main/res/values-sk/strings.xml @@ -32,7 +32,7 @@ Continue Volať Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-sr/strings.xml b/presentation/src/main/res/values-sr/strings.xml index d477ee29..99f23cba 100644 --- a/presentation/src/main/res/values-sr/strings.xml +++ b/presentation/src/main/res/values-sr/strings.xml @@ -32,7 +32,7 @@ Continue Позови Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-sv/strings.xml b/presentation/src/main/res/values-sv/strings.xml index e693d3a2..f85cf3db 100644 --- a/presentation/src/main/res/values-sv/strings.xml +++ b/presentation/src/main/res/values-sv/strings.xml @@ -32,29 +32,29 @@ Fortsätt Ring Detaljer - Spara bild + Spara till galleri %d vald Rensa Arkiv Avarkivera Blockera Radera - Syncing messages… + Synkroniserar meddelanden… Du: %s - Results in messages - %d messages + Resultat i meddelanden + %d meddelanden Dina konversationer kommer att dyka upp här Inga resultat Dina arkiverade konversationer kommer att dyka upp här Dina schemalagda meddelanden kommer att dyka upp här Starta en ny konversation - 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 + Älska att skicka SMS igen + Gör QKSMS till din standard-app för SMS + Ändra + Tillstånd krävs + QKSMS behöver tillåtelse att skicka och visa SMS-meddelanden + QKSMS behöver tillåtelse för att kunna se dina kontakter + Tillåt Inkorg Arkiverat Schemalagt @@ -74,15 +74,18 @@ Radera %d vald - %1$d of %2$d results + %1$d av %2$d resultat + 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 Skriv ett meddelande… Kopiera text Vidarebefordra Radera - Previous - Next - Clear + Föregående + Nästa + Rensa Lägg till en bilaga Bifoga en bild Ta en bild @@ -91,6 +94,8 @@ Levererade %s Misslyckades med att skicka. Knacka för att försöka igen Detaljer + Conversation title + Enter title Aviseringar Tema Arkivera @@ -98,7 +103,7 @@ Blockera Avblockera Radera konversation - Sparade bild + Spara till galleri Utseende Generellt QK svar @@ -114,7 +119,7 @@ Notifikations förhandsvisningar Vibration Ljud - None + Ingen QK-svar Popup för nya meddelanden Tryck för att avfärda @@ -128,7 +133,7 @@ Bekräfta att meddelanden har skickats Ta bort accenter Ta bort accenter från tecken i utåtgående SMS-meddelanden - Auto-compress MMS attachments + Komprimera MMS-bilagor automatiskt Synkronisera meddelanden Synkronisera dina meddelanden med telefonens SMS-databas Om QKSMS @@ -162,7 +167,7 @@ Säkerhetskopiering av meddelande Säkerhetskopiera automatiskt dina meddelanden. Du behöver aldrig mer oroa dig för att förlora dina konversationer om du byter telefon eller telefonen försvinner Schemalagda meddelanden - Vänta några sekunder innan ditt meddelande skickas + Schemalägg meddelanden att automatiskt skickas vid en specifik tid och datum Fördröj skickande av meddelanden Vänta några sekunder innan du skickar ditt meddelande Automatiskt nattläge @@ -190,6 +195,7 @@ Markera som läst Avbryt Radera + Save Mer Ställ in Avblockera @@ -228,11 +234,11 @@ 100KB 200KB - 300KB (Recommended) + 300KB (Rekommenderas) 600KB 1000KB 2000KB - No compression + Ingen kompression Okej diff --git a/presentation/src/main/res/values-th/strings.xml b/presentation/src/main/res/values-th/strings.xml index e924d4d9..376e280b 100644 --- a/presentation/src/main/res/values-th/strings.xml +++ b/presentation/src/main/res/values-th/strings.xml @@ -32,7 +32,7 @@ ทำต่อ โทร รายละเอียด - บันทึกภาพ + บันทึกรูปภาพ %d ถูกเลือก ลบออก จัดเก็บ @@ -75,7 +75,10 @@ %d ถูกเลือก %1$d ใน %2$d ของผลลัพท์ + ส่งเป็นข้อความกลุ่ม + ผู้รับและการตอบกลับจะแสดงให้ทุกคนเห็นทุกคน การเริ่มต้นของการสนทนาของคุณ บอกกล่าวบางอย่างที่นี่ + Contact card เขียนข้อความ... คัดลอกข้อความ ส่งต่อ @@ -91,6 +94,8 @@ %s ถูกส่งแล้ว การส่งล้มเหลว ลองแตะเพื่อส่งอีกครั้ง รายละเอียด + Conversation title + Enter title การแจ้งเตือน รูปแบบการแสดงผล จัดเก็บ @@ -98,7 +103,7 @@ ปิดกั้น ยกเลิกการปิดกั้น ลบการสนทนา - ภาพถูกบันทึกแล้ว + บันทึกรูปภาพแล้ว ลักษณะที่ปรากฏ ทั่วไป QK ตอบกลับ @@ -114,7 +119,7 @@ ตัวอย่างการแจ้งเตือน การสั่น เสียง - None + ไม่มี QK ตอบกลับ ป๊อปอัพข้อความใหม่ แตะเพื่อยกเลิก @@ -162,7 +167,7 @@ สำรองข้อมูลข้อความ สำรองข้อมูลข้อความของคุณโดยอัตโนมัติ ไม่ต้องกังวลว่าประวัติข้อความของคุณจะสูญหายถ้าคุณเปลี่ยนโทรศัพท์มือถือ หรือทำโทรศัพท์หาย ข้อความที่กำหนดเวลา - รอสักครู่ก่อนที่จะส่งข้อความของคุณ + ข้อความจะถูกส่งโดยอัตโนมัติตามวันและเวลาที่กำหนด การส่งแบบล่าช้า รอสักครู่ก่อนที่จะส่งข้อความของคุณ โหมดกลางคืนอัตโนมัติ @@ -190,6 +195,7 @@ ทำเครื่องหมายอ่านแล้ว ยกเลิก ลบ + Save เพิ่มเติม ตั้งค่า ยกเลิกการปิดกั้น diff --git a/presentation/src/main/res/values-tl/strings.xml b/presentation/src/main/res/values-tl/strings.xml index 7cc43ea4..3a3ce9a0 100644 --- a/presentation/src/main/res/values-tl/strings.xml +++ b/presentation/src/main/res/values-tl/strings.xml @@ -32,7 +32,7 @@ Continue Tawagan Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml index d70adbc6..a9bcb42f 100644 --- a/presentation/src/main/res/values-tr/strings.xml +++ b/presentation/src/main/res/values-tr/strings.xml @@ -32,10 +32,10 @@ Devam Ara Ayrıntılar - Görüntüyü Kaydet + Galeriye Kaydet %d Seçili Temizle - Arşivle + Arşiv Arşivden çıkar Engelle Sil @@ -75,7 +75,10 @@ %d Seçili %1$d / %2$d sonuçlar + 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 Mesaj Yaz... Metni kopyala Yönlendir @@ -91,6 +94,8 @@ Teslim Edildi %s Gönderilemedi. Yeniden denemek için dokunun Ayrıntılar + Conversation title + Enter title Bildirimler Tema Arşivle @@ -98,7 +103,7 @@ Engelle Engeli kaldır Yazışmayı sil - Görüntüyü Kaydet + Galeriye kaydedildi Görünüm Genel QK Yanıt @@ -119,20 +124,20 @@ Yeni iletiler için açılan menü Kapatmak için dokunun Açılır pencereyi kapatmak için pencere dışındaki herhangi bir yere dokunun - Engelle + Engellenmiş Ben cevap vereyim? İstenmeyen numaralardan gelen iletileri otomatik olarak filtre Gecikmeli gönderme İletim raporları Mesajınızın sorunsuz gönderildiğinin onayını alın - Şerit vurgular + Şeritli aksanlar Giden SMS mesajlarından aksanlı karakterleri kaldırın Otomatik-MMS ekleri sıkıştır İletileri eşitle İletilerinizi Android SMS veritabanı ile yeniden senkronize edin QKSMS Hakkında - Sürüm + Sürüm ve Diğerleri(TR Muhammet Öztürk) Süre (saniye olarak) girin Engelle Engellenen konuşmalarınız burada görünür @@ -162,7 +167,7 @@ Mesajları yedekle İletileriniz otomatik olarak yedekleyin. Telefonunuzu değiştirir veya kaybolursa endişelenmeyin. Zamanlanmış iletiler - İletinizi göndermeden önce birkaç saniye bekleyin + Belirli bir saatte ve tarihte otomatik olarak gönderilecek mesajları zamanla Gecikmeli gönderme İletinizi göndermeden önce birkaç saniye bekleyin Otomatik gece modu @@ -190,6 +195,7 @@ Okundu olarak işaretle İptal Sil + Save Daha fazla Ayarla Engelini kaldır diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index 7b82bde2..6e128eac 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -32,7 +32,7 @@ Tiếp tục Cuộc gọi Chi tiết - Lưu hình ảnh + Save to gallery %d đã chọn Dọn sạch Lưu trữ @@ -75,7 +75,10 @@ %d đã chọn %1$d trên %2$d results + Send as group message + Recipients and replies will be visible to everyone Bắt đầu cuộc hội thoại nào. Hãy nói điều gì đó tốt đẹp! + Contact card Viết một tin nhắn… Sao chép văn bản Chuyển tiếp @@ -91,6 +94,8 @@ Đã chuyển %s Gửi thất bại. Bấm để thử lại lần nữa Chi tiết + Conversation title + Enter title Thông báo Chủ đề Lưu trữ @@ -98,7 +103,7 @@ Chặn Bỏ chặn Xóa hội thoại - Lưu hình ảnh + Saved to gallery Giao diện Chung Trả lời nhanh @@ -162,7 +167,7 @@ Sao lưu tin nhắn Tự động sao lưu tin nhắn của bạn. Không bao giờ lo lắng về việc mất đi lịch sử của bạn nếu bạn thay đổi điện thoại hoặc điện thoại của bạn bị mất Tin nhắn theo lịch - Chờ một vài giây trước khi gửi tin nhắn + Schedule messages to automatically be sent at a specific time and date Gửi đã bị chậm chễ Chờ một vài giây trước khi gửi tin nhắn Chế độ tự động ban đêm @@ -190,6 +195,7 @@ Đánh dấu đã đọc Hủy Xóa + Save Xem thêm Set Bỏ chặn diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index 638473c1..81065dc8 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -20,29 +20,29 @@ --> QKSMS - Archived + 已存档 Scheduled 設定 - Notifications - Theme - Search inbox… + 通知 + 主题 + 搜索收件箱… 撰写 QKSMS+ 跳过 继续 致電 详情 - Save image - %d selected - Clear - Archive - Unarchive - Block - Delete - Syncing messages… - You: %s - Results in messages - %d messages + Save to gallery + 已选择 %d 项 + 清除 + 存档 + 取消存档 + 屏蔽 + 删除 + 正在同步信息… + 你:%s + 信息中的结果 + %d 条信息 Your conversations will appear here No results Your archived conversations will appear here @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s 发送失败。点击再试一次 Details + Conversation title + Enter title 通知 Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml index 0bbf07c9..09217736 100644 --- a/presentation/src/main/res/values-zh/strings.xml +++ b/presentation/src/main/res/values-zh/strings.xml @@ -32,7 +32,7 @@ Continue 致電 Details - Save image + Save to gallery %d selected Clear Archive @@ -75,7 +75,10 @@ %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 @@ -91,6 +94,8 @@ Delivered %s Failed to send. Tap to try again Details + Conversation title + Enter title Notifications Theme Archive @@ -98,7 +103,7 @@ Block Unblock Delete conversation - Saved image + Saved to gallery Appearance General QK Reply @@ -162,7 +167,7 @@ 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 - Wait a few seconds before sending your message + 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 @@ -190,6 +195,7 @@ Mark read Cancel Delete + Save More Set Unblock diff --git a/presentation/src/main/res/values/font_certs.xml b/presentation/src/main/res/values/font_certs.xml index 0dca3f35..85dac65c 100644 --- a/presentation/src/main/res/values/font_certs.xml +++ b/presentation/src/main/res/values/font_certs.xml @@ -22,12 +22,12 @@ @array/com_google_android_gms_fonts_certs_dev @array/com_google_android_gms_fonts_certs_prod - + MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs= - + MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK From 82332207d23d9be47a3cd2b251a953e64ad84453 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jun 2018 22:39:24 -0400 Subject: [PATCH 31/31] Fix proguard issues with ezvcard --- presentation/build.gradle | 8 +++++++- presentation/proguard-rules.pro | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index 1fe5f2fe..2fa99db0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -113,6 +113,13 @@ dependencies { kapt "com.google.dagger:dagger-android-processor:$dagger_version" compileOnly "javax.annotation:jsr250-api:1.0" + // ezvcard + implementation('com.googlecode.ez-vcard:ez-vcard:0.10.4', { + exclude group: "org.jsoup", module: "jsoup" + exclude group: "org.freemarker", module: "freemarker" + exclude group: "com.fasterxml.jackson.core", module: "jackson-core" + }) + // realm implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" @@ -139,7 +146,6 @@ dependencies { implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" - implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.4' implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation project(":android-smsmms") diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro index 698eeab1..53eb4da5 100644 --- a/presentation/proguard-rules.pro +++ b/presentation/proguard-rules.pro @@ -5,5 +5,11 @@ -dontwarn android.net.ConnectivityManager -dontwarn android.net.LinkProperties +# ez-vcard +-dontwarn ezvcard.** +-dontwarn org.apache.log.** +-dontwarn org.apache.log4j.** +-dontwarn org.python.core.** + # okio -dontwarn okio.** \ No newline at end of file