Update: scoped storage 대응

Author: jisungbin

buildSrc/src/main/kotlin/Dependencies.kt

@@ -14,8 +14,8 @@ object Application {
     const val targetSdk = 31
     const val compileSdk = 31
     const val jvmTarget = "11"
-    const val versionCode = 1
-    const val versionName = "dev-0.1.0"
+    const val versionCode = 2
+    const val versionName = "dev-0.1.1"
 
     val targetCompat = JavaVersion.VERSION_11
     val sourceCompat = JavaVersion.VERSION_11

common/src/main/kotlin/io/github/jisungbin/gitmessengerbot/common/core/Storage.kt

@@ -31,6 +31,7 @@ object Storage {
     private fun String.parsePath() = if (contains(sdcard)) this else "$sdcard/$this"
 
     fun write(path: String, content: String) {
+        if (isScoped) return
         val file = File(path.parsePath())
         if (!file.exists()) {
             File(file.path.substringBeforeLast("/")).mkdirs()
@@ -40,6 +41,7 @@ object Storage {
     }
 
     fun read(path: String, default: String?): String? {
+        if (isScoped) return default
         return try {
             val file = File(path.parsePath())
             if (file.exists()) {
@@ -53,26 +55,31 @@ object Storage {
     }
 
     fun append(path: String, prefix: String, appendContent: String) {
+        if (isScoped) return
         val preContent = read(path, "")
         val newContent = "$preContent$prefix$appendContent"
         write(path, newContent)
     }
 
     fun delete(path: String) {
+        if (isScoped) return
         File(path.parsePath()).delete()
     }
 
     fun deleteAll(path: String) {
+        if (isScoped) return
         File(path.parsePath()).deleteRecursively()
     }
 
-    fun fileList(path: String) = File(path.parsePath()).listFiles()?.toList() ?: emptyList()
+    fun fileList(path: String) =
+        if (isScoped) emptyList() else File(path.parsePath()).listFiles()?.toList() ?: emptyList()
 
     @RequiresApi(Build.VERSION_CODES.R)
     fun isStorageManagerPermissionGranted() = Environment.isExternalStorageManager()
 
     @RequiresApi(Build.VERSION_CODES.R)
     fun requestStorageManagePermission(activity: Activity) {
+        if (isScoped) return
         val intent = Intent(
             Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
             "package:${activity.packageName}".toUri()

presentation/src/main/AndroidManifest.xml

@@ -11,15 +11,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="io.github.jisungbin.gitmessengerbot">
 
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <!-- https://developer.chrome.com/docs/android/custom-tabs/best-practices/#applications-targeting-android-11-api-level-30-or-above -->

presentation/src/main/kotlin/io/github/jisungbin/gitmessengerbot/activity/main/MainActivity.kt

@@ -13,6 +13,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AlertDialog
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -49,6 +50,7 @@ import io.github.jisungbin.gitmessengerbot.activity.main.composable.CustomWidthB
 import io.github.jisungbin.gitmessengerbot.activity.main.dashboard.script.ScriptContent
 import io.github.jisungbin.gitmessengerbot.activity.main.setting.Setting
 import io.github.jisungbin.gitmessengerbot.common.constant.ScriptConstant
+import io.github.jisungbin.gitmessengerbot.common.core.Storage
 import io.github.jisungbin.gitmessengerbot.common.extension.doWhen
 import io.github.jisungbin.gitmessengerbot.common.extension.toast
 import io.github.jisungbin.gitmessengerbot.common.script.ScriptLang
@@ -115,6 +117,14 @@ class MainActivity : ComponentActivity() {
             }
         }
 
+        if (Storage.isScoped) {
+            AlertDialog.Builder(this)
+                .setMessage(R.string.activity_main_dialog_android_11_notice_title)
+                .setMessage(R.string.activity_main_dialog_android_11_notice_message)
+                .setPositiveButton(R.string.close, null)
+                .show()
+        }
+
         setContent {
             MaterialTheme {
                 Content()

presentation/src/main/kotlin/io/github/jisungbin/gitmessengerbot/activity/splash/SplashActivity.kt

@@ -66,25 +66,32 @@ class SplashActivity : ComponentActivity() {
         }
 
         val isSetupDone = Storage.read(GithubConstant.DataPath, null) != null
-        val builtDate = Calendar.getInstance().apply { timeInMillis = BuildConfig.TIMESTAMP }
-        val builtTime = "${builtDate.get(Calendar.HOUR_OF_DAY)}h" +
-            " ${builtDate.get(Calendar.MINUTE)}m " +
-            "${builtDate.get(Calendar.SECOND)}s"
 
-        toast("Built at: $builtTime")
+        if (BuildConfig.DEBUG) {
+            val builtDate = Calendar.getInstance().apply { timeInMillis = BuildConfig.TIMESTAMP }
+            val builtTime = "${builtDate.get(Calendar.HOUR_OF_DAY)}h" +
+                " ${builtDate.get(Calendar.MINUTE)}m " +
+                "${builtDate.get(Calendar.SECOND)}s"
+
+            toast("Built at: $builtTime")
+        }
 
         if (BuildOption.TestMode) {
             startActivity(Intent(this, TestActivity::class.java))
         } else {
             lifecycleScope.launchWhenCreated {
                 doDelay(1500) {
                     finish()
-                    startActivity(
-                        Intent(
-                            this@SplashActivity,
-                            if (isSetupDone) MainActivity::class.java else SetupActivity::class.java
+                    if (Storage.isScoped) {
+                        startActivity(Intent(this@SplashActivity, MainActivity::class.java))
+                    } else {
+                        startActivity(
+                            Intent(
+                                this@SplashActivity,
+                                if (isSetupDone) MainActivity::class.java else SetupActivity::class.java
+                            )
                         )
-                    )
+                    }
                 }
             }
         }

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

@@ -13,6 +13,7 @@
     <string name="todo">개발 예정</string>
     <string name="save">저장</string>
     <string name="saved">저장되었습니다.</string>
+    <string name="close">닫기</string>
 
     <string name="activity_setup_title">새로운 시작을 위해,\n아래의 권한들을 허용해주세요.</string>
     <string name="activity_setup_last_way">마지막으로,</string>
@@ -27,9 +28,12 @@
     <string name="activity_setup_dialog_button_start">시작하기</string>
     <string name="activity_setup_toast_welcome">%s님 환영합니다! 🎉🎈</string>
 
+    <string name="activity_main_dialog_android_11_notice_title">안드로이드11 공지</string>
+    <string name="activity_main_dialog_android_11_notice_message">안드로이드11 부터는 구글 정책으로 인해 내부 저장소 접근이 불가능 합니다. (접근하려면 파일 관리자 앱 처럼 파일 접근 기능이 앱의 핵심 기능이여야 함)\n\n따라서 앱의 기능이 모두 작동하지 않을 수 있습니다.\n\n추후 product 버전에서는 이 문제 해결 및 앱의 정상적인 작동을 보장합니다.\n\n이 버전은 dev 버전이므로, 이해 부탁드립니다. 감사합니다.</string>
     <string name="activity_main_toast_eval_loaded">eval 준비 완료</string>
     <string name="activity_main_toast_eval_load_faled">eval 준비 실패\n\n%s</string>
     <string name="activity_main_toast_confirm_finish">정말 종료하실려면 뒤로가기를 한 번 더 눌러주세요.</string>
+
     <string name="activity_main_composable_dashboard_script_header_welcome">Hi, %s</string>
     <string name="activity_main_composable_dashboard_script_header_power">메인 전원</string>
     <string name="activity_main_composable_dashboard_script_header_menu_power_on">On</string>