update

Author: eval-exec

android-app/app/src/main/java/com/nervosnetwork/ckblightclient/LightClientService.kt

@@ -12,6 +12,7 @@ import java.io.*
 
 class LightClientService : Service() {
     private var isRunning = false
+    private var isStarting = false
     private val TAG = "LightClientService"
 
     companion object {
@@ -155,62 +156,75 @@ class LightClientService : Service() {
     }
 
     private fun startLightClient() {
-        if (isRunning) {
-            appendLog("Already running!")
+        if (isRunning || isStarting) {
+            appendLog("Already running or starting, please wait...")
             return
         }
 
-        try {
-            val configPath = File(filesDir, MainActivity.CONFIG_NAME).absolutePath
-
-            appendLog("---")
-            appendLog("Starting CKB Light Client via JNI...")
-            appendLog("Config: $configPath")
-            appendLog("---")
-
-            // Initialize native light client
-            val initSuccess = LightClientNative.nativeInit(
-                configPath,
-                nativeLogCallback,
-                nativeStatusCallback
-            )
-
-            if (!initSuccess) {
-                appendLog("ERROR: Native initialization failed")
-                stopSelf()
-                return
-            }
+        isStarting = true
+        updateNotification("CKB Light Client is starting...")
 
-            appendLog("Native initialization succeeded")
+        Thread {
+            try {
+                val configPath = File(filesDir, MainActivity.CONFIG_NAME).absolutePath
 
-            // Apply saved RUST_LOG filter
-            val prefs = getSharedPreferences("CKBLightClientPrefs", Context.MODE_PRIVATE)
-            val savedFilter = prefs.getString("rust_log_filter", "debug") ?: "info"
-            LightClientNative.nativeSetLogFilter(savedFilter)
-            appendLog("Applied log filter: $savedFilter")
+                appendLog("---")
+                appendLog("Starting CKB Light Client via JNI (background thread)...")
+                appendLog("Config: $configPath")
+                appendLog("---")
 
-            // Start the light client
-            val startSuccess = LightClientNative.nativeStart()
+                // Initialize native light client
+                val initSuccess = LightClientNative.nativeInit(
+                    configPath,
+                    nativeLogCallback,
+                    nativeStatusCallback
+                )
+
+                if (!initSuccess) {
+                    appendLog("ERROR: Native initialization failed")
+                    stopSelf()
+                    return@Thread
+                }
 
-            if (startSuccess) {
-                isRunning = true
-                appendLog("Light Client started successfully!")
-                updateNotification("CKB Light Client is running")
-            } else {
-                appendLog("ERROR: Native start failed")
+                appendLog("Native initialization succeeded")
+
+                // Apply saved RUST_LOG filter
+                val prefs = getSharedPreferences("CKBLightClientPrefs", Context.MODE_PRIVATE)
+                val savedFilter = prefs.getString("rust_log_filter", "debug") ?: "info"
+                LightClientNative.nativeSetLogFilter(savedFilter)
+                appendLog("Applied log filter: $savedFilter")
+
+                // Start the light client
+                val startSuccess = LightClientNative.nativeStart()
+
+                if (startSuccess) {
+                    isRunning = true
+                    appendLog("Light Client started successfully!")
+                    updateNotification("CKB Light Client is running")
+                } else {
+                    appendLog("ERROR: Native start failed")
+                    stopSelf()
+                }
+
+            } catch (e: Exception) {
+                appendLog("ERROR: ${e.message}")
+                Log.e(TAG, "Start error", e)
+                isRunning = false
                 stopSelf()
+            } finally {
+                isStarting = false
             }
-
-        } catch (e: Exception) {
-            appendLog("ERROR: ${e.message}")
-            Log.e(TAG, "Start error", e)
-            isRunning = false
-            stopSelf()
-        }
+        }.start()
     }
 
     private fun stopLightClient() {
+        if (isStarting) {
+            appendLog("Still starting, please wait before stopping.")
+            return
+        }
+
         if (!isRunning) {
+            appendLog("Not running!")
             return
         }
 

light-client-lib/src/jni_bridge/callbacks.rs

@@ -40,7 +40,8 @@ struct LogFilterConfig {
 impl LogFilterConfig {
     const fn new() -> Self {
         Self {
-            default_level: LevelFilter::Info,
+            // Default to debug for normal diagnostics; can be overridden via nativeSetLogFilter()
+            default_level: LevelFilter::Debug,
             module_filters: Vec::new(),
         }
     }
@@ -119,9 +120,8 @@ impl Log for JniLogger {
         let message = format!("{}", record.args());
         buffer.entries.push((record.level(), message));
 
-        if buffer.should_flush() {
-            flush_log_buffer(buffer);
-        }
+        // Flush immediately to avoid losing short bursts (mobile app often emits only a few lines)
+        flush_log_buffer(buffer);
     }
 
     fn flush(&self) {

light-client-lib/src/jni_bridge/lifecycle.rs

@@ -92,8 +92,8 @@ pub extern "C" fn Java_com_nervosnetwork_ckblightclient_LightClientNative_native
             eprintln!("Failed to set logger: {}", e);
             return JNI_FALSE;
         }
-        // Default to Info level - can be changed via nativeSetLogFilter()
-        log::set_max_level(log::LevelFilter::Info);
+        // Default to debug; filters can still be tightened via nativeSetLogFilter()
+        log::set_max_level(log::LevelFilter::Trace);
     } else {
         info!("Reinitialization - JavaVM and callbacks already set, skipping...")
     }