Remove RxPermission

celestiamobile · Oct 17, 2020 · e934dd5 · e934dd5
1 parent dcd7d8a
commit e934dd5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -88,8 +88,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.0.6'
-    implementation 'com.github.tbruyelle:rxpermissions:0.12'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.7'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'

diff --git a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt
@@ -13,6 +13,7 @@ package space.celestia.mobilecelestia
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.PointF
 import android.graphics.RectF
 import android.net.Uri
@@ -27,15 +28,16 @@ import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.core.app.ShareCompat
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.contains
 import androidx.fragment.app.Fragment
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.microsoft.appcenter.AppCenter
 import com.microsoft.appcenter.analytics.Analytics
 import com.microsoft.appcenter.crashes.Crashes
-import com.tbruyelle.rxpermissions3.RxPermissions
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Observable
@@ -71,6 +73,7 @@ import java.io.File
 import java.io.IOException
 import java.lang.ref.WeakReference
 import java.util.*
+import java.util.concurrent.CountDownLatch
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 
@@ -118,6 +121,8 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
     private var readyForInteraction = false
     private var scriptOrURLPath: String? = null
 
+    private val permissionCountDownLatch = CountDownLatch(1)
+
     private val celestiaConfigFilePath: String
         get() {
             val custom = customConfigFilePath
@@ -253,6 +258,16 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
         if (hasFocus) hideSystemUI()
     }
 
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        if (requestCode != WRITE_DATA_PERMISSION_REQUEST_CODE) return
+        // We do not care whether we got the permission here, just post notification
+        permissionCountDownLatch.countDown()
+    }
+
     private fun hideSystemUI() {
         // Enables sticky immersive mode.
         window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
@@ -385,13 +400,18 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
     }
 
     private fun createPermissionObservable(): Observable<String> {
-        return RxPermissions(this).request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE).compose {
-            it.buffer(1).flatMap { result ->
-                if (result.size >= 1 && result.first()) {
-                    createAddonFolder()
-                }
-                Observable.just(CelestiaString("Requesting permission finished", ""))
+        return Observable.create<String> {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                it.onComplete()
+                return@create
+            }
+            if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                it.onComplete()
+                return@create
             }
+            ActivityCompat.requestPermissions(this, arrayOf(android.Manifest.permission.WRITE_EXTERNAL_STORAGE), WRITE_DATA_PERMISSION_REQUEST_CODE)
+            permissionCountDownLatch.await()
+            it.onComplete()
         }
     }
 
@@ -1052,7 +1072,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
     }
 
     override fun onDataLocationRequested(dataType: DataType) {
-        if (!RxPermissions(this).isGranted(android.Manifest.permission.READ_EXTERNAL_STORAGE)) {
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             // No permission to read
             return
         }
@@ -1423,6 +1443,8 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
 
         private var firstInstance = true
 
+        private const val WRITE_DATA_PERMISSION_REQUEST_CODE = 33
+
         var customDataDirPath: String? = null
         var customConfigFilePath: String? = null