From d57d644f902abb207379a5f1d3138b0fa7bd61c8 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Wed, 17 Jul 2019 10:10:12 -0400 Subject: [PATCH] #1461 - Check permission before trying to save image --- .../com/moez/QKSMS/feature/gallery/GalleryActivity.kt | 6 ++++++ .../com/moez/QKSMS/feature/gallery/GalleryView.kt | 2 ++ .../moez/QKSMS/feature/gallery/GalleryViewModel.kt | 11 +++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt index ce7b851a..4af41a7e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt @@ -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 = 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) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt index 2d1f2e51..b51b823b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt @@ -28,4 +28,6 @@ interface GalleryView : QkView { fun screenTouched(): Observable<*> fun pageChanged(): Observable + fun requestStoragePermission() + } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index 5c233c99..68033caa 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -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(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) } }