fix download for android < 10

Signed-off-by: Pablo <[email protected]>

app/src/main/java/org/dhis2/usescases/settings/SyncManagerFragment.java

@@ -194,7 +194,7 @@ private void shareDB(ExportDbModel fileData) {
     private void downloadDB(ExportDbModel fileData) {
         new FileHandler().copyAndOpen(fileData.getFile(), fileLiveData -> {
             fileLiveData.observe(getViewLifecycleOwner(), file -> {
-                Toast.makeText(requireContext(), R.string.downloaded_confirm, Toast.LENGTH_SHORT).show();
+                Toast.makeText(requireContext(), R.string.database_export_downloaded, Toast.LENGTH_SHORT).show();
                 presenter.onExportEnd();
             });
             return null;

app/src/main/java/org/dhis2/usescases/settings/ui/ExportOption.kt

@@ -51,20 +51,20 @@ fun ExportOption(
         label = "import content",
     ) { targetState ->
 
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(72.dp)
-                .padding(
-                    start = if (displayProgress) 16.dp else 72.dp,
-                    top = 16.dp,
-                    end = 16.dp,
-                    bottom = 16.dp,
-                ),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = if (displayProgress) Arrangement.Center else spacedBy(16.dp),
-        ) {
-            if (targetState.not()) {
+        if (targetState.not()) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(72.dp)
+                    .padding(
+                        start = 72.dp,
+                        top = 16.dp,
+                        end = 16.dp,
+                        bottom = 16.dp,
+                    ),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = if (displayProgress) Arrangement.Center else spacedBy(16.dp),
+            ) {
                 Button(
                     modifier = Modifier.weight(1f),
                     onClick = onDownload,
@@ -92,7 +92,16 @@ fun ExportOption(
                         )
                     },
                 )
-            } else {
+            }
+        } else {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(72.dp)
+                    .padding(16.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = if (displayProgress) Arrangement.Center else spacedBy(16.dp),
+            ) {
                 ProgressIndicator(type = ProgressIndicatorType.CIRCULAR)
             }
         }

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

@@ -963,4 +963,5 @@
     <string name="timeline">Timeline</string>
     <string name="clear_search">Clear search</string>
     <string name="optional">Optional</string>
+    <string name="database_export_downloaded">Database downloaded</string>
 </resources>

commons/src/main/java/org/dhis2/commons/data/FileHandler.kt

@@ -1,6 +1,7 @@
 package org.dhis2.commons.data
 
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.Environment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -43,10 +44,20 @@ class FileHandler {
         return sourceFile.copyTo(destinationDirectory, true)
     }
 
-    private fun getDownloadDirectory(outputFileName: String) = File(
-        Environment.getExternalStoragePublicDirectory(
-            Environment.DIRECTORY_DOWNLOADS,
-        ),
-        "dhis2" + File.separator + outputFileName,
-    )
+    private fun getDownloadDirectory(outputFileName: String) = if (Build.VERSION.SDK_INT >= 29) {
+        File(
+            Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS,
+            ),
+            "dhis2" + File.separator + outputFileName,
+        )
+    } else {
+        File.createTempFile(
+            "copied_",
+            outputFileName,
+            Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS,
+            ),
+        )
+    }
 }