test-app: Don't request for external storage access (#38)

The external storage access is actually not needed by the test app.

Author: mickael-menu

test-app/src/main/AndroidManifest.xml

@@ -13,8 +13,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.readium.r2.testapp">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

test-app/src/main/java/org/readium/r2/testapp/bookshelf/BookshelfFragment.kt

@@ -6,13 +6,9 @@
 
 package org.readium.r2.testapp.bookshelf
 
-import android.Manifest
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Rect
 import android.net.Uri
 import android.os.Bundle
-import android.provider.Settings
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
@@ -22,7 +18,6 @@ import android.widget.EditText
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.RecyclerView
@@ -37,26 +32,15 @@ import org.readium.r2.testapp.domain.model.Book
 import org.readium.r2.testapp.opds.GridAutoFitLayoutManager
 import org.readium.r2.testapp.reader.ReaderContract
 
-
 class BookshelfFragment : Fragment() {
 
     private val bookshelfViewModel: BookshelfViewModel by viewModels()
     private lateinit var bookshelfAdapter: BookshelfAdapter
     private lateinit var documentPickerLauncher: ActivityResultLauncher<String>
     private lateinit var readerLauncher: ActivityResultLauncher<ReaderContract.Input>
-    private var permissionAsked: Boolean = false
     private var _binding: FragmentBookshelfBinding? = null
     private val binding get() = _binding!!
 
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                importBooks()
-            }
-        }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -103,8 +87,6 @@ class BookshelfFragment : Fragment() {
             bookshelfAdapter.submitList(it)
         })
 
-        importBooks()
-
         // FIXME embedded dialogs like this are ugly
         binding.bookshelfAddBookFab.setOnClickListener {
             var selected = 0
@@ -181,57 +163,6 @@ class BookshelfFragment : Fragment() {
         }
     }
 
-    private fun requestStoragePermission() {
-        if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            Snackbar.make(
-                this.requireView(),
-                R.string.permission_external_new_explanation,
-                Snackbar.LENGTH_LONG
-            )
-                .setAction(R.string.permission_retry) {
-                    requestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                }
-                .show()
-        } else {
-            // FIXME this is an ugly hack for when user has said don't ask again
-            if (permissionAsked) {
-                Snackbar.make(
-                    this.requireView(),
-                    R.string.permission_external_new_explanation,
-                    Snackbar.LENGTH_INDEFINITE
-                )
-                    .setAction(R.string.action_settings) {
-                        Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                            addCategory(Intent.CATEGORY_DEFAULT)
-                            data = Uri.parse("package:${view?.context?.packageName}")
-                        }.run(::startActivity)
-                    }
-                    .setActionTextColor(
-                        ContextCompat.getColor(
-                            requireContext(),
-                            R.color.snackbar_text_color
-                        )
-                    )
-                    .show()
-            } else {
-                permissionAsked = true
-                requestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            }
-        }
-    }
-
-    private fun importBooks() {
-        if (ContextCompat.checkSelfPermission(
-                requireContext(),
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            )
-            == PackageManager.PERMISSION_GRANTED
-        ) {
-            bookshelfViewModel.copySamplesFromAssetsToStorage()
-        } else requestStoragePermission()
-
-    }
-
     private fun deleteBook(book: Book) {
         bookshelfViewModel.deleteBook(book)
     }

test-app/src/main/java/org/readium/r2/testapp/bookshelf/BookshelfViewModel.kt

@@ -68,6 +68,10 @@ class BookshelfViewModel(application: Application) : AndroidViewModel(applicatio
 
     val books = repository.books()
 
+    init {
+        copySamplesFromAssetsToStorage()
+    }
+
     fun deleteBook(book: Book) = viewModelScope.launch {
         book.id?.let { repository.deleteBook(it) }
         tryOrNull { File(book.href).delete() }

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

@@ -37,14 +37,6 @@
     <string name="epubactivity_accessibility_screen_reader_resume">Resume Screen Reader</string>
     <string name="epubactivity_accessibility_screen_reader_stop">Stop Screen Reader</string>
 
-    <string name="permission_read_ext_explanation">The app needs to read your storage so it can read and write books.</string>
-    <string name="permission_external_new_explanation">Can\'t read or write books without permission</string>
-    <string name="permission_read_ext_request">Should we ask for the permission again?</string>
-    <string name="permission_request_again">Request again</string>
-    <string name="permission_retry">Retry?</string>
-    <string name="permission_goto_settings">Settings</string>
-
-
     <string name="title_activity_opdscatalog">OPDS Catalog</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_r2_about">About R2 Reader</string>