diff --git a/qksms/build.gradle b/qksms/build.gradle index 586c52ef..ccef4075 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -69,6 +69,7 @@ dependencies { compile 'com.uber.autodispose:autodispose-android-archcomponents-test-kotlin:0.5.1' compile 'com.uber.autodispose:autodispose-android-kotlin:0.5.1' compile 'com.uber.autodispose:autodispose-kotlin:0.5.1' + compile 'id.zelory:compressor:2.1.0' compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile "io.reactivex.rxjava2:rxjava:2.1.4" compile 'io.reactivex.rxjava2:rxkotlin:2.1.0' diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 5a357b67..66b36a05 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -21,16 +21,19 @@ package interactor import android.app.PendingIntent import android.content.Context import android.content.Intent -import android.graphics.Bitmap +import android.net.Uri import android.telephony.SmsManager import com.klinker.android.send_message.Message import com.klinker.android.send_message.Settings import com.klinker.android.send_message.Transaction +import com.mlsdev.rximagepicker.RxImageConverters import common.util.Preferences import data.repository.MessageRepository +import id.zelory.compressor.Compressor import io.reactivex.Flowable import presentation.receiver.MessageDeliveredReceiver import presentation.receiver.MessageSentReceiver +import java.io.File import javax.inject.Inject class SendMessage @Inject constructor( @@ -39,7 +42,7 @@ 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 threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) override fun buildObservable(params: Params): Flowable { return Flowable.just(Unit) @@ -73,12 +76,27 @@ class SendMessage @Inject constructor( smsManager.sendMultipartTextMessage(address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents)) } - private fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) { + private fun sendMms(threadId: Long, addresses: List, body: String, attachments: List) { val settings = Settings().apply { } + val message = Message(body, addresses.toTypedArray()) - attachments.forEach { message.addImage(it) } + attachments + .map { uri -> + val file = File(context.cacheDir, "${System.currentTimeMillis()}.jpeg") + RxImageConverters.uriToFile(context, uri, file).blockingFirst() + } + .map { file -> + Compressor(context) + .setMaxHeight(1920) + .setMaxHeight(1920) + .setQuality(60) + .compressToBitmap(file) + } + .forEach { bitmap -> + message.addImage(bitmap) + } val transaction = Transaction(context, settings) transaction.sendNewMessage(message, threadId) diff --git a/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt b/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt index 85b93f86..cb7554f4 100644 --- a/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt @@ -19,10 +19,11 @@ package presentation.feature.compose import android.content.Context -import android.graphics.Bitmap +import android.net.Uri import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import com.bumptech.glide.Glide import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.util.Colors @@ -40,9 +41,9 @@ import javax.inject.Inject class AttachmentAdapter @Inject constructor( private val context: Context, private val colors: Colors -) : QkAdapter() { +) : QkAdapter() { - val attachmentDeleted: Subject = PublishSubject.create() + val attachmentDeleted: Subject = PublishSubject.create() private val disposables = CompositeDisposable() @@ -66,14 +67,14 @@ class AttachmentAdapter @Inject constructor( } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { - val bitmap = getItem(position) + val uri = getItem(position) val view = holder.itemView view.clicks().subscribe { - attachmentDeleted.onNext(bitmap) + attachmentDeleted.onNext(uri) } - view.thumbnail.setImageBitmap(bitmap) + Glide.with(context).load(uri).into(view.thumbnail) } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index 8d0f1b4f..b81320bf 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -22,6 +22,7 @@ import android.app.AlertDialog import android.content.res.ColorStateList import android.graphics.Bitmap import android.graphics.PorterDuff +import android.net.Uri import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView @@ -64,7 +65,7 @@ class ComposeActivity : QkActivity(), ComposeView { override val copyTextIntent: Subject = PublishSubject.create() override val forwardMessageIntent: Subject = PublishSubject.create() override val deleteMessageIntent: Subject = PublishSubject.create() - override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted } + override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted } override val textChangedIntent by lazy { message.textChanges() } override val attachIntent by lazy { attach.clicks() } override val sendIntent by lazy { send.clicks() } diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt index 3e003029..4d135b8b 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt @@ -18,7 +18,7 @@ */ package presentation.feature.compose -import android.graphics.Bitmap +import android.net.Uri import data.model.Contact import data.model.Message import io.realm.RealmResults @@ -32,6 +32,6 @@ data class ComposeState( val title: String = "", val archived: Boolean = false, val messages: RealmResults? = null, - val attachments: List = ArrayList(), + val attachments: List = ArrayList(), val canSend: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt index a6b6138a..92c0e4e2 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt @@ -19,6 +19,7 @@ package presentation.feature.compose import android.graphics.Bitmap +import android.net.Uri import data.model.Contact import data.model.Message import io.reactivex.Observable @@ -38,7 +39,7 @@ interface ComposeView : QkView { val copyTextIntent: Subject val forwardMessageIntent: Subject val deleteMessageIntent: Subject - val attachmentDeletedIntent: Subject + val attachmentDeletedIntent: Subject val textChangedIntent: Observable val attachIntent: Observable val sendIntent: Observable diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 6dfbd5c2..888df918 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -20,8 +20,7 @@ package presentation.feature.compose import android.content.Context import android.content.Intent -import android.graphics.Bitmap -import com.mlsdev.rximagepicker.RxImageConverters +import android.net.Uri import com.mlsdev.rximagepicker.RxImagePicker import com.mlsdev.rximagepicker.Sources import com.moez.QKSMS.R @@ -68,7 +67,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel( @Inject lateinit var deleteMessage: DeleteMessage private var draft: String = "" - private val attachments: Subject> = BehaviorSubject.createDefault(ArrayList()) + private val attachments: Subject> = BehaviorSubject.createDefault(ArrayList()) private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts().toObservable() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() private val selectedContacts: Observable> @@ -252,7 +251,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel( // Attach a photo view.attachIntent .flatMap { RxImagePicker.with(context).requestImage(Sources.GALLERY) } - .flatMap { uri -> RxImageConverters.uriToBitmap(context, uri) } .withLatestFrom(attachments, { attachment, attachments -> attachments + attachment }) .autoDisposable(view.scope()) .subscribe { attachments.onNext(it) }