Cambios de la prueba cerrada IV:

- Frecuencia de subida de datos de 24 a 8h, eliminadas las restricciones. - Añadido backoff criteria - Correción de concordancia en las respuestas en español de concentración y líbido - Actualización de algunas librerías Signed-off-by: Víctor Domínguez <viconel27@gmail.com>
Emotional-Wellbeing · Jul 1, 2023 · f89f7f8 · f89f7f8
1 parent 8c07704
commit f89f7f8
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 28 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdk 28 //Health connect requires sdk >=27
         targetSdk 33
         versionCode 1
-        versionName "1.3.2"
+        versionName "1.3.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/es/upm/bienestaremocional/data/AppConstants.kt b/app/src/main/java/es/upm/bienestaremocional/data/AppConstants.kt
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/RemoteConstants.kt b/app/src/main/java/es/upm/bienestaremocional/data/RemoteConstants.kt
@@ -0,0 +1,10 @@
+package es.upm.bienestaremocional.data
+
+import androidx.work.BackoffPolicy
+import androidx.work.WorkRequest
+
+object RemoteConstants {
+    const val SERVER_URL = "http://nispero.etsisi.upm.es:5000"
+    val BACKOFF_CRITERIA = BackoffPolicy.EXPONENTIAL
+    const val BACKOFF_INITIAL_DELAY = WorkRequest.DEFAULT_BACKOFF_DELAY_MILLIS
+}
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/worker/UploadWorker.kt b/app/src/main/java/es/upm/bienestaremocional/data/worker/UploadWorker.kt
@@ -29,13 +29,9 @@ class UploadWorker @AssistedInject constructor(
     private val postOneOffQuestionnairesUseCase: PostOneOffQuestionnairesUseCase,
 ) : CoroutineWorker(appContext, workerParams) {
     companion object : Schedulable {
-        override val initialTime: LocalDateTime = LocalDateTime.now()
-            .withHour(3)
-            .withMinute(0)
-            .withSecond(0)
-            .withNano(0)
+        override val initialTime: LocalDateTime? = null
         override val tag = "upload"
-        override val repeatInterval: Duration = Duration.ofHours(24)
+        override val repeatInterval: Duration = Duration.ofHours(8)
     }
 
     override suspend fun doWork(): Result {

diff --git a/app/src/main/java/es/upm/bienestaremocional/data/worker/WorkAdministratorImpl.kt b/app/src/main/java/es/upm/bienestaremocional/data/worker/WorkAdministratorImpl.kt
@@ -15,6 +15,7 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
+import es.upm.bienestaremocional.data.RemoteConstants
 import es.upm.bienestaremocional.utils.formatHoursMinutes
 import java.time.Duration
 import java.time.ZoneId
@@ -66,6 +67,10 @@ class WorkAdministratorImpl(
         )
             .addTag(schedulable.tag)
             .setInitialDelay(offset)
+            .setBackoffCriteria(
+                backoffPolicy = RemoteConstants.BACKOFF_CRITERIA,
+                duration = Duration.ofMillis(RemoteConstants.BACKOFF_INITIAL_DELAY)
+            )
 
         constraints?.let {
             requestBuilder.setConstraints(it)
@@ -161,18 +166,11 @@ class WorkAdministratorImpl(
     }
 
     override fun scheduleUploadWorker() {
-        //Only execute upload job when battery is not low and network is available
-        val constraints = Constraints.Builder()
-            .setRequiresBatteryNotLow(true)
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .build()
-
         with(UploadWorker)
         {
             scheduleRequest(
                 workerClass = UploadWorker::class.java,
                 schedulable = this,
-                constraints = constraints
             )
         }
     }

diff --git a/app/src/main/java/es/upm/bienestaremocional/di/AppModule.kt b/app/src/main/java/es/upm/bienestaremocional/di/AppModule.kt
@@ -12,7 +12,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import es.upm.bienestaremocional.data.AppConstants
+import es.upm.bienestaremocional.data.RemoteConstants
 import es.upm.bienestaremocional.data.healthconnect.HealthConnectAvailability
 import es.upm.bienestaremocional.data.info.AppInfo
 import es.upm.bienestaremocional.data.info.AppInfoImpl
@@ -100,7 +100,7 @@ object AppModule {
     @Provides
     @Singleton
     fun provideRemoteAPI(gson: Gson): RemoteAPI = Retrofit.Builder()
-        .baseUrl(AppConstants.SERVER_URL)
+        .baseUrl(RemoteConstants.SERVER_URL)
         .addConverterFactory(GsonConverterFactory.create(gson))
         .build()
         .create(RemoteAPI::class.java)

diff --git a/app/src/main/res/values/questionnaires.xml b/app/src/main/res/values/questionnaires.xml
@@ -129,14 +129,14 @@
         <item>Insuficiente</item>
     </string-array>
     <string-array name="concentration_answers">
-        <item>Satisfactoria</item>
-        <item>Moderada</item>
+        <item>Satisfactorio</item>
+        <item>Moderado</item>
         <item>Insuficiente</item>
     </string-array>
     <string-array name="libido_answers">
-        <item>Satisfactoria</item>
-        <item>Moderada</item>
-        <item>Baja</item>
+        <item>Satisfactorio</item>
+        <item>Moderado</item>
+        <item>Bajo</item>
     </string-array>
     <string-array name="pain_answers">
         <item>Sin dolor</item>

diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,10 @@ buildscript {
     ext {
         compose_ui_version = '1.4.3'
         navigation_compose_version = '2.6.0'
-        material3_version = '1.1.0'
+        material3_version = '1.1.1'
         accompanist_version = '0.28.0'
         compose_destination_version = '1.8.42-beta'
-        room_version = "2.5.1"
+        room_version = "2.5.2"
         dagger_hilt_version = "2.45"
         hilt_composer_version = "1.0.0"
         vico_version = "1.6.6"