Android support part 2

src/common/threading.c

@@ -59,6 +59,13 @@ static inline void* startThreadsThreadMain(void* instance)
 
 void ffStartDetectionThreads(FFinstance* instance)
 {
+    //Android needs none of the things that are detected here
+    //And using gsettings sometimes hangs the program in android for some unknown reason,
+    //and since we don't need it we just never call it.
+    #ifdef __ANDROID__
+        return;
+    #endif
+
     pthread_t startThreadsThread;
     pthread_create(&startThreadsThread, NULL, startThreadsThreadMain, instance);
     pthread_detach(startThreadsThread);

src/modules/cursor.c

@@ -175,6 +175,11 @@ static bool printCursorFromEnv(FFinstance* instance)
 
 void ffPrintCursor(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursorKey, &instance->config.cursorFormat, FF_CURSOR_NUM_FORMAT_ARGS, "Cursor detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
 
     if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, "TTY") == 0)

src/modules/de.c

@@ -7,6 +7,11 @@
 
 void ffPrintDesktopEnvironment(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_DE_MODULE_NAME, 0, &instance->config.deKey, &instance->config.deFormat, FF_DE_NUM_FORMAT_ARGS, "DE detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
 
     if(result->dePrettyName.length == 0)

src/modules/font.c

@@ -5,6 +5,11 @@
 
 void ffPrintFont(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_FONT_MODULE_NAME, 0, &instance->config.fontKey, &instance->config.fontFormat, FF_FONT_NUM_FORMAT_ARGS, "Font detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
 
     if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, "TTY") == 0)

src/modules/icons.c

@@ -5,6 +5,11 @@
 
 void ffPrintIcons(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.iconsKey, &instance->config.iconsFormat, FF_ICONS_NUM_FORMAT_ARGS, "Icons detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
 
     if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, "TTY") == 0)

src/modules/resolution.c

@@ -5,6 +5,11 @@
 
 void ffPrintResolution(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_RESOLUTION_MODULE_NAME, 0, &instance->config.resolutionKey, &instance->config.resolutionFormat, FF_RESOLUTION_NUM_FORMAT_ARGS, "Resolution detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* dsResult = ffConnectDisplayServer(instance);
 
     for(uint32_t i = 0; i < dsResult->resolutions.length; i++)

src/modules/theme.c

@@ -5,6 +5,11 @@
 
 void ffPrintTheme(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_THEME_MODULE_NAME, 0, &instance->config.themeKey, &instance->config.themeFormat, FF_THEME_NUM_FORMAT_ARGS, "Theme detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
 
     if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, "TTY") == 0)

src/modules/wm.c

@@ -5,6 +5,11 @@
 
 void ffPrintWM(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_WM_MODULE_NAME, 0, &instance->config.wmKey, &instance->config.wmFormat, FF_WM_NUM_FORMAT_ARGS, "WM detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
 
     if(result->wmPrettyName.length == 0)

src/modules/wmtheme.c

@@ -223,6 +223,11 @@ static void printOpenbox(FFinstance* instance, const FFstrbuf* dePrettyName)
 
 void ffPrintWMTheme(FFinstance* instance)
 {
+    #ifdef __ANDROID__
+        ffPrintError(instance, FF_WMTHEME_MODULE_NAME, 0, &instance->config.wmThemeKey, &instance->config.wmThemeFormat, FF_WMTHEME_NUM_FORMAT_ARGS, "WM theme detection is not supported on Android");
+        return;
+    #endif
+
     const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
 
     if(result->wmPrettyName.length == 0)