Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

Android clean (#87)

Rory Clearb4d84a595fbd
diff --git a/android/clearcam/app/src/main/java/com/rors/clearcam/HomeScreen.kt b/android/clearcam/app/src/main/java/com/rors/clearcam/HomeScreen.kt
index 7aa78e1..81f3be2 100644
--- a/android/clearcam/app/src/main/java/com/rors/clearcam/HomeScreen.kt
+++ b/android/clearcam/app/src/main/java/com/rors/clearcam/HomeScreen.kt
@@ -205,7 +205,7 @@ fun addDecryptionKey(context: Context, key: String) {
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HomeScreen(userId: String) {
- var cameraNames by remember { mutableStateOf<List<String>>(emptyList()) }
+ var cameraDevices by remember { mutableStateOf<List<Map<String, Any>>>(emptyList()) }
var eventVideos by remember { mutableStateOf<List<EventVideo>>(emptyList()) }
var isLoading by remember { mutableStateOf(true) }
var errorMessage by remember { mutableStateOf<String?>(null) }
@@ -237,14 +237,27 @@ fun HomeScreen(userId: String) {
coroutineScope.launch {
try {
if (!videosDir.exists()) videosDir.mkdirs()
-
- val camerasDeferred = async { fetchCameraNames(userId) }
+ val camerasDeferred = async { fetchCameraJson(userId) }
val newestTime = getNewestCreationTimeFromFiles(videosDir)
val newVideos = fetchEventVideos(userId, newestTime / 1000)
-
- cameraNames = camerasDeferred.await()
+ val camerasJson = camerasDeferred.await()
+ cameraDevices = if (camerasJson != null) {
+ val devicesArray = camerasJson.optJSONArray("devices")
+ if (devicesArray != null) {
+ (0 until devicesArray.length()).map { i ->
+ val deviceObj = devicesArray.getJSONObject(i)
+ mapOf(
+ "name" to deviceObj.optString("name", "Unknown"),
+ "alerts_on" to deviceObj.optInt("alerts_on", 0)
+ )
+ }
+ } else {
+ emptyList()
+ }
+ } else {
+ emptyList()
+ }
val decryptionKeys = getDecryptionKeys(context).toMutableList()
-
videosDir.listFiles()?.forEach { file ->
if (file.name.endsWith(".aes")) {
val outputFilename = file.name.removeSuffix(".aes")
@@ -362,7 +375,7 @@ fun HomeScreen(userId: String) {
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
- Spacer(modifier = Modifier.width(48.dp)) // Left placeholder (optional)
+ Spacer(modifier = Modifier.width(48.dp))
IconButton(onClick = { showSettings = true }) {
Icon(
@@ -411,7 +424,7 @@ fun HomeScreen(userId: String) {
else -> {
CameraHorizontalList(
- cameraNames = cameraNames,
+ cameraDevices = cameraDevices,
userId = userId,
onCameraClick = { cameraName ->
currentCameraName = cameraName
@@ -936,7 +949,7 @@ fun LiveStreamPlayer(
@Composable
fun CameraHorizontalList(
- cameraNames: List<String>,
+ cameraDevices: List<Map<String, Any>>,
userId: String,
onCameraClick: (String) -> Unit,
onRefresh: () -> Unit
@@ -964,7 +977,7 @@ fun CameraHorizontalList(
}
}
- if (cameraNames.isEmpty()) {
+ if (cameraDevices.isEmpty()) {
Column(
modifier = Modifier
.fillMaxWidth()
@@ -998,8 +1011,15 @@ fun CameraHorizontalList(
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
- cameraNames.forEach { name ->
- CameraCard(name = name, onClick = { onCameraClick(name) })
+ cameraDevices.forEach { device ->
+ val cameraName = device["name"] as? String ?: "Unknown"
+ val alertsOn = device["alerts_on"] as? Int ?: 0
+ CameraCard(
+ name = cameraName,
+ alertsOn = alertsOn,
+ userId = userId,
+ onClick = { onCameraClick(cameraName) }
+ )
}
}
}
@@ -1009,10 +1029,20 @@ fun CameraHorizontalList(
@Composable
fun CameraCard(
name: String,
+ alertsOn: Int,
+ userId: String, // Add userId parameter
onClick: () -> Unit
) {
val context = LocalContext.current
var thumbnailBitmap by remember { mutableStateOf<Bitmap?>(null) }
+ var currentAlertsState by remember { mutableStateOf(alertsOn) }
+ var isLoading by remember { mutableStateOf(false) }
+ val coroutineScope = rememberCoroutineScope()
+
+ // Update local state when props change
+ LaunchedEffect(alertsOn) {
+ currentAlertsState = alertsOn
+ }
LaunchedEffect(name) {
thumbnailBitmap = withContext(Dispatchers.IO) {
@@ -1020,6 +1050,65 @@ fun CameraCard(
}
}
+ suspend fun toggleAlerts(newState: Int) {
+ if (isLoading) return
+
+ isLoading = true
+ try {
+ val success = withContext(Dispatchers.IO) {
+ try {
+ val url = URL("https://rors.ai/toggle_alerts")
+ val connection = url.openConnection() as HttpURLConnection
+ connection.apply {
+ requestMethod = "POST"
+ setRequestProperty("Content-Type", "application/json")
+ doOutput = true
+ connectTimeout = 15000
+ readTimeout = 15000
+ }
+
+ val encodedDeviceName = URLEncoder.encode(name, "UTF-8")
+
+ val body = """
+ {
+ "session_token": "$userId",
+ "device_name": "$encodedDeviceName",
+ "alerts_on": $newState
+ }
+ """.trimIndent()
+
+ OutputStreamWriter(connection.outputStream).use { writer ->
+ writer.write(body)
+ writer.flush()
+ }
+
+ val responseCode = connection.responseCode
+ responseCode == HttpURLConnection.HTTP_OK
+ } catch (e: Exception) {
+ false
+ }
+ }
+
+ if (success) {
+ withContext(Dispatchers.Main) {
+ Toast.makeText(context, "Alerts ${if (newState == 1) "enabled" else "disabled"}", Toast.LENGTH_SHORT).show()
+ }
+ } else {
+ currentAlertsState = alertsOn
+ withContext(Dispatchers.Main) {
+ Toast.makeText(context, "Failed to update alerts", Toast.LENGTH_SHORT).show()
+ }
+ }
+ } catch (e: Exception) {
+ currentAlertsState = alertsOn
+ withContext(Dispatchers.Main) {
+ Toast.makeText(context, "Network error", Toast.LENGTH_SHORT).show()
+ }
+ } finally {
+ isLoading = false
+ }
+ }
+
Box(
modifier = Modifier
.width(280.dp)
@@ -1055,14 +1144,52 @@ fun CameraCard(
.align(Alignment.Center)
)
- Text(
- text = URLDecoder.decode(name, StandardCharsets.UTF_8.name()),
- color = Color.White,
- style = MaterialTheme.typography.titleMedium,
+ // Camera name and toggle switch
+ Row(
modifier = Modifier
.align(Alignment.BottomStart)
- .padding(12.dp)
- )
+ .fillMaxWidth()
+ .padding(12.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = URLDecoder.decode(name, StandardCharsets.UTF_8.name()),
+ color = Color.White,
+ style = MaterialTheme.typography.titleMedium
+ )
+
+ // Alerts label and toggle switch
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ if (isLoading) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(16.dp),
+ strokeWidth = 2.dp,
+ color = Color.White
+ )
+ } else {
+ Text(
+ text = "Alerts",
+ color = Color.White,
+ style = MaterialTheme.typography.labelMedium
+ )
+ }
+ Switch(
+ checked = currentAlertsState == 1,
+ onCheckedChange = { newState ->
+ val newAlertsState = if (newState) 1 else 0
+ currentAlertsState = newAlertsState
+ coroutineScope.launch {
+ toggleAlerts(newAlertsState)
+ }
+ },
+ enabled = !isLoading
+ )
+ }
+ }
}
}
diff --git a/android/clearcam/app/src/main/java/com/rors/clearcam/SettingsScreen.kt b/android/clearcam/app/src/main/java/com/rors/clearcam/SettingsScreen.kt
index 848836e..fe87d39 100644
--- a/android/clearcam/app/src/main/java/com/rors/clearcam/SettingsScreen.kt
+++ b/android/clearcam/app/src/main/java/com/rors/clearcam/SettingsScreen.kt
@@ -8,6 +8,7 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
+import android.widget.Toast
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
@@ -118,18 +119,36 @@ fun SettingsScreen(onBackPressed: () -> Unit) {
style = MaterialTheme.typography.bodyLarge
)
+ val activity = LocalContext.current as? Activity // todo
+
Switch(
checked = notificationsEnabled.value,
onCheckedChange = { enabled ->
- notificationsEnabled.value = enabled
- coroutineScope.launch {
- context.dataStore.edit { preferences ->
- preferences[booleanPreferencesKey("notifications_enabled")] = enabled
- }
- }
if (enabled) {
- requestNotificationPermissionAndRegister(context, userId)
+ // Temporarily disable switch until confirmation
+ notificationsEnabled.value = false
+
+ requestNotificationPermissionAndRegister(activity, context, userId) { success ->
+ // Must switch back to main thread for UI update
+ coroutineScope.launch(Dispatchers.Main) {
+ if (success) {
+ notificationsEnabled.value = true
+ context.dataStore.edit { prefs ->
+ prefs[booleanPreferencesKey("notifications_enabled")] = true
+ }
+ } else {
+ notificationsEnabled.value = false
+ Toast.makeText(context, "No connection. Could not enable notifications.", Toast.LENGTH_SHORT).show()
+ }
+ }
+ }
} else {
+ notificationsEnabled.value = false
+ coroutineScope.launch {
+ context.dataStore.edit { prefs ->
+ prefs[booleanPreferencesKey("notifications_enabled")] = false
+ }
+ }
disableNotifications(context)
}
}
@@ -173,7 +192,13 @@ private fun disableNotifications(context: Context) {
}
}
-private fun requestNotificationPermissionAndRegister(context: Context, userId: String) {
+private fun requestNotificationPermissionAndRegister(
+ activity: Activity?,
+ context: Context,
+ userId: String,
+ onResult: (Boolean) -> Unit
+) {
+ // Step 1: permission check (only if activity is available)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val hasPermission = ContextCompat.checkSelfPermission(
context,
@@ -181,36 +206,27 @@ private fun requestNotificationPermissionAndRegister(context: Context, userId: S
) == PackageManager.PERMISSION_GRANTED
if (!hasPermission) {
- val shouldShowRationale = ActivityCompat.shouldShowRequestPermissionRationale(
- context as Activity,
- Manifest.permission.POST_NOTIFICATIONS
- )
-
- if (shouldShowRationale) {
- // Could show a dialog here if you want
- Log.d("Settings", "Notification permission rationale should be shown")
- return
- } else {
+ if (activity != null) {
ActivityCompat.requestPermissions(
- context,
+ activity,
arrayOf(Manifest.permission.POST_NOTIFICATIONS),
1001
)
}
+ onResult(false)
+ return
}
}
- // Get FCM token and send to server
+ // Step 2: Get FCM token safely
FirebaseMessaging.getInstance().token
.addOnCompleteListener { task ->
if (!task.isSuccessful) {
- Log.w("FCM", "Fetching FCM token failed", task.exception)
+ onResult(false)
return@addOnCompleteListener
}
val token = task.result
- Log.d("FCM Token", token)
-
CoroutineScope(Dispatchers.IO).launch {
try {
val url = URL("https://rors.ai/add_device")
@@ -236,14 +252,11 @@ private fun requestNotificationPermissionAndRegister(context: Context, userId: S
}
val responseCode = connection.responseCode
- if (responseCode == HttpURLConnection.HTTP_OK) {
- Log.d("FCM", "Token successfully sent to server")
- } else {
- Log.e("FCM", "Server returned $responseCode")
- }
+ onResult(responseCode == HttpURLConnection.HTTP_OK)
} catch (e: Exception) {
- Log.e("FCM", "Failed to send token to server", e)
+ onResult(false)
}
}
}
}
+
diff --git a/android/clearcam/app/src/main/java/com/rors/clearcam/VideoHelper.kt b/android/clearcam/app/src/main/java/com/rors/clearcam/VideoHelper.kt
index c44afe5..e4f34dc 100644
--- a/android/clearcam/app/src/main/java/com/rors/clearcam/VideoHelper.kt
+++ b/android/clearcam/app/src/main/java/com/rors/clearcam/VideoHelper.kt
@@ -232,8 +232,8 @@ suspend fun deleteStreamLink(userId: String, cameraName: String) {
}
}
-data class DeviceInfo(val name: String, val alertsOn: Boolean)
-suspend fun fetchCameraNames(userId: String): List<String> = withContext(Dispatchers.IO) {
+
+suspend fun fetchCameraJson(userId: String): JSONObject? = withContext(Dispatchers.IO) {
try {
val url = URL("https://rors.ai/get_live_devicesv2?session_token=$userId")
val connection = url.openConnection() as HttpURLConnection
@@ -241,22 +241,15 @@ suspend fun fetchCameraNames(userId: String): List<String> = withContext(Dispatc
if (connection.responseCode == 200) {
val response = connection.inputStream.bufferedReader().use { it.readText() }
- val jsonObject = JSONObject(response)
- val devicesArray = jsonObject.getJSONArray("devices")
-
- (0 until devicesArray.length()).map { i ->
- val deviceObject = devicesArray.getJSONObject(i)
- deviceObject.getString("name")
- }
- } else {
- emptyList()
- }
+ JSONObject(response)
+ } else null
} catch (e: Exception) {
e.printStackTrace()
- emptyList()
+ null
}
}
+
suspend fun fetchEventVideos(
userId: String,
newestCreationTime: Long = 0