Skip to content

Commit 3e068d1

Browse files
committed
Wifi / Battery (Android): more accurate checks
1 parent c283e39 commit 3e068d1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/detection/battery/battery_android.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* re
1818
}))
1919
return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed";
2020

21-
if(buffer.length == 0)
22-
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty";
21+
if(buffer.chars[0] != '{')
22+
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)";
2323

2424
BatteryResult* battery = ffListAdd(results);
2525
battery->temperature = FF_BATTERY_TEMP_UNSET;

src/detection/wifi/wifi_android.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res
1313

1414
if(ffProcessAppendStdOut(&buffer, (char* const[]){
1515
FF_TERMUX_API_PATH,
16-
"WifiConnectionInfo"
16+
FF_TERMUX_API_PARAM
1717
}))
1818
return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed";
1919

20-
if(buffer.length == 0)
21-
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty";
20+
if(buffer.chars[0] != '{')
21+
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)";
2222

2323
FFWifiResult* item = (FFWifiResult*)ffListAdd(result);
2424
ffStrbufInit(&item->inf.description);

0 commit comments

Comments
 (0)