Merge pull request #5 from Emotional-Wellbeing/dominguez

Dominguez
Emotional-Wellbeing · May 16, 2024 · b3e79d2 · b3e79d2
2 parents 58a0162 + f1561bd
commit b3e79d2
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 799 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "es.upm.bienestaremocional"
         minSdk 28 //Health connect requires sdk >=27
         targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 14
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,13 +6,6 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"
-        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.health.READ_SLEEP"/>
     <uses-permission android:name="android.permission.health.READ_HEART_RATE"/>
     <uses-permission android:name="android.permission.health.READ_STEPS"/>

diff --git a/app/src/main/java/es/upm/bienestaremocional/data/FirstExecution.kt b/app/src/main/java/es/upm/bienestaremocional/data/FirstExecution.kt
@@ -25,9 +25,6 @@ suspend fun firstTimeExecution(
     workAdministrator.scheduleDailyNightNotificationWorker()
     workAdministrator.scheduleOneOffNotificationWorker()
     workAdministrator.scheduleUploadWorker()
-    workAdministrator.scheduleUploadPhoneDataWorker()
-    workAdministrator.scheduleUploadTrafficDataWorker()
-
 
     //insert values in last upload table
     val now = obtainTimestamp(Instant.now(), null)

diff --git a/app/src/main/java/es/upm/bienestaremocional/data/crypto/Crypto.kt b/app/src/main/java/es/upm/bienestaremocional/data/crypto/Crypto.kt
@@ -37,10 +37,4 @@ private fun generateRawUUID(): String = UUID.randomUUID().toString()
  * Generates a User ID using randomUUID and sha256 hash
  * @return User ID in hexadecimal format
  */
-fun generateUID(): String = sha512hash(generateRawUUID())
-
-/**
- * Encrypt private user data
- * @return User ID in String format
- */
-fun securePrivateData(message: String): String = sha512hash(message)
+fun generateUID(): String = sha512hash(generateRawUUID())
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/phonecalls/PhoneInfo.kt b/app/src/main/java/es/upm/bienestaremocional/data/phonecalls/PhoneInfo.kt
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/remote/RemoteAPI.kt b/app/src/main/java/es/upm/bienestaremocional/data/remote/RemoteAPI.kt
@@ -29,7 +29,4 @@ interface RemoteAPI {
     @POST("/one_off_questionnaires")
     suspend fun postOneOffQuestionnaires(@Body data: OneOffQuestionnairesRequest):
             Response<OneOffQuestionnairesResponse.Timestamps>
-
-    @POST("/bg_data")
-    suspend fun postBackgroundData(@Body message: String): Response<Unit>
 }
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/trafficstats/main.kt b/app/src/main/java/es/upm/bienestaremocional/data/trafficstats/main.kt
diff --git a/app/src/main/java/es/upm/bienestaremocional/data/usage/Usage.kt b/app/src/main/java/es/upm/bienestaremocional/data/usage/Usage.kt