From f77fe05c92fd336d157a2da14b87b48eb6ae4388 Mon Sep 17 00:00:00 2001 From: AnGgIt86 Date: Sat, 10 Aug 2024 18:56:37 +0700 Subject: [PATCH] Update RxPermissions and rxjava3 (#3463) --- .../v2ray/ang/service/V2RayServiceManager.kt | 20 +++++++++---------- .../kotlin/com/v2ray/ang/ui/AboutActivity.kt | 2 +- .../kotlin/com/v2ray/ang/ui/MainActivity.kt | 6 +++--- .../com/v2ray/ang/ui/MainRecyclerAdapter.kt | 4 ++-- .../com/v2ray/ang/ui/PerAppProxyActivity.kt | 4 ++-- .../v2ray/ang/ui/RoutingSettingsFragment.kt | 2 +- .../com/v2ray/ang/ui/ScScannerActivity.kt | 2 +- .../com/v2ray/ang/ui/ScannerActivity.kt | 2 +- .../com/v2ray/ang/ui/UserAssetActivity.kt | 2 +- .../com/v2ray/ang/util/AppManagerUtil.kt | 2 +- V2rayNG/gradle/libs.versions.toml | 12 +++++------ V2rayNG/settings.gradle.kts | 1 + 12 files changed, 30 insertions(+), 29 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt index ead2e503..4324f45c 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt @@ -33,8 +33,8 @@ import kotlinx.coroutines.launch import libv2ray.Libv2ray import libv2ray.V2RayPoint import libv2ray.V2RayVPNServiceSupportsSet -import rx.Observable -import rx.Subscription +import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.disposables.Disposable import java.lang.ref.SoftReference import kotlin.math.min @@ -59,7 +59,7 @@ object V2RayServiceManager { private var lastQueryTime = 0L private var mBuilder: NotificationCompat.Builder? = null - private var mSubscription: Subscription? = null + private var mDisposable: Disposable? = null private var mNotificationManager: NotificationManager? = null fun startV2Ray(context: Context) { @@ -334,8 +334,8 @@ object V2RayServiceManager { val service = serviceControl?.get()?.getService() ?: return service.stopForeground(true) mBuilder = null - mSubscription?.unsubscribe() - mSubscription = null + mDisposable?.dispose() + mDisposable = null } private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) { @@ -362,14 +362,14 @@ object V2RayServiceManager { } private fun startSpeedNotification() { - if (mSubscription == null && + if (mDisposable == null && v2rayPoint.isRunning && settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) == true) { var lastZeroSpeed = false val outboundTags = currentConfig?.getAllOutboundTags() outboundTags?.remove(TAG_DIRECT) - mSubscription = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS) + mDisposable = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS) .subscribe { val queryTime = System.currentTimeMillis() val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0 @@ -411,9 +411,9 @@ object V2RayServiceManager { } private fun stopSpeedNotification() { - if (mSubscription != null) { - mSubscription?.unsubscribe() //stop queryStats - mSubscription = null + if (mDisposable != null) { + mDisposable?.dispose() //stop queryStats + mDisposable = null updateNotification(currentConfig?.remarks, 0, 0) } } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/AboutActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/AboutActivity.kt index 04a3c3bf..8d2682a0 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/AboutActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/AboutActivity.kt @@ -6,7 +6,7 @@ import android.os.Build import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.FileProvider -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.BuildConfig diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index 5779615d..6b1e42f3 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -26,7 +26,7 @@ import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.navigation.NavigationView import com.google.android.material.tabs.TabLayout -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.R @@ -46,8 +46,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import me.drakeet.support.toast.ToastCompat -import rx.Observable -import rx.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt index a5c404af..1fd2c1d4 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt @@ -26,8 +26,8 @@ import com.v2ray.ang.service.V2RayServiceManager import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.MmkvManager import com.v2ray.ang.util.Utils -import rx.Observable -import rx.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt index ebaa3624..1d5b0f45 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/PerAppProxyActivity.kt @@ -23,8 +23,8 @@ import com.v2ray.ang.util.MmkvManager import com.v2ray.ang.util.Utils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import rx.android.schedulers.AndroidSchedulers -import rx.schedulers.Schedulers +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers import java.text.Collator class PerAppProxyActivity : BaseActivity() { diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt index 657c8f0a..02a690d0 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/RoutingSettingsFragment.kt @@ -10,7 +10,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceManager -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.R diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScScannerActivity.kt index 95361b90..c8508553 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScScannerActivity.kt @@ -4,7 +4,7 @@ import android.Manifest import android.content.Intent import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.v2ray.ang.R import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt index e53ba84a..c38d5362 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt @@ -9,7 +9,7 @@ import android.os.Build import android.view.Menu import android.view.MenuItem import androidx.activity.result.contract.ActivityResultContracts -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.R diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt index d353de40..a2986ef5 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt @@ -16,7 +16,7 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.gson.Gson -import com.tbruyelle.rxpermissions.RxPermissions +import com.tbruyelle.rxpermissions3.RxPermissions import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig import com.v2ray.ang.R diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt index 3c77c863..3e2a4d4a 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt @@ -6,7 +6,7 @@ import android.content.pm.ApplicationInfo import android.content.pm.PackageInfo import android.content.pm.PackageManager import com.v2ray.ang.dto.AppInfo -import rx.Observable +import io.reactivex.rxjava3.core.Observable object AppManagerUtil { fun loadNetworkAppList(ctx: Context): ArrayList { diff --git a/V2rayNG/gradle/libs.versions.toml b/V2rayNG/gradle/libs.versions.toml index 66a45a46..31f2101c 100644 --- a/V2rayNG/gradle/libs.versions.toml +++ b/V2rayNG/gradle/libs.versions.toml @@ -19,9 +19,9 @@ multidex = "2.0.1" preferenceKtx = "1.2.1" quickieBundled = "1.9.0" recyclerview = "1.3.2" -rxandroid = "1.2.1" -rxjava = "1.3.8" -rxpermissions = "0.9.4" +rxandroid = "3.0.2" +rxjava = "3.1.8" +rxpermissions = "0.12" toastcompat = "1.1.0" viewpager2 = "1.1.0" workRuntimeKtx = "2.8.1" @@ -52,9 +52,9 @@ multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } quickie-bundled = { module = "io.github.g00fy2.quickie:quickie-bundled", version.ref = "quickieBundled" } recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" } -rxandroid = { module = "io.reactivex:rxandroid", version.ref = "rxandroid" } -rxjava = { module = "io.reactivex:rxjava", version.ref = "rxjava" } -rxpermissions = { module = "com.tbruyelle.rxpermissions:rxpermissions", version.ref = "rxpermissions" } +rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" } +rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" } +rxpermissions = { module = "com.github.tbruyelle:rxpermissions", version.ref = "rxpermissions" } toastcompat = { module = "me.drakeet.support:toastcompat", version.ref = "toastcompat" } viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" } work-multiprocess = { module = "androidx.work:work-multiprocess", version.ref = "workRuntimeKtx" } diff --git a/V2rayNG/settings.gradle.kts b/V2rayNG/settings.gradle.kts index 8406d54c..f86c0114 100644 --- a/V2rayNG/settings.gradle.kts +++ b/V2rayNG/settings.gradle.kts @@ -11,6 +11,7 @@ dependencyResolutionManagement { google() mavenCentral() jcenter() + maven { url = uri("https://jitpack.io") } } } rootProject.name = "V2rayNG"