Skip to content

Commit aae9053

Browse files
authored
Api backward compatibility improvements :: Patch 1 (#91)
1 parent 0c4864f commit aae9053

File tree

22 files changed

+54
-59
lines changed

22 files changed

+54
-59
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
namespace 'com.shifthackz.aisdv1.app'
2222
defaultConfig {
2323
applicationId "com.shifthackz.aisdv1.app"
24-
versionName "0.5.1"
25-
versionCode 164
24+
versionName "0.5.2"
25+
versionCode 165
2626

2727
buildConfigField "String", "CLOUD_AI_URL", "\"https://sdai.moroz.cc\""
2828
buildConfigField "String", "IMAGE_CDN_URL", "\"https://random.imagecdn.app\""

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
minSdk = 26
3+
minSdk = 23
44
targetSdk = 33
55
}
66
def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()

core/common/src/main/java/com/shifthackz/aisdv1/core/common/appbuild/BuildVersion.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ class BuildVersion : Comparable<BuildVersion> {
1818
this.tag = tag
1919
}
2020

21-
constructor(versionString: String) {
21+
constructor(versionString: String?) {
22+
if (versionString.isNullOrBlank()) return
2223
val verWithTag = versionString.split(DELIMITER_TAG)
2324
verWithTag.getOrNull(1)?.let { this.tag = it }
2425
verWithTag.getOrNull(0)?.let { version ->

data/src/main/java/com/shifthackz/aisdv1/data/mappers/ImageToImagePayloadMappers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fun Pair<ImageToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenera
4646
let { (payload, response) ->
4747
AiGenerationResult(
4848
id = 0L,
49-
image = response.images.firstOrNull() ?: "",
49+
image = response.images?.firstOrNull() ?: "",
5050
inputImage = payload.base64Image,
5151
createdAt = Date(),
5252
type = AiGenerationResult.Type.IMAGE_TO_IMAGE,

data/src/main/java/com/shifthackz/aisdv1/data/mappers/ResponseParamsMapper.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import com.google.gson.reflect.TypeToken
55
import com.shifthackz.aisdv1.core.common.log.errorLog
66
import com.shifthackz.aisdv1.network.response.SdGenerationResponse
77

8-
fun mapSeedFromRemote(infoString: String): String = parseInfo(infoString).fold(
8+
fun mapSeedFromRemote(infoString: String?): String = parseInfo(infoString).fold(
99
onFailure = { "" },
1010
onSuccess = { "${it.seed}" }
1111
)
1212

13-
fun mapSubSeedFromRemote(infoString: String): String = parseInfo(infoString).fold(
13+
fun mapSubSeedFromRemote(infoString: String?): String = parseInfo(infoString).fold(
1414
onFailure = { "" },
1515
onSuccess = { "${it.subSeed}" }
1616
)
1717

18-
private fun parseInfo(infoString: String) = runCatching {
18+
private fun parseInfo(infoString: String?) = runCatching {
1919
return@runCatching Gson().fromJson<SdGenerationResponse.Info>(
2020
infoString,
2121
object : TypeToken<SdGenerationResponse.Info>() {}.type

data/src/main/java/com/shifthackz/aisdv1/data/mappers/ServerConfigurationMappers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.shifthackz.aisdv1.storage.db.cache.entity.ServerConfigurationEntity
77
//region RAW --> DOMAIN
88
fun ServerConfigurationRaw.mapToDomain(): ServerConfiguration = with(this) {
99
ServerConfiguration(
10-
sdModelCheckpoint = sdModelCheckpoint,
10+
sdModelCheckpoint = sdModelCheckpoint ?: "Unknown",
1111
)
1212
}
1313
//endregion

data/src/main/java/com/shifthackz/aisdv1/data/mappers/StableDiffusionModelsMappers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ fun List<StableDiffusionModelRaw>.mapRawToDomain(): List<StableDiffusionModel> =
1010

1111
fun StableDiffusionModelRaw.mapRawToDomain(): StableDiffusionModel = with(this) {
1212
StableDiffusionModel(
13-
title = title,
14-
modelName = modelName,
13+
title = title ?: "",
14+
modelName = modelName ?: "",
1515
hash = hash ?: "",
1616
sha256 = sha256 ?: "",
17-
filename = filename,
17+
filename = filename ?: "",
1818
config = config ?: "",
1919
)
2020
}

data/src/main/java/com/shifthackz/aisdv1/data/mappers/StableDiffusionSamplersMappers.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ fun List<StableDiffusionSamplerRaw>.mapRawToDomain(): List<StableDiffusionSample
1010

1111
fun StableDiffusionSamplerRaw.mapRawToDomain(): StableDiffusionSampler = with(this) {
1212
StableDiffusionSampler(
13-
name = name,
14-
aliases = aliases,
15-
options = options,
13+
name = name ?: "",
14+
aliases = aliases ?: emptyList(),
15+
options = options ?: mapOf(),
1616
)
1717
}
1818
//endregion

data/src/main/java/com/shifthackz/aisdv1/data/mappers/TextToImagePayloadMappers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fun Pair<TextToImagePayload, SdGenerationResponse>.mapToAiGenResult(): AiGenerat
4545
let { (payload, response) ->
4646
AiGenerationResult(
4747
id = 0L,
48-
image = response.images.firstOrNull() ?: "",
48+
image = response.images?.firstOrNull() ?: "",
4949
inputImage = "",
5050
createdAt = Date(),
5151
type = AiGenerationResult.Type.TEXT_TO_IMAGE,

data/src/main/java/com/shifthackz/aisdv1/data/remote/AppVersionRemoteDataSource.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ internal class AppVersionRemoteDataSource(
1212

1313
override fun get(): Single<BuildVersion> = api
1414
.fetchAppVersion()
15-
.map(AppVersionResponse::googlePlay)
16-
.map(::BuildVersion)
15+
.map { response -> BuildVersion(response.googlePlay) }
1716
}

0 commit comments

Comments
 (0)