Skip to content

Update API models to match latest ImmichFrame server, fix retry logic #56

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
dave-palt wants to merge 4 commits into
base: main
Choose a base branch
from
+159 −116
Open

Update API models to match latest ImmichFrame server, fix retry logic #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cdef22
Update API models to match latest ImmichFrame server, fix retry logic…
May 27, 2026
9c85c07
Fix TOCTOU race on portraitCache in showImage coroutine
May 27, 2026
1d0b8ee
Remove unused ServerSettings fields per maintainer feedback
May 27, 2026
ee52b71
Fix dangling | separators in merged metadata and use class handler fo…
May 27, 2026
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
67 changes: 34 additions & 33 deletions app/src/main/java/com/immichframe/immichframe/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,45 +114,43 @@ object Helpers {
}

data class ImageResponse(
val randomImageBase64: String,
val thumbHashImageBase64: String,
val photoDate: String,
val imageLocation: String
val randomImageBase64: String? = null,
val thumbHashImageBase64: String? = null,
val photoDate: String? = null,
val imageLocation: String? = null
)

data class ServerSettings(
val margin: String,
val interval: Int,
val transitionDuration: Double,
val downloadImages: Boolean,
val renewImagesDuration: Int,
val showClock: Boolean,
val clockFormat: String,
val showPhotoDate: Boolean,
val photoDateFormat: String,
val showImageDesc: Boolean,
val showPeopleDesc: Boolean,
val showImageLocation: Boolean,
val imageLocationFormat: String,
val primaryColor: String?,
val secondaryColor: String,
val style: String,
val baseFontSize: String?,
val showWeatherDescription: Boolean,
val unattendedMode: Boolean,
val imageZoom: Boolean,
val imageFill: Boolean,
val layout: String,
val language: String
val interval: Int = 10,
val transitionDuration: Double = 1.0,
val downloadImages: Boolean = false,
val renewImagesDuration: Int = 0,
val showClock: Boolean = false,
val clockFormat: String? = null,
val showPhotoDate: Boolean = false,
val photoDateFormat: String? = null,
val showImageDesc: Boolean = false,
val showPeopleDesc: Boolean = false,
val showImageLocation: Boolean = false,
val imageLocationFormat: String? = null,
val primaryColor: String? = null,
val secondaryColor: String? = null,
val style: String? = null,
val baseFontSize: String? = null,
val showWeatherDescription: Boolean = false,
val imageZoom: Boolean = false,
val imageFill: Boolean = false,
val layout: String? = null,
val language: String? = null
)

data class Weather(
val location: String,
val temperature: Double,
val unit: String,
val temperatureUnit: String,
val description: String,
val iconId: String
val location: String? = null,
val temperature: Double = 0.0,
val unit: String? = null,
val temperatureUnit: String? = null,
val description: String? = null,
val iconId: String? = null
)

interface ApiService {
Expand All @@ -162,6 +160,9 @@ object Helpers {
@GET("api/Config")
fun getServerSettings(): Call<ServerSettings>

@GET("api/Config/Version")
fun getVersion(): Call<String>

@GET("api/Weather")
fun getWeather(): Call<Weather>
}
Expand Down
90 changes: 55 additions & 35 deletions app/src/main/java/com/immichframe/immichframe/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,21 +178,27 @@ class MainActivity : AppCompatActivity() {

private fun showImage(imageResponse: Helpers.ImageResponse) {
CoroutineScope(Dispatchers.IO).launch {
//get the window size
val imageBase64 = imageResponse.randomImageBase64
val thumbHashBase64 = imageResponse.thumbHashImageBase64
if (imageBase64 == null || thumbHashBase64 == null) {
return@launch
}

val decorView = window.decorView
val width = decorView.width
val height = decorView.height
val maxSize = maxOf(width, height)

var randomBitmap = Helpers.decodeBitmapFromBytes(imageResponse.randomImageBase64)
val thumbHashBitmap = Helpers.decodeBitmapFromBytes(imageResponse.thumbHashImageBase64)
var randomBitmap = Helpers.decodeBitmapFromBytes(imageBase64)
val thumbHashBitmap = Helpers.decodeBitmapFromBytes(thumbHashBase64)
var isMerged = false

val isPortrait = randomBitmap.height > randomBitmap.width
if (isPortrait && serverSettings.layout == "splitview") {
if (portraitCache != null) {
val localPortrait = portraitCache
if (localPortrait?.randomImageBase64 != null) {
var decodedPortraitImageBitmap =
Helpers.decodeBitmapFromBytes(portraitCache!!.randomImageBase64)
Helpers.decodeBitmapFromBytes(localPortrait.randomImageBase64)
decodedPortraitImageBitmap =
Helpers.reduceBitmapQuality(decodedPortraitImageBitmap, maxSize)
randomBitmap = Helpers.reduceBitmapQuality(randomBitmap, maxSize)
Expand Down Expand Up @@ -265,24 +271,23 @@ class MainActivity : AppCompatActivity() {
isShowingFirst = !isShowingFirst

if (isMerged) {
val mergedPhotoDate =
if (portraitCache!!.photoDate.isNotEmpty() || imageResponse.photoDate.isNotEmpty()) {
"${portraitCache!!.photoDate} | ${imageResponse.photoDate}"
} else {
""
}
val cachedPhotoDate = portraitCache?.photoDate.orEmpty()
val cachedImageLocation = portraitCache?.imageLocation.orEmpty()
val responsePhotoDate = imageResponse.photoDate.orEmpty()
val responseImageLocation = imageResponse.imageLocation.orEmpty()

val mergedImageLocation =
if (portraitCache!!.imageLocation.isNotEmpty() || imageResponse.imageLocation.isNotEmpty()) {
"${portraitCache!!.imageLocation} | ${imageResponse.imageLocation}"
} else {
""
}
val mergedPhotoDate = listOf(cachedPhotoDate, responsePhotoDate)
.filter { it.isNotEmpty() }
.joinToString(" | ")

val mergedImageLocation = listOf(cachedImageLocation, responseImageLocation)
.filter { it.isNotEmpty() }
.joinToString(" | ")

updatePhotoInfo(mergedPhotoDate, mergedImageLocation)
portraitCache = null
} else {
updatePhotoInfo(imageResponse.photoDate, imageResponse.imageLocation)
updatePhotoInfo(imageResponse.photoDate.orEmpty(), imageResponse.imageLocation.orEmpty())
}

updateDateTimeWeather()
Expand All @@ -308,17 +313,17 @@ class MainActivity : AppCompatActivity() {
val currentDateTime = Calendar.getInstance().time

val formattedDate = try {
SimpleDateFormat(serverSettings.photoDateFormat, Locale.getDefault()).format(
currentDateTime
)
serverSettings.photoDateFormat?.let {
SimpleDateFormat(it, Locale.getDefault()).format(currentDateTime)
} ?: ""
} catch (_: Exception) {
""
}

val formattedTime = try {
SimpleDateFormat(serverSettings.clockFormat, Locale.getDefault()).format(
currentDateTime
)
serverSettings.clockFormat?.let {
SimpleDateFormat(it, Locale.getDefault()).format(currentDateTime)
} ?: ""
} catch (_: Exception) {
""
}
Expand Down Expand Up @@ -418,8 +423,11 @@ class MainActivity : AppCompatActivity() {
if (response.isSuccessful) {
val weatherResponse = response.body()
if (weatherResponse != null) {
currentWeather =
"\n ${weatherResponse.location}, ${"%.1f".format(weatherResponse.temperature)}${weatherResponse.unit} \n ${weatherResponse.description}"
val loc = weatherResponse.location ?: "Unknown"
val temp = weatherResponse.temperature
val unit = weatherResponse.unit ?: ""
val desc = weatherResponse.description ?: ""
currentWeather = "\n $loc, ${"%.1f".format(temp)}$unit \n $desc"
}
}
}
Expand Down Expand Up @@ -452,29 +460,41 @@ class MainActivity : AppCompatActivity() {
if (serverSettingsResponse != null) {
onSuccess(serverSettingsResponse)
} else {
handleFailure(Exception("Empty response body"))
handleFailure(Exception("Empty response body"), retryable = true)
}
} else {
handleFailure(Exception("HTTP ${response.code()}: ${response.message()}"))
val code = response.code()
val retryable = code !in 400..499
val hint = when (code) {
404 -> "Endpoint not found. Make sure the URL points to an ImmichFrame server, not the Immich server directly."
401, 403 -> "Authentication failed. Check your Authorization Secret in settings."
else -> null
}
val msg = if (hint != null) "$hint (HTTP $code)" else "HTTP $code: ${response.message()}"
handleFailure(Exception(msg), retryable = retryable)
}
}

override fun onFailure(call: Call<Helpers.ServerSettings>, t: Throwable) {
handleFailure(t)
handleFailure(t, retryable = true)
}

private fun handleFailure(t: Throwable) {
private fun handleFailure(t: Throwable, retryable: Boolean) {
if (useWebView) {
return
}
if (!retryable) {
onFailure(t)
return
}
if (retryCount < maxRetries) {
retryCount++
Toast.makeText(
this@MainActivity,
"Retrying to fetch server settings... Attempt $retryCount of $maxRetries",
"Connecting to server... Attempt $retryCount of $maxRetries",
Toast.LENGTH_SHORT
).show()
Handler(Looper.getMainLooper()).postDelayed({
handler.postDelayed({
attemptFetch()
}, retryDelayMillis)
} else {
Expand Down Expand Up @@ -556,13 +576,13 @@ class MainActivity : AppCompatActivity() {
if (request?.isForMainFrame == true && error != null) {
view?.loadUrl("file:///android_asset/error_page.html")

Handler(Looper.getMainLooper()).postDelayed({
handler.postDelayed({
val errorCode = error.errorCode
val errorDescription = error.description.toString().replace("'", "\\'")
view?.evaluateJavascript("showError('$errorCode', '$errorDescription')", null)
}, 500)
}
Handler(Looper.getMainLooper()).postDelayed({
handler.postDelayed({
//check url again in case the user has changed it
var currentUrl = prefs.getString("webview_url", "")?.trim() ?: ""
currentUrl = if (authSecret.isNotEmpty()) {
Expand Down Expand Up @@ -596,7 +616,7 @@ class MainActivity : AppCompatActivity() {
Toast.makeText(
this,
"Failed to load server settings: ${error.localizedMessage}",
Toast.LENGTH_SHORT
Toast.LENGTH_LONG
).show()
}
)
Expand Down
Loading