Android: support Wifi & Battery by using termux-api

CMakeLists.txt

@@ -351,7 +351,7 @@ elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
         src/common/networking_linux.c
         src/common/processing_linux.c
-        src/detection/battery/battery_nosupport.c
+        src/detection/battery/battery_android.c
         src/detection/bios/bios_nosupport.c
         src/detection/board/board_nosupport.c
         src/detection/brightness/brightness_nosupport.c
@@ -378,7 +378,7 @@ elseif(ANDROID)
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/uptime/uptime_linux.c
         src/detection/users/users_linux.c
-        src/detection/wifi/wifi_nosupport.c
+        src/detection/wifi/wifi_android.c
         src/detection/wmtheme/wmtheme_nosupport.c
         src/util/platform/FFPlatform_unix.c
     )

src/detection/battery/battery_android.c

@@ -0,0 +1,38 @@
+#include "fastfetch.h"
+#include "battery.h"
+
+#include "common/processing.h"
+#include "common/properties.h"
+
+const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* results)
+{
+    FF_STRBUF_AUTO_DESTROY buffer;
+    ffStrbufInit(&buffer);
+
+    if(ffProcessAppendStdOut(&buffer, (char* const[]){
+        FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api",
+        "BatteryStatus"
+    }))
+        return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " BatteryStatus` failed";
+
+    BatteryResult* battery = ffListAdd(results);
+    battery->temperature = FF_BATTERY_TEMP_UNSET;
+    ffStrbufInit(&battery->manufacturer);
+    ffStrbufInit(&battery->modelName);
+    ffStrbufInit(&battery->status);
+    ffStrbufInit(&battery->technology);
+
+    if(ffParsePropLines(buffer.chars, "\"percentage\": ", &battery->status))
+    {
+        battery->capacity = ffStrbufToDouble(&battery->status);
+        ffStrbufClear(&battery->status);
+    }
+
+    if(ffParsePropLines(buffer.chars, "\"status\": ", &battery->status))
+    {
+        ffStrbufTrimRight(&battery->status, ',');
+        ffStrbufTrim(&battery->status, '"');
+    }
+
+    return NULL;
+}

src/detection/wifi/wifi_android.c

@@ -0,0 +1,62 @@
+#include "wifi.h"
+
+#include "common/processing.h"
+#include "common/properties.h"
+
+const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* result)
+{
+    FF_STRBUF_AUTO_DESTROY buffer;
+    ffStrbufInit(&buffer);
+
+    if(ffProcessAppendStdOut(&buffer, (char* const[]){
+        FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api",
+        "WifiConnectionInfo"
+    }))
+        return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " WifiConnectionInfo` failed";
+
+    FFWifiResult* item = (FFWifiResult*)ffListAdd(result);
+    ffStrbufInit(&item->inf.description);
+    ffStrbufInit(&item->inf.status);
+    ffStrbufInit(&item->conn.status);
+    ffStrbufInit(&item->conn.ssid);
+    ffStrbufInit(&item->conn.macAddress);
+    ffStrbufInit(&item->conn.protocol);
+    ffStrbufInit(&item->conn.security);
+    item->conn.signalQuality = 0.0/0.0;
+    item->conn.rxRate = 0.0/0.0;
+    item->conn.txRate = 0.0/0.0;
+
+    if(!ffParsePropLines(buffer.chars, "\"supplicant_state\": ", &item->inf.status))
+        ffStrbufAppendS(&item->inf.status, "Unknown");
+
+    {
+        ffStrbufTrimRight(&item->inf.status, ',');
+        ffStrbufTrim(&item->inf.status, '"');
+        if(!ffStrbufEqualS(&item->inf.status, "COMPLETED"))
+            return NULL;
+    }
+
+    if(ffParsePropLines(buffer.chars, "\"rssi\": ", &item->inf.description))
+    {
+        double rssi = ffStrbufToDouble(&item->inf.description);
+        item->conn.signalQuality = rssi >= -50 ? 100 : rssi <= -100 ? 0 : (rssi + 100) * 2;
+        ffStrbufClear(&item->inf.description);
+    }
+
+    if(ffParsePropLines(buffer.chars, "\"network_id\": ", &item->inf.description))
+        ffStrbufTrimRight(&item->inf.description, ',');
+
+    if(ffParsePropLines(buffer.chars, "\"bssid\": ", &item->conn.macAddress))
+    {
+        ffStrbufTrimRight(&item->conn.macAddress, ',');
+        ffStrbufTrim(&item->conn.macAddress, '"');
+    }
+
+    if(ffParsePropLines(buffer.chars, "\"ssid\": ", &item->conn.ssid))
+    {
+        ffStrbufTrimRight(&item->conn.ssid, ',');
+        ffStrbufTrim(&item->conn.ssid, '"');
+    }
+
+    return NULL;
+}

src/detection/wifi/wifi_apple.m

@@ -119,6 +119,8 @@ const char* ffDetectWifi(const FFinstance* instance, FFlist* result)
                 ffStrbufAppendF(&item->conn.security, "Unknown (%ld)", inf.security);
                 break;
         }
+        else
+            ffStrbufAppendS(&item->conn.security, "Insecure");
     }
     return NULL;
 }

src/detection/wifi/wifi_linux.c

@@ -161,8 +161,6 @@ static const char* detectWifiWithLibnm(const FFinstance* instance, FFlist* resul
                     ffStrbufSetS(&item->conn.protocol, "802.11a/b/g");
             }
         }
-        if(!item->conn.protocol.length)
-            ffStrbufAppendS(&item->conn.protocol, "802.11");
 
         NM80211ApFlags flags = ffnm_access_point_get_flags(ap);
         NM80211ApSecurityFlags wpaFlags = ffnm_access_point_get_wpa_flags(ap);
@@ -188,7 +186,10 @@ static const char* detectWifiWithLibnm(const FFinstance* instance, FFlist* resul
             || (rsnFlags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
             ffStrbufAppendS(&item->conn.security, "802.1X ");
         }
-        ffStrbufTrimRight(&item->conn.security, ' ');
+        if (!item->conn.security.length)
+            ffStrbufAppendS(&item->conn.security, "Insecure");
+        else
+            ffStrbufTrimRight(&item->conn.security, ' ');
     }
 
     ffg_object_unref(client);
@@ -294,9 +295,10 @@ static const char* detectWifiWithIoctls(FF_MAYBE_UNUSED const FFinstance* instan
                 case IW_ENCODE_ALG_AES_CMAC:
                     ffStrbufAppendS(&item->conn.security, "CMAC");
                     break;
+                default:
+                    ffStrbufAppendF(&item->conn.security, "Unknown (%d)", (int) iwe->alg);
+                    break;
             }
-        } else {
-            ffStrbufAppendS(&item->conn.security, "unknown");
         }
 
         close(sock);

src/detection/wifi/wifi_windows.c

@@ -198,6 +198,8 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res
             if(connInfo->wlanSecurityAttributes.bOneXEnabled)
                 ffStrbufAppendS(&item->conn.security, " 802.11X");
         }
+        else
+            ffStrbufAppendS(&item->conn.security, "Insecure");
 
         ffWlanFreeMemory(connInfo);
     }

src/modules/wifi.c

@@ -32,11 +32,12 @@ void ffPrintWifi(FFinstance* instance)
             ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
             if(item->conn.ssid.length)
             {
-                printf("%s - %s - %s\n",
-                    item->conn.ssid.chars,
-                    item->conn.protocol.chars,
-                    item->conn.security.length > 0 ? item->conn.security.chars : "insecure"
-                );
+                ffStrbufWriteTo(&item->conn.ssid, stdout);
+                if(item->conn.protocol.length)
+                    printf("- %s", item->conn.protocol.chars);
+                if(item->conn.security.length)
+                    printf("- %s", item->conn.security.chars);
+                putchar('\n');
             }
             else
             {