修复db目录权限问题

Author: WrBug

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.wrbug.developerhelper"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 100000
-        versionName "1.0.0.0"
+        versionCode 100010
+        versionName "1.0.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/wrbug/developerhelper/ui/activity/databaseedit/DatabaseEditActivity.kt

@@ -3,6 +3,7 @@ package com.wrbug.developerhelper.ui.activity.databaseedit
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Environment
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
@@ -32,7 +33,11 @@ class DatabaseEditActivity : BaseActivity() {
     private val adapter = DatabaseTableAdapter(this)
     private var selectedIndex = 0
     private val dstDir: File by lazy {
-        File(cacheDir, "db")
+        val file = File(externalCacheDir, "db")
+        if (file.exists()) {
+            file.mkdir()
+        }
+        file
     }
 
     companion object {
@@ -102,6 +107,7 @@ class DatabaseEditActivity : BaseActivity() {
             }
             val file = File(dstDir, dbPath.name)
             dbMap = DatabaseUtils.getDatabase(file.absolutePath)
+            file.delete()
             tableNames.addAll(dbMap.keys)
             uiThread {
                 setTableContainer()
@@ -110,12 +116,6 @@ class DatabaseEditActivity : BaseActivity() {
         }
     }
 
-    override fun onDestroy() {
-        doAsync {
-            ShellManager.rmFile(dstDir.absolutePath)
-        }
-        super.onDestroy()
-    }
 
     private fun setTableContainer() {
         tableNameContainer.removeAllViews()

app/src/main/java/com/wrbug/developerhelper/ui/widget/appdatainfoview/AppDataInfoView.kt

@@ -54,9 +54,11 @@ class AppDataInfoView : FrameLayout {
         doAsync {
             val sqliteFiles = ShellManager.getSqliteFiles(packageName)
             uiThread {
-                if (sqliteFiles.isNotEmpty()) {
-                    databaseContainer.removeAllViews()
+                if (sqliteFiles.isEmpty()) {
+                    defaultDbTv.setText(R.string.none)
+                    return@uiThread
                 }
+                databaseContainer.removeAllViews()
                 val params = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
                 for (sqliteFile in sqliteFiles) {
                     val textView = AppCompatTextView(context)
@@ -78,10 +80,11 @@ class AppDataInfoView : FrameLayout {
     private fun getSharedPreferencesFiles(packageName: String) {
         doAsync {
             val files = AppInfoManager.getSharedPreferencesFiles(packageName)
-            if (files.isEmpty()) {
-                return@doAsync
-            }
             uiThread {
+                if (files.isEmpty()) {
+                    defaultSpTv.setText(R.string.none)
+                    return@uiThread
+                }
                 sharedPreferenceContainer.removeAllViews()
                 val params = LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
                 files.forEach {

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

@@ -78,18 +78,19 @@
             android:paddingBottom="8dp">
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/defaultSpTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="8dp"
-                android:text="无"
+                android:text="@string/getting"
                 android:textColor="@color/item_content_text"
                 android:textSize="14sp" />
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="数据库列表"
+            android:text="@string/database_list"
             android:textColor="@color/item_title_text"
             android:textSize="16sp" />
 
@@ -101,10 +102,11 @@
             android:paddingBottom="8dp">
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/defaultDbTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="8dp"
-                android:text="无"
+                android:text="@string/getting"
                 android:textColor="@color/item_content_text"
                 android:textSize="14sp" />
         </LinearLayout>

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

@@ -53,4 +53,7 @@
     <string name="table">表</string>
     <string name="table_data_is_empty">该表数据为空</string>
     <string name="get_database_failed">获取数据库信息失败</string>
+    <string name="getting">获取中...</string>
+    <string name="database_list">数据库列表</string>
+    <string name="none">无</string>
 </resources>