diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt index 9aabecef..a5e0da0b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt @@ -95,4 +95,4 @@ inline fun Intent.serializable(key: String): T? = whe else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T } -inline fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty()) \ No newline at end of file +fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty()) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt index 1906c3e9..8c432dde 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt @@ -240,7 +240,7 @@ object V2rayConfigManager { val rulesetItems = MmkvManager.decodeRoutingRulesets() rulesetItems?.forEach { key -> - if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) { + if (key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) { key.domain?.forEach { if (it != GEOSITE_PRIVATE && (it.startsWith("geosite:") || it.startsWith("domain:")) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt index 072b1c32..121cfd33 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt @@ -222,7 +222,7 @@ object PluginManager { return File(pluginDir, pluginId).absolutePath } - fun ComponentInfo.loadString(key: String) = when (val value = metaData.get(key)) { + fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(key)) { is String -> value is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo) .getString(value) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt index cf317e0f..a008a840 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt @@ -4,6 +4,7 @@ import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent +import android.app.Service import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -353,7 +354,12 @@ object V2RayServiceManager { fun cancelNotification() { val service = serviceControl?.get()?.getService() ?: return - service.stopForeground(true) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + service.stopForeground(Service.STOP_FOREGROUND_REMOVE) + } else { + service.stopForeground(true) + } + mBuilder = null mDisposable?.dispose() mDisposable = null diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt index 6dcd6fac..53ae34ea 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt @@ -387,7 +387,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() @@ -407,7 +407,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() @@ -427,7 +427,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt index dadbb4fd..30bc3ed2 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt @@ -143,7 +143,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter removeServer(guid, position) } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt index 48d4da37..561db0e9 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt @@ -95,7 +95,7 @@ class RoutingEditActivity : BaseActivity() { } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> // do nothing } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt index d3820305..44410d67 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt @@ -105,7 +105,7 @@ class RoutingSettingActivity : BaseActivity() { } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() @@ -134,7 +134,7 @@ class RoutingSettingActivity : BaseActivity() { } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do nothing } .show() @@ -189,7 +189,7 @@ class RoutingSettingActivity : BaseActivity() { } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do nothing } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt index 26b88fa1..7cb66933 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt @@ -600,7 +600,7 @@ class ServerActivity : BaseActivity() { MmkvManager.removeServer(editGuid) finish() } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> // do nothing } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index 9d8e3305..6dba8faf 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt @@ -106,7 +106,7 @@ class ServerCustomConfigActivity : BaseActivity() { MmkvManager.removeServer(editGuid) finish() } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> // do nothing } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt index 0c32ff76..45f92c2d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt @@ -113,7 +113,7 @@ class SubEditActivity : BaseActivity() { } } } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> // do nothing } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt index 0f217546..c59afe5b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt @@ -333,7 +333,7 @@ class UserAssetActivity : BaseActivity() { MmkvManager.removeAssetUrl(item.first) initAssets() } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> //do noting } .show() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt index 98b4c86b..0f95dd7a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt @@ -116,7 +116,7 @@ class UserAssetUrlActivity : BaseActivity() { MmkvManager.removeAssetUrl(editAssetId) finish() } - .setNegativeButton(android.R.string.no) { _, _ -> + .setNegativeButton(android.R.string.cancel) { _, _ -> // do nothing } .show() diff --git a/V2rayNG/settings.gradle.kts b/V2rayNG/settings.gradle.kts index 3f61841e..7ac30b30 100644 --- a/V2rayNG/settings.gradle.kts +++ b/V2rayNG/settings.gradle.kts @@ -16,7 +16,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - jcenter() maven { url = uri("https://jitpack.io") } } }