Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-18 22:20:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Update subscription on menu

Browse Source
This commit is contained in:
purofle 2023-11-04 11:04:38 +08:00
parent a921b7224c
commit 451cdab857
No known key found for this signature in database
GPG Key ID: 57DEC1478152D973
6 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/io/nekohasekai/sagernet/bg/SubscriptionUpdater.kt
View File

@ -4,7 +4,7 @@ import android.content.Context
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkerParameters
import androidx.work.multiprocess.RemoteWorkManager
@ -39,7 +39,7 @@ object SubscriptionUpdater {
// main process
RemoteWorkManager.getInstance(app).enqueueUniquePeriodicWork(
WORK_NAME,
ExistingPeriodicWorkPolicy.REPLACE,
UPDATE,
PeriodicWorkRequest.Builder(UpdateTask::class.java, minDelay, TimeUnit.MINUTES)
.apply {
if (minInitDelay > 0) setInitialDelay(minInitDelay, TimeUnit.SECONDS)

5
app/src/main/java/io/nekohasekai/sagernet/ktx/Asyncs.kt
View File

@ -2,6 +2,8 @@
package io.nekohasekai.sagernet.ktx
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.*
fun block(block: suspend CoroutineScope.() -> Unit): suspend CoroutineScope.() -> Unit {
@ -11,6 +13,9 @@ fun block(block: suspend CoroutineScope.() -> Unit): suspend CoroutineScope.() -
fun runOnDefaultDispatcher(block: suspend CoroutineScope.() -> Unit) =
GlobalScope.launch(Dispatchers.Default, block = block)
fun Fragment.runOnLifecycleDispatcher(block: suspend CoroutineScope.() -> Unit) =
lifecycleScope.launch(Dispatchers.Default, block = block)
suspend fun <T> onDefaultDispatcher(block: suspend CoroutineScope.() -> T) =
withContext(Dispatchers.Default, block = block)

13
app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
View File

@ -43,6 +43,7 @@ import io.nekohasekai.sagernet.databinding.LayoutProfileListBinding
import io.nekohasekai.sagernet.databinding.LayoutProgressListBinding
import io.nekohasekai.sagernet.fmt.AbstractBean
import io.nekohasekai.sagernet.fmt.toUniversalLink
import io.nekohasekai.sagernet.group.GroupUpdater
import io.nekohasekai.sagernet.group.RawUpdater
import io.nekohasekai.sagernet.ktx.*
import io.nekohasekai.sagernet.plugin.PluginManager
@ -419,6 +420,18 @@ class ConfigurationFragment @JvmOverloads constructor(
.show()
}
R.id.action_update_subscription -> {
val group = DataStore.currentGroup()
if (group.type != GroupType.SUBSCRIPTION) {
snackbar(R.string.group_not_subscription).show()
Logs.e("onMenuItemClick: Group(${group.displayName()}) is not subscription")
} else {
runOnLifecycleDispatcher {
GroupUpdater.startUpdate(group, true)
}
}
}
R.id.action_clear_traffic_statistics -> {
runOnDefaultDispatcher {
val profiles = SagerDatabase.proxyDao.getByGroup(DataStore.currentGroupId())

3
app/src/main/res/menu/add_profile_menu.xml
View File

@ -83,6 +83,9 @@
android:title=""
app:showAsAction="always">
<menu>
<item
android:id="@+id/action_update_subscription"
android:title="@string/update_current_subscription" />
<item
android:id="@+id/action_clear_traffic_statistics"
android:title="@string/clear_traffic_statistics" />

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

@ -487,4 +487,6 @@
<string name="ech_config">ECH 配置</string>
<string name="http_upgrade_host">HTTPUpgrade 主机</string>
<string name="http_upgrade_path">HTTPUpgrade 路径</string>
<string name="update_current_subscription">更新当前组订阅</string>
<string name="group_not_subscription">组类型不是订阅</string>
</resources>

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

@ -528,5 +528,7 @@ Anyone can write advanced plugins, which can control NekoBox. please download an
<string name="dynamic_record_sizing_sum">If enable, the largest possible TLS record size is always used. When disable, the size of TLS records may be adjusted in an attempt to improve latency.</string>
<string name="http_upgrade_host">HTTPUpgrade Host</string>
<string name="http_upgrade_path">HTTPUpgrade Path</string>
<string name="update_current_subscription">Update current Group\'s subscription</string>
<string name="group_not_subscription">Group type is not subscription</string>
</resources>