ANDROID: replace MUI based portal with native js implementation

- implemented proxy handling to the web build

Author: Chris Warren-Smith

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.31])
+AC_INIT([smallbasic], [12.32])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -271,7 +271,6 @@ function buildAndroid() {
    TEST_DIR="src/platform/android"
    AC_SUBST(TEST_DIR)
    if test $with_library = no; then
-      (cd src/platform/android/webui && npm run build)
       TARGET="Building for Android."
    else
       TARGET="Building for Android library."
@@ -351,6 +350,14 @@ function buildWeb() {
      PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread -lmicrohttpd"
      AC_CHECK_HEADERS([microhttpd.h], [], [AC_MSG_ERROR([microhttpd is not installed])])
    fi
+
+   AC_CHECK_HEADERS([curl/curl.h], [have_curl_h=yes; break;])
+
+   if test "x${have_curl_h}" = "xyes" ; then
+      AC_DEFINE(USE_LIB_CURL, 1, [use the curl library.])
+      PACKAGE_LIBS="${PACKAGE_LIBS} -lcurl"
+   fi
+
    BUILD_SUBDIRS="src/common src/platform/web"
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
@@ -482,7 +489,7 @@ checkProfiling
 checkForWindows
 
 CFLAGS="${CFLAGS} -std=gnu11"
-PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
+PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Werror -Wno-unused-result"
 BUILD_DATE=`date +"%a, %d %b %Y"`
 AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date])
 

src/platform/android/Makefile.am

@@ -56,3 +56,6 @@ library:
 	(cp -R app/build/intermediates/stripped_native_libs/release/out/lib/ dist)
 	(cp app/build/intermediates/dex/release/minifyReleaseWithR8/classes.dex dist)
 
+# launch WebServerTest in intellij
+start-ui:
+	(cd app/src/main/assets/webui && valgrind ../../../../../../web/sbasicw -p 3000 -a 'api' -o 'http://localhost:8080')

src/platform/android/portal-ui/index.html …oid/app/src/main/assets/webui/index.htmlsrc/platform/android/portal-ui/index.html renamed to src/platform/android/app/src/main/assets/webui/index.html src/platform/android/portal-ui/index.html renamed to src/platform/android/app/src/main/assets/webui/index.html

@@ -13,7 +13,6 @@
     const mainContent = document.getElementById('main-content');
     if (token) {
       renderFileList(mainContent);
-      setupFileListEventListeners();
     } else {
       renderTokenInput(mainContent);
     }
@@ -90,6 +89,7 @@
 
     renderTableRows();
     updateToolbarState();
+    setupFileListEventListeners();
   }
 
   function renderTableRows() {
@@ -322,6 +322,7 @@
       rows = data;
       renderContent();
     } catch (error) {
+      console.log(error);
       tokenInput.classList.add('error');
       helperText.textContent = 'Invalid token. Enter the access token displayed on the SmallBASIC [About] screen.';
       helperText.classList.add('error');
@@ -342,8 +343,7 @@
       for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const dataUrl = await fileToDataURL(file);
-        await callApi('/api/upload',
-                           `fileName=${encodeURIComponent(file.name)}&data=${dataUrl}`);
+        await callApi('/api/upload', `fileName=${encodeURIComponent(file.name)}&data=${dataUrl}`);
 
         if (files.length > 1) {
           showSnackbar(`Uploaded ${i + 1}/${files.length} files`, 'info');
@@ -413,8 +413,7 @@
       `Are you sure you want to permanently delete ${selectedRow.fileName}? You cannot undo `
     )) {
       try {
-        const data = await callApi('/api/delete',
-                                        `fileName=${encodeURIComponent(selectedRow.fileName)}`);
+        const data = await callApi('/api/delete', `fileName=${encodeURIComponent(selectedRow.fileName)}`);
         rows = data;
         selectedRows.clear();
         renderTableRows();
@@ -434,8 +433,7 @@
     if (oldName === newName) return;
 
     try {
-      await callApi('/api/rename',
-                         `from=${encodeURIComponent(oldName)}&to=${encodeURIComponent(newName)}`);
+      await callApi('/api/rename', `from=${encodeURIComponent(oldName)}&to=${encodeURIComponent(newName)}`);
       row.fileName = newName;
       showSnackbar('File renamed successfully', 'success');
     } catch (error) {
@@ -454,6 +452,7 @@
 
     const data = await response.json();
     if (data.error) {
+      console.log(data);
       throw new Error(data.error);
     }
     return data;

src/platform/android/portal-ui/main.css …droid/app/src/main/assets/webui/main.csssrc/platform/android/portal-ui/main.css renamed to src/platform/android/app/src/main/assets/webui/main.css src/platform/android/portal-ui/main.css renamed to src/platform/android/app/src/main/assets/webui/main.css

@@ -1,12 +1,17 @@
 # SmallBASIC web server version
-# Copyright(C) 2001-2016 Chris Warren-Smith.
+# Copyright(C) 2001-2025 Chris Warren-Smith.
 #
 # This program is distributed under the terms of the GPL v2.0 or later
 # Download the GNU Public License (GPL) from www.gnu.org
 # 
 
+#
+# sudo apt install libcurl4-openssl-dev
+#
+
 AM_CPPFLAGS = -I$(top_builddir)/src -I. @PACKAGE_CFLAGS@
 bin_PROGRAMS = sbasicw
-sbasicw_SOURCES = main.cpp canvas.cpp ../../ui/strlib.cpp
+sbasicw_SOURCES = main.cpp canvas.cpp config.cpp ../../ui/strlib.cpp
 sbasicw_LDADD = -L$(top_srcdir)/src/common -lsb_common @PACKAGE_LIBS@
 sbasicw_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a
+

src/platform/android/portal-ui/main.js …ndroid/app/src/main/assets/webui/main.jssrc/platform/android/portal-ui/main.js renamed to src/platform/android/app/src/main/assets/webui/main.js src/platform/android/portal-ui/main.js renamed to src/platform/android/app/src/main/assets/webui/main.js

@@ -0,0 +1,19 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2025 Chris Warren-Smith.
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+//
+
+#include <config.h>
+
+#if defined(USE_LIB_CURL)
+#include "proxy.cpp"
+#else
+#include <microhttpd.h>
+void proxy_init(const char *path, const char *host) {}
+void proxy_cleanup() {}
+bool proxy_accept(MHD_Connection *connection, const char *path) { return false; }
+MHD_Response *proxy_request(MHD_Connection *connection, const char *path, const char *method, const char *body) { return nullptr; }
+#endif