Skip to content

Commit 304f171

Browse files
committed
Battery / Wifi (Android): add more debug messages
1 parent 9a3909f commit 304f171

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

src/detection/battery/battery_android.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@
44
#include "common/processing.h"
55
#include "common/properties.h"
66

7+
#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
8+
#define FF_TERMUX_API_PARAM "BatteryStatus"
9+
710
const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* results)
811
{
912
FF_STRBUF_AUTO_DESTROY buffer;
1013
ffStrbufInit(&buffer);
1114

1215
if(ffProcessAppendStdOut(&buffer, (char* const[]){
13-
FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api",
14-
"BatteryStatus"
16+
FF_TERMUX_API_PATH,
17+
FF_TERMUX_API_PARAM
1518
}))
16-
return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " BatteryStatus` failed";
19+
return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed";
20+
21+
if(buffer.length == 0)
22+
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty";
1723

1824
BatteryResult* battery = ffListAdd(results);
1925
battery->temperature = FF_BATTERY_TEMP_UNSET;

src/detection/wifi/wifi_android.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33
#include "common/processing.h"
44
#include "common/properties.h"
55

6+
#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
7+
#define FF_TERMUX_API_PARAM "WifiConnectionInfo"
8+
69
const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* result)
710
{
811
FF_STRBUF_AUTO_DESTROY buffer;
912
ffStrbufInit(&buffer);
1013

1114
if(ffProcessAppendStdOut(&buffer, (char* const[]){
12-
FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api",
15+
FF_TERMUX_API_PATH,
1316
"WifiConnectionInfo"
1417
}))
15-
return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " WifiConnectionInfo` failed";
18+
return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed";
19+
20+
if(buffer.length == 0)
21+
return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty";
1622

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

0 commit comments

Comments
 (0)