Migrate services and receivers to data package

This commit is contained in:
Moez Bhatti
2018-05-29 11:11:38 -04:00
parent 554791db49
commit c0968e4b42
35 changed files with 323 additions and 200 deletions
+1
View File
@@ -19,6 +19,7 @@ dependencies {
// dagger // dagger
implementation "com.google.dagger:dagger:$dagger_version" implementation "com.google.dagger:dagger:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version"
compileOnly "javax.annotation:jsr250-api:1.0" compileOnly "javax.annotation:jsr250-api:1.0"
@@ -24,7 +24,7 @@ import android.content.Intent
import android.os.Build import android.os.Build
import android.provider.Telephony import android.provider.Telephony
import android.support.annotation.RequiresApi import android.support.annotation.RequiresApi
import injection.appComponent import dagger.android.AndroidInjection
import interactor.SyncMessages import interactor.SyncMessages
import util.Preferences import util.Preferences
import javax.inject.Inject import javax.inject.Inject
@@ -36,7 +36,7 @@ class DefaultSmsChangedReceiver : BroadcastReceiver() {
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
override fun onReceive(context: Context, intent: Intent) { 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)) { if (intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)) {
val pendingResult = goAsync() val pendingResult = goAsync()
@@ -21,7 +21,7 @@ package receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import interactor.MarkRead import interactor.MarkRead
import javax.inject.Inject import javax.inject.Inject
@@ -30,7 +30,7 @@ class MarkReadReceiver : BroadcastReceiver() {
@Inject lateinit var markRead: MarkRead @Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
val threadId = intent.getLongExtra("threadId", 0) val threadId = intent.getLongExtra("threadId", 0)
markRead.execute(threadId) markRead.execute(threadId)
@@ -21,7 +21,7 @@ package receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import interactor.MarkSeen import interactor.MarkSeen
import javax.inject.Inject import javax.inject.Inject
@@ -30,7 +30,7 @@ class MarkSeenReceiver : BroadcastReceiver() {
@Inject lateinit var markSeen: MarkSeen @Inject lateinit var markSeen: MarkSeen
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
val threadId = intent.getLongExtra("threadId", 0) val threadId = intent.getLongExtra("threadId", 0)
markSeen.execute(threadId) markSeen.execute(threadId)
@@ -18,9 +18,11 @@
*/ */
package receiver package receiver
import android.content.Context
import android.content.Intent
import android.net.Uri import android.net.Uri
import com.klinker.android.send_message.MmsReceivedReceiver import com.klinker.android.send_message.MmsReceivedReceiver
import injection.appComponent import dagger.android.AndroidInjection
import interactor.ReceiveMms import interactor.ReceiveMms
import javax.inject.Inject import javax.inject.Inject
@@ -28,9 +30,12 @@ class MmsReceivedReceiver : MmsReceivedReceiver() {
@Inject lateinit var receiveMms: ReceiveMms @Inject lateinit var receiveMms: ReceiveMms
override fun onMessageReceived(messageUri: Uri?) { override fun onReceive(context: Context?, intent: Intent?) {
appComponent.inject(this) AndroidInjection.inject(this, context)
super.onReceive(context, intent)
}
override fun onMessageReceived(messageUri: Uri?) {
messageUri?.let { uri -> messageUri?.let { uri ->
val pendingResult = goAsync() val pendingResult = goAsync()
receiveMms.execute(uri) { pendingResult.finish() } receiveMms.execute(uri) { pendingResult.finish() }
@@ -29,7 +29,7 @@ import android.provider.Telephony
import com.google.android.mms.MmsException import com.google.android.mms.MmsException
import com.google.android.mms.util_alt.SqliteWrapper import com.google.android.mms.util_alt.SqliteWrapper
import com.klinker.android.send_message.Transaction import com.klinker.android.send_message.Transaction
import injection.appComponent import dagger.android.AndroidInjection
import interactor.SyncMessage import interactor.SyncMessage
import timber.log.Timber import timber.log.Timber
import java.io.File import java.io.File
@@ -40,7 +40,7 @@ class MmsSentReceiver : BroadcastReceiver() {
@Inject lateinit var syncMessage: SyncMessage @Inject lateinit var syncMessage: SyncMessage
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
Timber.v("MMS sending result: $resultCode") Timber.v("MMS sending result: $resultCode")
val uri = Uri.parse(intent.getStringExtra(Transaction.EXTRA_CONTENT_URI)) val uri = Uri.parse(intent.getStringExtra(Transaction.EXTRA_CONTENT_URI))
@@ -22,7 +22,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import injection.appComponent import dagger.android.AndroidInjection
import interactor.SyncMessage import interactor.SyncMessage
import javax.inject.Inject import javax.inject.Inject
@@ -35,7 +35,8 @@ class MmsUpdatedReceiver : BroadcastReceiver() {
@Inject lateinit var syncMessage: SyncMessage @Inject lateinit var syncMessage: SyncMessage
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
intent.getStringExtra(URI)?.let { uriString -> intent.getStringExtra(URI)?.let { uriString ->
val pendingResult = goAsync() val pendingResult = goAsync()
syncMessage.execute(Uri.parse(uriString)) { pendingResult.finish() } syncMessage.execute(Uri.parse(uriString)) { pendingResult.finish() }
@@ -21,19 +21,17 @@ package receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import common.util.NightModeManager import util.NightModeManager
import javax.inject.Inject import javax.inject.Inject
class NightModeReceiver : BroadcastReceiver() { class NightModeReceiver : BroadcastReceiver() {
@Inject lateinit var nightModeManager: NightModeManager @Inject lateinit var nightModeManager: NightModeManager
init {
appComponent.inject(this)
}
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this, context)
nightModeManager.updateCurrentTheme() nightModeManager.updateCurrentTheme()
} }
} }
@@ -22,7 +22,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.support.v4.app.RemoteInput import android.support.v4.app.RemoteInput
import injection.appComponent import dagger.android.AndroidInjection
import interactor.MarkRead import interactor.MarkRead
import interactor.SendMessage import interactor.SendMessage
import javax.inject.Inject import javax.inject.Inject
@@ -33,7 +33,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() {
@Inject lateinit var markRead: MarkRead @Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
val remoteInput = RemoteInput.getResultsFromIntent(intent) val remoteInput = RemoteInput.getResultsFromIntent(intent)
val bundle = intent.extras val bundle = intent.extras
@@ -21,7 +21,7 @@ package receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import interactor.RetrySending import interactor.RetrySending
import repository.MessageRepository import repository.MessageRepository
import javax.inject.Inject import javax.inject.Inject
@@ -32,7 +32,7 @@ class SendSmsReceiver : BroadcastReceiver() {
@Inject lateinit var retrySending: RetrySending @Inject lateinit var retrySending: RetrySending
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
val id = intent.getLongExtra("id", 0L) val id = intent.getLongExtra("id", 0L)
messageRepo.getMessage(id)?.let { message -> messageRepo.getMessage(id)?.let { message ->
@@ -22,7 +22,7 @@ import android.app.Activity
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import interactor.MarkDelivered import interactor.MarkDelivered
import interactor.MarkDeliveryFailed import interactor.MarkDeliveryFailed
import javax.inject.Inject import javax.inject.Inject
@@ -32,11 +32,9 @@ class SmsDeliveredReceiver : BroadcastReceiver() {
@Inject lateinit var markDelivered: MarkDelivered @Inject lateinit var markDelivered: MarkDelivered
@Inject lateinit var markDeliveryFailed: MarkDeliveryFailed @Inject lateinit var markDeliveryFailed: MarkDeliveryFailed
init {
appComponent.inject(this)
}
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this, context)
val id = intent.getLongExtra("id", 0L) val id = intent.getLongExtra("id", 0L)
when (resultCode) { when (resultCode) {
@@ -21,7 +21,7 @@ package receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import injection.appComponent import dagger.android.AndroidInjection
import interactor.SyncMessage import interactor.SyncMessage
import javax.inject.Inject import javax.inject.Inject
@@ -41,7 +41,7 @@ class SmsProviderChangedReceiver : BroadcastReceiver() {
@Inject lateinit var syncMessage: SyncMessage @Inject lateinit var syncMessage: SyncMessage
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
// Obtain the uri for the changed data // Obtain the uri for the changed data
// If the value is null, don't continue // If the value is null, don't continue
@@ -22,7 +22,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.provider.Telephony.Sms import android.provider.Telephony.Sms
import injection.appComponent import dagger.android.AndroidInjection
import interactor.ReceiveSms import interactor.ReceiveSms
import javax.inject.Inject import javax.inject.Inject
@@ -31,7 +31,7 @@ class SmsReceiver : BroadcastReceiver() {
@Inject lateinit var receiveMessage: ReceiveSms @Inject lateinit var receiveMessage: ReceiveSms
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
Sms.Intents.getMessagesFromIntent(intent)?.let { messages -> Sms.Intents.getMessagesFromIntent(intent)?.let { messages ->
val pendingResult = goAsync() val pendingResult = goAsync()
@@ -23,7 +23,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.telephony.SmsManager import android.telephony.SmsManager
import injection.appComponent import dagger.android.AndroidInjection
import interactor.MarkFailed import interactor.MarkFailed
import interactor.MarkSent import interactor.MarkSent
import javax.inject.Inject import javax.inject.Inject
@@ -34,7 +34,7 @@ class SmsSentReceiver : BroadcastReceiver() {
@Inject lateinit var markFailed: MarkFailed @Inject lateinit var markFailed: MarkFailed
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this) AndroidInjection.inject(this, context)
val id = intent.getLongExtra("id", 0L) val id = intent.getLongExtra("id", 0L)
@@ -24,14 +24,18 @@ import android.content.ContentUris
import android.content.ContentValues import android.content.ContentValues
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Bitmap
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.provider.BaseColumns import android.provider.BaseColumns
import android.provider.Telephony import android.provider.Telephony
import android.telephony.PhoneNumberUtils import android.telephony.PhoneNumberUtils
import android.telephony.SmsManager import android.telephony.SmsManager
import com.google.android.mms.ContentType
import com.klinker.android.send_message.BroadcastUtils 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.StripAccents
import com.klinker.android.send_message.Transaction
import filter.ConversationFilter import filter.ConversationFilter
import io.reactivex.Maybe import io.reactivex.Maybe
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
@@ -43,6 +47,7 @@ import io.realm.Sort
import manager.KeyManager import manager.KeyManager
import mapper.CursorToConversation import mapper.CursorToConversation
import mapper.CursorToRecipient import mapper.CursorToRecipient
import model.Attachment
import model.Contact import model.Contact
import model.Conversation import model.Conversation
import model.Message import model.Message
@@ -54,6 +59,7 @@ import util.extensions.anyOf
import util.extensions.asMaybe import util.extensions.asMaybe
import util.extensions.insertOrUpdate import util.extensions.insertOrUpdate
import util.extensions.map import util.extensions.map
import java.io.ByteArrayOutputStream
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -64,6 +70,7 @@ class MessageRepositoryImpl @Inject constructor(
private val conversationFilter: ConversationFilter, private val conversationFilter: ConversationFilter,
private val cursorToConversation: CursorToConversation, private val cursorToConversation: CursorToConversation,
private val cursorToRecipient: CursorToRecipient, private val cursorToRecipient: CursorToRecipient,
private val imageRepository: ImageRepository,
private val prefs: Preferences) : MessageRepository { private val prefs: Preferences) : MessageRepository {
override fun getConversations(archived: Boolean): RealmResults<Conversation> { override fun getConversations(archived: Boolean): RealmResults<Conversation> {
@@ -104,7 +111,7 @@ class MessageRepositoryImpl @Inject constructor(
.sortedByDescending { result -> result.messages } .sortedByDescending { result -> result.messages }
return conversations return conversations
.filter { conversation -> conversationFilter.filter(conversation, query) } .filter { conversation -> conversationFilter.filter(conversation, query) }
.map { conversation -> SearchResult(query, conversation, 0) } .map { conversation -> SearchResult(query, conversation, 0) }
.plus(messagesByConversation) .plus(messagesByConversation)
} }
@@ -436,6 +443,60 @@ class MessageRepositoryImpl @Inject constructor(
smsManager.sendMultipartTextMessage(message.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents)) smsManager.sendMultipartTextMessage(message.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents))
} }
override fun sendMms(threadId: Long, addresses: List<String>, body: String, attachments: List<Attachment>) {
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) { override fun cancelDelayedSms(id: Long) {
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
alarmManager.cancel(getIntentForDelayedSms(id)) alarmManager.cancel(getIntentForDelayedSms(id))
@@ -22,7 +22,7 @@ import android.app.IntentService
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
import injection.appComponent import dagger.android.AndroidInjection
import interactor.SendMessage import interactor.SendMessage
import repository.MessageRepository import repository.MessageRepository
import javax.inject.Inject import javax.inject.Inject
@@ -35,7 +35,7 @@ class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {
override fun onHandleIntent(intent: Intent?) { override fun onHandleIntent(intent: Intent?) {
if (intent?.action != TelephonyManager.ACTION_RESPOND_VIA_MESSAGE) return 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 -> intent.extras?.getString(Intent.EXTRA_TEXT)?.takeIf { it.isNotBlank() }?.let { body ->
val intentUri = intent.data val intentUri = intent.data
val recipients = getRecipients(intentUri).split(";") val recipients = getRecipients(intentUri).split(";")
@@ -16,15 +16,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>. * along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/ */
package common.util package util
import android.app.AlarmManager import android.app.AlarmManager
import android.app.PendingIntent import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import receiver.NightModeReceiver import receiver.NightModeReceiver
import util.Preferences
import util.tryOrNull
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@@ -0,0 +1,46 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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<SendMessage.Params>() {
data class Params(val threadId: Long, val addresses: List<String>, val body: String, val attachments: List<Attachment> = listOf())
override fun buildObservable(params: Params): Flowable<Unit> {
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) }
}
}
@@ -16,13 +16,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>. * along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/ */
package feature.compose package model
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.support.v13.view.inputmethod.InputContentInfoCompat 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) { 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 { fun isGif(context: Context): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && inputContent != null) { 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 { } else {
context.contentResolver.getType(uri) == ContentType.IMAGE_GIF context.contentResolver.getType(uri) == "image/gif"
} }
} }
@@ -20,6 +20,7 @@ package repository
import io.reactivex.Maybe import io.reactivex.Maybe
import io.realm.RealmResults import io.realm.RealmResults
import model.Attachment
import model.Conversation import model.Conversation
import model.Message import model.Message
import model.MmsPart import model.MmsPart
@@ -100,6 +101,8 @@ interface MessageRepository {
*/ */
fun sendSms(message: Message) fun sendSms(message: Message)
fun sendMms(threadId: Long, addresses: List<String>, body: String, attachments: List<Attachment>)
/** /**
* Attempts to cancel sending the message with the given id * Attempts to cancel sending the message with the given id
*/ */
@@ -20,6 +20,8 @@ package common
*/ */
import android.app.Activity import android.app.Activity
import android.app.Application import android.app.Application
import android.app.Service
import android.content.BroadcastReceiver
import android.support.text.emoji.EmojiCompat import android.support.text.emoji.EmojiCompat
import android.support.text.emoji.FontRequestEmojiCompatConfig import android.support.text.emoji.FontRequestEmojiCompatConfig
import android.support.v4.provider.FontRequest import android.support.v4.provider.FontRequest
@@ -27,10 +29,12 @@ import com.bugsnag.android.Bugsnag
import com.bugsnag.android.Configuration import com.bugsnag.android.Configuration
import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R import com.moez.QKSMS.R
import common.util.NightModeManager import util.NightModeManager
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector import dagger.android.DispatchingAndroidInjector
import dagger.android.HasActivityInjector import dagger.android.HasActivityInjector
import dagger.android.HasBroadcastReceiverInjector
import dagger.android.HasServiceInjector
import injection.AppComponentManager import injection.AppComponentManager
import injection.appComponent import injection.appComponent
import io.realm.Realm import io.realm.Realm
@@ -40,7 +44,7 @@ import migration.QkRealmMigration
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
class QKApplication : Application(), HasActivityInjector { class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector {
/** /**
* Inject this so that it is forced to initialize * Inject this so that it is forced to initialize
@@ -48,7 +52,9 @@ class QKApplication : Application(), HasActivityInjector {
@Suppress("unused") @Suppress("unused")
@Inject lateinit var analyticsManager: AnalyticsManager @Inject lateinit var analyticsManager: AnalyticsManager
@Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity> @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity>
@Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver>
@Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service>
@Inject lateinit var nightModeManager: NightModeManager @Inject lateinit var nightModeManager: NightModeManager
private val packages = arrayOf("common", "feature", "injection", "filter", "interactor", "manager", "mapper", private val packages = arrayOf("common", "feature", "injection", "filter", "interactor", "manager", "mapper",
@@ -88,7 +94,15 @@ class QKApplication : Application(), HasActivityInjector {
} }
override fun activityInjector(): AndroidInjector<Activity> { override fun activityInjector(): AndroidInjector<Activity> {
return dispatchingAndroidInjector return dispatchingActivityInjector
}
override fun broadcastReceiverInjector(): AndroidInjector<BroadcastReceiver> {
return dispatchingBroadcastReceiverInjector
}
override fun serviceInjector(): AndroidInjector<Service> {
return dispatchingServiceInjector
} }
} }
@@ -31,6 +31,7 @@ import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.attachment_list_item.view.* import kotlinx.android.synthetic.main.attachment_list_item.view.*
import model.Attachment
import javax.inject.Inject import javax.inject.Inject
class AttachmentAdapter @Inject constructor( class AttachmentAdapter @Inject constructor(
@@ -50,6 +50,7 @@ import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.compose_activity.*
import model.Attachment
import model.Contact import model.Contact
import model.Message import model.Message
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@@ -19,6 +19,7 @@
package feature.compose package feature.compose
import io.realm.RealmResults import io.realm.RealmResults
import model.Attachment
import model.Contact import model.Contact
import model.Conversation import model.Conversation
import model.Message import model.Message
@@ -23,6 +23,7 @@ import android.support.v13.view.inputmethod.InputContentInfoCompat
import common.base.QkView import common.base.QkView
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import model.Attachment
import model.Contact import model.Contact
import model.Message import model.Message
@@ -49,6 +49,7 @@ import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import io.realm.RealmList import io.realm.RealmList
import manager.PermissionManager import manager.PermissionManager
import model.Attachment
import model.Contact import model.Contact
import model.Conversation import model.Conversation
import model.Message import model.Message
@@ -27,7 +27,7 @@ import common.base.QkViewModel
import common.util.BillingManager import common.util.BillingManager
import common.util.Colors import common.util.Colors
import common.util.DateFormatter import common.util.DateFormatter
import common.util.NightModeManager import util.NightModeManager
import interactor.SyncMessages import interactor.SyncMessages
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.rxkotlin.withLatestFrom
@@ -31,9 +31,9 @@ import android.widget.RemoteViews
import com.moez.QKSMS.R import com.moez.QKSMS.R
import common.util.Colors import common.util.Colors
import common.util.extensions.getColorCompat import common.util.extensions.getColorCompat
import dagger.android.AndroidInjection
import feature.compose.ComposeActivity import feature.compose.ComposeActivity
import feature.main.MainActivity import feature.main.MainActivity
import injection.appComponent
import manager.WidgetManager import manager.WidgetManager
import timber.log.Timber import timber.log.Timber
import util.Preferences import util.Preferences
@@ -44,11 +44,9 @@ class WidgetProvider : AppWidgetProvider() {
@Inject lateinit var colors: Colors @Inject lateinit var colors: Colors
@Inject lateinit var prefs: Preferences @Inject lateinit var prefs: Preferences
init {
appComponent.inject(this)
}
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this, context)
when (intent.action) { when (intent.action) {
WidgetManager.ACTION_NOTIFY_DATASET_CHANGED -> updateData(context) WidgetManager.ACTION_NOTIFY_DATASET_CHANGED -> updateData(context)
else -> super.onReceive(context, intent) else -> super.onReceive(context, intent)
@@ -26,7 +26,7 @@ import feature.themepicker.ThemePickerActivity
import feature.themepicker.ThemePickerActivityModule import feature.themepicker.ThemePickerActivityModule
@Module @Module
abstract class BuildersModule { abstract class ActivityBuilderModule {
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [MainActivityModule::class]) @ContributesAndroidInjector(modules = [MainActivityModule::class])
@@ -31,25 +31,15 @@ import dagger.Component
import dagger.android.support.AndroidSupportInjectionModule import dagger.android.support.AndroidSupportInjectionModule
import feature.compose.DetailedChipView import feature.compose.DetailedChipView
import feature.widget.WidgetAdapter 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 import javax.inject.Singleton
@Singleton @Singleton
@Component(modules = [AndroidSupportInjectionModule::class, AppModule::class, BuildersModule::class]) @Component(modules = [
AndroidSupportInjectionModule::class,
AppModule::class,
ActivityBuilderModule::class,
BroadcastReceiverBuilderModule::class,
ServiceBuilderModule::class])
interface AppComponent { interface AppComponent {
fun inject(application: QKApplication) fun inject(application: QKApplication)
@@ -58,22 +48,6 @@ interface AppComponent {
fun inject(fetcher: ContactImageLoader.ContactImageFetcher) 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(service: WidgetAdapter)
fun inject(view: AvatarView) fun inject(view: AvatarView)
@@ -0,0 +1,102 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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
}
@@ -0,0 +1,32 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package injection
import dagger.Module
import dagger.android.ContributesAndroidInjector
import service.HeadlessSmsSendService
@Module
abstract class ServiceBuilderModule {
@ActivityScope
@ContributesAndroidInjector()
abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService
}
@@ -19,8 +19,8 @@
package interactor package interactor
import com.f2prateek.rx.preferences2.RxSharedPreferences import com.f2prateek.rx.preferences2.RxSharedPreferences
import common.util.NightModeManager
import io.reactivex.Flowable import io.reactivex.Flowable
import util.NightModeManager
import util.Preferences import util.Preferences
import javax.inject.Inject import javax.inject.Inject
@@ -1,112 +0,0 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
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<SendMessage.Params>() {
data class Params(val threadId: Long, val addresses: List<String>, val body: String, val attachments: List<Attachment> = listOf())
override fun buildObservable(params: Params): Flowable<Unit> {
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<String>, body: String, attachments: List<Attachment>) {
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()
}
}