diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ed5c562b93..eab6117952 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -88,7 +88,7 @@ android { val mapboxAccessToken = System.getenv("MAPBOX_ACCESS_TOKEN") ?: defMapboxToken val bitriseSentryDSN = System.getenv("SENTRY_DSN") ?: "" - buildConfigField("String", "SDK_VERSION", "\"" + "1.10.1-eyeseetea-fork-2" + "\"") + buildConfigField("String", "SDK_VERSION", "\"" + libs.versions.dhis2sdk.get() + "\"") buildConfigField("String", "MAPBOX_ACCESS_TOKEN", "\"" + mapboxAccessToken + "\"") buildConfigField("String", "MATOMO_URL", "\"https://usage.analytics.dhis2.org/matomo.php\"") buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}") diff --git a/app/src/main/java/org/dhis2/data/server/ServerModule.kt b/app/src/main/java/org/dhis2/data/server/ServerModule.kt index f78931d708..5335e4b673 100644 --- a/app/src/main/java/org/dhis2/data/server/ServerModule.kt +++ b/app/src/main/java/org/dhis2/data/server/ServerModule.kt @@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.D2 import org.hisp.dhis.android.core.D2Configuration import org.hisp.dhis.android.core.D2Manager import org.hisp.dhis.android.core.D2Manager.blockingInstantiateD2 +import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper @Module class ServerModule { @@ -191,6 +192,7 @@ class ServerModule { .networkInterceptors(interceptors) .writeTimeoutInSeconds(10 * 60) .context(context) + .fileResizerDimension(FileResizerHelper.Dimension.MEDIUM) .build() } } diff --git a/dhis2-android-sdk b/dhis2-android-sdk index 1acf258ff9..1311b9de51 160000 --- a/dhis2-android-sdk +++ b/dhis2-android-sdk @@ -1 +1 @@ -Subproject commit 1acf258ff95e4f8cbfd64067df254abe9f603542 +Subproject commit 1311b9de51e46a0aad59949536a485ce0e3cf2a9 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8b0c07a1e..5a4c285c7e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ ndk = "21.4.7075529" sdk = "34" minSdk = "21" vCode = "136" -vName = "3.0.1-widp-fork-1" +vName = "3.0.1-widp-fork-2" kotlinCompilerExtensionVersion = "1.5.6" dhis2AndroidSdkCode = "294" gradle = "8.2.2" @@ -12,7 +12,7 @@ hilt = '2.47' hiltCompiler = '1.0.0' jacoco = '0.8.10' designSystem = "0.3.0" -dhis2sdk = "1.10.1" +dhis2sdk = "1.10.1-eyeseetea-fork-2" ruleEngine = "3.0.0" expressionParser = "1.1.0" appcompat = "1.6.1"