From 3e068d16df2ae5deaf3de604f85acaea436d25ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 21 Feb 2023 21:25:02 +0800 Subject: [PATCH] Wifi / Battery (Android): more accurate checks --- src/detection/battery/battery_android.c | 4 ++-- src/detection/wifi/wifi_android.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index fe081e85b..c80e5cf6b 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -18,8 +18,8 @@ const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* re })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; - if(buffer.length == 0) - return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; + if(buffer.chars[0] != '{') + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)"; BatteryResult* battery = ffListAdd(results); battery->temperature = FF_BATTERY_TEMP_UNSET; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index 5a304de4c..e7278407e 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -13,12 +13,12 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res if(ffProcessAppendStdOut(&buffer, (char* const[]){ FF_TERMUX_API_PATH, - "WifiConnectionInfo" + FF_TERMUX_API_PARAM })) return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; - if(buffer.length == 0) - return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; + if(buffer.chars[0] != '{') + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)"; FFWifiResult* item = (FFWifiResult*)ffListAdd(result); ffStrbufInit(&item->inf.description);