From c9b3ab8de3f026afca5dc2b2738ab7a8c3f91a7a Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Tue, 7 Oct 2025 12:26:50 +0100
Subject: [PATCH 1/7] add glitchip configurations

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 claimManagement/.DS_Store                     | Bin 6148 -> 6148 bytes
 claimManagement/build.gradle                  |   6 +-
 claimManagement/src/main/AndroidManifest.xml  |   4 +
 .../org/openimis/imisclaims/MainActivity.java |  79 +++++++++++-------
 .../imisclaims/domain/entity/Claim.java       |   4 +-
 .../imisclaims/domain/entity/ClaimAdmin.java  |   2 +-
 .../entity/DiagnosesServicesMedications.java  |   2 +-
 .../imisclaims/domain/entity/Diagnosis.java   |   2 +-
 .../domain/entity/HealthFacility.java         |   2 +-
 .../imisclaims/domain/entity/Insuree.java     |   2 +-
 .../imisclaims/domain/entity/Medication.java  |   2 +-
 .../imisclaims/domain/entity/PaymentList.java |   2 +-
 .../domain/entity/PendingClaim.java           |   6 +-
 .../imisclaims/domain/entity/Policy.java      |   2 +-
 .../imisclaims/domain/entity/Service.java     |   2 +-
 .../domain/entity/SubServiceItem.java         |   2 +-
 17 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index c36a0f11a4f9a20696eef589b249c8e51cf8c07c..43976835ea07bf08bd14f8cfb6869e2464303a02 100644
GIT binary patch
delta 542
zcmZp1XmQw}Di9a=OO}CwfrUYjA)O(Up(Hoo#U&{xKM5$tG23J2zAmrhj;Qh}c;yQ+
z41<&Na|?ia7?}PtOl}r%WGl{YjGyK;`GbJS<a+`<2(A+slSEB7P$4^m-edt02{yIW
zDN-}MCN~I*OwJSJVLKxAao=<hSD~KC-~h-(R-iL88B!Qh84`2S5f(8pn(Cm+B739p
z4v$hl#2ZNZbMp}%!L9<yEA<Qvj8F$8F_Z$Gki(FI;s6FoMX&?lvd9i-``3GHI?Mq`
zDi999t^(lzHlX2*0t}ORgp~x4?NyR|%?K1!nfyzLi><wQmk==Y9DrOsVIBn6fLUc@
lz~*9MLq?Uj8;nQ3n}B1KnW2Osm!SYT7$CBnPl(uX0|0DvjxYcK

delta 542
zcmZp1XmQw}DiG&-Gm3$MfrUYjA)O(Up(Hoo#U&{xKM5$tQLXtWfXDE-BdUA~UipFy
z!{Frn+ybB;2Bzx@lbZz`*-pD8-(^yt{6Rou@;w0_1lNg+@##`Yph9*Ay~zS15^Pos
zU+;4pPHqqsnVcuc!^ZmU{)~7XAXlND@tFe1L{^|PGZ|7CQW+9+(h(LhFiI(-$|8GX
zx|ebt)Eh|pbMp}%nS8F!_mlzHqev={yi(7=z_<b8fFy=epc8T!QcxVg!0-g@0Jto&
z0}`(sIQWnsYCMt(gafdvKsbO6WcLAv$vnbJ0?77Cy-9xn6jYh~ONfh&d1r(>kKtqo
vAXiVA2f;O9mib<=xmehcQDypp2?7rl!7gEDC}GHDC_oMdi0tMQA~xIriH(eu

diff --git a/claimManagement/.DS_Store b/claimManagement/.DS_Store
index 2473cf23c0f8c123d6d8553f71e7ea3d61de7966..dc378a4fb56f086befa70c8395f969c8dcdcf1b8 100644
GIT binary patch
delta 113
zcmZoMXffEJ#>ArdtL(*OEhZ_pz;uaTMYqXbOfoQL4wDSCO520Y-As~<HW%X=7#Nrt
niW!O+l5_K2T#|C~lYk-|Ov`S!cX=ImM3zlKlimD)Sw#c@RZbxE

delta 113
zcmZoMXffEJ#>66Z=I7hVT1--GAB~Ka7HCfPVv>O|bC_h9WzGt0?q-r?v^o8dfq{XU
np_rkFAvrhS#U&{xKM5$pvF%BOJCEUUM`YO)G}+A$m{mjox4<D>

diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index c3a245d7..06dd39f1 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -62,6 +62,7 @@ android {
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
         resValue "string", "release_tag", "release/25.04"
+        resValue "string", "glitchip_dsn", "https://3afee255dd9f4b96b0d1b207b1bb5f1b@glitchtip.s2.openimis.org/3"
     }
 
     productFlavors {
@@ -171,8 +172,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     buildFeatures {
         viewBinding true
@@ -220,5 +221,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
+    implementation 'io.sentry:sentry-android:5.3.0'
 
 }
diff --git a/claimManagement/src/main/AndroidManifest.xml b/claimManagement/src/main/AndroidManifest.xml
index db8ddd0b..3ed4368f 100644
--- a/claimManagement/src/main/AndroidManifest.xml
+++ b/claimManagement/src/main/AndroidManifest.xml
@@ -57,6 +57,10 @@
                 android:resource="@xml/paths" />
         </provider>
 
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="@string/glitchip_dsn" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
index 51dd0273..e3a3377f 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
@@ -58,6 +58,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.sentry.Sentry;
+import io.sentry.android.core.SentryAndroid;
+
 
 public class MainActivity extends ImisActivity {
     private static final int REQUEST_PERMISSIONS_CODE = 1;
@@ -109,49 +112,53 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        try {
+            setContentView(R.layout.activity_main);
 
-        isSDCardAvailable();
+            isSDCardAvailable();
 
-        broadcastList = new ArrayList<>();
-        broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
+            broadcastList = new ArrayList<>();
+            broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
 
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setCancelable(false);
+            progressDialog = new ProgressDialog(this);
+            progressDialog.setCancelable(false);
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        actionBar = getSupportActionBar();
+            Toolbar toolbar = findViewById(R.id.toolbar);
+            setSupportActionBar(toolbar);
+            actionBar = getSupportActionBar();
 
-        new Thread(this::checkForUpdates).start();
+            new Thread(this::checkForUpdates).start();
 
-        drawer = findViewById(R.id.drawer_layout);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        drawer.addDrawerListener(toggle);
-        toggle.syncState();
+            drawer = findViewById(R.id.drawer_layout);
+            ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                    this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+            drawer.addDrawerListener(toggle);
+            toggle.syncState();
 
-        NavigationView navigationView = findViewById(R.id.nav_view);
-        navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
+            NavigationView navigationView = findViewById(R.id.nav_view);
+            navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
 
-        View header = navigationView.getHeaderView(0);
-        loginText = header.findViewById(R.id.LoginText);
-        loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
-        RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
-        loginButton.setOnClickListener((view) -> changeLoginState());
+            View header = navigationView.getHeaderView(0);
+            loginText = header.findViewById(R.id.LoginText);
+            loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
+            RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
+            loginButton.setOnClickListener((view) -> changeLoginState());
 
-        accepted_count = findViewById(R.id.accepted_count);
-        rejected_count = findViewById(R.id.rejected_count);
-        entered_Count = findViewById(R.id.entered_count);
+            accepted_count = findViewById(R.id.accepted_count);
+            rejected_count = findViewById(R.id.rejected_count);
+            entered_Count = findViewById(R.id.entered_count);
 
-        accepted_count.setText("0");
-        rejected_count.setText("0");
-        entered_Count.setText("0");
+            accepted_count.setText("0");
+            rejected_count.setText("0");
+            entered_Count.setText("0");
 
-        AdminName = findViewById(R.id.AdminName);
+            AdminName = findViewById(R.id.AdminName);
 
-        if (checkRequirements()) {
-            onAllRequirementsMet();
+            if (checkRequirements()) {
+                onAllRequirementsMet();
+            }
+        } catch (Exception exception) {
+            Sentry.captureException(exception);
         }
     }
 
@@ -283,6 +290,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
                                     (d, i) -> finish());
                         }
                     } catch (Exception e) {
+                        Sentry.captureException(e);
                         Log.e(LOG_TAG, "Error while copying master data.", e);
                     }
                 }
@@ -303,6 +311,7 @@ public void PickMasterDataFileDialog() {
                             try {
                                 startActivityForResult(intent, REQUEST_PICK_MD_FILE);
                             } catch (ActivityNotFoundException e) {
+                                Sentry.captureException(e);
                                 Toast.makeText(getApplicationContext(), getResources().getString(R.string.NoFileExporerInstalled), Toast.LENGTH_SHORT).show();
                             }
                         }).setNegativeButton(getResources().getString(R.string.No),
@@ -319,6 +328,7 @@ public AlertDialog confirmRefreshMap() {
                     try {
                         doLoggedIn(() -> DownLoadDiagnosesServicesItems(global.getOfficerCode()));
                     } catch (Exception e) {
+                        Sentry.captureException(e);
                         e.printStackTrace();
                     }
                 },
@@ -409,6 +419,7 @@ public AlertDialog DownloadMasterDialog() {
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
+                            Sentry.captureException(e);
                             DownloadMasterDialog();
                         }
                     } else {
@@ -442,6 +453,7 @@ private void checkForUpdates() {
                 try {
                     mNotificationManager.notify(SIMPLE_NOTIFICATION_ID, builder.build());
                 } catch (Exception e) {
+                    Sentry.captureException(e);
                     e.printStackTrace();
                 }
 
@@ -479,6 +491,7 @@ public void run() {
                         });
                     } catch (Exception e) {
                         e.printStackTrace();
+                        Sentry.captureException(e);
                         runOnUiThread(() -> {
                             progressDialog.dismiss();
                             ErrorDialogBox(e.getMessage());
@@ -519,6 +532,7 @@ public void getClaimAdmins() {
                     });
                 } catch (Exception e) {
                     e.printStackTrace();
+                    Sentry.captureException(e);
                     runOnUiThread(() -> progressDialog.dismiss());
                 }
             });
@@ -553,6 +567,7 @@ public void validateClaimAdminCode(final String claimAdminCode) {
                             progressDialog.dismiss();
                             doLoggedIn(() -> DownLoadDiagnosesServicesItems(claimAdminCode));
                         } catch (Exception e) {
+                            Sentry.captureException(e);
                             e.printStackTrace();
                         }
                     }
@@ -636,6 +651,7 @@ public void run() {
                         });
                     } catch (Exception e) {
                         e.printStackTrace();
+                        Sentry.captureException(e);
                         runOnUiThread(() -> {
                             progressDialog.dismiss();
                             Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.SomethingWentWrongServer), Toast.LENGTH_LONG).show();
@@ -680,6 +696,7 @@ public void run() {
                         });
                     } catch (Exception e) {
                         e.printStackTrace();
+                        Sentry.captureException(e);
                         runOnUiThread(() -> {
                             progressDialog.dismiss();
                             Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.AccessDenied), Toast.LENGTH_LONG).show();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
index 85f85803..447e6d84 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
@@ -501,7 +501,7 @@ public String getJustification() {
             return justification;
         }
 
-        public static final Creator<Service> CREATOR = new Creator<>() {
+        public static final Creator<Service> CREATOR = new Creator<Service>() {
             @Override
             public Service createFromParcel(Parcel in) {
                 return new Service(in);
@@ -611,7 +611,7 @@ public String getJustification() {
             return justification;
         }
 
-        public static final Creator<Medication> CREATOR = new Creator<>() {
+        public static final Creator<Medication> CREATOR = new Creator<Medication>() {
             @Override
             public Medication createFromParcel(Parcel in) {
                 return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
index 188fc57e..1e512641 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
@@ -72,7 +72,7 @@ public String getHealthFacilityCode() {
         return hfCode;
     }
 
-    public static final Creator<ClaimAdmin> CREATOR = new Creator<>() {
+    public static final Creator<ClaimAdmin> CREATOR = new Creator<ClaimAdmin>() {
         @Override
         public ClaimAdmin createFromParcel(Parcel in) {
             return new ClaimAdmin(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
index f4b5abc0..6d1f827e 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
@@ -70,7 +70,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<>() {
+    public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<DiagnosesServicesMedications>() {
         @Override
         public DiagnosesServicesMedications createFromParcel(Parcel in) {
             return new DiagnosesServicesMedications(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
index 14e3fa65..ad21b54d 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
@@ -46,7 +46,7 @@ public String getName() {
         return name;
     }
 
-    public static final Creator<Diagnosis> CREATOR = new Creator<>() {
+    public static final Creator<Diagnosis> CREATOR = new Creator<Diagnosis>() {
         @Override
         public Diagnosis createFromParcel(Parcel in) {
             return new Diagnosis(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
index fd02a8fc..4abeeb36 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
@@ -46,7 +46,7 @@ public String getCode(){
     public String getName(){
         return name;
     }
-    public static final Creator<HealthFacility> CREATOR = new Creator<>() {
+    public static final Creator<HealthFacility> CREATOR = new Creator<HealthFacility>() {
         @Override
         public HealthFacility createFromParcel(Parcel in) {
             return new HealthFacility(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
index 5cf7b700..85ad52fd 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
@@ -105,7 +105,7 @@ public List<Policy> getPolicies() {
         return policies;
     }
 
-    public static final Creator<Insuree> CREATOR = new Creator<>() {
+    public static final Creator<Insuree> CREATOR = new Creator<Insuree>() {
         @Override
         public Insuree createFromParcel(Parcel in) {
             return new Insuree(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
index a24c2582..19c93fa0 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
@@ -90,7 +90,7 @@ public String getCurrency() {
         return currency;
     }
 
-    public static final Creator<Medication> CREATOR = new Creator<>() {
+    public static final Creator<Medication> CREATOR = new Creator<Medication>() {
         @Override
         public Medication createFromParcel(Parcel in) {
             return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
index 03fb0929..546b5d5c 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
@@ -59,7 +59,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<PaymentList> CREATOR = new Creator<>() {
+    public static final Creator<PaymentList> CREATOR = new Creator<PaymentList>() {
         @Override
         public PaymentList createFromParcel(Parcel in) {
             return new PaymentList(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
index fbb3c1e7..3d732db8 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
@@ -261,7 +261,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<PendingClaim> CREATOR = new Creator<>() {
+    public static final Creator<PendingClaim> CREATOR = new Creator<PendingClaim>() {
         @Override
         public PendingClaim createFromParcel(Parcel in) {
             return new PendingClaim(in);
@@ -334,7 +334,7 @@ public double getQuantity() {
             return quantity;
         }
 
-        public static final Creator<Service> CREATOR = new Creator<>() {
+        public static final Creator<Service> CREATOR = new Creator<Service>() {
             @Override
             public Service createFromParcel(Parcel in) {
                 return new Service(in);
@@ -408,7 +408,7 @@ public double getQuantity() {
             return quantity;
         }
 
-        public static final Creator<Medication> CREATOR = new Creator<>() {
+        public static final Creator<Medication> CREATOR = new Creator<Medication>() {
             @Override
             public Medication createFromParcel(Parcel in) {
                 return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
index d0383d94..8442d167 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
@@ -425,7 +425,7 @@ public enum Status {
         IDLE, ACTIVE, SUSPENDED, EXPIRED, READY
     }
 
-    public static final Creator<Policy> CREATOR = new Creator<>() {
+    public static final Creator<Policy> CREATOR = new Creator<Policy>() {
         @Override
         public Policy createFromParcel(Parcel in) {
             return new Policy(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
index c9434cc0..7a7bc6d8 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
@@ -129,7 +129,7 @@ public List<SubServiceItem> getSubItems() {
         return subItems;
     }
 
-    public static final Creator<Service> CREATOR = new Creator<>() {
+    public static final Creator<Service> CREATOR = new Creator<Service>() {
         @Override
         public Service createFromParcel(Parcel in) {
             return new Service(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
index fbfe2e5b..28899706 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
@@ -45,7 +45,7 @@ public int getQty() {
     public String getPrice() {
         return price;
     }
-    public static final Parcelable.Creator<SubServiceItem> CREATOR = new Parcelable.Creator<>() {
+    public static final Parcelable.Creator<SubServiceItem> CREATOR = new Parcelable.Creator<SubServiceItem>() {
         @Override
         public SubServiceItem createFromParcel(Parcel in) {
             return new SubServiceItem(in);

From 6f74b9f77c47e4e14c8557c430dd34878464b82d Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Tue, 7 Oct 2025 12:36:09 +0100
Subject: [PATCH 2/7] delete ds_store files

---
 .DS_Store                     | Bin 8196 -> 8196 bytes
 .gitignore                    |   2 ++
 claimManagement/.DS_Store     | Bin 6148 -> 0 bytes
 claimManagement/src/.DS_Store | Bin 8196 -> 0 bytes
 4 files changed, 2 insertions(+)
 delete mode 100644 claimManagement/.DS_Store
 delete mode 100644 claimManagement/src/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 43976835ea07bf08bd14f8cfb6869e2464303a02..4821d9843ac0622cc481510d180b4dabbef0cc4c 100644
GIT binary patch
delta 369
zcmZp1XmQw}Di9YG@`QnbfrUYjA)O(Up(Hoo#U&{xKM5$t(feD`d4|_<M^yO~yz&JZ
zhQZ1CxdlKy3{3wnOl}rXWa4v~yi6d6Ljfel&Y(B>gRle_lSE28lq(=2F*!s~4Tz<D
zQM4N@0O?=_IxUkSg&~z8F((~iI0K{VT~t|Qr^n7(#W!>ELqS;=Fbm=dB$JTsVPM<<
zu_uY46lhZpLkfyL42-gqorL0<89p#f<`GsBK$cW8J+})es51GN5ErY52A}cF$@apk
Ull6po;5;Ly%M6=~g(va=0Q8+%D*ylh

delta 365
zcmZp1XmQw}Di9a=OO}CwfrUYjA)O(Up(Hoo#U&{xKM5$tG23J2zAmrhj;Qh}c;yQ+
z41<&Na|?ia7?}PtOl}rXWK#2(yi6d6!vQ45&Y(B>gRle_lSEB7lq(=2F}X@mYI2?+
z59<-BkNc)it`}6cKLAqA3UpQ`LkdGGLt;)k!e9nQQyo-UWM?<t;Zf?J{7_KV1<ZnY
z0Ldg|Co(WX?MY%N1=^Iukb+_lgQVhQC!u&|MgfM&Ji<x>$dXEuuNi@YDwBT+aj~`+
b?-H6Z*<M(6vYs#xoM*(eF<^7C@I)Q}weVVK

diff --git a/.gitignore b/.gitignore
index abd7044a..5b46a751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,8 @@ fastlane/readme.md
 
 # Visual Studio Code
 .vscode/
+./.DS_Store
+*.DS_Store
 
 
 # Custom product flavours
diff --git a/claimManagement/.DS_Store b/claimManagement/.DS_Store
deleted file mode 100644
index dc378a4fb56f086befa70c8395f969c8dcdcf1b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKy-EW?5S~q<B-o@(5#a(BmgWu4a9Y?&uvU_j7`SlJkW>~|84v`Y!NNyT+tfCe
zc?GTfW_P)}%_Z20$PDa$d-Jn1``ypp5|Qdm!!}W!h^lCer5d_5!gg*2DOn8%D?LXT
z4cgs)JQ^2#Me#Qo;Cr`4J(|*xB699u>ua`jt)n;ydQseiwt6~fJhYBq4_7_HA3Vla
z*%PvN_knQQranzjK|q%@Tk`}t_IwS&)8hKGrfXR7$*S1oldpq|fK<T15L`^08dP|Y
zx8?KC-_Dx1%@^h%jUB~V?sax2uhK6{8LPjczLRx#agJH7C7-kO{64=w(Q8hvS;nH(
z$+!QANkxPKVL%w*J)5PvV^DfwKo}4PQU>_@;Gr@4788T|(}7MO0e}^#wP4J@lpNz(
z^erX^VSy+U3N)e09x;>&hu*V(zQx3#2`6O_AIfG{_JpEzcFgZ-cT&DV>4gDdz-6Fp
zF6+GiA8kJWyFqd#3<v}NiUCy#x<Lm^vU_V`alF@hXcuTK?3Wl!Lom==F?@L|ZlGy_
Y-s1t#x0o1&1|mNKng;2FfnR0d8zS<6g#Z8m

diff --git a/claimManagement/src/.DS_Store b/claimManagement/src/.DS_Store
deleted file mode 100644
index bc5cf4182160c35a03f437dc14aeca6bf53d4052..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMziSjh6n=BL(~~qdLJTRk&_*nh#!}aCk~SEy5QOag7Iw2oyt5FC!&q5qDcEYG
z*oz=m3KkYAMbOIs!Om}f?ChJ{S<{ImGcfa(`QF>_&9}2NH+w`RHfQ|}q7@=)qe^>r
z8I7k%T-Hiyn4Wc5fq0@M9c}FN@@!J^4IM#&pg>R{C=e6~3j7}mV9%DNU9<0NG_*m1
zpumY#K&}rFs<g4Ob8XeqfkqtxV4LVx1=lzSsF=vu*x0$YDirtBrw3s|g*jpf9S%H_
z?y#}3b8U4v2^~(tFbi`+5sDpgk#Z*yYa802Kv1Bnz&g5G)TIGUXuNoSzr5+9S>EY%
z)4Yq`_N5=+4}PEde0|ZQe}u<m%)b!C2&X0LfqUqFJGk8`5zhNEd-lZenz$@4IjgA4
zr#?)ysE_e>X+|TL^V}D3GL-XPo!we{xb{hp*T!>hzlX~ofdDI=jL#^iZQ4iMce9{x
zJ|CXTgBP!dQ>}gFUOc0}`MG(iRdd<qbrboes0rPpfhW5fPoCr9q1CI_yL@g(dwcS2
zA;%nZC!us9$M;Z>p**j5AFOtcN12P?!^7XiGfe0%?K$kLzdnN9Vx0T!wcb-RcNtzX
z`*4T%!cW{9J7-4s9ZphnM)h;PH{+z3vj!`<7BPoMZ^A9w!{|ns2m20N<KkCj!BEaQ
z+}eF^*99BTXQki6;cslqah}H8Q9BP$-Kl!;JRV=^7Gqzy56`9E%gLwEW2#oF#QVm!
z$f7)t^Qq0l@hG2!-^0V-1j7Jt<kWc@M310^#W?rqmE~r5$?U^Dyz*Iua{Lrn(nDI2
z=l>h^-~W%_z{7}w0zm<*fM|AhI`XH!Ia^zxxM<)aLfu7`Mf%OPRUv4ki|kj&aaj9@
gA+95X#m3IH1%mR=KLiZI{$HHo!v3$O;E8Ph01t<)K>z>%


From bf5cc57b5dafca858097f97942bb1f8eb3ba5d21 Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Tue, 7 Oct 2025 12:39:03 +0100
Subject: [PATCH 3/7] delete ds_store files

---
 .DS_Store  | Bin 8196 -> 0 bytes
 .gitignore |   1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 4821d9843ac0622cc481510d180b4dabbef0cc4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMJ8KkC6h3#d>VmM@a*+t5M6nWs+OKg05p0aDkDW}|Ebe3$lXNM@Mys^GDr;@5
zZIuXuQLwR5Ec^j>7DDj5kIbICGh?ho^jx_24ELOKzwdtY+A~W;YJNSLBkB-Q6J6W(
zK@1g5`*kn1z|G9UD&*6!Kew=$rK3`$Oo#%afG8jehytR(-=YBC*}64r-uu=oqbMK>
z{Fe&o=R=6DZP(e{TJz|@U`hbk2BuBJaa$k2hR$}K&8>w8P1#gfo2p!ip=>(lLl@U|
zHn-NMlXAs}a>&Y6D9WH?{m_Jy>RKzKC?E=y70|VNgHBSP2DHZO_u$IauiTerQ4|le
z7<0|dA4kqVy!85<?@xZ|A1#l+4Fo&ykxB=4acP;>Ddy-zt*9KqIjr8gbK}0{FtJXW
zjhWO(aX#)@W!Je)JxXXuOPo*8N$wSViU`i<__O4Y(_~^D&Zj<#^9fEp0T}IrJ_B%B
zq8{f$>ewgW%XwUT{IvDR>ca9lhw2E9PwKhFk8xfG&?52hNgX!$g_q;s-PzoFu#3+k
z#^<Cu!o#O;8h@G=f!zaxlrF=rp!cChioW7stw+ypzt}s2^SpSXb=v8)2M*Wn_p|tZ
zW<Tid;66(z!=6@sHGLoF`0i~yvoW(}?=zRn*;M&Cu34FAKU6EOSs(l5Hex(K$DjUO
z;7`Pi&t_eW&*O`xGDT}RcO#!c^Uc`9v9EtrufCr#&ls1-cV71Tcy0IdLEisbcxj?Q
zg#uG{uA}S!3-#asD>7wD6c7de6$MlyT8QSc8&_MG_N8m>5d9{)ZaOZv)}&xC<v45u
f)7oGBVTj|<&2^p4t%V0oJ_HyUWDo`Zr~*F$<n$#@

diff --git a/.gitignore b/.gitignore
index 5b46a751..f812f042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,7 @@ fastlane/readme.md
 # Visual Studio Code
 .vscode/
 ./.DS_Store
+./.git/.DS_Store
 *.DS_Store
 
 

From ef332696253a3af3823faf7cb7994f6ffdb8afbc Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Tue, 7 Oct 2025 16:08:28 +0100
Subject: [PATCH 4/7] change glitchip_dsn to sentry_dsn

---
 claimManagement/build.gradle                 | 2 +-
 claimManagement/src/main/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index 06dd39f1..26acdf3d 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -62,7 +62,7 @@ android {
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
         resValue "string", "release_tag", "release/25.04"
-        resValue "string", "glitchip_dsn", "https://3afee255dd9f4b96b0d1b207b1bb5f1b@glitchtip.s2.openimis.org/3"
+        resValue "string", "sentry_dsn", "https://3afee255dd9f4b96b0d1b207b1bb5f1b@glitchtip.s2.openimis.org/3"
     }
 
     productFlavors {
diff --git a/claimManagement/src/main/AndroidManifest.xml b/claimManagement/src/main/AndroidManifest.xml
index 3ed4368f..62201dbb 100644
--- a/claimManagement/src/main/AndroidManifest.xml
+++ b/claimManagement/src/main/AndroidManifest.xml
@@ -59,7 +59,7 @@
 
         <meta-data
             android:name="io.sentry.dsn"
-            android:value="@string/glitchip_dsn" />
+            android:value="@string/sentry_dsn" />
 
         <activity
             android:name=".MainActivity"

From c26dfba40bc038189dc6eaf92272ba468cb8e0c5 Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Wed, 8 Oct 2025 09:56:58 +0100
Subject: [PATCH 5/7] add sentry_dsn description in readme

---
 README.md                    | 5 ++++-
 claimManagement/build.gradle | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 59fe99a3..fb239696 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,10 @@ private String _Domain = "http://132.148.151.32/";
 ```
 
 For demo purposes, the default Web Services domain is set to the openIMIS
-demo server: demo.openimis.org (IP: 132.148.151.32).  
+demo server: demo.openimis.org (IP: 132.148.151.32).
+
+If you want to receive error and exception events in sentry
+you can set `sentry_dsn` in build.gradle file
 
 ### Running the app
 
diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index 26acdf3d..c895cd86 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -62,7 +62,7 @@ android {
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
         resValue "string", "release_tag", "release/25.04"
-        resValue "string", "sentry_dsn", "https://3afee255dd9f4b96b0d1b207b1bb5f1b@glitchtip.s2.openimis.org/3"
+        resValue "string", "sentry_dsn", ""
     }
 
     productFlavors {

From ff65dd2abed08c59da9dc5b691d2c8d3c654b00d Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Thu, 30 Oct 2025 15:42:29 +0100
Subject: [PATCH 6/7] add gradle properties in gitignor

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f812f042..9ee11dd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,5 @@ fastlane/readme.md
 *custom-flavours.gradle
 
 .DS_Store
+*.properties
+./gradle
\ No newline at end of file

From 54728d166324da36cf156c76e01713b3f66b8192 Mon Sep 17 00:00:00 2001
From: vaneck237 <vaneckbilongo@gmail.com>
Date: Thu, 30 Oct 2025 16:00:40 +0100
Subject: [PATCH 7/7] updgrade sentry dependence version

---
 claimManagement/build.gradle                  |  6 +-
 .../org/openimis/imisclaims/MainActivity.java | 66 +++++++++----------
 .../imisclaims/SynchronizeActivity.java       |  5 ++
 .../imisclaims/SynchronizeService.java        |  5 ++
 .../imisclaims/domain/entity/Claim.java       |  6 +-
 .../imisclaims/domain/entity/ClaimAdmin.java  |  2 +-
 .../entity/DiagnosesServicesMedications.java  |  2 +-
 .../imisclaims/domain/entity/Diagnosis.java   |  2 +-
 .../domain/entity/HealthFacility.java         |  2 +-
 .../imisclaims/domain/entity/Insuree.java     |  2 +-
 .../imisclaims/domain/entity/Medication.java  |  2 +-
 .../imisclaims/domain/entity/PaymentList.java |  2 +-
 .../domain/entity/PendingClaim.java           |  6 +-
 .../imisclaims/domain/entity/Policy.java      |  2 +-
 .../imisclaims/domain/entity/Service.java     |  2 +-
 .../domain/entity/SubServiceItem.java         |  2 +-
 16 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index c895cd86..20814539 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -172,8 +172,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     buildFeatures {
         viewBinding true
@@ -221,6 +221,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
-    implementation 'io.sentry:sentry-android:5.3.0'
+    implementation 'io.sentry:sentry-android:8.25.0'
 
 }
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
index e3a3377f..b755847f 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
@@ -112,53 +112,49 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        try {
-            setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_main);
 
-            isSDCardAvailable();
+        isSDCardAvailable();
 
-            broadcastList = new ArrayList<>();
-            broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
+        broadcastList = new ArrayList<>();
+        broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
 
-            progressDialog = new ProgressDialog(this);
-            progressDialog.setCancelable(false);
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setCancelable(false);
 
-            Toolbar toolbar = findViewById(R.id.toolbar);
-            setSupportActionBar(toolbar);
-            actionBar = getSupportActionBar();
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        actionBar = getSupportActionBar();
 
-            new Thread(this::checkForUpdates).start();
+        new Thread(this::checkForUpdates).start();
 
-            drawer = findViewById(R.id.drawer_layout);
-            ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                    this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-            drawer.addDrawerListener(toggle);
-            toggle.syncState();
+        drawer = findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
 
-            NavigationView navigationView = findViewById(R.id.nav_view);
-            navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
+        NavigationView navigationView = findViewById(R.id.nav_view);
+        navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
 
-            View header = navigationView.getHeaderView(0);
-            loginText = header.findViewById(R.id.LoginText);
-            loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
-            RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
-            loginButton.setOnClickListener((view) -> changeLoginState());
+        View header = navigationView.getHeaderView(0);
+        loginText = header.findViewById(R.id.LoginText);
+        loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
+        RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
+        loginButton.setOnClickListener((view) -> changeLoginState());
 
-            accepted_count = findViewById(R.id.accepted_count);
-            rejected_count = findViewById(R.id.rejected_count);
-            entered_Count = findViewById(R.id.entered_count);
+        accepted_count = findViewById(R.id.accepted_count);
+        rejected_count = findViewById(R.id.rejected_count);
+        entered_Count = findViewById(R.id.entered_count);
 
-            accepted_count.setText("0");
-            rejected_count.setText("0");
-            entered_Count.setText("0");
+        accepted_count.setText("0");
+        rejected_count.setText("0");
+        entered_Count.setText("0");
 
-            AdminName = findViewById(R.id.AdminName);
+        AdminName = findViewById(R.id.AdminName);
 
-            if (checkRequirements()) {
-                onAllRequirementsMet();
-            }
-        } catch (Exception exception) {
-            Sentry.captureException(exception);
+        if (checkRequirements()) {
+            onAllRequirementsMet();
         }
     }
 
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java
index 35c436b5..35ac037f 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java
@@ -36,6 +36,8 @@
 import java.net.URL;
 import java.util.ArrayList;
 
+import io.sentry.Sentry;
+
 public class SynchronizeActivity extends ImisActivity {
     private static final String LOG_TAG = "SYNCACTIVITY";
     private static final int PICK_FILE_REQUEST_CODE = 1;
@@ -129,6 +131,7 @@ protected void onBroadcastReceived(Context context, Intent intent) {
                         showDialog(getResources().getString(R.string.BulkUpload));
                     }
                 } catch (JSONException e) {
+                    Sentry.captureException(e);
                     Log.e(LOG_TAG, "Error while processing claim response", e);
                 }
                 break;
@@ -289,6 +292,7 @@ public void CheckUpdate(){
                                 Toast.LENGTH_SHORT).show();
                     });
                 } catch (Exception e) {
+                    Sentry.captureException(e);
                     runOnUiThread(() -> {
                         pd.dismiss();
                         Toast.makeText(this,
@@ -320,6 +324,7 @@ public void downloadUpdate(String lastVersion, String tagName) {
 
         } catch (Exception e) {
             Toast.makeText(this, getResources().getString(R.string.downloadUpdateFail), Toast.LENGTH_SHORT).show();
+            Sentry.captureException(e);
             Log.e("DownloadUpdate", "Erreur: ", e);
         }
     }
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
index f7593030..cfb906d0 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
@@ -31,6 +31,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import io.sentry.Sentry;
+
 public class SynchronizeService extends JobIntentService {
     private static final int JOB_ID = 6541259; //Random unique Job id
     private static final String LOG_TAG = "SYNCSERVICE";
@@ -114,6 +116,7 @@ private void handleUploadClaims() {
             broadcastSyncSuccess(claimStatus);
         } catch (Exception e) {
             e.printStackTrace();
+            Sentry.captureException(e);
             broadcastError(getResources().getString(R.string.ErrorOccurred) + ": " + e.getMessage(), ACTION_UPLOAD_CLAIMS);
         }
     }
@@ -195,6 +198,7 @@ private void handleExportClaims() {
                         AppInformation.DateTimeInfo.getDefaultIsoDatetimeFormatter().format(new Date()),
                         SQLHandler.CLAIM_UPLOAD_STATUS_EXPORTED, null);
             } catch (JSONException e) {
+                Sentry.captureException(e);
                 Log.e(LOG_TAG, "Exception while exporting claims", e);
             }
         }
@@ -219,6 +223,7 @@ private File createClaimFile(JSONObject details) {
             String filename = "Claim_" + details.getString("HFCode") + "_" + details.getString("ClaimCode") + "_" + d + ".xml";
             return storageManager.createTempFile("exports/claim/" + filename);
         } catch (JSONException e) {
+            Sentry.captureException(e);
             Log.e(LOG_TAG, "Parsing claim JSON failed", e);
         }
         return null;
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
index 447e6d84..edc14f24 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
@@ -392,7 +392,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<Claim> CREATOR = new Creator<Claim>() {
+    public static final Creator<Claim> CREATOR = new Creator<>() {
         @Override
         public Claim createFromParcel(Parcel in) {
             return new Claim(in);
@@ -501,7 +501,7 @@ public String getJustification() {
             return justification;
         }
 
-        public static final Creator<Service> CREATOR = new Creator<Service>() {
+        public static final Creator<Service> CREATOR = new Creator<>() {
             @Override
             public Service createFromParcel(Parcel in) {
                 return new Service(in);
@@ -611,7 +611,7 @@ public String getJustification() {
             return justification;
         }
 
-        public static final Creator<Medication> CREATOR = new Creator<Medication>() {
+        public static final Creator<Medication> CREATOR = new Creator<>() {
             @Override
             public Medication createFromParcel(Parcel in) {
                 return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
index 1e512641..188fc57e 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java
@@ -72,7 +72,7 @@ public String getHealthFacilityCode() {
         return hfCode;
     }
 
-    public static final Creator<ClaimAdmin> CREATOR = new Creator<ClaimAdmin>() {
+    public static final Creator<ClaimAdmin> CREATOR = new Creator<>() {
         @Override
         public ClaimAdmin createFromParcel(Parcel in) {
             return new ClaimAdmin(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
index 6d1f827e..f4b5abc0 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java
@@ -70,7 +70,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<DiagnosesServicesMedications>() {
+    public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<>() {
         @Override
         public DiagnosesServicesMedications createFromParcel(Parcel in) {
             return new DiagnosesServicesMedications(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
index ad21b54d..14e3fa65 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java
@@ -46,7 +46,7 @@ public String getName() {
         return name;
     }
 
-    public static final Creator<Diagnosis> CREATOR = new Creator<Diagnosis>() {
+    public static final Creator<Diagnosis> CREATOR = new Creator<>() {
         @Override
         public Diagnosis createFromParcel(Parcel in) {
             return new Diagnosis(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
index 4abeeb36..fd02a8fc 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java
@@ -46,7 +46,7 @@ public String getCode(){
     public String getName(){
         return name;
     }
-    public static final Creator<HealthFacility> CREATOR = new Creator<HealthFacility>() {
+    public static final Creator<HealthFacility> CREATOR = new Creator<>() {
         @Override
         public HealthFacility createFromParcel(Parcel in) {
             return new HealthFacility(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
index 85ad52fd..5cf7b700 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java
@@ -105,7 +105,7 @@ public List<Policy> getPolicies() {
         return policies;
     }
 
-    public static final Creator<Insuree> CREATOR = new Creator<Insuree>() {
+    public static final Creator<Insuree> CREATOR = new Creator<>() {
         @Override
         public Insuree createFromParcel(Parcel in) {
             return new Insuree(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
index 19c93fa0..a24c2582 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Medication.java
@@ -90,7 +90,7 @@ public String getCurrency() {
         return currency;
     }
 
-    public static final Creator<Medication> CREATOR = new Creator<Medication>() {
+    public static final Creator<Medication> CREATOR = new Creator<>() {
         @Override
         public Medication createFromParcel(Parcel in) {
             return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
index 546b5d5c..03fb0929 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PaymentList.java
@@ -59,7 +59,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<PaymentList> CREATOR = new Creator<PaymentList>() {
+    public static final Creator<PaymentList> CREATOR = new Creator<>() {
         @Override
         public PaymentList createFromParcel(Parcel in) {
             return new PaymentList(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
index 3d732db8..fbb3c1e7 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java
@@ -261,7 +261,7 @@ public List<Medication> getMedications() {
         return medications;
     }
 
-    public static final Creator<PendingClaim> CREATOR = new Creator<PendingClaim>() {
+    public static final Creator<PendingClaim> CREATOR = new Creator<>() {
         @Override
         public PendingClaim createFromParcel(Parcel in) {
             return new PendingClaim(in);
@@ -334,7 +334,7 @@ public double getQuantity() {
             return quantity;
         }
 
-        public static final Creator<Service> CREATOR = new Creator<Service>() {
+        public static final Creator<Service> CREATOR = new Creator<>() {
             @Override
             public Service createFromParcel(Parcel in) {
                 return new Service(in);
@@ -408,7 +408,7 @@ public double getQuantity() {
             return quantity;
         }
 
-        public static final Creator<Medication> CREATOR = new Creator<Medication>() {
+        public static final Creator<Medication> CREATOR = new Creator<>() {
             @Override
             public Medication createFromParcel(Parcel in) {
                 return new Medication(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
index 8442d167..d0383d94 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Policy.java
@@ -425,7 +425,7 @@ public enum Status {
         IDLE, ACTIVE, SUSPENDED, EXPIRED, READY
     }
 
-    public static final Creator<Policy> CREATOR = new Creator<Policy>() {
+    public static final Creator<Policy> CREATOR = new Creator<>() {
         @Override
         public Policy createFromParcel(Parcel in) {
             return new Policy(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
index 7a7bc6d8..c9434cc0 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
@@ -129,7 +129,7 @@ public List<SubServiceItem> getSubItems() {
         return subItems;
     }
 
-    public static final Creator<Service> CREATOR = new Creator<Service>() {
+    public static final Creator<Service> CREATOR = new Creator<>() {
         @Override
         public Service createFromParcel(Parcel in) {
             return new Service(in);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
index 28899706..fbfe2e5b 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/SubServiceItem.java
@@ -45,7 +45,7 @@ public int getQty() {
     public String getPrice() {
         return price;
     }
-    public static final Parcelable.Creator<SubServiceItem> CREATOR = new Parcelable.Creator<SubServiceItem>() {
+    public static final Parcelable.Creator<SubServiceItem> CREATOR = new Parcelable.Creator<>() {
         @Override
         public SubServiceItem createFromParcel(Parcel in) {
             return new SubServiceItem(in);