Add object detection, tracking, mobile notifications, and search to any security camera.
deslop
roryclearcb27b6768d77
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.ktindex 20463b7..f1faf32 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@@ -242,7 +242,6 @@ fun HomeScreen(userId: String) {cameraNames = camerasDeferred.await()val decryptionKeys = getDecryptionKeys(context).toMutableList()- // First try to decrypt any existing encrypted files with all available keysvideosDir.listFiles()?.forEach { file ->if (file.name.endsWith(".aes")) {val outputFilename = file.name.removeSuffix(".aes")@@ -253,7 +252,6 @@ fun HomeScreen(userId: String) {try {val aesData = file.readBytes()if (decryptAesFileToMp4(aesData, videoFile, key)) {- // Success - delete the encrypted filefile.delete()break}@@ -265,7 +263,6 @@ fun HomeScreen(userId: String) {}}- // Then process new videosnewVideos.forEach { video ->try {val outputFilename = video.fileName.removeSuffix(".aes")@@ -286,7 +283,6 @@ fun HomeScreen(userId: String) {}if (!success) {- // Keep the encrypted file if decryption failsvideoFile.delete()}}@@ -356,7 +352,6 @@ fun HomeScreen(userId: String) {.padding(16.dp).verticalScroll(scrollState)) {- // 🔝 Compact scrollable top barRow(modifier = Modifier.fillMaxWidth()@@ -419,7 +414,7 @@ fun HomeScreen(userId: String) {currentCameraName = cameraNameshowLiveStream = true},- onRefresh = { refreshData() } // Pass the existing refresh function+ onRefresh = { refreshData() })Spacer(modifier = Modifier.height(24.dp))@@ -436,7 +431,6 @@ fun HomeScreen(userId: String) {if (file.exists()) {file.delete()}- // Clear the thumbnail cacheThumbnailCache.deleteCachedThumbnail(context, deletedVideo.fileName)coroutineScope.launch {@@ -479,22 +473,17 @@ fun SimpleVideoPlayer(videoPath: String, onDismiss: () -> Unit) {val videoViewRef = remember { mutableStateOf<VideoView?>(null) }val coroutineScope = rememberCoroutineScope()- // Track playback statesvar isPrepared by remember { mutableStateOf(false) }var isInitialPlay by remember { mutableStateOf(true) }- // Handle video playbackLaunchedEffect(videoPath) {videoViewRef.value?.apply {- // Reset statesshowError = falseisPrepared = false- // Reset the video viewstopPlayback()setVideoPath("")- // Set the new pathsetVideoPath(videoPath)}}@@ -531,7 +520,6 @@ fun SimpleVideoPlayer(videoPath: String, onDismiss: () -> Unit) {}isPlaying = true- // Update position periodicallycoroutineScope.launch {while (isActive) {if (!isScrubbing) {@@ -551,7 +539,6 @@ fun SimpleVideoPlayer(videoPath: String, onDismiss: () -> Unit) {}setOnErrorListener { _, what, extra ->- // Only show error if we were actually trying to playif (isPrepared) {showError = true}@@ -968,7 +955,7 @@ fun CameraHorizontalList(modifier = Modifier.size(24.dp)) {Icon(- imageVector = Icons.Default.Refresh, // Using Material Icons+ imageVector = Icons.Default.Refresh,contentDescription = "Refresh cameras")}@@ -1108,21 +1095,12 @@ fun EventVideoSection(val outputFile = File(videosDir, video.fileName.removeSuffix(".aes") + ".mp4")if (decryptAesFileToMp4(encryptedFile.readBytes(), outputFile, key)) {- // Success - add key to saved keysaddDecryptionKey(context, key)-- // Delete the encrypted fileencryptedFile.delete()-- // Clear thumbnail cache for encrypted versionThumbnailCache.deleteCachedThumbnail(context, video.fileName)-- // Trigger refresh to update UIonVideoClick(outputFile.absolutePath)} else {- // Failed - delete the output file if it was createdif (outputFile.exists()) outputFile.delete()- // Show errorToast.makeText(context, "Invalid decryption key", Toast.LENGTH_SHORT).show()}} catch (e: Exception) {@@ -1203,7 +1181,6 @@ fun EventVideoListItem(thumbnailBitmap = bitmap}} else {- // Ensure there's no misleading thumbnail from old cacheThumbnailCache.deleteCachedThumbnail(context, cacheKey)}}@@ -1284,12 +1261,12 @@ fun EventVideoListItem() {Column(modifier = Modifier.weight(1f)) {Text(- text = video.time, // This shows the formatted time (HH:MM:SS)+ text = video.time,style = MaterialTheme.typography.bodyMedium,color = MaterialTheme.colorScheme.onSurface)Text(- text = video.date, // This shows the date (YYYY-MM-DD)+ text = video.date,style = MaterialTheme.typography.bodySmall,color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f))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.ktindex 7040099..848836e 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@@ -106,7 +106,6 @@ fun SettingsScreen(onBackPressed: () -> Unit) {.fillMaxSize().padding(innerPadding)) {- // Your existing notification toggle - completely unchangedRow(modifier = Modifier.fillMaxWidth()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.ktindex f242645..c6587ad 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@@ -288,7 +288,6 @@ fun getNewestCreationTimeFromFiles(videosDir: File): Long {return videosDir.listFiles()?.mapNotNull { file: File ->try {- // Parse filename like "2025-08-01_13-41-50.mp4"val baseName = file.name.removeSuffix(".mp4")val format = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss", Locale.getDefault())format.parse(baseName)?.time ?: 0L