improve android database setup

Author: ubaldus

.github/workflows/release.yml

@@ -163,7 +163,7 @@ jobs:
       - name: Copy package files
         run: |
           mkdir -p termux-packages/packages/
-          cp -r ./scripts/termux/packages/* termux-packages/packages/
+          cp -r ./termux/packages/* termux-packages/packages/
 
       - name: Build wikilite package
         run: |
@@ -199,7 +199,7 @@ jobs:
       - name: Copy package files
         run: |
           mkdir -p termux-packages/packages/
-          cp -r ./scripts/termux/packages/* termux-packages/packages/
+          cp -r ./termux/packages/* termux-packages/packages/
 
       - name: Build wikilite package
         run: |

android/app/src/main/AndroidManifest.xml

@@ -4,10 +4,8 @@
     package="it.eja.wikilite">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
 
@@ -19,9 +17,7 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true"
-        android:enableOnBackInvokedCallback="true"
-        tools:targetApi="28">
-
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true">

android/app/src/main/java/it/eja/wikilite/DatabaseDownloadActivity.kt

@@ -23,6 +23,7 @@ class DatabaseDownloadActivity : AppCompatActivity() {
     private val databaseFiles = mutableListOf<String>()
     private lateinit var preferences: SharedPreferences
     private var progressDialog: ProgressDialog? = null
+    private val DB_FILENAME = "wikilite.db"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,12 +35,17 @@ class DatabaseDownloadActivity : AppCompatActivity() {
         loadDatabaseFiles()
     }
 
+    private fun goToMainActivity() {
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
+    }
+
     private fun setupUI() {
         recyclerView = findViewById(R.id.recyclerView)
         recyclerView.layoutManager = LinearLayoutManager(this)
 
         adapter = DatabaseFileAdapter(databaseFiles) { filePath ->
-            showDownloadOptions(filePath)
+            startDownload(filePath, filesDir.absolutePath)
         }
         recyclerView.adapter = adapter
     }
@@ -93,35 +99,6 @@ class DatabaseDownloadActivity : AppCompatActivity() {
         return files
     }
 
-    private fun getAppStorageLocations(): List<String> {
-        val locationPaths = mutableListOf<String>()
-        val storageDirs = applicationContext.getExternalFilesDirs(null).filterNotNull()
-
-        if (storageDirs.isNotEmpty()) {
-            locationPaths.addAll(storageDirs.map { it.absolutePath })
-        }
-
-        if (locationPaths.isEmpty()) {
-            locationPaths.add(applicationContext.filesDir.absolutePath)
-        }
-        return locationPaths
-    }
-
-    private fun showDownloadOptions(filePath: String) {
-        val storageLocations = getAppStorageLocations()
-
-        if (storageLocations.size <= 1) {
-            val downloadPath = storageLocations.first()
-            Toast.makeText(this, "Downloading to app storage...", Toast.LENGTH_SHORT).show()
-            startDownload(filePath, downloadPath)
-        } else {
-            val dialog = DownloadDialog(filePath) { selectedFilePath, downloadPath ->
-                startDownload(selectedFilePath, downloadPath)
-            }
-            dialog.show(supportFragmentManager, "download_dialog")
-        }
-    }
-
     private fun startDownload(filePath: String, downloadPath: String) {
         DownloadAndExtractTask().execute(filePath to downloadPath)
     }
@@ -155,8 +132,7 @@ class DatabaseDownloadActivity : AppCompatActivity() {
 
                 val fileLength = connection.contentLength.toLong()
 
-                val finalFileName = currentFilePath.substringAfterLast("/").replace(".gz", "")
-                val outputFile = File(downloadPath, finalFileName)
+                val outputFile = File(downloadPath, DB_FILENAME)
                 finalDbPath = outputFile.absolutePath
 
                 val inputStream = connection.getInputStream()
@@ -187,7 +163,6 @@ class DatabaseDownloadActivity : AppCompatActivity() {
                 true
 
             } catch (e: Exception) {
-                println("Download/Extraction error: ${e.message}")
                 e.printStackTrace()
                 false
             }
@@ -216,8 +191,7 @@ class DatabaseDownloadActivity : AppCompatActivity() {
             if (success) {
                 preferences.edit().putString("db_path", finalDbPath).apply()
                 Toast.makeText(this@DatabaseDownloadActivity, "Download successful!", Toast.LENGTH_SHORT).show()
-                startActivity(Intent(this@DatabaseDownloadActivity, MainActivity::class.java))
-                finish()
+                goToMainActivity()
             } else {
                 Toast.makeText(this@DatabaseDownloadActivity, "Download failed!", Toast.LENGTH_LONG).show()
             }

android/app/src/main/java/it/eja/wikilite/DatabaseFileAdapter.kt

@@ -23,8 +23,7 @@ class DatabaseFileAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val filePath = files[position]
-        val fileName = filePath.substringAfterLast("/")
-        holder.tvFileName.text = fileName
+        holder.tvFileName.text = filePath
 
         holder.itemView.setOnClickListener {
             onItemClick(filePath)