mirror of
https://github.com/2dust/v2rayNG.git
synced 2025-06-28 12:19:52 +00:00
Temporarily add option to allow insecure HTTP subscription address
https://github.com/2dust/v2rayNG/issues/4526
This commit is contained in:
parent
247e2b3ba3
commit
1bca321d3f
13 changed files with 41 additions and 3 deletions
|
@ -11,5 +11,6 @@ data class SubscriptionItem(
|
|||
var prevProfile: String? = null,
|
||||
var nextProfile: String? = null,
|
||||
var filter: String? = null,
|
||||
var allowInsecureUrl: Boolean = false,
|
||||
)
|
||||
|
||||
|
|
|
@ -419,8 +419,10 @@ object AngConfigManager {
|
|||
if (!Utils.isValidUrl(url)) {
|
||||
return 0
|
||||
}
|
||||
if (!Utils.isValidSubUrl(url)) {
|
||||
return 0
|
||||
if (!it.second.allowInsecureUrl) {
|
||||
if (!Utils.isValidSubUrl(url)) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
Log.i(AppConfig.TAG, url)
|
||||
|
||||
|
|
|
@ -46,6 +46,7 @@ class SubEditActivity : BaseActivity() {
|
|||
binding.etFilter.text = Utils.getEditable(subItem.filter)
|
||||
binding.chkEnable.isChecked = subItem.enabled
|
||||
binding.autoUpdateCheck.isChecked = subItem.autoUpdate
|
||||
binding.allowInsecureUrl.isChecked = subItem.allowInsecureUrl
|
||||
binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile)
|
||||
binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile)
|
||||
return true
|
||||
|
@ -77,6 +78,7 @@ class SubEditActivity : BaseActivity() {
|
|||
subItem.autoUpdate = binding.autoUpdateCheck.isChecked
|
||||
subItem.prevProfile = binding.etPreProfile.text.toString()
|
||||
subItem.nextProfile = binding.etNextProfile.text.toString()
|
||||
subItem.allowInsecureUrl = binding.allowInsecureUrl.isChecked
|
||||
|
||||
if (TextUtils.isEmpty(subItem.remarks)) {
|
||||
toast(R.string.sub_setting_remarks)
|
||||
|
@ -90,7 +92,9 @@ class SubEditActivity : BaseActivity() {
|
|||
|
||||
if (!Utils.isValidSubUrl(subItem.url)) {
|
||||
toast(R.string.toast_insecure_url_protocol)
|
||||
return false
|
||||
if (!subItem.allowInsecureUrl) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -138,6 +138,28 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/padding_spacing_dp16"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:text="@string/sub_allow_insecure_url" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/allow_insecure_url"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/padding_spacing_dp16"
|
||||
android:paddingEnd="@dimen/padding_spacing_dp16"
|
||||
app:theme="@style/BrandedSwitch" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
@ -258,6 +258,7 @@
|
|||
<string name="sub_setting_filter">Remarks regular filter</string>
|
||||
<string name="sub_setting_enable">تفعيل التحديث</string>
|
||||
<string name="sub_auto_update">تفعيل التحديث التلقائي</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
|
||||
<string name="sub_setting_next_profile">Next proxy configuration remarks</string>
|
||||
<string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
|
||||
|
|
|
@ -258,6 +258,7 @@
|
|||
<string name="sub_setting_filter">Remarks regular filter</string>
|
||||
<string name="sub_setting_enable">আপডেট সক্রিয় করুন</string>
|
||||
<string name="sub_auto_update">স্বয়ংক্রিয় আপডেট সক্রিয় করুন</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
|
||||
<string name="sub_setting_next_profile">Next proxy configuration remarks</string>
|
||||
<string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
|
||||
|
|
|
@ -258,6 +258,7 @@
|
|||
<string name="sub_setting_filter">نوم موستعار فیلتر</string>
|
||||
<string name="sub_setting_enable">فعال بیڌن ورۊ کردن</string>
|
||||
<string name="sub_auto_update">فعال بیڌن ورۊ کردن خوتکار</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">نوم موستعار پروکسی دیندایی</string>
|
||||
<string name="sub_setting_next_profile">نوم موستعار پروکسی نیایی</string>
|
||||
<string name="sub_setting_pre_profile_tip">موتمعن بۊ ک نوم موستعار هڌس وو جۊرس نی</string>
|
||||
|
|
|
@ -255,6 +255,7 @@
|
|||
<string name="sub_setting_filter">نام مستعار فیلتر</string>
|
||||
<string name="sub_setting_enable">فعال کردن بهروزرسانی</string>
|
||||
<string name="sub_auto_update">فعال سازی بهروزرسانی خودکار</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">نام مستعار پروکسی قبلی</string>
|
||||
<string name="sub_setting_next_profile">نام مستعار پروکسی بعدی</string>
|
||||
<string name="sub_setting_pre_profile_tip">لطفاً مطمئن شوید که نام مستعار وجود دارد و منحصر به فرد است</string>
|
||||
|
|
|
@ -257,6 +257,7 @@
|
|||
<string name="sub_setting_filter">Название фильтра</string>
|
||||
<string name="sub_setting_enable">Использовать обновление</string>
|
||||
<string name="sub_auto_update">Использовать автообновление</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">Предыдущая конфигурация прокси</string>
|
||||
<string name="sub_setting_next_profile">Следующая конфигурация прокси</string>
|
||||
<string name="sub_setting_pre_profile_tip">Конфигурация должна быть уникальной</string>
|
||||
|
|
|
@ -258,6 +258,7 @@
|
|||
<string name="sub_setting_filter">Remarks regular filter</string>
|
||||
<string name="sub_setting_enable">Sử dụng gói đăng ký này</string>
|
||||
<string name="sub_auto_update">Bật tự động cập nhật</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
|
||||
<string name="sub_setting_next_profile">Next proxy configuration remarks</string>
|
||||
<string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
|
||||
|
|
|
@ -255,6 +255,7 @@
|
|||
<string name="sub_setting_filter">别名正则过滤</string>
|
||||
<string name="sub_setting_enable">启用更新</string>
|
||||
<string name="sub_auto_update">启用自动更新</string>
|
||||
<string name="sub_allow_insecure_url">允许不安全的 HTTP 地址</string>
|
||||
<string name="sub_setting_pre_profile">前置代理配置文件别名</string>
|
||||
<string name="sub_setting_next_profile">落地代理配置文件別名</string>
|
||||
<string name="sub_setting_pre_profile_tip">请确保配置文件别名存在并唯一</string>
|
||||
|
|
|
@ -256,6 +256,7 @@
|
|||
<string name="sub_setting_filter">別名正規過濾</string>
|
||||
<string name="sub_setting_enable">啟用更新</string>
|
||||
<string name="sub_auto_update">啟用自動更新</string>
|
||||
<string name="sub_allow_insecure_url">允許不安全的 HTTP 位址</string>
|
||||
<string name="sub_setting_pre_profile">前置代理設定檔别名</string>
|
||||
<string name="sub_setting_next_profile">落地代理設定檔別名</string>
|
||||
<string name="sub_setting_pre_profile_tip">请确保設定檔别名存在并唯一</string>
|
||||
|
|
|
@ -259,6 +259,7 @@
|
|||
<string name="sub_setting_filter">Remarks regular filter</string>
|
||||
<string name="sub_setting_enable">Enable update</string>
|
||||
<string name="sub_auto_update">Enable automatic update</string>
|
||||
<string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
|
||||
<string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
|
||||
<string name="sub_setting_next_profile">Next proxy configuration remarks</string>
|
||||
<string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue