Fix: #243 - converting days to years

decentralised-dataexchange · Nov 28, 2023 · 7506e8c · 7506e8c
1 parent 5bd8e7a
commit 7506e8c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt b/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt
@@ -25,6 +25,7 @@ import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_TOKEN
 import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_USERID
 import com.github.privacyDashboard.utils.BBConsentLocaleHelper
 import com.google.gson.Gson
+import kotlin.math.floor
 
 
 object PrivacyDashboard {
@@ -121,10 +122,19 @@ object PrivacyDashboard {
                 dataAgreement?.policy?.storageLocation
             )
         )
+        var retentionPeriod = "${dataAgreement?.policy?.dataRetentionPeriodDays.toString()} days"
+        try {
+            var years = floor(
+                (dataAgreement?.policy?.dataRetentionPeriodDays?.div(365)?.toDouble()
+                    ?: 0) as Double
+            )
+            retentionPeriod = "$years years"
+        } catch (e: Exception) {
+        }
         subList.add(
             DataAgreementPolicyModel(
                 context.resources.getString(R.string.bb_consent_data_agreement_policy_retention_period),
-                dataAgreement?.policy?.dataRetentionPeriodDays.toString()
+                retentionPeriod
             )
         )
         subList.add(

diff --git a/...main/java/com/github/privacyDashboard/modules/dataSharing/BBConsentDataSharingActivity.kt b/...main/java/com/github/privacyDashboard/modules/dataSharing/BBConsentDataSharingActivity.kt
@@ -26,6 +26,7 @@ import com.github.privacyDashboard.modules.dataAttribute.BBConsentDataAttributeL
 import com.github.privacyDashboard.modules.webView.BBConsentWebViewActivity
 import com.github.privacyDashboard.utils.BBConsentImageUtils
 import com.google.gson.Gson
+import kotlin.math.floor
 
 class BBConsentDataSharingActivity : BBConsentBaseActivity() {
 
@@ -295,10 +296,19 @@ class BBConsentDataSharingActivity : BBConsentBaseActivity() {
                 dataAgreement?.policy?.storageLocation
             )
         )
+        var retentionPeriod = "${dataAgreement?.policy?.dataRetentionPeriodDays.toString()} days"
+        try {
+            var years = floor(
+                (dataAgreement?.policy?.dataRetentionPeriodDays?.div(365)?.toDouble()
+                    ?: 0) as Double
+            )
+            retentionPeriod = "$years years"
+        } catch (e: Exception) {
+        }
         subList.add(
             DataAgreementPolicyModel(
                 resources.getString(R.string.bb_consent_data_agreement_policy_retention_period),
-                dataAgreement?.policy?.dataRetentionPeriodDays.toString()
+                retentionPeriod
             )
         )
         subList.add(