jahlib/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #1088 from yuhan6665/import-fix

Browse Source 
Fix a null pointer when subscribe link doesn't have sni field
This commit is contained in:
2dust
2021-06-07 08:17:13 +08:00
committed by GitHub
parent 35c5d64863 031e9105e2
commit 19cc665f2d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+2 -1
View File
@@ -192,6 +192,7 @@ object AngConfigManager {
return R.string.toast_decoding_failed
}
val vmessQRCode = Gson().fromJson(result, VmessQRCode::class.java)
// Although VmessQRCode fields are non null, looks like Gson may still create null fields
if (TextUtils.isEmpty(vmessQRCode.add)
|| TextUtils.isEmpty(vmessQRCode.port)
|| TextUtils.isEmpty(vmessQRCode.id)
@@ -212,7 +213,7 @@ object AngConfigManager {
val sni = streamSetting.populateTransportSettings(vmessQRCode.net, vmessQRCode.type, vmessQRCode.host,
vmessQRCode.path, vmessQRCode.path, vmessQRCode.host, vmessQRCode.path, vmessQRCode.type, vmessQRCode.path)
streamSetting.populateTlsSettings(vmessQRCode.tls, allowInsecure,
if (vmessQRCode.sni.isNotBlank()) vmessQRCode.sni else sni)
if (TextUtils.isEmpty(vmessQRCode.sni)) sni else vmessQRCode.sni)
}
}
} else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {