astelm/tg-ws-proxy
1
0
Fork 0
mirror of https://github.com/Flowseal/tg-ws-proxy.git synced 2026-05-26 01:11:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): normalize Chaquopy Java list inputs for proxy config

Browse Source
This commit is contained in:
Dark-Avery
2026-03-16 21:39:04 +03:00
parent fe55624e24
commit c5f8b40570
2 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/app/src/main/python/android_proxy_bridge.py
View File

@@ -18,7 +18,24 @@ def _remember_error(message: str) -> None:
def _normalize_dc_ip_list(dc_ip_list: Iterable[object]) -> list[str]:
return [str(item).strip() for item in dc_ip_list if str(item).strip()]
if dc_ip_list is None:
return []
values: list[object]
try:
values = list(dc_ip_list)
except TypeError:
# Chaquopy may expose Kotlin's List<String> as java.util.ArrayList,
# which isn't always directly iterable from Python.
if hasattr(dc_ip_list, "toArray"):
values = list(dc_ip_list.toArray())
elif hasattr(dc_ip_list, "size") and hasattr(dc_ip_list, "get"):
size = int(dc_ip_list.size())
values = [dc_ip_list.get(i) for i in range(size)]
else:
values = [dc_ip_list]
return [str(item).strip() for item in values if str(item).strip()]
def start_proxy(app_dir: str, host: str, port: int,