Update

Author: Novfensec

client/buildozer.spec

@@ -42,7 +42,7 @@ version = 0.1
 
 # (list) Application requirements
 # comma separated e.g. requirements = sqlite3,kivy
-requirements = python3, kivy==2.3.0, https://github.com/CarbonKivy/CarbonKivy/archive/master.zip, android, requests, pyjnius
+requirements = python3, kivy==2.3.0, https://github.com/CarbonKivy/CarbonKivy/archive/master.zip, android, requests, pyjnius, kaki, watchdog
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -251,7 +251,7 @@ android.add_src = ./src
 #android.res_xml = PATH_TO_FILE,
 
 # (str) launchMode to set for the main activity
-android.manifest.launch_mode = standard
+android.manifest.launch_mode = singleTask
 
 # (str) screenOrientation to set for the main activity.
 # Valid values can be found at https://developer.android.com/guide/topics/manifest/activity-element

client/libs/launcher/__init__.py

@@ -87,7 +87,7 @@ def download_file_from_server(self, filename: str) -> None:
             r.raise_for_status()
             with open(local_path, "wb") as f:
                 f.write(r.content)
-            print(f"[SYNC] Downloaded: {filename}")
+            print(f"[SYNC] Downloaded {filename} at {local_path}")
         except Exception as e:
             print(f"[ERROR] Failed to download {filename}: {e}")
         self.start_auto_sync()
@@ -109,15 +109,14 @@ def sync_loop(self) -> None:
             except Exception as e:
                 print(f"[SYNC ERROR] {e}")
             time.sleep(3.0)  # Poll interval
-            if (self.process and (self.process.poll() != None)) or (self.running == False):
+            if (self.process and (self.process.poll() != None)) or (self.app.running == False):
                 break
 
     def run_entrypoint(self) -> None:
         entrypoint_path = os.path.abspath(os.path.join(self.target_dir, self.entrypoint))
         self.display_indicator(False)
         if platform == "android":
             launch_client_activity(entrypoint_path)
-            self.running = False
         else:
             self.process = subprocess.Popen([sys.executable, entrypoint_path], cwd=self.target_dir) # nosec
             print(f"[RUN] {self.entrypoint} launched...")

client/libs/launcher/android/__init__.py

@@ -1,5 +1,6 @@
 import os
 from jnius import autoclass
+from android.runnable import run_on_ui_thread # type: ignore
 
 PythonActivity = autoclass("org.kivy.android.PythonActivity")
 ClientActivity = autoclass("org.kvdeveloper.client.ClientActivity")
@@ -9,14 +10,13 @@
 activity = PythonActivity.mActivity
 AppStorageDir = os.path.join(activity.getFilesDir().getAbsolutePath(), "Applications")
 
+@run_on_ui_thread
 def launch_client_activity(entrypoint_path: str) -> None:
     app_dir = os.path.dirname(entrypoint_path)
     uri = Uri.parse("file://" + app_dir)
 
-    intent = Intent(Intent.ACTION_MAIN)
-    intent.setClass(activity, ClientActivity)
+    intent = Intent(activity.getApplicationContext(), ClientActivity)
     intent.setData(uri)
-    intent.setAction("org.kivy.LAUNCH")
     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
     activity.startActivity(intent)
 

client/main.py

@@ -12,7 +12,7 @@ def set_softinput(*args) -> None:
 
 Window.on_restore(Clock.schedule_once(set_softinput, 0.1))
 
-from kivy.properties import StringProperty
+from kivy.properties import StringProperty, BooleanProperty
 
 from carbonkivy.app import CarbonApp
 from carbonkivy.uix.screenmanager import CScreenManager
@@ -29,6 +29,8 @@ class KvDeveloperClient(CarbonApp):
 
     status = StringProperty()
 
+    running = BooleanProperty(None, allownone=True)
+
     def __init__(self, *args, **kwargs) -> None:
         super(KvDeveloperClient, self).__init__(*args, **kwargs)
         self.load_all_kv_files(os.path.join(self.directory, "View"))
@@ -54,30 +56,18 @@ def referrer(self, destination: str = None) -> None:
         if self.manager_screens.current != destination:
             self.manager_screens.current = destination
 
+    def on_resume(self):
+        self.running = False
+        return super().on_resume()
+
     def launch(self, server_url: str, *args) -> None:
         self.launcher = ApplicationLauncher(server_url=server_url, entrypoint="main.py", app_name="Demo")
         self.launcher.launch_app()
+        self.running = True
         self.launcher = None
 
 
 if __name__ == "__main__":
     app = KvDeveloperClient()
     app.run()
-    import sys
-    from kivy.utils import platform
-
-    if platform == "android":
-        from jnius import autoclass
-        activity = autoclass("org.kivy.android.PythonActivity").mActivity
-        log_dir = activity.getExternalFilesDir(None).getAbsolutePath()
-    else:
-        log_dir = os.path.expanduser("~/AppLogs")
-
-    os.makedirs(log_dir, exist_ok=True)
-
-    log_file_path = os.path.join(log_dir, "app_log.txt")
-    sys.stdout = open(log_file_path, "a")
-    sys.stderr = sys.stdout
-
-    print("[LOG] Logging started.")
 

client/src/org/kvdeveloper/client/ClientActivity.java

@@ -1,5 +1,7 @@
 package org.kvdeveloper.client;
 
+import android.net.Uri;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 
@@ -8,6 +10,25 @@
 public class ClientActivity extends PythonActivity {
     private static final String TAG = "ClientActivity";
 
+    @Override
+    protected String getEntryPoint() {
+        Uri uri = getIntent().getData();
+        if (uri != null) {
+            String path = uri.getPath();
+            Log.i(TAG, "Launching entrypoint from URI: " + path);
+            return path;
+        } else {
+            Log.w(TAG, "No entrypoint URI passed.");
+            finish();
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.i(TAG, "ClientActivity started");
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         int keyCode = event.getKeyCode();