Merge pull request #154 from yangyxd/master

导入本地书时增加文件读写权限检查,没权限时显示提示

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme.Light"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
         <!--主入口-->

app/src/main/java/io/legado/app/help/permission/PermissionsCompat.kt

@@ -1,8 +1,11 @@
 package io.legado.app.help.permission
 
+import android.os.Build
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import org.jetbrains.anko.startActivity
+import java.util.ArrayList
 
 class PermissionsCompat private constructor() {
 
@@ -12,6 +15,17 @@ class PermissionsCompat private constructor() {
         RequestManager.pushRequest(request)
     }
 
+    companion object {
+        // 检查权限, 如果已经拥有返回 true
+        fun check(activity: AppCompatActivity, vararg permissions: String): Boolean {
+            var request: Request = Request(activity)
+            var pers = ArrayList<String>()
+            pers.addAll(listOf(*permissions))
+            var data = request.getDeniedPermissions(pers.toTypedArray())
+            return data == null;
+        }
+    }
+
     class Builder {
         private val request: Request
 

app/src/main/java/io/legado/app/help/permission/Request.kt

@@ -102,7 +102,7 @@ internal class Request : OnRequestPermissionsResultCallback {
         deniedCallback = null
     }
 
-    private fun getDeniedPermissions(permissions: Array<String>?): Array<String>? {
+    fun getDeniedPermissions(permissions: Array<String>?): Array<String>? {
         if (permissions != null) {
             val deniedPermissionList = ArrayList<String>()
             for (permission in permissions) {

app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.provider.DocumentsContract
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.widget.PopupMenu
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.LiveData
@@ -16,7 +17,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.constant.EventBus
 import io.legado.app.help.AppConfig
+import io.legado.app.help.ReadBookConfig
+import io.legado.app.help.permission.Permissions
+import io.legado.app.help.permission.PermissionsCompat
 import io.legado.app.ui.filechooser.FileChooserDialog
 import io.legado.app.ui.filechooser.FilePicker
 import io.legado.app.ui.widget.SelectActionBar
@@ -80,6 +85,24 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
                 }
             }
         })
+
+        // 没有权限就显示一个授权提示和按钮
+        if (PermissionsCompat.check(this, *Permissions.Group.STORAGE)) {
+            hint_per.visibility = View.GONE
+        } else {
+            hint_per.visibility = View.VISIBLE
+            tv_request_per.onClick {
+                PermissionsCompat.Builder(this)
+                    .addPermissions(*Permissions.Group.STORAGE)
+                    .rationale(R.string.tip_perm_request_storage)
+                    .onGranted {
+                        hint_per.visibility = View.GONE
+                        initData()
+                        upRootDoc()
+                    }
+                    .request()
+            }
+        }
     }
 
     private fun initEvent() {

app/src/main/res/layout/activity_import_book.xml

@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/titleBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/book_local" />
 
     <!--path-->
     <LinearLayout
+        android:id="@+id/layTop"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/titleBar"
         android:background="@color/background"
         android:minHeight="36dp"
         android:padding="8dp"
@@ -53,12 +56,51 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
+        app:layout_constraintTop_toBottomOf="@id/layTop"
+        app:layout_constraintBottom_toTopOf="@id/select_action_bar"
         android:layout_height="0dp"
         android:layout_weight="1" />
 
     <io.legado.app.ui.widget.SelectActionBar
         android:id="@+id/select_action_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/hint_per"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical"
+        android:padding="36dp"
+        android:gravity="center"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:text="@string/tip_local_perm_request_storage"
+            android:layout_marginBottom="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        </TextView>
+
+        <io.legado.app.ui.widget.text.AccentBgTextView
+            android:id="@+id/tv_request_per"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:minHeight="42dp"
+            android:gravity="center"
+            android:text="@string/request_permission"
+            android:textSize="14sp"
+            app:radius="30dp" />
+
+    </LinearLayout>
+
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -646,5 +646,6 @@
     <string name="bar_elevation_s">当前阴影大小(elevation): %s</string>
     <string name="btn_default_s">默认</string>
     <string name="main_menu">主菜单</string>
-
+    <string name="request_permission">点击授予权限</string>
+    <string name="tip_local_perm_request_storage">阅读需要访问存储卡权限，请点击下方的"授予权限"按钮，或前往“设置”—“应用权限”—打开所需权限。如果授予权限后仍然不正常，请点击右上角的“选择文件夹”，使用系统文件夹选择器。</string>
 </resources>