From 897cfc628e121c91d180dc6656d5875d55274310 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sat, 1 Aug 2026 09:44:49 +0300 Subject: [PATCH] Renamed blocked.json file to blocked Renamed blocking.json file to blocking and added it to BARESIP_FILES Renamed blocking_list string to blocking_rules string --- app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt | 9 +++++++-- app/src/main/kotlin/com/tutpro/baresip/Blocked.kt | 9 +++++++-- app/src/main/kotlin/com/tutpro/baresip/Utils.kt | 4 ++-- app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 9 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt b/app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt index 5bd9a41a..a6f870c7 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt @@ -24,7 +24,7 @@ class BlockRule( fun save() { Log.d(TAG, "Saving ${BaresipService.blockRules.size} block rules") - val file = File(BaresipService.filesPath + "/blocking.json") + val file = File(BaresipService.filesPath + "/blocking") try { val jsonString = Json.encodeToString(BaresipService.blockRules) file.writeText(jsonString) @@ -34,7 +34,12 @@ class BlockRule( } fun restore() { - val file = File(BaresipService.filesPath + "/blocking.json") + val file = File(BaresipService.filesPath + "/blocking") + val oldFile = File(BaresipService.filesPath + "/blocking.json") + if (oldFile.exists()) { + Log.i(TAG, "Migrating blocking.json to blocking") + oldFile.renameTo(file) + } if (file.exists()) try { val jsonString = file.readText() diff --git a/app/src/main/kotlin/com/tutpro/baresip/Blocked.kt b/app/src/main/kotlin/com/tutpro/baresip/Blocked.kt index 921b18f5..e996a4d3 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Blocked.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Blocked.kt @@ -36,7 +36,7 @@ class Blocked ( fun save() { Log.d(TAG, "Saving ${BaresipService.blocked.size} blocked calls and messages") - val file = File(BaresipService.filesPath + "/blocked.json") + val file = File(BaresipService.filesPath + "/blocked") try { val jsonString = Json.encodeToString(BaresipService.blocked) file.writeText(jsonString) @@ -46,7 +46,12 @@ class Blocked ( } fun restore() { - val file = File(BaresipService.filesPath + "/blocked.json") + val file = File(BaresipService.filesPath + "/blocked") + val oldFile = File(BaresipService.filesPath + "/blocked.json") + if (oldFile.exists()) { + Log.i(TAG, "Migrating blocked.json to blocked") + oldFile.renameTo(file) + } if (file.exists()) { try { val jsonString = file.readText() diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt index 029a5c92..884c1b92 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt @@ -104,8 +104,8 @@ import kotlinx.serialization.encoding.Encoder object Utils { - val BARESIP_FILES = listOf("accounts", "call_history", "config", "contacts", "messages", "uuid", - "gzrtp.zid", "cert.pem", "ca_certs.crt", "blocked.json") + val BARESIP_FILES = listOf("accounts", "call_history", "blocked", "blocking", "config", + "contacts", "messages", "uuid", "gzrtp.zid", "cert.pem", "ca_certs.crt") fun getNameValue(string: String, name: String): ArrayList { val lines = string.split("\n") diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5474f689..e92d922e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -466,7 +466,6 @@ Mensaje auto‐rechazado del remitente oculto Gestor SIM Bloqueando - Listado de bloqueos Nueva regla de bloqueo Regla de bloqueo puede ser una cadena simple o una expresión regular. Si la cadena simple es incluida en la URI emparejada o si la cadena de exp. reg. coincide con la pareja URL, la llamada o el mensaje será bloqueado. ¿Desea borrar regla de bloqueo \'%1$s\'? diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b0072787..ee8cdb04 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -282,7 +282,7 @@ Estetty viesti tuntemattomalta lähettäjältä Estot - Estolista + Estosäännöt Uusi estosääntö Estosääntö voi olla joko tavallinen merkkijono tai säännöllinen lauseke. Jos tavallinen merkkijono löytyy soittajan tai viestin lähettäjän URI:sta tai jos säännöllinen lauseke sopii siihen, niin puhelu tai viesti estetään. Haluatko poistaa estosäännön \'%1$s\'? diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d358659d..fa5191b2 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -414,7 +414,6 @@ Panggilan dari penelepon tersembunyi ditolak otomatis Pesan dari pengirim tersembunyi ditolak otomatis Pemblokiran - Daftar Blokir Aturan Blokir Baru Aturan blokir dapat berupa string biasa atau string regular expression. Jika string biasa terdapat dalam URI pihak terkait atau string regular expression cocok dengan URI pihak terkait, panggilan atau pesan akan diblokir. Apakah Anda ingin menghapus aturan blokir \'%1$s\'? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 49320249..4a9f17cc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -400,7 +400,6 @@ Автоматически отклонено заблокированное сообщение от %1$s Автоматически отклонено сообщение от скрытого отправителя Блокировка - Список блокировки Новое правило блокировки Правило блокировки может быть простой строкой или регулярным выражением. Если простая строка содержится в URI собеседника или если регулярное выражение соответствует URI собеседника, вызов или сообщение будет заблокировано. Удалить правило блокировки \'%1$s\'? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 91eda7e5..bdd008a4 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -416,7 +416,6 @@ 已自动拒绝来自隐藏来电者的来电 已自动拒绝来自隐藏发送者的消息 屏蔽 - 屏蔽列表 新建屏蔽规则 屏蔽规则可以是纯字符串或正则表达式字符串。如果纯字符串包含在联系人 URI 中，或者如果正则表达式与联系人 URI 匹配，则通话或消息将被屏蔽。 是否要删除屏蔽规则“%1$s”？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d667b87..c1065fc3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -274,7 +274,7 @@ Auto-rejected message from hidden sender Blocking - Blocking List + Blocking Rules New Blocking Rule Blocking rule can be either a plain string or a regular expression string. If plain string is included in the peer URI or if