FOSS : Remove app version check (#72)

* FOSS : Remove app version check - Patch 1

* FOSS : Remove app version check - Patch 2

Author: ShiftHackZ

README.md

@@ -2,7 +2,7 @@
 
 # Stable-Diffusion-Android
 
-[![Version](https://img.shields.io/badge/Version-0.4.9-blue)](https://github.com/ShiftHackZ/Stable-Diffusion-Android/releases)
+[![Version](https://img.shields.io/badge/Version-0.4.10-blue)](https://github.com/ShiftHackZ/Stable-Diffusion-Android/releases)
 
 
 [![Google Play](docs/assets/google_play.png)](https://play.google.com/store/apps/details?id=com.shifthackz.aisdv1.app)

app/build.gradle

@@ -21,8 +21,8 @@ android {
     namespace 'com.shifthackz.aisdv1.app'
     defaultConfig {
         applicationId "com.shifthackz.aisdv1.app"
-        versionName "0.4.9"
-        versionCode 156
+        versionName "0.4.10"
+        versionCode 157
 
         buildConfigField "String", "CLOUD_AI_URL", "\"https://sdai.moroz.cc\""
         buildConfigField "String", "HORDE_AI_URL", "\"https://stablehorde.net\""

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

@@ -1,23 +1,17 @@
 package com.shifthackz.aisdv1.data.remote
 
-import com.shifthackz.aisdv1.core.common.appbuild.BuildInfoProvider
 import com.shifthackz.aisdv1.core.common.appbuild.BuildVersion
 import com.shifthackz.aisdv1.domain.datasource.AppVersionDataSource
 import com.shifthackz.aisdv1.network.api.sdai.AppUpdateRestApi
+import com.shifthackz.aisdv1.network.response.AppVersionResponse
 import io.reactivex.rxjava3.core.Single
 
 internal class AppVersionRemoteDataSource(
-    private val buildInfoProvider: BuildInfoProvider,
     private val api: AppUpdateRestApi,
 ) : AppVersionDataSource.Remote {
 
     override fun get(): Single<BuildVersion> = api
         .fetchAppVersion()
-        .map { response ->
-            val version = when (buildInfoProvider.buildType) {
-                com.shifthackz.aisdv1.core.common.appbuild.BuildType.FOSS -> response.fDroid
-                com.shifthackz.aisdv1.core.common.appbuild.BuildType.GOOGLE_PLAY -> response.googlePlay
-            }
-            BuildVersion(version)
-        }
+        .map(AppVersionResponse::googlePlay)
+        .map(::BuildVersion)
 }

domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/version/CheckAppVersionUpdateUseCaseImpl.kt

@@ -1,10 +1,13 @@
 package com.shifthackz.aisdv1.domain.usecase.version
 
+import com.shifthackz.aisdv1.core.common.appbuild.BuildInfoProvider
+import com.shifthackz.aisdv1.core.common.appbuild.BuildType
 import com.shifthackz.aisdv1.core.common.appbuild.BuildVersion
 import com.shifthackz.aisdv1.domain.repository.AppVersionRepository
 import io.reactivex.rxjava3.core.Single
 
 internal class CheckAppVersionUpdateUseCaseImpl(
+    private val buildInfoProvider: BuildInfoProvider,
     private val repository: AppVersionRepository,
 ) : CheckAppVersionUpdateUseCase {
 
@@ -18,13 +21,18 @@ internal class CheckAppVersionUpdateUseCaseImpl(
         repository.getLocalVersion()
     }
 
-    override fun invoke() = Single
-        .zip(remoteVersionProducer(), localVersionProducer(), ::Pair)
-        .map { (actualVer, localVer) ->
-            if (localVer < actualVer) {
-                CheckAppVersionUpdateUseCase.Result.NewVersionAvailable(actualVer)
-            } else {
-                CheckAppVersionUpdateUseCase.Result.NoUpdateNeeded
-            }
+    override fun invoke(): Single<CheckAppVersionUpdateUseCase.Result> =
+        when (buildInfoProvider.buildType) {
+            BuildType.GOOGLE_PLAY -> Single
+                .zip(remoteVersionProducer(), localVersionProducer(), ::Pair)
+                .map { (actualVer, localVer) ->
+                    if (localVer < actualVer) {
+                        CheckAppVersionUpdateUseCase.Result.NewVersionAvailable(actualVer)
+                    } else {
+                        CheckAppVersionUpdateUseCase.Result.NoUpdateNeeded
+                    }
+                }
+
+            else -> Single.just(CheckAppVersionUpdateUseCase.Result.NoUpdateNeeded)
         }
 }

network/src/main/java/com/shifthackz/aisdv1/network/response/AppVersionResponse.kt

@@ -5,6 +5,4 @@ import com.google.gson.annotations.SerializedName
 data class AppVersionResponse(
     @SerializedName("googleplay")
     val googlePlay: String,
-    @SerializedName("fdroid")
-    val fDroid: String
 )

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsContract.kt

@@ -27,6 +27,7 @@ sealed interface SettingsState : MviState {
         val saveToMediaStore: Boolean,
         val formAdvancedOptionsAlwaysShow: Boolean,
         val appVersion: String,
+        val showCheckForUpdates: Boolean,
         val showRewardedSdAiAd: Boolean,
         val showSdModelSelector: Boolean,
         val showMonitorConnectionOption: Boolean,

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsScreen.kt

@@ -323,7 +323,7 @@ private fun ContentSettingsState(
             text = R.string.settings_item_report_problem.asUiText(),
             onClick = onReportProblemItemClick,
         )
-        SettingsItem(
+        if (state.showCheckForUpdates) SettingsItem(
             modifier = itemModifier,
             startIcon = Icons.Filled.GetApp,
             text = R.string.settings_item_check_updates.asUiText(),
@@ -391,6 +391,7 @@ private fun PreviewStateContent() {
             autoSaveAiResults = true,
             saveToMediaStore = true,
             formAdvancedOptionsAlwaysShow = false,
+            showCheckForUpdates = true,
             showSdModelSelector = true,
             showMonitorConnectionOption = true,
             showRateGooglePlay = true,

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsStateProducer.kt

@@ -32,6 +32,7 @@ class SettingsStateProducer(
             saveToMediaStore = settings.saveToMediaStore,
             formAdvancedOptionsAlwaysShow = settings.formAdvancedOptionsAlwaysShow,
             appVersion = version,
+            showCheckForUpdates = buildInfoProvider.buildType == BuildType.GOOGLE_PLAY,
             showRewardedSdAiAd = settings.useSdAiCloud,
             showSdModelSelector = settings.source == ServerSource.CUSTOM,
             showMonitorConnectionOption = settings.source == ServerSource.CUSTOM,