Skip to content

fix: Android security hardening + resource leak fixes #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juliosuas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Android security hardening + resource leak fixes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/CameraAccessAndroid/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:icon="@mipmap/ic_launcher"
android:label="VisionClaw"
android:supportsRtl="true"
android:usesCleartextTraffic="true"
android:networkSecurityConfig="@xml/network_security_config"
android:theme="@style/Theme.CameraAccess">

<!-- Without Developer Mode, this key will need to be set with ID from app registered in Wearables Developer Center -->
Expand Down
4 changes: 3 additions & 1 deletion ...in/java/com/meta/wearable/dat/externalsampleapps/cameraaccess/gemini/GeminiLiveService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ class GeminiLiveService {
}
})

// Timeout after 15 seconds (use Timer so we don't block sendExecutor)
// Cancel any previous timer before creating a new one (prevents leaks on repeated connect())
timeoutTimer?.cancel()
timeoutTimer = Timer().apply {
schedule(object : TimerTask() {
override fun run() {
Expand All @@ -134,6 +135,7 @@ class GeminiLiveService {
fun disconnect() {
timeoutTimer?.cancel()
timeoutTimer = null
sendExecutor.shutdownNow()
webSocket?.close(1000, null)
webSocket = null
onToolCall = null
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/meta/wearable/dat/externalsampleapps/cameraaccess/webrtc/WebRTCClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ class WebRTCClient(private val context: Context) {
// Create video source + track with custom capturer
val factory = peerConnectionFactory ?: return
videoSource = factory.createVideoSource(false) // false = not a screen cast
customCapturer = CustomVideoCapturer().apply { initialize(videoSource!!) }
val source = videoSource ?: return
customCapturer = CustomVideoCapturer().apply { initialize(source) }
localVideoTrack = factory.createVideoTrack("video0", videoSource).apply {
setEnabled(true)
}
Expand Down
13 changes: 13 additions & 0 deletions samples/CameraAccessAndroid/app/src/main/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<!-- Allow cleartext only for local network (OpenClaw gateway on LAN) -->
<domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">localhost</domain>
<domain includeSubdomains="true">127.0.0.1</domain>
<domain includeSubdomains="true">10.0.0.0/8</domain>
<domain includeSubdomains="true">192.168.0.0/16</domain>
<domain includeSubdomains="true">172.16.0.0/12</domain>
</domain-config>
<!-- Block cleartext for all other domains (enforce HTTPS) -->
<base-config cleartextTrafficPermitted="false" />
</network-security-config>