优化：放宽`Bark-Server`正则表达式限制 #457

app/src/main/java/com/idormy/sms/forwarder/database/dao/MsgDao.kt

@@ -27,9 +27,6 @@ interface MsgDao {
     @Query("DELETE FROM Msg where id=:id")
     fun delete(id: Long)
 
-    @Query("DELETE FROM Msg where type=:type")
-    fun deleteAll(type: String): Completable
-
     @RawQuery
     fun deleteAll(sql: SupportSQLiteQuery): Int
 

app/src/main/java/com/idormy/sms/forwarder/database/repository/MsgRepository.kt

@@ -14,8 +14,6 @@ class MsgRepository(private val msgDao: MsgDao) {
 
     fun deleteAll() = msgDao.deleteAll()
 
-    fun deleteAll(type: String) = msgDao.deleteAll(type)
-
     @WorkerThread
     fun deleteTimeAgo(time: Long) = msgDao.deleteTimeAgo(time)
 

app/src/main/java/com/idormy/sms/forwarder/database/viewmodel/MsgViewModel.kt

@@ -10,6 +10,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import com.idormy.sms.forwarder.database.dao.MsgDao
 import com.idormy.sms.forwarder.database.entity.MsgAndLogs
 import com.idormy.sms.forwarder.database.ext.ioThread
+import com.idormy.sms.forwarder.utils.Log
 import com.xuexiang.xutil.data.DateUtils
 import kotlinx.coroutines.flow.Flow
 
@@ -55,18 +56,16 @@ class MsgViewModel(private val dao: MsgDao) : ViewModel() {
     }
 
     fun deleteAll() = ioThread {
-        if (filter.isEmpty()) {
-            dao.deleteAll(type)
-        } else {
-            val sb = StringBuilder().apply {
-                append("DELETE FROM Msg WHERE type = '$type'")
+        val sb = StringBuilder().apply {
+            append("DELETE FROM Msg WHERE type = '$type'")
+            if (filter.isNotEmpty()) {
                 append(getOtherCondition())
             }
-
-            //Log.d("MsgViewModel", "sql: $sb")
-            val query = SimpleSQLiteQuery(sb.toString())
-            dao.deleteAll(query)
         }
+
+        Log.d("MsgViewModel", "sql: $sb")
+        val query = SimpleSQLiteQuery(sb.toString())
+        dao.deleteAll(query)
     }
 
     private fun getOtherCondition(): String {

app/src/main/java/com/idormy/sms/forwarder/fragment/LogsFragment.kt

@@ -85,6 +85,7 @@ class LogsFragment : BaseFragment<FragmentLogsBinding?>(), MsgPagingAdapter.OnIt
                     .negativeText(R.string.lab_no)
                     .onPositive { _: MaterialDialog?, _: DialogAction? ->
                         try {
+                            Log.d(TAG, "deleteAll, currentType:$currentType, currentFilter:$currentFilter")
                             viewModel.setType(currentType).setFilter(currentFilter).deleteAll()
                             reloadData()
                             XToastUtils.success(if (currentFilter.isEmpty()) R.string.delete_type_log_toast else R.string.delete_filter_log_toast)

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

@@ -534,7 +534,7 @@
 
     <string name="bark_server">Bark-Server</string>
     <string name="bark_server_tips">e.g. https://api.day.app/XXXXXXXX/</string>
-    <string name="bark_server_regex">^https?://[^/]+/[^/]+/$</string>
+    <string name="bark_server_regex">^https?://[^/]+/[^/]+/.*</string>
     <string name="bark_server_error">The Url format is wrong, e.g. https://api.day.app/XXXXXXXX/</string>
     <string name="bark_group">Group Name</string>
     <string name="bark_group_tips">Opt., e.g. SmsForwarder</string>

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

@@ -535,7 +535,7 @@
 
     <string name="bark_server">Bark-Server</string>
     <string name="bark_server_tips">例：https://api.day.app/XXXXXXXX/</string>
-    <string name="bark_server_regex">^https?://[^/]+/[^/]+/$</string>
+    <string name="bark_server_regex">^https?://[^/]+/[^/]+/.*</string>
     <string name="bark_server_error">Url格式错误，例：https://api.day.app/XXXXXXXX/</string>
     <string name="bark_group">分组名称</string>
     <string name="bark_group_tips">可选，例：短信转发器</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -535,7 +535,7 @@
 
     <string name="bark_server">Bark-Server</string>
     <string name="bark_server_tips">例：https://api.day.app/XXXXXXXX/</string>
-    <string name="bark_server_regex">^https?://[^/]+/[^/]+/$</string>
+    <string name="bark_server_regex">^https?://[^/]+/[^/]+/.*</string>
     <string name="bark_server_error">Url格式錯誤，例：https://api.day.app/XXXXXXXX/</string>
     <string name="bark_group">分組名稱</string>
     <string name="bark_group_tips">可選，例：簡訊轉發器</string>

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

@@ -562,7 +562,7 @@
 
     <string name="bark_server">Bark-Server</string>
     <string name="bark_server_tips">例：https://api.day.app/XXXXXXXX/</string>
-    <string name="bark_server_regex">^https?://[^/]+/[^/]+/$</string>
+    <string name="bark_server_regex">^https?://[^/]+/[^/]+/.*</string>
     <string name="bark_server_error">Url格式错误，例：https://api.day.app/XXXXXXXX/</string>
     <string name="bark_group">分组名称</string>
     <string name="bark_group_tips">可选，例：短信转发器</string>