TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix proxy parse, #492

Browse Source
This commit is contained in:
luvletter2333 2021-05-06 00:10:34 +08:00
parent 1c6a86b164
commit 33e83cae6b
No known key found for this signature in database
GPG Key ID: BFD68B892BECC1D8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
View File

@ -78,7 +78,7 @@ object ProxyUtil {
@JvmOverloads @JvmOverloads
fun parseProxies(text: String, tryDecode: Boolean = true): MutableList<String> { fun parseProxies(text: String, tryDecode: Boolean = true): MutableList<String> {
if (tryDecode) { if (tryDecode && !text.contains("proxies:")) {
try { try {
return parseProxies(String(Base64.decode(text, Base64.NO_PADDING)), false) return parseProxies(String(Base64.decode(text, Base64.NO_PADDING)), false)
} catch (ignored: Exception) { } catch (ignored: Exception) {
@ -98,7 +98,7 @@ object ProxyUtil {
} catch (ignored: JSONException) { } catch (ignored: JSONException) {
} }
if (text.contains("proxies:\n")) { if (text.contains("proxies:")) {
if (BuildVars.isMini) { if (BuildVars.isMini) {
error(LocaleController.getString("MiniVersionAlert", R.string.MiniVersionAlert)) error(LocaleController.getString("MiniVersionAlert", R.string.MiniVersionAlert))