fix: update test script and vibrator_haptics nil safety

Author: xaionaro@dx.center

examples/test_all_apks.sh

@@ -82,9 +82,16 @@ for i in "${!EXAMPLES[@]}"; do
     # Uninstall old version (ignore errors)
     "$ADB" uninstall "$pkg" > /dev/null 2>&1 || true
 
-    # Install
+    # Install via push + pm install (more reliable than streaming install)
     echo "  Installing..."
-    if ! "$ADB" install -r "$dir/build/$name.apk" >> "$result_file" 2>&1; then
+    "$ADB" wait-for-device
+    if ! "$ADB" push "$dir/build/$name.apk" /data/local/tmp/ >> "$result_file" 2>&1; then
+        echo "  PUSH FAILED"
+        FAIL=$((FAIL + 1))
+        ERRORS="$ERRORS\n  INSTALL_FAIL: $name"
+        continue
+    fi
+    if ! "$ADB" shell pm install -r "/data/local/tmp/$name.apk" >> "$result_file" 2>&1; then
         echo "  INSTALL FAILED"
         FAIL=$((FAIL + 1))
         ERRORS="$ERRORS\n  INSTALL_FAIL: $name"
@@ -97,34 +104,45 @@ for i in "${!EXAMPLES[@]}"; do
         "$ADB" shell pm grant "$pkg" "$perm" 2>/dev/null || true
     done
 
-    # Clear logcat and wait for any stale crash dumps to flush
+    # Clear logcat
     "$ADB" logcat -c 2>/dev/null || true
-    sleep 2
+    sleep 1
     "$ADB" logcat -c 2>/dev/null || true
 
     # Launch
     echo "  Running..."
     "$ADB" shell am start -n "$pkg/android.app.NativeActivity" >> "$result_file" 2>&1
 
-    # Get the PID of the launched app for filtering
+    # Get the PID of the launched app for filtering (take first PID if multiple)
     sleep 1
-    app_pid=$("$ADB" shell pidof "$pkg" 2>/dev/null || true)
+    app_pid=$("$ADB" shell pidof "$pkg" 2>/dev/null | awk '{print $1}' || true)
 
     # Wait for output (the app writes to logcat with tag GoJNI)
-    # Poll for up to 30 seconds
+    # Poll for up to 30 seconds, filtering by PID to avoid stale messages
     got_output=false
     for attempt in $(seq 1 30); do
         sleep 1
-        output=$("$ADB" logcat -d -s GoJNI 2>/dev/null | grep -v "^-" || true)
+        if [ -n "$app_pid" ]; then
+            output=$("$ADB" logcat -d -s GoJNI --pid="$app_pid" 2>/dev/null | grep -v "^-" || true)
+            # Fallback: some adb versions don't support --pid; use grep
+            if [ -z "$output" ]; then
+                output=$("$ADB" logcat -d -s GoJNI 2>/dev/null | grep -v "^-" | grep " $app_pid " || true)
+            fi
+        else
+            output=$("$ADB" logcat -d -s GoJNI 2>/dev/null | grep -v "^-" || true)
+        fi
         if [ -n "$output" ]; then
             got_output=true
             break
         fi
         # Check if app is still alive
         if [ -n "$app_pid" ]; then
             if ! "$ADB" shell kill -0 "$app_pid" 2>/dev/null; then
-                # App exited, check for crash
-                break
+                # App exited; re-read PID in case it restarted, then check for crash
+                app_pid=$("$ADB" shell pidof "$pkg" 2>/dev/null || true)
+                if [ -z "$app_pid" ]; then
+                    break
+                fi
             fi
         fi
     done
@@ -163,11 +181,9 @@ for i in "${!EXAMPLES[@]}"; do
 
     # Force stop the app
     "$ADB" shell am force-stop "$pkg" 2>/dev/null || true
-    sleep 1
 
     # Uninstall to keep device clean
     "$ADB" uninstall "$pkg" > /dev/null 2>&1 || true
-    sleep 1
 done
 
 echo ""

examples/vibrator_haptics/main.go

@@ -146,25 +146,23 @@ func run(vm *jni.VM, output *bytes.Buffer) error {
 	fmt.Fprintln(output, "")
 	fmt.Fprintln(output, "--- Pattern 3: Three quick pulses ---")
 	pattern := []int64{0, 100, 100, 100, 100, 100} // ms: delay, on, off, on, off, on
-	var patternObj *jni.Object
+	// Create long array and call Vibrate inside the same vm.Do scope
+	// to avoid invalid local reference after scope exit.
 	vm.Do(func(env *jni.Env) error {
 		longArr := env.NewLongArray(int32(len(pattern)))
 		if longArr == nil {
 			return fmt.Errorf("NewLongArray returned nil")
 		}
 		env.SetLongArrayRegion(longArr, 0, int32(len(pattern)), unsafe.Pointer(&pattern[0]))
-		patternObj = (*jni.Object)(unsafe.Pointer(longArr))
-		return nil
-	})
-
-	if patternObj != nil {
+		patternObj := (*jni.Object)(unsafe.Pointer(longArr))
 		if err := vib.Vibrate2_5(patternObj, -1); err != nil {
 			fmt.Fprintf(output, "Error: %v\n", err)
 		} else {
 			fmt.Fprintln(output, "Vibrating pattern: [0, 100, 100, 100, 100, 100] ms")
 			fmt.Fprintln(output, "  (delay=0, on=100, off=100, on=100, off=100, on=100)")
 		}
-	}
+		return nil
+	})
 	time.Sleep(600 * time.Millisecond)
 
 	// Pattern 4: SOS pattern (... --- ...)
@@ -180,24 +178,20 @@ func run(vm *jni.VM, output *bytes.Buffer) error {
 		300,                      // letter gap
 		100, 100, 100, 100, 100,  // S: dot dot dot
 	}
-	var sosObj *jni.Object
 	vm.Do(func(env *jni.Env) error {
 		longArr := env.NewLongArray(int32(len(sosPattern)))
 		if longArr == nil {
 			return fmt.Errorf("NewLongArray returned nil")
 		}
 		env.SetLongArrayRegion(longArr, 0, int32(len(sosPattern)), unsafe.Pointer(&sosPattern[0]))
-		sosObj = (*jni.Object)(unsafe.Pointer(longArr))
-		return nil
-	})
-
-	if sosObj != nil {
+		sosObj := (*jni.Object)(unsafe.Pointer(longArr))
 		if err := vib.Vibrate2_5(sosObj, -1); err != nil {
 			fmt.Fprintf(output, "Error: %v\n", err)
 		} else {
 			fmt.Fprintln(output, "Vibrating SOS: ... --- ...")
 		}
-	}
+		return nil
+	})
 	time.Sleep(3 * time.Second)
 
 	// Cancel any ongoing vibration