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 121cfd33..e7e8457a 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 @@ -32,10 +32,10 @@ import android.database.Cursor import android.net.Uri import android.os.Build import android.system.Os -import android.widget.Toast import androidx.core.os.bundleOf import com.v2ray.ang.AngApplication import com.v2ray.ang.extension.listenForPackageChanges +import com.v2ray.ang.extension.toast import com.v2ray.ang.plugin.PluginContract.METADATA_KEY_ID import java.io.File import java.io.FileNotFoundException @@ -126,7 +126,7 @@ object PluginManager { if (providers.size > 1) { val message = "Conflicting plugins found from: ${providers.joinToString { it.providerInfo.packageName }}" - Toast.makeText(AngApplication.application, message, Toast.LENGTH_LONG).show() + AngApplication.application.toast(message) throw IllegalStateException(message) } val provider = providers.single().providerInfo @@ -224,8 +224,8 @@ object PluginManager { fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(key)) { is String -> value - is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo) - .getString(value) +// is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo) +// .getString(value) null -> null else -> error("meta-data $key has invalid type ${value.javaClass}") diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt index 87931874..02acd461 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt @@ -1,6 +1,5 @@ package com.v2ray.ang.service -import android.annotation.TargetApi import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -9,6 +8,7 @@ import android.graphics.drawable.Icon import android.os.Build import android.service.quicksettings.Tile import android.service.quicksettings.TileService +import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat import com.v2ray.ang.AppConfig import com.v2ray.ang.R @@ -16,7 +16,7 @@ import com.v2ray.ang.util.MessageUtil import com.v2ray.ang.util.Utils import java.lang.ref.SoftReference -@TargetApi(Build.VERSION_CODES.N) +@RequiresApi(Build.VERSION_CODES.N) class QSTileService : TileService() { /** 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 5dba1eb1..1f7201ab 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 @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.util.Log -import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.core.content.FileProvider @@ -14,6 +13,7 @@ import com.v2ray.ang.AppConfig import com.v2ray.ang.BuildConfig import com.v2ray.ang.R import com.v2ray.ang.databinding.ActivityAboutBinding +import com.v2ray.ang.extension.toast import com.v2ray.ang.handler.SpeedtestManager import com.v2ray.ang.util.Utils import com.v2ray.ang.util.ZipUtil @@ -195,8 +195,4 @@ class AboutActivity : BaseActivity() { } } } - - private fun toast(messageResId: Int) { - Toast.makeText(this, getString(messageResId), Toast.LENGTH_SHORT).show() - } } \ No newline at end of file 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 6dba8faf..ecc36088 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 @@ -78,7 +78,7 @@ class ServerCustomConfigActivity : BaseActivity() { CustomFmt.parse(binding.editor.text.toString()) } catch (e: Exception) { e.printStackTrace() - ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show() + toast("${getString(R.string.toast_malformed_josn)} ${e.cause?.message}") return false }