diff --git a/data/src/main/java/manager/PermissionManagerImpl.kt b/data/src/main/java/manager/PermissionManagerImpl.kt
index 3b7f1d2d..c4d6c066 100644
--- a/data/src/main/java/manager/PermissionManagerImpl.kt
+++ b/data/src/main/java/manager/PermissionManagerImpl.kt
@@ -20,7 +20,7 @@ package manager
import android.Manifest
import android.content.Context
-import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PERMISSION_GRANTED
import android.provider.Telephony
import android.support.v4.content.ContextCompat
import javax.inject.Inject
@@ -35,9 +35,10 @@ class PermissionManagerImpl @Inject constructor(private val context: Context) :
return hasSms() && hasContacts()
}
- override fun hasSms(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED
+ override fun hasSms(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PERMISSION_GRANTED
- override fun hasContacts(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
+ override fun hasContacts(): Boolean = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == 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/domain/src/main/java/manager/PermissionManager.kt b/domain/src/main/java/manager/PermissionManager.kt
index eb25c54e..c0716299 100644
--- a/domain/src/main/java/manager/PermissionManager.kt
+++ b/domain/src/main/java/manager/PermissionManager.kt
@@ -28,4 +28,6 @@ interface PermissionManager {
fun hasContacts(): Boolean
+ fun hasStorage(): Boolean
+
}
\ No newline at end of file
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 37798e8a..480a4789 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -135,7 +135,6 @@ dependencies {
implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
implementation "com.google.android:flexbox:0.3.1"
implementation "com.jakewharton.timber:timber:$timber_version"
- implementation "com.mlsdev.rximagepicker:library:2.0.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation project(":android-smsmms")
implementation project(':data')
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index df3465fd..d47b59fc 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
+
= PublishSubject.create()
override val inputContentIntent by lazy { message.inputContentSelected }
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
+
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
@@ -224,6 +242,30 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
messageAdapter.clearSelection()
}
+ override fun requestStoragePermission() {
+ ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
+ }
+
+ override fun requestCamera() {
+ cameraDestination = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+ .let { timestamp -> ContentValues().apply { put(MediaStore.Images.Media.TITLE, timestamp) } }
+ .let { cv -> contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, cv) }
+
+ val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+ .putExtra(MediaStore.EXTRA_OUTPUT, cameraDestination)
+ startActivityForResult(intent, CAMERA_REQUEST_CODE)
+ }
+
+ override fun requestGallery() {
+ val intent = Intent(Intent.ACTION_PICK)
+ .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
+ .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+ .putExtra(Intent.EXTRA_LOCAL_ONLY, false)
+ .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ .setType("image/*")
+ startActivityForResult(intent, GALLERY_REQUEST_CODE)
+ }
+
override fun setDraft(draft: String) {
message.setText(draft)
}
@@ -249,6 +291,16 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
return super.getColoredMenuItems() + R.id.call
}
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ if (resultCode == Activity.RESULT_OK) {
+ when (requestCode) {
+ CAMERA_REQUEST_CODE -> cameraDestination
+ GALLERY_REQUEST_CODE -> data?.data
+ else -> null
+ }?.let(attachmentSelectedIntent::onNext)
+ }
+ }
+
override fun onBackPressed() {
backPressedIntent.onNext(Unit)
}
diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt
index fa1b477f..25e29af1 100644
--- a/presentation/src/main/java/feature/compose/ComposeView.kt
+++ b/presentation/src/main/java/feature/compose/ComposeView.kt
@@ -18,6 +18,7 @@
*/
package feature.compose
+import android.net.Uri
import android.support.v13.view.inputmethod.InputContentInfoCompat
import common.base.QkView
import io.reactivex.Observable
@@ -43,10 +44,14 @@ interface ComposeView : QkView {
val attachIntent: Observable
val cameraIntent: Observable<*>
val galleryIntent: Observable<*>
+ val attachmentSelectedIntent: Observable
val inputContentIntent: Observable
val sendIntent: Observable
fun clearSelection()
+ fun requestStoragePermission()
+ fun requestCamera()
+ fun requestGallery()
fun setDraft(draft: String)
fun scrollToMessage(id: Long)
val backPressedIntent: Observable
diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt
index 27a8c9a1..480ae84a 100644
--- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt
+++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt
@@ -24,8 +24,6 @@ import android.net.Uri
import android.telephony.PhoneNumberUtils
import android.telephony.SmsMessage
import android.view.inputmethod.EditorInfo
-import com.mlsdev.rximagepicker.RxImagePicker
-import com.mlsdev.rximagepicker.Sources
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
@@ -50,6 +48,7 @@ import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmList
+import manager.PermissionManager
import model.Contact
import model.Conversation
import model.Message
@@ -72,13 +71,14 @@ class ComposeViewModel @Inject constructor(
private val cancelMessage: CancelDelayedMessage,
private val contactFilter: ContactFilter,
private val contactsRepo: ContactRepository,
+ private val deleteMessages: DeleteMessages,
+ private val markRead: MarkRead,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
- private val syncContacts: ContactSync,
- private val sendMessage: SendMessage,
+ private val permissionManager: PermissionManager,
private val retrySending: RetrySending,
- private val markRead: MarkRead,
- private val deleteMessages: DeleteMessages
+ private val sendMessage: SendMessage,
+ private val syncContacts: ContactSync
) : QkViewModel(ComposeState(query = intent.extras?.getString("query") ?: "")) {
private var sharedText: String = intent.extras?.getString(Intent.EXTRA_TEXT) ?: ""
@@ -421,25 +421,23 @@ class ComposeViewModel @Inject constructor(
// Attach a photo from camera
view.cameraIntent
- .flatMap { RxImagePicker.with(context).requestImage(Sources.CAMERA) }
- .map { uri -> Attachment(uri) }
- .withLatestFrom(attachments, { attachment, attachments -> attachments + attachment })
- .doOnNext { attachments.onNext(it) }
.autoDisposable(view.scope())
- .subscribe { newState { it.copy(attaching = false) } }
+ .subscribe {
+ when (permissionManager.hasStorage()) {
+ true -> view.requestCamera()
+ false -> view.requestStoragePermission()
+ }
+ }
// Attach a photo from gallery
view.galleryIntent
- .flatMap { RxImagePicker.with(context).requestImage(Sources.GALLERY) }
- .map { uri -> Attachment(uri) }
- .withLatestFrom(attachments, { attachment, attachments -> attachments + attachment })
- .doOnNext { attachments.onNext(it) }
.autoDisposable(view.scope())
- .subscribe { newState { it.copy(attaching = false) } }
+ .subscribe { view.requestGallery() }
- // Attach media from the keyboard
- view.inputContentIntent
- .map { inputContent -> Attachment(uri = null, inputContent = inputContent) }
+ // A photo was selected
+ Observable.merge(
+ view.attachmentSelectedIntent.map { uri -> Attachment(uri) },
+ view.inputContentIntent.map { inputContent -> Attachment(inputContent = inputContent) })
.withLatestFrom(attachments, { attachment, attachments -> attachments + attachment })
.doOnNext { attachments.onNext(it) }
.autoDisposable(view.scope())