Fixed permission dialog behaviour

feelfreelinux · Aug 1, 2018 · ebcf0ae · ebcf0ae
1 parent 1161389
commit ebcf0ae
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -150,6 +150,7 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:2.16"
     implementation 'com.google.dagger:dagger-android:2.16'
     implementation 'com.google.dagger:dagger-android-support:2.16'
+    implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
     provided 'org.glassfish:javax.annotation:10.0-b28'
 
     // Glide

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/base/BaseActivity.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/base/BaseActivity.kt
@@ -10,6 +10,7 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
+import com.tbruyelle.rxpermissions2.RxPermissions
 import dagger.android.support.DaggerAppCompatActivity
 import io.github.feelfreelinux.wykopmobilny.R
 import io.github.feelfreelinux.wykopmobilny.ui.dialogs.showExceptionDialog
@@ -22,6 +23,7 @@ import io.github.feelfreelinux.wykopmobilny.utils.preferences.SettingsPreference
 // This class should be extended in all activities in this app. Place global-activity settings here
 abstract class BaseActivity : DaggerAppCompatActivity() {
     lateinit var swipeBackHandler : SwipeBackActivityHelper
+    lateinit var rxPermissions: RxPermissions
     open val enableSwipeBackLayout : Boolean = false
     open val isActivityTransfluent : Boolean = false
     public var isRunning = false
@@ -45,6 +47,7 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         initTheme()
         super.onCreate(savedInstanceState)
+        rxPermissions = RxPermissions(this)
         if (enableSwipeBackLayout) {
             Slidr.attach(this,
                     SlidrConfig.Builder().edge(true).build())
@@ -86,16 +89,4 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
 
         }
     }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == MarkdownToolbar.REQUEST_EXTERNAL_STORAGE) {
-            if (permissions.contains(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                if (grantResults[0] == PackageManager.PERMISSION_DENIED) {
-                    Toast.makeText(this, "Aplikacja wymaga uprawnień zapisu do pamięci aby wysyłać zdjęcia.", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-
-    }
 }
diff --git a/...otlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/markdown_toolbar/MarkdownToolbar.kt b/...otlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/markdown_toolbar/MarkdownToolbar.kt
@@ -7,9 +7,11 @@ import android.net.Uri
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import io.github.feelfreelinux.wykopmobilny.R
 import io.github.feelfreelinux.wykopmobilny.api.WykopImageFile
+import io.github.feelfreelinux.wykopmobilny.base.BaseActivity
 import io.github.feelfreelinux.wykopmobilny.ui.dialogs.EditTextFormatDialog
 import io.github.feelfreelinux.wykopmobilny.ui.dialogs.formatDialogCallback
 import io.github.feelfreelinux.wykopmobilny.ui.widgets.FloatingImageView
@@ -87,16 +89,6 @@ class MarkdownToolbar : LinearLayout {
     init {
         View.inflate(context, R.layout.markdown_toolbar, this)
 
-        val activity = getActivityContext()
-        activity?.let {
-            if (ActivityCompat.checkSelfPermission(activity,
-                            android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_EXTERNAL_STORAGE)
-
-            }
-        }
-
         // Create callbacks
         markdownDialogs.apply {
             format_bold.setOnClickListener { insertFormat("**", "**") }
@@ -106,7 +98,22 @@ class MarkdownToolbar : LinearLayout {
             insert_code.setOnClickListener { insertFormat("`", "`") }
             insert_spoiler.setOnClickListener { insertFormat("\n!", "") }
             insert_emoticon.setOnClickListener { showLennyfaceDialog(formatText) }
-            insert_photo.setOnClickListener { showUploadPhotoBottomsheet() }
+            insert_photo.setOnClickListener {
+                val activity = getActivityContext() as? BaseActivity
+                activity?.let {
+                    if (!activity.rxPermissions.isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+                        activity.rxPermissions.request(Manifest.permission.WRITE_EXTERNAL_STORAGE).subscribe {
+                            if (it) {
+                                showUploadPhotoBottomsheet()
+                            } else {
+                                Toast.makeText(activity, "Aplikacja wymaga uprawnień zapisu do pamięci aby wysyłać zdjęcia.", Toast.LENGTH_LONG).show()
+                            }
+                        }
+                    } else {
+                        showUploadPhotoBottomsheet()
+                    }
+                }
+            }
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         versionMajor = 0
         versionMinor = 9
         versionPatch = 5
-        versionBuild = 0
+        versionBuild = 1
     }
 }