openmrs · f4ww4z · Jul 31, 2020 · Jul 30, 2020
diff --git a/...t/src/main/java/org/openmrs/mobile/activities/addeditpatient/AddEditPatientPresenter.java b/...t/src/main/java/org/openmrs/mobile/activities/addeditpatient/AddEditPatientPresenter.java
@@ -26,7 +26,7 @@
 import org.openmrs.mobile.api.RestServiceBuilder;
 import org.openmrs.mobile.api.repository.PatientRepository;
 import org.openmrs.mobile.dao.PatientDAO;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
 import org.openmrs.mobile.models.ConceptAnswers;
 import org.openmrs.mobile.models.Module;
 import org.openmrs.mobile.models.Patient;
@@ -215,7 +215,7 @@ private boolean validate(Patient patient) {
 
     @Override
     public void registerPatient() {
-        patientRepository.registerPatient(mPatient, new DefaultResponseCallbackListener() {
+        patientRepository.registerPatient(mPatient, new DefaultResponseCallback() {
             @Override
             public void onResponse() {
                 mPatientInfoView.startPatientDashbordActivity(mPatient);
@@ -232,7 +232,7 @@ public void onErrorResponse(String errorMessage) {
 
     @Override
     public void updatePatient(Patient patient) {
-        patientRepository.updatePatient(patient, new DefaultResponseCallbackListener() {
+        patientRepository.updatePatient(patient, new DefaultResponseCallback() {
             @Override
             public void onResponse() {
                 mPatientInfoView.finishPatientInfoActivity();
@@ -253,7 +253,7 @@ public PlacesClient getPlaces() {
 
     @Override
     public void getCauseOfDeathGlobalID() {
-        restApi.getSystemProperty(ApplicationConstants.CAUSE_OF_DEATH, ApplicationConstants.REPRESENTATION_FULL).enqueue(new Callback<Results<SystemProperty>>() {
+        restApi.getSystemProperty(ApplicationConstants.CAUSE_OF_DEATH, ApplicationConstants.API.FULL).enqueue(new Callback<Results<SystemProperty>>() {
             @Override
             public void onResponse(Call<Results<SystemProperty>> call, Response<Results<SystemProperty>> response) {
                 if (response.isSuccessful()) {

diff --git a/...ent/src/main/java/org/openmrs/mobile/activities/formadmission/FormAdmissionPresenter.java b/...ent/src/main/java/org/openmrs/mobile/activities/formadmission/FormAdmissionPresenter.java
@@ -26,29 +26,23 @@
 import org.openmrs.mobile.dao.PatientDAO;
 import org.openmrs.mobile.databases.AppDatabase;
 import org.openmrs.mobile.databases.entities.LocationEntity;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.EncounterResponseCallback;
+import org.openmrs.mobile.listeners.retrofit.LocationResponseCallback;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
 import org.openmrs.mobile.models.EncounterProviderCreate;
 import org.openmrs.mobile.models.Encountercreate;
 import org.openmrs.mobile.models.Obscreate;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.models.Provider;
 import org.openmrs.mobile.models.Resource;
-import org.openmrs.mobile.models.Results;
-import org.openmrs.mobile.utilities.ApplicationConstants;
-import org.openmrs.mobile.utilities.NetworkUtils;
 import org.openmrs.mobile.utilities.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
 import static org.openmrs.mobile.utilities.FormService.getFormResourceByName;
 
 public class FormAdmissionPresenter extends BasePresenter implements FormAdmissionContract.Presenter {
-
     private FormAdmissionContract.View view;
     private Long patientID;
     private String encounterType;
@@ -57,6 +51,7 @@ public class FormAdmissionPresenter extends BasePresenter implements FormAdmissi
     private Patient mPatient;
     private RestApi restApi;
     private Context mContext;
+    private ProviderRepository providerRepository;
 
     public FormAdmissionPresenter(FormAdmissionContract.View view, Long patientID, String encounterType, String formName, Context context) {
         this.view = view;
@@ -68,13 +63,15 @@ public FormAdmissionPresenter(FormAdmissionContract.View view, Long patientID, S
         restApi = RestServiceBuilder.createService(RestApi.class);
         this.view.setPresenter(this);
         this.mContext = context;
+        this.providerRepository = new ProviderRepository();
     }
 
     public FormAdmissionPresenter(FormAdmissionContract.View formAdmissionView, RestApi restApi, Context context) {
         this.view = formAdmissionView;
         this.restApi = restApi;
         this.view.setPresenter(this);
         this.mContext = context;
+        this.providerRepository = new ProviderRepository();
     }
 
     @Override
@@ -84,7 +81,6 @@ public void subscribe() {
 
     @Override
     public void getProviders(FormAdmissionFragment fragment) {
-        ProviderRepository providerRepository = new ProviderRepository(mContext);
         providerRepository.getProviders(restApi).observe(fragment, this::updateViews);
     }
 
@@ -98,51 +94,33 @@ public void updateViews(List<Provider> providerList) {
         }
     }
 
-    @Override
     public void getLocation(String url) {
-        if (NetworkUtils.hasNetwork()) {
-            String locationEndPoint = url + ApplicationConstants.API.REST_ENDPOINT + "location";
-            Call<Results<LocationEntity>> call =
-                    restApi.getLocations(locationEndPoint, "Admission Location", "full");
-            call.enqueue(new Callback<Results<LocationEntity>>() {
-                @Override
-                public void onResponse(Call<Results<LocationEntity>> call, Response<Results<LocationEntity>> response) {
-                    if (response.isSuccessful()) {
-                        view.updateLocationAdapter(response.body().getResults());
-                    } else {
-                        view.showToast(mContext.getResources().getString(R.string.error_occurred));
-                        view.enableSubmitButton(false);
-                    }
-                }
+        providerRepository.getLocation(restApi, url, new LocationResponseCallback() {
+            @Override
+            public void onResponse(List<LocationEntity> locationList) {
+                view.updateLocationAdapter(locationList);
+            }
 
-                @Override
-                public void onFailure(Call<Results<LocationEntity>> call, Throwable t) {
-                    view.showToast(t.getMessage());
-                    view.enableSubmitButton(false);
-                }
-            });
-        } else {
-            view.showToast(mContext.getResources().getString(R.string.offline_error_message));
-        }
+            @Override
+            public void onErrorResponse(String errorMessage) {
+                view.showToast(errorMessage);
+                view.enableSubmitButton(false);
+            }
+        });
     }
 
     @Override
     public void getEncounterRoles() {
-        restApi.getEncounterRoles().enqueue(new Callback<Results<Resource>>() {
+        providerRepository.getEncounterRoles(restApi, new EncounterResponseCallback() {
             @Override
-            public void onResponse(Call<Results<Resource>> call, Response<Results<Resource>> response) {
-                if (response.isSuccessful()) {
-                    view.updateEncounterRoleList(response.body().getResults());
-                } else {
-                    view.enableSubmitButton(false);
-                    view.showToast(mContext.getResources().getString(R.string.error_occurred));
-                }
+            public void onResponse(List<Resource> encounterRoleList) {
+                view.updateEncounterRoleList(encounterRoleList);
             }
 
             @Override
-            public void onFailure(Call<Results<Resource>> call, Throwable t) {
-                view.showToast(t.getMessage());
+            public void onErrorResponse(String errorMessage) {
                 view.enableSubmitButton(false);
+                view.showToast(errorMessage);
             }
         });
     }
@@ -176,7 +154,7 @@ public void createEncounter(String providerUUID, String locationUUID, String enc
             view.showToast(mContext.getResources().getString(R.string.form_data_will_be_synced_later_error_message));
             view.enableSubmitButton(true);
         } else {
-            new EncounterService().addEncounter(encountercreate, new DefaultResponseCallbackListener() {
+            new EncounterService().addEncounter(encountercreate, new DefaultResponseCallback() {
                 @Override
                 public void onResponse() {
                     view.enableSubmitButton(true);

diff --git a/...ent/src/main/java/org/openmrs/mobile/activities/formdisplay/FormDisplayMainPresenter.java b/...ent/src/main/java/org/openmrs/mobile/activities/formdisplay/FormDisplayMainPresenter.java
@@ -19,7 +19,7 @@
 import org.openmrs.mobile.application.OpenMRS;
 import org.openmrs.mobile.dao.PatientDAO;
 import org.openmrs.mobile.databases.AppDatabase;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
 import org.openmrs.mobile.models.Encountercreate;
 import org.openmrs.mobile.models.Obscreate;
 import org.openmrs.mobile.models.Patient;
@@ -122,7 +122,7 @@ public void createEncounter() {
                 mFormDisplayView.showToast();
                 mFormDisplayView.enableSubmitButton(true);
             } else {
-                new EncounterService().addEncounter(encountercreate, new DefaultResponseCallbackListener() {
+                new EncounterService().addEncounter(encountercreate, new DefaultResponseCallback() {
                     @Override
                     public void onResponse() {
                         mFormDisplayView.showSuccessfulToast();

diff --git a/...rg/openmrs/mobile/activities/lastviewedpatients/LastViewedPatientRecyclerViewAdapter.java b/...rg/openmrs/mobile/activities/lastviewedpatients/LastViewedPatientRecyclerViewAdapter.java
@@ -35,7 +35,7 @@
 import org.openmrs.mobile.api.repository.PatientRepository;
 import org.openmrs.mobile.api.repository.VisitRepository;
 import org.openmrs.mobile.dao.PatientDAO;
-import org.openmrs.mobile.listeners.retrofit.DownloadPatientCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.DownloadPatientCallback;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.utilities.DateUtils;
 import org.openmrs.mobile.utilities.ToastUtil;
@@ -353,7 +353,7 @@ public void setUpCheckBoxLogic(final PatientViewHolder holder, final Patient pat
     }
 
     private void downloadPatient(final Patient patient, final Boolean showSnackBar) {
-        new PatientRepository().downloadPatientByUuid(patient.getUuid(), new DownloadPatientCallbackListener() {
+        new PatientRepository().downloadPatientByUuid(patient.getUuid(), new DownloadPatientCallback() {
             @Override
             public void onPatientDownloaded(Patient newPatient) {
                 new PatientDAO().savePatient(newPatient)

diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/activities/login/LoginPresenter.java b/openmrs-client/src/main/java/org/openmrs/mobile/activities/login/LoginPresenter.java
@@ -27,7 +27,7 @@
 import org.openmrs.mobile.application.OpenMRSLogger;
 import org.openmrs.mobile.dao.LocationDAO;
 import org.openmrs.mobile.databases.entities.LocationEntity;
-import org.openmrs.mobile.listeners.retrofit.GetVisitTypeCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.GetVisitTypeCallback;
 import org.openmrs.mobile.models.Results;
 import org.openmrs.mobile.models.Session;
 import org.openmrs.mobile.models.VisitType;
@@ -138,7 +138,7 @@ public void onResponse(@NonNull Call<Session> call, @NonNull Response<Session> r
                                 mOpenMRS.setPasswordAndHashedPassword(password);
                             }
 
-                            visitRepository.getVisitType(new GetVisitTypeCallbackListener() {
+                            visitRepository.getVisitType(new GetVisitTypeCallback() {
                                 @Override
                                 public void onGetVisitTypeResponse(VisitType visitType) {
                                     OpenMRS.getInstance().setVisitTypeUUID(visitType.getUuid());

diff --git a/.../openmrs/mobile/activities/patientdashboard/details/PatientDashboardDetailsPresenter.java b/.../openmrs/mobile/activities/patientdashboard/details/PatientDashboardDetailsPresenter.java
@@ -20,8 +20,8 @@
 import org.openmrs.mobile.api.repository.PatientRepository;
 import org.openmrs.mobile.api.repository.VisitRepository;
 import org.openmrs.mobile.dao.PatientDAO;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
-import org.openmrs.mobile.listeners.retrofit.DownloadPatientCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
+import org.openmrs.mobile.listeners.retrofit.DownloadPatientCallback;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.utilities.NetworkUtils;
 
@@ -109,7 +109,7 @@ private void syncVitalsData() {
      * Sync Visits
      */
     private void syncVisitsData() {
-        visitRepository.syncVisitsData(mPatient, new DefaultResponseCallbackListener() {
+        visitRepository.syncVisitsData(mPatient, new DefaultResponseCallback() {
             @Override
             public void onResponse() {
                 mPatientDetailsView.showToast(R.string.synchronize_patient_successful, false);
@@ -128,7 +128,7 @@ public void onErrorResponse(String errorMessage) {
      * Download Patient
      */
     private void syncDetailsData() {
-        patientRepository.downloadPatientByUuid(mPatient.getUuid(), new DownloadPatientCallbackListener() {
+        patientRepository.downloadPatientByUuid(mPatient.getUuid(), new DownloadPatientCallback() {
             @Override
             public void onPatientDownloaded(Patient patient) {
                 updatePatientData(patient);

diff --git a/...rg/openmrs/mobile/activities/patientdashboard/visits/PatientDashboardVisitsPresenter.java b/...rg/openmrs/mobile/activities/patientdashboard/visits/PatientDashboardVisitsPresenter.java
@@ -20,8 +20,8 @@
 import org.openmrs.mobile.api.repository.VisitRepository;
 import org.openmrs.mobile.dao.PatientDAO;
 import org.openmrs.mobile.dao.VisitDAO;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
-import org.openmrs.mobile.listeners.retrofit.StartVisitResponseListenerCallback;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
+import org.openmrs.mobile.listeners.retrofit.StartVisitResponseCallback;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.utilities.NetworkUtils;
 
@@ -83,7 +83,7 @@ public void getVisitFromDB() {
 
     public void getVisitFromServer() {
         if (NetworkUtils.isOnline()) {
-            new VisitRepository().syncVisitsData(mPatient, new DefaultResponseCallbackListener() {
+            new VisitRepository().syncVisitsData(mPatient, new DefaultResponseCallback() {
                 @Override
                 public void onResponse() {
                     getVisitFromDB();
@@ -115,7 +115,7 @@ public void showStartVisitDialog() {
     @Override
     public void syncVisits() {
         mPatientVisitsView.showStartVisitProgressDialog();
-        visitRepository.syncVisitsData(mPatient, new DefaultResponseCallbackListener() {
+        visitRepository.syncVisitsData(mPatient, new DefaultResponseCallback() {
             @Override
             public void onResponse() {
                 addSubscription(visitDAO.getVisitsByPatientID(mPatient.getId())
@@ -138,7 +138,7 @@ public void onErrorResponse(String errorMessage) {
     @Override
     public void startVisit() {
         mPatientVisitsView.showStartVisitProgressDialog();
-        visitRepository.startVisit(mPatient, new StartVisitResponseListenerCallback() {
+        visitRepository.startVisit(mPatient, new StartVisitResponseCallback() {
             @Override
             public void onStartVisitResponse(long id) {
                 mPatientVisitsView.goToVisitDashboard(id);

diff --git a/...rg/openmrs/mobile/activities/patientdashboard/vitals/PatientDashboardVitalsPresenter.java b/...rg/openmrs/mobile/activities/patientdashboard/vitals/PatientDashboardVitalsPresenter.java
@@ -19,7 +19,7 @@
 import org.openmrs.mobile.api.repository.VisitRepository;
 import org.openmrs.mobile.dao.EncounterDAO;
 import org.openmrs.mobile.dao.PatientDAO;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.utilities.NetworkUtils;
 
@@ -55,7 +55,7 @@ public void subscribe() {
 
     private void loadVitalsFromServer() {
         if (NetworkUtils.isOnline()) {
-            visitRepository.syncLastVitals(mPatient.getUuid(), new DefaultResponseCallbackListener() {
+            visitRepository.syncLastVitals(mPatient.getUuid(), new DefaultResponseCallback() {
                 @Override
                 public void onResponse() {
                     loadVitalsFromDB();

diff --git a/...t/src/main/java/org/openmrs/mobile/activities/visitdashboard/VisitDashboardPresenter.java b/...t/src/main/java/org/openmrs/mobile/activities/visitdashboard/VisitDashboardPresenter.java
@@ -20,7 +20,7 @@
 import org.openmrs.mobile.api.RestServiceBuilder;
 import org.openmrs.mobile.api.repository.VisitRepository;
 import org.openmrs.mobile.dao.VisitDAO;
-import org.openmrs.mobile.listeners.retrofit.DefaultVisitsCallback;
+import org.openmrs.mobile.listeners.retrofit.VisitsResponseCallback;
 import org.openmrs.mobile.models.Encounter;
 import org.openmrs.mobile.models.Patient;
 import org.openmrs.mobile.models.Visit;
@@ -70,7 +70,7 @@ public void endVisitByUUID(final Visit visit) {
         Visit testVisit = new Visit();
         testVisit.setStopDatetime(visit.getStopDatetime());
 
-        visitRepository.endVisitByUuid(visit.getUuid(), testVisit, new DefaultVisitsCallback() {
+        visitRepository.endVisitByUuid(visit.getUuid(), testVisit, new VisitsResponseCallback() {
             @Override
             public void onSuccess(String response) {
                 addSubscription(visitDAO.getVisitByID(visit.getId())

diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/api/EncounterService.java b/openmrs-client/src/main/java/org/openmrs/mobile/api/EncounterService.java
@@ -22,8 +22,8 @@
 import org.openmrs.mobile.dao.PatientDAO;
 import org.openmrs.mobile.dao.VisitDAO;
 import org.openmrs.mobile.databases.AppDatabase;
-import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallbackListener;
-import org.openmrs.mobile.listeners.retrofit.StartVisitResponseListenerCallback;
+import org.openmrs.mobile.listeners.retrofit.DefaultResponseCallback;
+import org.openmrs.mobile.listeners.retrofit.StartVisitResponseCallback;
 import org.openmrs.mobile.models.Encounter;
 import org.openmrs.mobile.models.EncounterType;
 import org.openmrs.mobile.models.Encountercreate;
@@ -44,7 +44,7 @@ public EncounterService() {
         super("Save Encounter");
     }
 
-    public void addEncounter(final Encountercreate encountercreate, @Nullable DefaultResponseCallbackListener callbackListener) {
+    public void addEncounter(final Encountercreate encountercreate, @Nullable DefaultResponseCallback callbackListener) {
 
         if (NetworkUtils.isOnline()) {
             new VisitDAO().getActiveVisitByPatientId(encountercreate.getPatientId())
@@ -71,9 +71,9 @@ public void addEncounter(final Encountercreate encountercreate) {
         addEncounter(encountercreate, null);
     }
 
-    private void startNewVisitForEncounter(final Encountercreate encountercreate, @Nullable final DefaultResponseCallbackListener callbackListener) {
+    private void startNewVisitForEncounter(final Encountercreate encountercreate, @Nullable final DefaultResponseCallback callbackListener) {
         new VisitRepository().startVisit(new PatientDAO().findPatientByUUID(encountercreate.getPatient()),
-                new StartVisitResponseListenerCallback() {
+                new StartVisitResponseCallback() {
                     @Override
                     public void onStartVisitResponse(long id) {
                         new VisitDAO().getVisitByID(id)
@@ -104,7 +104,7 @@ public void startNewVisitForEncounter(final Encountercreate encountercreate) {
         startNewVisitForEncounter(encountercreate, null);
     }
 
-    public void syncEncounter(final Encountercreate encountercreate, @Nullable final DefaultResponseCallbackListener callbackListener) {
+    public void syncEncounter(final Encountercreate encountercreate, @Nullable final DefaultResponseCallback callbackListener) {
 
         if (NetworkUtils.isOnline()) {