Cleaner code

vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt

@@ -18,16 +18,18 @@ package im.vector.riotredesign.core.files
 
 import android.app.DownloadManager
 import android.content.Context
+import androidx.annotation.WorkerThread
+import arrow.core.Try
 import okio.Okio
 import timber.log.Timber
 import java.io.File
 
 /**
  * Save a string to a file with Okio
- * @return true in case of success
  */
-fun saveStringToFile(str: String, file: File): Boolean {
+@WorkerThread
-    return try {
+fun writeToFile(str: String, file: File): Try<Unit> {
+    return Try {
         val sink = Okio.sink(file)
 
         val bufferedSink = Okio.buffer(sink)
@@ -36,14 +38,25 @@ fun saveStringToFile(str: String, file: File): Boolean {
 
         bufferedSink.close()
         sink.close()
-
-        true
-    } catch (e: Exception) {
-        Timber.e(e, "Error saving file")
-        false
     }
 }
 
+/**
+ * Save a byte array to a file with Okio
+ */
+@WorkerThread
+fun writeToFile(data: ByteArray, file: File): Try<Unit> {
+    return Try {
+        val sink = Okio.sink(file)
+
+        val bufferedSink = Okio.buffer(sink)
+
+        bufferedSink.write(data)
+
+        bufferedSink.close()
+        sink.close()
+    }
+}
 
 fun addEntryToDownloadManager(context: Context,
                               file: File,

vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt

@@ -18,17 +18,16 @@ package im.vector.riotredesign.features.crypto.keys
 
 import android.content.Context
 import android.os.Environment
-import androidx.annotation.WorkerThread
 import arrow.core.Try
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.internal.extensions.foldToCallback
 import im.vector.riotredesign.core.files.addEntryToDownloadManager
+import im.vector.riotredesign.core.files.writeToFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okio.Okio
 import java.io.File
 
 class KeysExporter(private val session: Session) {
@@ -42,7 +41,16 @@ class KeysExporter(private val session: Session) {
             override fun onSuccess(data: ByteArray) {
                 GlobalScope.launch(Dispatchers.Main) {
                     withContext(Dispatchers.IO) {
-                        copyToFile(context, data)
+                        Try {
+                            val parentDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                            val file = File(parentDir, "riotx-keys-" + System.currentTimeMillis() + ".txt")
+
+                            writeToFile(data, file)
+
+                            addEntryToDownloadManager(context, file, "text/plain")
+
+                            file.absolutePath
+                        }
                     }
                             .foldToCallback(callback)
                 }
@@ -53,25 +61,4 @@ class KeysExporter(private val session: Session) {
             }
         })
     }
-
-    @WorkerThread
-    private fun copyToFile(context: Context, data: ByteArray): Try<String> {
-        return Try {
-            val parentDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-            val file = File(parentDir, "riotx-keys-" + System.currentTimeMillis() + ".txt")
-
-            val sink = Okio.sink(file)
-
-            val bufferedSink = Okio.buffer(sink)
-
-            bufferedSink.write(data)
-
-            bufferedSink.close()
-            sink.close()
-
-            addEntryToDownloadManager(context, file, "text/plain")
-
-            file.absolutePath
-        }
-    }
 }

vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt

@@ -25,15 +25,20 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import arrow.core.Try
 import butterknife.BindView
 import butterknife.OnClick
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import im.vector.fragments.keysbackup.setup.KeysBackupSetupSharedViewModel
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.files.addEntryToDownloadManager
-import im.vector.riotredesign.core.files.saveStringToFile
+import im.vector.riotredesign.core.files.writeToFile
 import im.vector.riotredesign.core.platform.VectorBaseFragment
 import im.vector.riotredesign.core.utils.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 
 class KeysBackupSetupStep3Fragment : VectorBaseFragment() {
@@ -157,30 +162,39 @@ class KeysBackupSetupStep3Fragment : VectorBaseFragment() {
     }
 
     private fun exportRecoveryKeyToFile(data: String) {
+        GlobalScope.launch(Dispatchers.Main) {
+            withContext(Dispatchers.IO) {
+                Try {
                     val parentDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
                     val file = File(parentDir, "recovery-key-" + System.currentTimeMillis() + ".txt")
 
-        if (saveStringToFile(data, file)) {
+                    writeToFile(data, file)
+
                     addEntryToDownloadManager(requireContext(), file, "text/plain")
 
-            context?.let {
+                    file.absolutePath
-                AlertDialog.Builder(it)
-                        .setMessage(getString(R.string.recovery_key_export_saved_as_warning, file.absolutePath))
-                        .setCancelable(false)
-                        .setPositiveButton(R.string.ok, null)
-                        .show()
                 }
-
+            }
-            viewModel.copyHasBeenMade = true
+                    .fold(
-        } else {
+                            { throwable ->
                                 context?.let {
                                     AlertDialog.Builder(it)
                                             .setTitle(R.string.dialog_title_error)
-                        .setMessage(getString(R.string.unknown_error))
+                                            .setMessage(throwable.localizedMessage)
-                        .setCancelable(false)
-                        .setPositiveButton(R.string.ok, null)
-                        .show()
                                 }
+                            },
+                            { path ->
+                                viewModel.copyHasBeenMade = true
+
+                                context?.let {
+                                    AlertDialog.Builder(it)
+                                            .setMessage(getString(R.string.recovery_key_export_saved_as_warning, path))
+                                }
+                            }
+                    )
+                    ?.setCancelable(false)
+                    ?.setPositiveButton(R.string.ok, null)
+                    ?.show()
         }
     }