#1461 - Check permission before trying to save image

This commit is contained in:
moezbhatti
2019-07-17 10:10:12 -04:00
parent 208584b60a
commit d57d644f90
3 changed files with 17 additions and 2 deletions
@@ -18,9 +18,11 @@
*/
package com.moez.QKSMS.feature.gallery
import android.Manifest
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.core.app.ActivityCompat
import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
@@ -99,6 +101,10 @@ class GalleryActivity : QkActivity(), GalleryView {
override fun pageChanged(): Observable<MmsPart> = pageChangedSubject
override fun requestStoragePermission() {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.gallery, menu)
return super.onCreateOptionsMenu(menu)
@@ -28,4 +28,6 @@ interface GalleryView : QkView<GalleryState> {
fun screenTouched(): Observable<*>
fun pageChanged(): Observable<MmsPart>
fun requestStoragePermission()
}
@@ -25,6 +25,7 @@ import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.extensions.mapNotNull
import com.moez.QKSMS.interactor.SaveImage
import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.repository.MessageRepository
import com.uber.autodispose.kotlin.autoDisposable
@@ -39,7 +40,8 @@ class GalleryViewModel @Inject constructor(
messageRepo: MessageRepository,
@Named("partId") private val partId: Long,
private val context: Context,
private val saveImage: SaveImage
private val saveImage: SaveImage,
private val permissions: PermissionManager
) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
init {
@@ -47,7 +49,11 @@ class GalleryViewModel @Inject constructor(
.mapNotNull(messageRepo::getMessageForPart)
.mapNotNull { message -> message.threadId }
.doOnNext { threadId -> newState { copy(parts = messageRepo.getPartsForConversation(threadId)) } }
.doOnNext { threadId -> newState { copy(title = conversationRepo.getConversation(threadId)?.getTitle()) } }
.doOnNext { threadId ->
newState {
copy(title = conversationRepo.getConversation(threadId)?.getTitle())
}
}
.subscribe()
}
@@ -64,6 +70,7 @@ class GalleryViewModel @Inject constructor(
// Save image to device
view.optionsItemSelected()
.filter { itemId -> itemId == R.id.save }
.filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
.withLatestFrom(view.pageChanged()) { _, part -> part.id }
.autoDisposable(view.scope())
.subscribe { partId -> saveImage.execute(partId) { context.makeToast(R.string.gallery_toast_saved) } }