From 84c640cb52fa59c640fd3223cdc08a4f6485276c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 10 Jun 2025 10:56:40 +0300
Subject: [PATCH] Backup/restore improvement and bug fix

---
 app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
index 480bbdf1..b740db33 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
@@ -2517,7 +2517,7 @@ private fun updateIcons(viewModel: ViewModel, acc: Account?) {
 
 private fun backup(ctx: Context, password: String) {
     val files = arrayListOf("accounts", "config", "contacts", "call_history",
-        "messages", "gzrtp.zid", "cert.pem", "ca_cert", "ca_certs.crt")
+        "messages", "uuid", "gzrtp.zid", "cert.pem", "ca_cert", "ca_certs.crt")
     File(BaresipService.filesPath).walk().forEach {
         if (it.name.endsWith(".png"))
             files.add(it.name)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index def6ee91..ef922d05 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -740,7 +740,7 @@ object Utils {
     }
 
     fun unZip(zipFilePath: String): Boolean {
-        val allFiles = listOf("accounts", "history", "config", "contacts", "messages", "uuid",
+        val allFiles = listOf("accounts", "call_history", "config", "contacts", "messages", "uuid",
                 "gzrtp.zid", "cert.pem", "ca_cert", "ca_certs.crt")
         val zipFiles = mutableListOf<String>()
         try {