added checks for null condition in location

openmrs · May 21, 2020 · 8430311 · 8430311
1 parent c708faa
commit 8430311
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/databases/DBOpenHelper.java b/openmrs-client/src/main/java/org/openmrs/mobile/databases/DBOpenHelper.java
@@ -275,8 +275,16 @@ public long insertEncounter(SQLiteDatabase db, Encounter encounter) {
             bindString(5, encounter.getEncounterType().getDisplay(), encounterStatement);
             bindString(6, encounter.getPatientUUID(), encounterStatement);
             bindString(7, encounter.getFormUuid(), encounterStatement);
-            bindString(8, encounter.getLocation().getUuid(), encounterStatement);
-            bindString(9, encounter.getEncounterProviders().get(0).getProvider().getUuid(), encounterStatement);
+
+            if(encounter.getLocation() == null)
+                bindString(8, "", encounterStatement);
+            else
+                bindString(8, encounter.getLocation().getUuid(), encounterStatement);
+
+            if(encounter.getEncounterProviders().size() == 0)
+                bindString(9, "", encounterStatement);
+            else
+                bindString(9, encounter.getEncounterProviders().get(0).getProvider().getUuid(), encounterStatement);
             encounterId = encounterStatement.executeInsert();
             encounterStatement.clearBindings();
             db.setTransactionSuccessful();
@@ -294,8 +302,15 @@ public int updateEncounter(SQLiteDatabase db, long encounterID, Encounter encoun
         newValues.put(EncounterTable.Column.DISPLAY, encounter.getDisplay());
         newValues.put(EncounterTable.Column.ENCOUNTER_DATETIME, encounter.getEncounterDatetime());
         newValues.put(EncounterTable.Column.ENCOUNTER_TYPE, encounter.getEncounterType().getDisplay());
-        newValues.put(EncounterTable.Column.LOCATION_UUID, encounter.getLocation().getUuid());
-        newValues.put(EncounterTable.Column.ENCOUNTER_PROVIDER_UUID, encounter.getEncounterProviders().get(0).getProvider().getUuid());
+        if(encounter.getLocation() == null)
+            newValues.put(EncounterTable.Column.LOCATION_UUID, "");
+        else
+            newValues.put(EncounterTable.Column.LOCATION_UUID, encounter.getLocation().getUuid());
+
+        if(encounter.getEncounterProviders().size() == 0)
+            newValues.put(EncounterTable.Column.ENCOUNTER_PROVIDER_UUID, "");
+        else
+            newValues.put(EncounterTable.Column.ENCOUNTER_PROVIDER_UUID, encounter.getEncounterProviders().get(0).getProvider().getUuid());
 
         String[] whereArgs = new String[]{String.valueOf(encounterID)};