From dc04ec42bc773f8a99e78d18b3567284b10d6a94 Mon Sep 17 00:00:00 2001 From: 14Sandee Date: Wed, 17 Jan 2024 16:30:45 +0530 Subject: [PATCH] Bug fixes - chat sender and receiver id to be principal ids --- .idea/deploymentTargetDropDown.xml | 8 ++++---- .../java/com/app/simplitend/apputils/AppUtil.java | 12 +++++++++--- .../activities/CaregiverDashActivity.java | 8 ++++---- .../java/com/app/simplitend/chats/ChatsActivity.java | 4 ++-- .../simplitend/locationupdates/LocationService.java | 4 ++-- .../patient_dashboard/DashBoardActivity.java | 2 +- .../fragments/PatientDashboardFragment.java | 7 ++++--- .../patientgeofencing/GeoFenceBroadcastReceiver.java | 4 ++-- .../medreminder/mvvm/ReminderViewModel.java | 6 +++--- .../setuproutine/mvvm/RoutineViewModel.java | 6 +++--- 10 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 2792bda..881a232 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,9 +1,9 @@ - + - + @@ -11,8 +11,8 @@ - - + + diff --git a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java index f1eaa67..20c2a08 100644 --- a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java @@ -478,7 +478,7 @@ public abstract class AppUtil { // geofence details clear updatePatientGeofence(context, null, null, null, null, null); - updatePatientGeofenceChatsCred(context, -1, -1, -1); + updatePatientGeofenceChatsCred(context, -1, -1, -1, -1); // removing geofence of same tag removeGeofence(context); @@ -708,6 +708,7 @@ public abstract class AppUtil { private static final String PATIENT_GEOFENCE_CG_ID = "pg_cg_uid"; private static final String PATIENT_GEOFENCE_CHANNEL_ID = "pg_channel_uid"; private static final String PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID = "pg_patient_geofence_uid"; + private static final String PATIENT_GEOFENCE_CAREGIVER_PRINCIPLE_ID = "pg_caregiver_geofence_uid"; public static final String IS_SENIOR_OUT_OF_GEOFENCE = "is_senior_out_of_geofence"; @@ -727,13 +728,16 @@ public abstract class AppUtil { public static void updatePatientGeofenceChatsCred(Context context, int cg_id, - int channel_id, int patient_principal_id){ + int channel_id, + int patient_principal_id, + int cg_principal_id){ SharedPreferences sp = context.getSharedPreferences(PATIENT_DETAILS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = sp.edit(); editor.putInt(PATIENT_GEOFENCE_CG_ID, cg_id); editor.putInt(PATIENT_GEOFENCE_CHANNEL_ID, channel_id); editor.putInt(PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID, patient_principal_id); + editor.putInt(PATIENT_GEOFENCE_CAREGIVER_PRINCIPLE_ID, cg_principal_id); editor.apply(); } @@ -744,13 +748,15 @@ public abstract class AppUtil { // 1 -> caregiver_id // 2 -> channel_id // 3 -> patient_principal_id + // 4 -> cg_principal_id @NonNull public static int[] getPatientGeofenceChatCred(Context context){ SharedPreferences sp = context.getSharedPreferences(PATIENT_DETAILS, Context.MODE_PRIVATE); return new int[]{sp.getInt(PATIENT_UID, -1), sp.getInt(PATIENT_GEOFENCE_CG_ID, -1), sp.getInt(PATIENT_GEOFENCE_CHANNEL_ID, -1), - sp.getInt(PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID, -1)}; + sp.getInt(PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID, -1), + sp.getInt(PATIENT_GEOFENCE_CAREGIVER_PRINCIPLE_ID, -1)}; } public static void updatePatientGeofence(Context context, diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java index cd093d1..80d6afb 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java @@ -61,10 +61,10 @@ public class CaregiverDashActivity extends AppCompatActivity implements CaregiverDataCache.getCaregiverData(this, (careGiverData) -> { this.careGiverData = careGiverData; - if (careGiverData != null){ + if (careGiverData != null && careGiverData.patientDetails != null){ SocketHelper.getInstance().establishConnection(null); - String uniqueKey = careGiverData.patientId + "medActivity" + careGiverData.caregiver_xid; + String uniqueKey = careGiverData.patientDetails.id + "medActivity" + careGiverData.id; SocketHelper.getInstance().initializeSocket(this, uniqueKey); } @@ -327,8 +327,8 @@ public class CaregiverDashActivity extends AppCompatActivity implements } replaceFragment(new ChatFragment( - careGiverData1.caregiver_xid + "", - careGiverData1.patientId + "", + careGiverData1.id + "", + careGiverData1.patientDetails.id + "", careGiverData1.link_id, careGiverData1.patientDetails.id + "", careGiverData1.first_name, diff --git a/app/src/main/java/com/app/simplitend/chats/ChatsActivity.java b/app/src/main/java/com/app/simplitend/chats/ChatsActivity.java index 24faebc..f8148ee 100644 --- a/app/src/main/java/com/app/simplitend/chats/ChatsActivity.java +++ b/app/src/main/java/com/app/simplitend/chats/ChatsActivity.java @@ -42,8 +42,8 @@ public class ChatsActivity extends AppCompatActivity implements INotificationLif getSupportFragmentManager().beginTransaction() .add(R.id.chats_fcv, new ChatFragment( - careGiverData1.caregiver_xid + "", - careGiverData1.patientId + "", + careGiverData1.id + "", + careGiverData1.patientDetails.id + "", careGiverData1.link_id, careGiverData1.patientDetails.id + "", careGiverData1.first_name, diff --git a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java index 0b9805f..f13d7a2 100644 --- a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java +++ b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java @@ -305,14 +305,14 @@ public class LocationService extends Service implements LocationClient.DefaultLo } int[] chatsCred = AppUtil.getPatientGeofenceChatCred(context); - if (chatsCred[0] == -1 || chatsCred[1] == -1 || chatsCred[2] == -1) { + if (chatsCred[3] == -1 || chatsCred[4] == -1 || chatsCred[2] == -1) { Log.d(GEOFENCE_TAG, "notifyPatient: CANNOT SEND MESSAGE AS EITHER PAT_ID, CG_ID OR CHANNEL_ID IS NOT AVAILABLE"); return; } Log.d(GEOFENCE_TAG, "notifyPatient: " + chatsCred[2]); // sending message - sendMessage(message, chatsCred[0], chatsCred[1], chatsCred[2], chatsCred[3]); + sendMessage(message, chatsCred[3], chatsCred[4], chatsCred[2], chatsCred[3]); } private void sendMessage(@NonNull String message, int patientId, int cg_id, int channel_id, int patient_principal_id) { diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java index a26ab68..14baa25 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java @@ -97,7 +97,7 @@ public class DashBoardActivity extends AppCompatActivity implements CgHomeContra PatientDataCache.getPatientData(this, patientData -> { if (patientData == null) return; - String uniqueKey = patientData.caregiverId + "medActivity" + patientData.patientId; + String uniqueKey = patientData.caregiver_iamprincipal_id + "medActivity" + patientData.id; initSocket(uniqueKey); }, false); } diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java index bb71959..00c6fe8 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java @@ -176,7 +176,8 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac requireContext(), cg_id, channel_id, - patientData.id + patientData.id, + patientData.caregiver_iamprincipal_id == null?-1:Integer.parseInt(patientData.caregiver_iamprincipal_id) ); } @@ -319,8 +320,8 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac getParentFragmentManager().beginTransaction() .replace(R.id.fragmentContainerView, new ChatFragment( - patientData1.patientId + "", - patientData1.caregiverId, + patientData1.id + "", + patientData1.caregiver_iamprincipal_id, patientData1.link_id, patientData1.caregiver_iamprincipal_id, patientData1.first_name, diff --git a/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java b/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java index e9613b0..73be357 100644 --- a/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java +++ b/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java @@ -131,14 +131,14 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver { } int[] chatsCred = AppUtil.getPatientGeofenceChatCred(context); - if (chatsCred[0] == -1 || chatsCred[1] == -1 || chatsCred[2] == -1) { + if (chatsCred[3] == -1 || chatsCred[4] == -1 || chatsCred[2] == -1) { Log.d(GEOFENCE_TAG, "notifyPatient: CANNOT SEND MESSAGE AS EITHER PAT_ID, CG_ID OR CHANNEL_ID IS NOT AVAILABLE"); return; } Log.d(GEOFENCE_TAG, "notifyPatient: " + chatsCred[2]); // sending message - sendMessage(message, chatsCred[0], chatsCred[1], chatsCred[2], chatsCred[3]); + sendMessage(message, chatsCred[3], chatsCred[4], chatsCred[2], chatsCred[3]); } private void sendMessage(@NonNull String message, int patientId, int cg_id, int channel_id, int patient_principal_id) { diff --git a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/ReminderViewModel.java b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/ReminderViewModel.java index c7b7a0b..1a680d5 100644 --- a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/ReminderViewModel.java +++ b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/ReminderViewModel.java @@ -111,7 +111,7 @@ public class ReminderViewModel extends ViewModel { return; } - String uniqueId = patientData.patientId + "medActivity" + patientData.caregiverId; + String uniqueId = patientData.id + "medActivity" + patientData.caregiver_iamprincipal_id; SocketHelper.getInstance().establishConnection(new SocketHelper.SockCallBack() { @Override public void onSocketConnected() { @@ -133,11 +133,11 @@ public class ReminderViewModel extends ViewModel { }else{ // caregiver logged in CaregiverDataCache.getCaregiverData(context, careGiverData -> { - if (careGiverData == null){ + if (careGiverData == null || careGiverData.patientDetails == null){ return; } - String uniqueId = careGiverData.caregiver_xid + "medActivity" + careGiverData.patientId; + String uniqueId = careGiverData.id + "medActivity" + careGiverData.patientDetails.id; SocketHelper.getInstance().establishConnection(new SocketHelper.SockCallBack() { @Override public void onSocketConnected() { diff --git a/app/src/main/java/com/app/simplitend/patientprofile/setuproutine/mvvm/RoutineViewModel.java b/app/src/main/java/com/app/simplitend/patientprofile/setuproutine/mvvm/RoutineViewModel.java index 24555a6..3445a43 100644 --- a/app/src/main/java/com/app/simplitend/patientprofile/setuproutine/mvvm/RoutineViewModel.java +++ b/app/src/main/java/com/app/simplitend/patientprofile/setuproutine/mvvm/RoutineViewModel.java @@ -109,7 +109,7 @@ public class RoutineViewModel extends ViewModel { return; } - String uniqueId = patientData.patientId + "medActivity" + patientData.caregiverId; + String uniqueId = patientData.id + "medActivity" + patientData.caregiver_iamprincipal_id; SocketHelper.getInstance().establishConnection(new SocketHelper.SockCallBack() { @Override public void onSocketConnected() { @@ -131,11 +131,11 @@ public class RoutineViewModel extends ViewModel { }else{ // caregiver logged in CaregiverDataCache.getCaregiverData(context, careGiverData -> { - if (careGiverData == null){ + if (careGiverData == null || careGiverData.patientDetails == null){ return; } - String uniqueId = careGiverData.caregiver_xid + "medActivity" + careGiverData.patientId; + String uniqueId = careGiverData.id + "medActivity" + careGiverData.patientDetails.id; SocketHelper.getInstance().establishConnection(new SocketHelper.SockCallBack() { @Override public void onSocketConnected() {