Merge pull request #13176 from SORMAS-Foundation/feature-13093_Data_protection_update

leventegal-she · web-flow · commit 8045e05e0d04 · 2024-10-30T13:00:12.000+02:00
#13093 - Update Data Protection for certain Data Fields - fix issues …
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/campaign/edit/CampaignFormMetaDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/campaign/edit/CampaignFormMetaDialog.java
@@ -30,6 +30,7 @@
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.campaign.Campaign;
 import de.symeda.sormas.app.backend.campaign.form.CampaignFormMeta;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.component.dialog.FormDialog;
 import de.symeda.sormas.app.component.validation.FragmentValidator;
 import de.symeda.sormas.app.core.notification.NotificationHelper;
@@ -51,7 +52,7 @@ public CampaignFormMetaDialog(final FragmentActivity activity, Campaign campaign
                 R.layout.dialog_root_two_button_panel_layout,
                 R.string.heading_campaign_form_meta_select,
                 -1,
-                UiFieldAccessCheckers.forSensitiveData(campaign.isPseudonymized()));
+                UiFieldAccessCheckers.forSensitiveData(campaign.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
         this.campaign = campaign;
     }
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditFragment.java
@@ -130,7 +130,7 @@ public static CaseEditFragment newInstance(Case activityRootData) {
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		caseEditFragment.differentPlaceOfStayJurisdiction =
 			activityRootData.getRegion() != null || activityRootData.getDistrict() != null || activityRootData.getCommunity() != null;
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditHealthConditionsFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditHealthConditionsFragment.java
@@ -33,7 +33,7 @@ public static CaseEditHealthConditionsFragment newInstance(Case activityRootData
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+				UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	@Override
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditHospitalizationFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditHospitalizationFragment.java
@@ -33,6 +33,7 @@
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.caze.Case;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.hospitalization.Hospitalization;
 import de.symeda.sormas.app.backend.hospitalization.PreviousHospitalization;
 import de.symeda.sormas.app.component.Item;
@@ -57,7 +58,7 @@ public static CaseEditHospitalizationFragment newInstance(Case activityRootData)
 			null,
 			activityRootData,
 			new FieldVisibilityCheckers(),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Instance methods
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditMaternalHistoryFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/CaseEditMaternalHistoryFragment.java
@@ -25,6 +25,7 @@
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.caze.Case;
 import de.symeda.sormas.app.backend.caze.maternalhistory.MaternalHistory;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.component.Item;
 import de.symeda.sormas.app.databinding.FragmentCaseEditMaternalHistoryLayoutBinding;
 import de.symeda.sormas.app.util.InfrastructureDaoHelper;
@@ -44,7 +45,7 @@ public static CaseEditMaternalHistoryFragment newInstance(Case activityRootData)
 			null,
 			activityRootData,
 			null,
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Overrides
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/PreviousHospitalizationDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/edit/PreviousHospitalizationDialog.java
@@ -30,6 +30,7 @@
 import de.symeda.sormas.api.utils.ValidationException;
 import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.app.R;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.hospitalization.PreviousHospitalization;
 import de.symeda.sormas.app.backend.infrastructure.InfrastructureHelper;
 import de.symeda.sormas.app.component.Item;
@@ -60,7 +61,7 @@ public class PreviousHospitalizationDialog extends FormDialog {
 			R.layout.dialog_root_three_button_panel_layout,
 			R.string.heading_previous_hospitalization,
 			-1,
-			UiFieldAccessCheckers.forSensitiveData(previousHospitalization.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(previousHospitalization.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		this.data = previousHospitalization;
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadFragment.java
@@ -61,7 +61,7 @@ public static CaseReadFragment newInstance(Case activityRootData) {
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		return caseReadFragment;
 	}
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadHospitalizationFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/caze/read/CaseReadHospitalizationFragment.java
@@ -28,6 +28,7 @@
 import de.symeda.sormas.app.BaseReadFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.caze.Case;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.hospitalization.Hospitalization;
 import de.symeda.sormas.app.backend.hospitalization.PreviousHospitalization;
 import de.symeda.sormas.app.databinding.FragmentCaseReadHospitalizationLayoutBinding;
@@ -48,7 +49,7 @@ public static CaseReadHospitalizationFragment newInstance(Case activityRootData)
 			null,
 			activityRootData,
 			new FieldVisibilityCheckers(),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Overrides
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/clinicalcourse/edit/ClinicalVisitEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/clinicalcourse/edit/ClinicalVisitEditFragment.java
@@ -20,6 +20,7 @@
 import de.symeda.sormas.app.BaseEditFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.clinicalcourse.ClinicalVisit;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.databinding.FragmentClinicalVisitEditLayoutBinding;
 
 public class ClinicalVisitEditFragment extends BaseEditFragment<FragmentClinicalVisitEditLayoutBinding, ClinicalVisit, ClinicalVisit> {
@@ -32,7 +33,7 @@ public static ClinicalVisitEditFragment newInstance(ClinicalVisit activityRootDa
 			null,
 			activityRootData,
 			null,
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	@Override
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/contact/edit/ContactEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/contact/edit/ContactEditFragment.java
@@ -85,7 +85,7 @@ public static ContactEditFragment newInstance(Contact activityRootData) {
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	private void setUpControlListeners(FragmentContactEditLayoutBinding contentBinding) {
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/read/EnvironmentReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/read/EnvironmentReadFragment.java
@@ -27,7 +27,7 @@ public static EnvironmentReadFragment newInstance(Environment activityRootData)
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.getNoop(),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		return environmentReadFragment;
 	}
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/environmentsample/edit/EnvironmentSampleEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/environmentsample/edit/EnvironmentSampleEditFragment.java
@@ -68,7 +68,7 @@ public static EnvironmentSampleEditFragment newInstance(EnvironmentSample activi
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()),
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()),
 			UserRight.ENVIRONMENT_SAMPLE_EDIT);
 	}
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/ActivityAsCaseDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/ActivityAsCaseDialog.java
@@ -60,7 +60,7 @@ public class ActivityAsCaseDialog extends FormDialog {
 			R.string.heading_activityAsCase,
 			-1,
 			false,
-			UiFieldAccessCheckers.forSensitiveData(activityAsCase.isPseudonymized()),
+			UiFieldAccessCheckers.forSensitiveData(activityAsCase.isPseudonymized(), ConfigProvider.getServerCountryCode()),
 			FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(activityRootData)).andWithCountry(ConfigProvider.getServerCountryCode()));
 
 		this.data = activityAsCase;
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/EpidemiologicalDataEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/EpidemiologicalDataEditFragment.java
@@ -41,6 +41,7 @@
 import de.symeda.sormas.app.backend.caze.Case;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
 import de.symeda.sormas.app.backend.common.PseudonymizableAdo;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.contact.Contact;
 import de.symeda.sormas.app.backend.epidata.EpiData;
 import de.symeda.sormas.app.backend.exposure.Exposure;
@@ -65,7 +66,7 @@ public static EpidemiologicalDataEditFragment newInstance(PseudonymizableAdo act
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(activityRootData)),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	private void setUpControlListeners(final FragmentEditEpidLayoutBinding contentBinding) {
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/EpidemiologicalDataReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/EpidemiologicalDataReadFragment.java
@@ -69,7 +69,7 @@ public static EpidemiologicalDataReadFragment newInstance(Case activityRootData)
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(activityRootData)).andWithCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	public static EpidemiologicalDataReadFragment newInstance(Contact activityRootData) {
@@ -78,7 +78,7 @@ public static EpidemiologicalDataReadFragment newInstance(Contact activityRootDa
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(activityRootData)).andWithCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	private void setUpControlListeners() {
@@ -107,7 +107,7 @@ private void setUpControlListeners() {
 				ExposureDto.class,
 				(ViewGroup) infoDialog.getBinding().getRoot(),
 				FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(getActivityRootData())),
-				UiFieldAccessCheckers.forSensitiveData(((PseudonymizableAdo) getActivityRootData()).isPseudonymized()));
+				UiFieldAccessCheckers.forSensitiveData(((PseudonymizableAdo) getActivityRootData()).isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 			infoDialog.show();
 		};
@@ -141,7 +141,7 @@ private void setUpControlListeners() {
 				(ViewGroup) infoDialog.getBinding().getRoot(),
 				FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(getActivityRootData()))
 					.andWithCountry(ConfigProvider.getServerCountryCode()),
-				UiFieldAccessCheckers.forSensitiveData(((PseudonymizableAdo) getActivityRootData()).isPseudonymized()));
+				UiFieldAccessCheckers.forSensitiveData(((PseudonymizableAdo) getActivityRootData()).isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 			infoDialog.show();
 		};
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/ExposureDialog.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/epidata/ExposureDialog.java
@@ -58,7 +58,7 @@ public class ExposureDialog extends FormDialog {
 			R.string.heading_exposure,
 			-1,
 			false,
-			UiFieldAccessCheckers.forSensitiveData(exposure.isPseudonymized()),
+			UiFieldAccessCheckers.forSensitiveData(exposure.isPseudonymized(), ConfigProvider.getServerCountryCode()),
 			FieldVisibilityCheckers.withDisease(getDiseaseOfCaseOrContact(activityRootData)).andWithCountry(ConfigProvider.getServerCountryCode()));
 
 		this.data = exposure;
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/event/edit/EventEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/event/edit/EventEditFragment.java
@@ -101,7 +101,7 @@ public static EventEditFragment newInstance(Event activityRootData) {
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		fragment.isMultiDayEvent = activityRootData.getEndDate() != null;
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/event/eventparticipant/edit/EventParticipantEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/event/eventparticipant/edit/EventParticipantEditFragment.java
@@ -27,6 +27,7 @@
 import de.symeda.sormas.app.BaseEditFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.event.EventParticipant;
 import de.symeda.sormas.app.backend.location.Location;
 import de.symeda.sormas.app.caze.edit.CaseNewActivity;
@@ -50,7 +51,7 @@ public static EventParticipantEditFragment newInstance(EventParticipant activity
 			null,
 			activityRootData,
 			new FieldVisibilityCheckers(),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Instance methods
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/event/eventparticipant/read/EventParticipantReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/event/eventparticipant/read/EventParticipantReadFragment.java
@@ -25,6 +25,7 @@
 import de.symeda.sormas.app.BaseReadFragment;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
+import de.symeda.sormas.app.backend.config.ConfigProvider;
 import de.symeda.sormas.app.backend.event.EventParticipant;
 import de.symeda.sormas.app.caze.read.CaseReadActivity;
 import de.symeda.sormas.app.databinding.FragmentEventParticipantReadLayoutBinding;
@@ -41,7 +42,7 @@ public static EventParticipantReadFragment newInstance(EventParticipant activity
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getEvent().getDisease()),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Instance methods
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/event/read/EventReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/event/read/EventReadFragment.java
@@ -56,7 +56,7 @@ public static EventReadFragment newInstance(Event activityRootData) {
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Overrides
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/edit/ImmunizationEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/edit/ImmunizationEditFragment.java
@@ -89,7 +89,7 @@ public static ImmunizationEditFragment newInstance(Immunization activityRootData
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		immunizationEditFragment.setMeansOfImmunizationChange(meansOfImmunizationChange);
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/read/ImmunizationReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/read/ImmunizationReadFragment.java
@@ -47,7 +47,7 @@ public static ImmunizationReadFragment newInstance(Immunization activityRootData
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 
 		return immunizationReadFragment;
 	}
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/vaccination/VaccinationEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/vaccination/VaccinationEditFragment.java
@@ -57,7 +57,7 @@ public static VaccinationEditFragment newInstance(Vaccination activityRootData)
 			null,
 			activityRootData,
 			null,
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	@Override
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/vaccination/VaccinationEditHealthConditionsFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/immunization/vaccination/VaccinationEditHealthConditionsFragment.java
@@ -33,7 +33,7 @@ public static VaccinationEditHealthConditionsFragment newInstance(Vaccination ac
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getImmunization().getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	@Override
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/pathogentest/edit/PathogenTestEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/pathogentest/edit/PathogenTestEditFragment.java
@@ -75,7 +75,7 @@ public static PathogenTestEditFragment newInstance(PathogenTest activityRootData
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getTestedDisease()).andWithCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Overrides
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/pathogentest/read/PathogenTestReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/pathogentest/read/PathogenTestReadFragment.java
@@ -44,7 +44,7 @@ public static PathogenTestReadFragment newInstance(PathogenTest activityRootData
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withCountry(ConfigProvider.getServerCountryCode()),
-			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	// Overrides
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java
@@ -101,7 +101,7 @@ public static PersonEditFragment newInstance(Case activityRootData) {
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease())
 				.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	public static PersonEditFragment newInstance(Contact activityRootData) {
@@ -111,7 +111,7 @@ public static PersonEditFragment newInstance(Contact activityRootData) {
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease()),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	public static PersonEditFragment newInstance(Immunization activityRootData) {
@@ -121,7 +121,7 @@ public static PersonEditFragment newInstance(Immunization activityRootData) {
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getDisease()),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	public static PersonEditFragment newInstance(EventParticipant activityRootData) {
@@ -131,7 +131,7 @@ public static PersonEditFragment newInstance(EventParticipant activityRootData)
 			null,
 			activityRootData,
 			FieldVisibilityCheckers.withDisease(activityRootData.getEvent().getDisease()),
-			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));
+			UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));
 	}
 
 	private void setUpLayoutBinding(final BaseEditFragment fragment, final Person record, final FragmentPersonEditLayoutBinding contentBinding) {
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/person/read/PersonReadFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/person/read/PersonReadFragment.java
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/sample/edit/SampleEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/sample/edit/SampleEditFragment.java
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/symptoms/SymptomsEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/symptoms/SymptomsEditFragment.java
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/therapy/edit/PrescriptionEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/therapy/edit/PrescriptionEditFragment.java
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/therapy/edit/TreatmentEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/therapy/edit/TreatmentEditFragment.java
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/visit/edit/VisitEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/visit/edit/VisitEditFragment.java

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static CaseEditHealthConditionsFragment newInstance(Case activityRootData`
`33`	`33`	`activityRootData,`
`34`	`34`	`FieldVisibilityCheckers.withDisease(activityRootData.getDisease())`
`35`	`35`	`.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),`
`36`		`- UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));`
	`36`	`+ UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static CaseReadFragment newInstance(Case activityRootData) {`
`61`	`61`	`activityRootData,`
`62`	`62`	`FieldVisibilityCheckers.withDisease(activityRootData.getDisease())`
`63`	`63`	`.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),`
`64`		`- UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized()));`
	`64`	`+ UiFieldAccessCheckers.getDefault(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));`
`65`	`65`
`66`	`66`	`return caseReadFragment;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static ContactEditFragment newInstance(Contact activityRootData) {`
`85`	`85`	`activityRootData,`
`86`	`86`	`FieldVisibilityCheckers.withDisease(activityRootData.getDisease())`
`87`	`87`	`.add(new CountryFieldVisibilityChecker(ConfigProvider.getServerLocale())),`
`88`		`- UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized()));`
	`88`	`+ UiFieldAccessCheckers.forSensitiveData(activityRootData.isPseudonymized(), ConfigProvider.getServerCountryCode()));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private void setUpControlListeners(FragmentContactEditLayoutBinding contentBinding) {`