jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed blocked.json file to blocked

Browse Source 
Renamed blocking.json file to blocking and added it to BARESIP_FILES
Renamed blocking_list string to blocking_rules string
This commit is contained in:
Juha Heinanen
2026-08-01 09:44:49 +03:00
parent 36c86bbb29
commit 897cfc628e
9 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/tutpro/baresip/BlockRule.kt
View File

@ -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()

9
app/src/main/kotlin/com/tutpro/baresip/Blocked.kt
View File

@ -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()

4
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
View File

@ -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<String> {
val lines = string.split("\n")

1
app/src/main/res/values-es/strings.xml
View File

@ -466,7 +466,6 @@
<string name="hidden_message_blocked">Mensaje auto‐rechazado del remitente oculto</string>
<string name="sim_manager">Gestor SIM</string>
<string name="blocking">Bloqueando</string>
<string name="blocking_list">Listado de bloqueos</string>
<string name="new_blocking_rule">Nueva regla de bloqueo</string>
<string name="blocking_rule_help">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.</string>
<string name="blocking_delete_alert">¿Desea borrar regla de bloqueo \'%1$s\'?</string>

2
app/src/main/res/values-fi/strings.xml
View File

@ -282,7 +282,7 @@
<string name="hidden_message_blocked">Estetty viesti tuntemattomalta lähettäjältä</string>
<!-- Blocking Activity -->
<string name="blocking">Estot</string>
<string name="blocking_list">Estolista</string>
<string name="blocking_rules">Estosäännöt</string>
<string name="new_blocking_rule">Uusi estosääntö</string>
<string name="blocking_rule_help">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.</string>
<string name="blocking_delete_alert">Haluatko poistaa estosäännön \'%1$s\'?</string>

1
app/src/main/res/values-in/strings.xml
View File

@ -414,7 +414,6 @@
<string name="hidden_call_blocked">Panggilan dari penelepon tersembunyi ditolak otomatis</string>
<string name="hidden_message_blocked">Pesan dari pengirim tersembunyi ditolak otomatis</string>
<string name="blocking">Pemblokiran</string>
<string name="blocking_list">Daftar Blokir</string>
<string name="new_blocking_rule">Aturan Blokir Baru</string>
<string name="blocking_rule_help">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.</string>
<string name="blocking_delete_alert">Apakah Anda ingin menghapus aturan blokir \'%1$s\'?</string>

1
app/src/main/res/values-ru/strings.xml
View File

@ -400,7 +400,6 @@
<string name="message_blocked">Автоматически отклонено заблокированное сообщение от %1$s</string>
<string name="hidden_message_blocked">Автоматически отклонено сообщение от скрытого отправителя</string>
<string name="blocking">Блокировка</string>
<string name="blocking_list">Список блокировки</string>
<string name="new_blocking_rule">Новое правило блокировки</string>
<string name="blocking_rule_help">Правило блокировки может быть простой строкой или регулярным выражением. Если простая строка содержится в URI собеседника или если регулярное выражение соответствует URI собеседника, вызов или сообщение будет заблокировано.</string>
<string name="blocking_delete_alert">Удалить правило блокировки \'%1$s\'?</string>

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -416,7 +416,6 @@
<string name="hidden_call_blocked">已自动拒绝来自隐藏来电者的来电</string>
<string name="hidden_message_blocked">已自动拒绝来自隐藏发送者的消息</string>
<string name="blocking">屏蔽</string>
<string name="blocking_list">屏蔽列表</string>
<string name="new_blocking_rule">新建屏蔽规则</string>
<string name="blocking_rule_help">屏蔽规则可以是纯字符串或正则表达式字符串。如果纯字符串包含在联系人 URI 中，或者如果正则表达式与联系人 URI 匹配，则通话或消息将被屏蔽。</string>
<string name="blocking_delete_alert">是否要删除屏蔽规则“%1$s”？</string>

2
app/src/main/res/values/strings.xml
View File

@ -274,7 +274,7 @@
<string name="hidden_message_blocked">Auto-rejected message from hidden sender</string>
<!-- Blocking Activity -->
<string name="blocking">Blocking</string>
<string name="blocking_list">Blocking List</string>
<string name="blocking_rules">Blocking Rules</string>
<string name="new_blocking_rule">New Blocking Rule</string>
<string name="blocking_rule_help">Blocking rule can be either a plain string or a
regular expression string. If plain string is included in the peer URI or if