update Commons for easy runtime permissions handling

app/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.30.4'
+    compile 'com.simplemobiletools:commons:2.30.6'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt

@@ -1,16 +1,13 @@
 package com.simplemobiletools.gallery.activities
 
-import android.Manifest
 import android.app.Activity
 import android.content.ClipData
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.provider.MediaStore
-import android.support.v4.app.ActivityCompat
 import android.support.v7.widget.GridLayoutManager
 import android.view.Menu
 import android.view.MenuItem
@@ -21,6 +18,7 @@ import com.simplemobiletools.commons.dialogs.CreateNewFolderDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.helpers.SORT_BY_DATE_MODIFIED
 import com.simplemobiletools.commons.helpers.SORT_BY_DATE_TAKEN
 import com.simplemobiletools.commons.models.RadioItem
@@ -40,7 +38,6 @@ import java.io.*
 import java.util.*
 
 class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
-    private val STORAGE_PERMISSION = 1
     private val PICK_MEDIA = 2
     private val PICK_WALLPAPER = 3
     private val LAST_MEDIA_CHECK_PERIOD = 3000L
@@ -189,25 +186,15 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     }
 
     private fun tryloadGallery() {
-        if (hasWriteStoragePermission()) {
+        handlePermission(PERMISSION_WRITE_STORAGE) {
-            if (config.showAll)
+            if (it) {
-                showAllMedia()
+                if (config.showAll)
-            else
+                    showAllMedia()
-                getDirectories()
+                else
+                    getDirectories()
 
-            setupLayoutManager()
+                setupLayoutManager()
-            checkIfColorChanged()
+                checkIfColorChanged()
-        } else {
-            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION)
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        if (requestCode == STORAGE_PERMISSION) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                getDirectories()
             } else {
                 toast(R.string.no_storage_permissions)
                 finish()

app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt

@@ -21,6 +21,7 @@ import com.google.gson.Gson
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.views.MyScalableRecyclerView
 import com.simplemobiletools.gallery.R
@@ -138,14 +139,17 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun tryloadGallery() {
-        if (hasWriteStoragePermission()) {
+        handlePermission(PERMISSION_WRITE_STORAGE) {
-            val dirName = getHumanizedFilename(mPath)
+            if (it) {
-            title = if (mShowAll) resources.getString(R.string.all_folders) else dirName
+                val dirName = getHumanizedFilename(mPath)
-            getMedia()
+                title = if (mShowAll) resources.getString(R.string.all_folders) else dirName
-            setupLayoutManager()
+                getMedia()
-            checkIfColorChanged()
+                setupLayoutManager()
-        } else {
+                checkIfColorChanged()
-            finish()
+            } else {
+                toast(R.string.no_storage_permissions)
+                finish()
+            }
         }
     }
 

app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt

@@ -1,21 +1,18 @@
 package com.simplemobiletools.gallery.activities
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.database.Cursor
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
-import android.support.v4.app.ActivityCompat
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import com.simplemobiletools.commons.extensions.hasWriteStoragePermission
 import com.simplemobiletools.commons.extensions.scanPath
 import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.extensions.*
 import com.simplemobiletools.gallery.fragments.PhotoFragment
@@ -29,7 +26,6 @@ import kotlinx.android.synthetic.main.fragment_holder.*
 import java.io.File
 
 open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentListener {
-    private val STORAGE_PERMISSION = 1
     private var mMedium: Medium? = null
     private var mIsFullScreen = false
     private var mIsFromGallery = false
@@ -44,11 +40,13 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_holder)
-
+        handlePermission(PERMISSION_WRITE_STORAGE) {
-        if (hasWriteStoragePermission()) {
+            if (it) {
-            checkIntent(savedInstanceState)
+                checkIntent(savedInstanceState)
-        } else {
+            } else {
-            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION)
+                toast(R.string.no_storage_permissions)
+                finish()
+            }
         }
     }
 
@@ -115,19 +113,6 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
         supportActionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.actionbar_gradient_background))
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        if (requestCode == STORAGE_PERMISSION) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                checkIntent()
-            } else {
-                toast(R.string.no_storage_permissions)
-                finish()
-            }
-        }
-    }
-
     private fun sendViewPagerIntent(path: String) {
         Intent(this, ViewPagerActivity::class.java).apply {
             putExtra(IS_VIEW_INTENT, true)

app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt

@@ -26,6 +26,7 @@ import android.view.animation.DecelerateInterpolator
 import com.simplemobiletools.commons.dialogs.PropertiesDialog
 import com.simplemobiletools.commons.dialogs.RenameItemDialog
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.MediaActivity.Companion.mMedia
 import com.simplemobiletools.gallery.adapters.MyPagerAdapter
@@ -73,11 +74,17 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_medium)
 
-        if (!hasWriteStoragePermission()) {
+        handlePermission(PERMISSION_WRITE_STORAGE) {
-            finish()
+            if (it) {
-            return
+                initViewPager()
+            } else {
+                toast(R.string.no_storage_permissions)
+                finish()
+            }
         }
+    }
 
+    private fun initViewPager() {
         measureScreen()
         val uri = intent.data
         if (uri != null) {
@@ -189,8 +196,9 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     override fun onResume() {
         super.onResume()
-        if (!hasWriteStoragePermission()) {
+        if (!hasPermission(PERMISSION_WRITE_STORAGE)) {
             finish()
+            return
         }
         supportActionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.actionbar_gradient_background))
 

app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetDirectoriesAsynctask.kt

@@ -3,9 +3,10 @@ package com.simplemobiletools.gallery.asynctasks
 import android.content.Context
 import android.os.AsyncTask
 import com.simplemobiletools.commons.extensions.getFilenameFromPath
-import com.simplemobiletools.commons.extensions.hasWriteStoragePermission
+import com.simplemobiletools.commons.extensions.hasPermission
 import com.simplemobiletools.commons.extensions.internalStoragePath
 import com.simplemobiletools.commons.extensions.sdCardPath
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.helpers.SORT_DESCENDING
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.extensions.config
@@ -21,7 +22,7 @@ class GetDirectoriesAsynctask(val context: Context, val isPickVideo: Boolean, va
     val mediaFetcher = MediaFetcher(context)
 
     override fun doInBackground(vararg params: Void): ArrayList<Directory> {
-        if (!context.hasWriteStoragePermission())
+        if (!context.hasPermission(PERMISSION_WRITE_STORAGE))
             return ArrayList()
 
         val config = context.config