From e14b48f3ebf8a5b8aaf58d8aa39c4ec6eb350616 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Tue, 18 Mar 2025 15:04:25 +0800 Subject: [PATCH] Code clean --- V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt | 2 -- V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt | 6 ++++-- V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt | 1 - .../src/main/java/com/v2ray/ang/handler/SettingsManager.kt | 1 - .../com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt | 1 - .../src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt | 2 +- .../app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt | 1 - .../app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt | 1 - .../app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt | 2 +- .../app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt | 1 - 15 files changed, 6 insertions(+), 17 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt index 6b437021..a999a9b4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt @@ -1,8 +1,6 @@ package com.v2ray.ang import android.content.Context -import android.content.pm.PackageManager -import android.os.Build import androidx.multidex.MultiDexApplication import androidx.work.Configuration import androidx.work.WorkManager diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt index e528546d..a602b940 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt @@ -8,8 +8,10 @@ import com.google.gson.JsonSerializer import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import com.v2ray.ang.AppConfig -import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.* -import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.* +import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.ServersBean +import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean +import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean +import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean import com.v2ray.ang.util.Utils import java.lang.reflect.Type diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt index 0c85b171..e9ebc53e 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt @@ -4,7 +4,6 @@ import com.v2ray.ang.dto.EConfigType import com.v2ray.ang.dto.ProfileItem import com.v2ray.ang.dto.V2rayConfig.OutboundBean import com.v2ray.ang.extension.isNotNullEmpty -import kotlin.text.orEmpty object HttpFmt : FmtBase() { fun toOutbound(profileItem: ProfileItem): OutboundBean? { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt index b610a9da..3b47bf3e 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt @@ -7,7 +7,6 @@ import com.v2ray.ang.extension.idnHost import com.v2ray.ang.extension.isNotNullEmpty import com.v2ray.ang.util.Utils import java.net.URI -import kotlin.text.orEmpty object SocksFmt : FmtBase() { fun parse(str: String): ProfileItem? { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt index 7139ada0..db0c907d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt @@ -9,7 +9,6 @@ import com.v2ray.ang.extension.idnHost import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.util.Utils import java.net.URI -import kotlin.text.orEmpty object TrojanFmt : FmtBase() { fun parse(str: String): ProfileItem? { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt index 72a5868a..e566f5fa 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt @@ -14,7 +14,6 @@ import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.util.JsonUtil import com.v2ray.ang.util.Utils import java.net.URI -import kotlin.text.orEmpty object VmessFmt : FmtBase() { fun parse(str: String): ProfileItem? { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt index 11231887..2bce4d24 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt @@ -8,7 +8,6 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean import com.v2ray.ang.extension.idnHost import com.v2ray.ang.util.Utils import java.net.URI -import kotlin.text.orEmpty object WireguardFmt : FmtBase() { fun parse(str: String): ProfileItem? { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt index 83376356..cf116a4d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt @@ -22,7 +22,6 @@ import com.v2ray.ang.util.Utils.parseInt import java.io.File import java.io.FileOutputStream import java.util.Collections -import kotlin.Int object SettingsManager { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt index ff61aadc..44a9853b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt @@ -16,7 +16,6 @@ package com.v2ray.ang.helper import android.animation.ValueAnimator -import android.animation.ValueAnimator.AnimatorUpdateListener import android.graphics.Canvas import android.view.animation.DecelerateInterpolator import androidx.recyclerview.widget.GridLayoutManager diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt index 806758af..69838ac2 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt @@ -7,7 +7,6 @@ import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts -import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import com.tencent.mmkv.MMKV diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt index a6fdfdef..e59cd537 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt @@ -19,12 +19,12 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.extension.v2RayApplication import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.util.AppManagerUtil +import com.v2ray.ang.util.HttpUtil import com.v2ray.ang.util.Utils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.text.Collator -import com.v2ray.ang.util.HttpUtil class PerAppProxyActivity : BaseActivity() { private val binding by lazy { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt index 829d345d..6702cdc1 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt @@ -9,7 +9,6 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.activity.result.contract.ActivityResultContracts -import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import com.v2ray.ang.AppConfig import com.v2ray.ang.R diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt index 2a287d11..8d5c2b42 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt @@ -10,7 +10,6 @@ import com.v2ray.ang.databinding.ActivityLogcatBinding import com.v2ray.ang.extension.toast import com.v2ray.ang.handler.AngConfigManager import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.net.URLDecoder diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt index e2300512..e813384d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt @@ -4,8 +4,8 @@ import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import com.v2ray.ang.dto.AppInfo -import kotlinx.coroutines.withContext import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext object AppManagerUtil { suspend fun loadNetworkAppList(context: Context): ArrayList = diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt index d1b13d21..6aae9bfc 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt @@ -7,7 +7,6 @@ import android.util.Log import com.v2ray.ang.AppConfig import com.v2ray.ang.R import com.v2ray.ang.extension.responseLength -import com.v2ray.ang.util.HttpUtil import kotlinx.coroutines.isActive import libv2ray.Libv2ray import java.io.IOException