From 66fb2e9a62fa1be4e7492bb5860fe13109c1cd62 Mon Sep 17 00:00:00 2001
From: Pupil <tom5079@naver.com>
Date: Mon, 17 Feb 2020 18:50:58 +0900
Subject: [PATCH] Fixed ArrayIndexOutOFBoundsException

---
 app/src/main/AndroidManifest.xml                           | 7 ++++---
 .../xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt   | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d445644f..f9bf5296 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,8 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".Pupil"
@@ -18,7 +18,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme">
+        tools:replace="android:theme"
+        android:requestLegacyExternalStorage="true">
 
         <provider
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt
index b394b50a..6c3b5b86 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt
@@ -115,7 +115,10 @@ class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
         externalFilesDirs.indexOfFirst {
             it.canonicalPath == getDownloadDirectory(context).canonicalPath
         }.let { index ->
-            buttons[index].first.isChecked = true
+            if (index < 0)
+                buttons.first().first.isChecked = true
+            else
+                buttons[index].first.isChecked = true
         }
 
         setTitle(R.string.settings_dl_location)