Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Tweaked SSTV image saving flow, added permissions #264
Arty Bishopa751e4af298a
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 343282c7..b691f1a7 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -13,6 +13,9 @@<uses-permission android:name="android.permission.BLUETOOTH_SCAN" /><uses-permission android:name="android.permission.INTERNET" /><uses-permission android:name="android.permission.RECORD_AUDIO" />+ <uses-permission+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"+ android:maxSdkVersion="28" /><applicationandroid:name=".MainApplication"diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/SaveImage.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/SaveImage.ktindex a4f41d9d..7f998c6b 100644--- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/SaveImage.kt+++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/usecase/SaveImage.kt@@ -20,10 +20,13 @@ package com.rtbishop.look4sat.core.data.usecaseimport android.content.ContentValuesimport android.content.Contextimport android.graphics.Bitmap+import android.media.MediaScannerConnectionimport android.os.Buildimport android.os.Environmentimport android.provider.MediaStore+import android.util.Logimport com.rtbishop.look4sat.core.domain.usecase.ISaveImage+import kotlinx.coroutines.CancellationExceptionimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.withContextimport java.io.File@@ -32,23 +35,29 @@ import java.text.SimpleDateFormatimport java.util.Dateimport java.util.Locale-//Saves images to the device gallery using MediaStore (API 29+) or direct file write (API < 29)+// Legacy public storage writes require WRITE_EXTERNAL_STORAGE on API 24-28.class SaveImage(private val context: Context) : ISaveImage {override suspend fun invoke(pixels: IntArray, width: Int, height: Int, modeName: String): Boolean {return withContext(Dispatchers.IO) {try {val bitmap = Bitmap.createBitmap(pixels, width, height, Bitmap.Config.ARGB_8888)- val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())- val filename = "SSTV_${modeName}_$timestamp.png"- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {- saveWithMediaStore(bitmap, filename)- } else {- saveToExternalStorage(bitmap, filename)+ try {+ val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss_SSS", Locale.US).format(Date())+ val filename = "SSTV_${modeName}_$timestamp.png"+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {+ saveWithMediaStore(bitmap, filename)+ } else {+ saveToExternalStorage(bitmap, filename)+ }+ true+ } finally {+ bitmap.recycle()}- bitmap.recycle()- true- } catch (_: Exception) {+ } catch (e: CancellationException) {+ throw e+ } catch (e: Exception) {+ Log.e("SaveImage", "Failed to save SSTV image", e)false}}@@ -64,21 +73,42 @@ class SaveImage(private val context: Context) : ISaveImage {val resolver = context.contentResolverval uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values)?: throw IllegalStateException("Failed to create MediaStore entry")- resolver.openOutputStream(uri)?.use { stream ->- bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)+ var saved = false+ try {+ val stream = resolver.openOutputStream(uri)+ ?: throw IllegalStateException("Failed to open MediaStore output stream")+ stream.use {+ check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)) { "Failed to encode PNG" }+ }+ values.clear()+ values.put(MediaStore.Images.Media.IS_PENDING, 0)+ check(resolver.update(uri, values, null, null) == 1) { "Failed to publish image" }+ saved = true+ } finally {+ if (!saved) {+ check(resolver.delete(uri, null, null) == 1) { "Failed to delete incomplete image" }+ }}- values.clear()- values.put(MediaStore.Images.Media.IS_PENDING, 0)- resolver.update(uri, values, null, null)}private fun saveToExternalStorage(bitmap: Bitmap, filename: String) {val picturesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)val dir = File(picturesDir, "Look4Sat")- if (!dir.exists()) dir.mkdirs()+ check(dir.isDirectory || dir.mkdirs()) { "Failed to create pictures directory" }val file = File(dir, filename)- FileOutputStream(file).use { stream ->- bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)+ var saved = false+ try {+ FileOutputStream(file).use { stream ->+ check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)) { "Failed to encode PNG" }+ }+ MediaScannerConnection.scanFile(+ context, arrayOf(file.absolutePath), arrayOf("image/png"), null+ )+ saved = true+ } finally {+ if (!saved && file.exists()) {+ check(file.delete()) { "Failed to delete incomplete image" }+ }}}}diff --git a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/usecase/ISaveImage.kt b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/usecase/ISaveImage.ktindex 0c3ff4c0..a822b81c 100644--- a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/usecase/ISaveImage.kt+++ b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/usecase/ISaveImage.kt@@ -19,6 +19,7 @@ package com.rtbishop.look4sat.core.domain.usecase/*** Saves a decoded SSTV image to the device gallery.+ * The caller must obtain storage permission on Android API 24-28 before saving.* @return true if the image was saved successfully*/interface ISaveImage {diff --git a/core/presentation/src/main/res/values/strings.xml b/core/presentation/src/main/res/values/strings.xmlindex 7c06952d..9da26655 100644--- a/core/presentation/src/main/res/values/strings.xml+++ b/core/presentation/src/main/res/values/strings.xml@@ -146,6 +146,9 @@<!-- SSTV screen --><string name="sstv_grant_permission">Grant permission</string>+ <string name="sstv_image_saved">Image saved</string>+ <string name="sstv_image_save_failed">Failed to save image</string>+ <string name="sstv_storage_permission_denied">Storage permission is required to save images. If denied permanently, enable it in app settings.</string><string name="sstv_listening">Listening…</string><string name="sstv_mic_permission">Microphone access needed</string><string name="sstv_mode_format">Mode: %s</string>diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.ktindex 84ed76ae..66394544 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt@@ -19,6 +19,7 @@ package com.rtbishop.look4sat.feature.radarimport android.Manifestimport android.content.pm.PackageManager+import android.os.Buildimport androidx.activity.compose.rememberLauncherForActivityResultimport androidx.activity.result.contract.ActivityResultContractsimport androidx.compose.animation.core.LinearEasing@@ -100,9 +101,39 @@ fun RadarDestination(navigateUp: () -> Unit) {val permissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> viewModel.onAction(RadarAction.SstvPermissionResult(granted)) }- RadarScreen(uiState, viewModel.timeNow, viewModel::onAction, navigateUp, requestMicPermission = {- permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)- })+ val saveImage = {+ viewModel.onAction(+ RadarAction.SstvSaveImage(+ context.getString(R.string.sstv_image_saved),+ context.getString(R.string.sstv_image_save_failed)+ )+ )+ }+ val storagePermissionLauncher = rememberLauncherForActivityResult(+ ActivityResultContracts.RequestPermission()+ ) { granted ->+ if (granted) {+ saveImage()+ } else {+ viewModel.onAction(+ RadarAction.ShowToast(context.getString(R.string.sstv_storage_permission_denied))+ )+ }+ }+ RadarScreen(+ uiState, viewModel.timeNow, viewModel::onAction, navigateUp,+ requestMicPermission = { permissionLauncher.launch(Manifest.permission.RECORD_AUDIO) },+ requestSaveImage = {+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&+ ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) !=+ PackageManager.PERMISSION_GRANTED+ ) {+ storagePermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)+ } else {+ saveImage()+ }+ }+ )}@Composable@@ -111,7 +142,8 @@ private fun RadarScreen(timeNow: StateFlow<Long>,onAction: (RadarAction) -> Unit,navigateUp: () -> Unit,- requestMicPermission: () -> Unit+ requestMicPermission: () -> Unit,+ requestSaveImage: () -> Unit) {val upcomingPass = uiState.currentPass ?: getDefaultPass()val addToCalendar: () -> Unit = {@@ -142,11 +174,11 @@ private fun RadarScreen(}if (isVertical) {RadarCard(uiState, Modifier.weight(1f))- PagerCard(uiState, onAction, requestMicPermission, Modifier.weight(1f))+ PagerCard(uiState, onAction, requestMicPermission, requestSaveImage, Modifier.weight(1f))} else {Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {RadarCard(uiState, Modifier.weight(1f))- PagerCard(uiState, onAction, requestMicPermission, Modifier.weight(1f))+ PagerCard(uiState, onAction, requestMicPermission, requestSaveImage, Modifier.weight(1f))}}}@@ -157,6 +189,7 @@ private fun PagerCard(uiState: RadarState,onAction: (RadarAction) -> Unit,requestMicPermission: () -> Unit,+ requestSaveImage: () -> Unit,modifier: Modifier = Modifier) {val hasCalculatorPage = remember(uiState.transceivers.transmitters) {@@ -211,7 +244,8 @@ private fun PagerCard(sstv = uiState.sstv,dopplerFrequency = uiState.transceivers.selectedFrequency?.let { formatFrequency(it) },onAction = onAction,- requestMicPermission = requestMicPermission+ requestMicPermission = requestMicPermission,+ requestSaveImage = requestSaveImage)}}diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.ktindex 3b9db61f..e0cfd905 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt@@ -94,7 +94,8 @@ sealed interface RadarAction {// SSTV actionsdata object SstvStartRecording : RadarActiondata object SstvStopRecording : RadarAction- data object SstvSaveImage : RadarAction+ data class SstvSaveImage(val successMessage: String, val failureMessage: String) : RadarAction+ data class ShowToast(val message: String) : RadarActiondata object SstvReset : RadarActiondata class SstvSelectMode(val modeName: String) : RadarActiondata class SstvPermissionResult(val granted: Boolean) : RadarActiondiff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.ktindex 9fe32ff1..7761d7b0 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt@@ -297,14 +297,19 @@ class RadarViewModel(}RadarAction.SstvStartRecording -> startSstvRecording()RadarAction.SstvStopRecording -> stopSstvRecording()- RadarAction.SstvSaveImage -> {+ is RadarAction.ShowToast -> showToast(action.message)+ is RadarAction.SstvSaveImage -> {+ if (_uiState.value.sstv.isSaving) returnval frame = _uiState.value.sstv.currentFrame ?: returnval pixels = frame.imagePixels ?: return_uiState.update { it.copy(sstv = it.sstv.copy(isSaving = true)) }viewModelScope.launch {- saveImage(pixels, frame.imageWidth, frame.imageHeight, frame.modeName)- _uiState.update { it.copy(sstv = it.sstv.copy(isSaving = false)) }- showToast("Image saved")+ try {+ val saved = saveImage(pixels, frame.imageWidth, frame.imageHeight, frame.modeName)+ showToast(if (saved) action.successMessage else action.failureMessage)+ } finally {+ _uiState.update { it.copy(sstv = it.sstv.copy(isSaving = false)) }+ }}}is RadarAction.SstvSelectMode -> {diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.ktindex 6e0bf2c7..e91200ce 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt@@ -66,7 +66,8 @@ internal fun SstvPage(sstv: SstvSubState,dopplerFrequency: String?,onAction: (RadarAction) -> Unit,- requestMicPermission: () -> Unit+ requestMicPermission: () -> Unit,+ requestSaveImage: () -> Unit) {if (!sstv.hasPermission) {Box(@@ -243,7 +244,7 @@ internal fun SstvPage()// Save button — always visible, enabled when there are pixelsIconCard(- action = { onAction(RadarAction.SstvSaveImage) },+ action = requestSaveImage,resId = R.drawable.ic_save,enabled = sstv.currentFrame?.imagePixels != null && !sstv.isSaving)diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 44c037d6..efdbbadd 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -25,7 +25,7 @@ compose-navigation3 = "1.2.0"google-ksp = "2.3.11"-kotlin = "2.4.20"+kotlin = "2.4.21"kotlin-coroutines = "1.11.0"kotlin-serialization = "1.11.0"diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex f63d7b28..b6446eed 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,7 +1,7 @@-#Sun Sep 27 11:54:01 BST 2026+#Sun Oct 11 12:52:55 BST 2026distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zipnetworkTimeout=10000validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOME