Skip to content

Commit 84c10ef

Browse files
committed
refactor: extract KEY_URI constant, remove hardcoded URI from 4 UI files
1 parent 99cfeb2 commit 84c10ef

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

app/src/main/java/com/nous/wxhook/db/WxHookProvider.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class WxHookProvider : ContentProvider() {
1414
private var capturedKey: String? = null
1515
private var capturedTime: Long = 0
1616

17+
const val KEY_URI = "content://com.nous.wxhook.db_provider/key"
18+
1719
fun setKey(key: String) {
1820
capturedKey = key
1921
capturedTime = System.currentTimeMillis()

app/src/main/java/com/nous/wxhook/ui/module/ModuleViewModel.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.app.Application
44
import androidx.lifecycle.AndroidViewModel
55
import androidx.lifecycle.viewModelScope
66
import com.nous.wxhook.db.BackupManager
7+
import com.nous.wxhook.db.WxHookProvider
78
import com.nous.wxhook.root.RootGateways
89
import com.nous.wxhook.rootbridge.backup.BackupHookLocal
910
import com.nous.wxhook.sync.Syncer
@@ -206,7 +207,7 @@ class ModuleViewModel(application: Application) : AndroidViewModel(application)
206207
try {
207208
val app = getApplication<Application>()
208209
val cursor = app.contentResolver.query(
209-
android.net.Uri.parse("content://com.nous.wxhook.db_provider/key"),
210+
android.net.Uri.parse(WxHookProvider.KEY_URI),
210211
null, null, null, null
211212
)
212213
val key = if (cursor != null && cursor.moveToFirst()) {
@@ -310,7 +311,7 @@ class ModuleViewModel(application: Application) : AndroidViewModel(application)
310311
try {
311312
val app = getApplication<Application>()
312313
val cursor = app.contentResolver.query(
313-
android.net.Uri.parse("content://com.nous.wxhook.db_provider/key"),
314+
android.net.Uri.parse(WxHookProvider.KEY_URI),
314315
null, null, null, null
315316
)
316317
val key = if (cursor != null && cursor.moveToFirst()) {

app/src/main/java/com/nous/wxhook/ui/search/SearchActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.widget.ScrollView
1111
import android.widget.TextView
1212
import androidx.appcompat.app.AppCompatActivity
1313
import com.google.android.material.button.MaterialButton
14+
import com.nous.wxhook.db.WxHookProvider
1415
import com.nous.wxhook.root.RootGateways
1516
import com.nous.wxhook.ui.M3
1617
import java.io.File
@@ -76,7 +77,7 @@ class SearchActivity : AppCompatActivity() {
7677
var key: String? = null
7778
try {
7879
val cursor = contentResolver.query(
79-
android.net.Uri.parse("content://com.nous.wxhook.db_provider/key"),
80+
android.net.Uri.parse(WxHookProvider.KEY_URI),
8081
null, null, null, null
8182
)
8283
if (cursor != null && cursor.moveToFirst()) {

app/src/main/java/com/nous/wxhook/ui/status/StatusActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.widget.TextView
1212
import androidx.appcompat.app.AppCompatActivity
1313
import com.google.android.material.button.MaterialButton
1414
import com.nous.wxhook.db.DbCleanup
15+
import com.nous.wxhook.db.WxHookProvider
1516
import com.nous.wxhook.ui.M3
1617

1718
class StatusActivity : AppCompatActivity() {
@@ -55,7 +56,7 @@ class StatusActivity : AppCompatActivity() {
5556
var key: String? = null
5657
try {
5758
val cursor = contentResolver.query(
58-
android.net.Uri.parse("content://com.nous.wxhook.db_provider/key"),
59+
android.net.Uri.parse(WxHookProvider.KEY_URI),
5960
null, null, null, null
6061
)
6162
if (cursor != null && cursor.moveToFirst()) {

0 commit comments

Comments
 (0)