From 3c3d10809816b6c5a2aa4a2e75df17428fed8061 Mon Sep 17 00:00:00 2001 From: 14Sandee Date: Mon, 27 Nov 2023 21:03:43 +0530 Subject: [PATCH] , --- .../main/java/com/app/simplitend/apputils/AppUtil.java | 2 +- .../com/app/simplitend/apputils/NotificationService.java | 9 ++++++++- .../fragments/CgDashBoardFragment.java | 2 +- .../caregiverdashboard/fragments/MyPatientFragment.java | 2 +- .../patientgeofencing/GeoFenceBroadcastReceiver.java | 1 + app/src/main/res/values/strings.xml | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) 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 7557ddc..ff187f0 100644 --- a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java @@ -569,7 +569,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_channel_uid"; + private static final String PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID = "pg_patient_geofence_uid"; public static void updatePatientGeofenceChatsCred(Context context, int cg_id, diff --git a/app/src/main/java/com/app/simplitend/apputils/NotificationService.java b/app/src/main/java/com/app/simplitend/apputils/NotificationService.java index ef7a9ad..39bc63d 100644 --- a/app/src/main/java/com/app/simplitend/apputils/NotificationService.java +++ b/app/src/main/java/com/app/simplitend/apputils/NotificationService.java @@ -82,7 +82,14 @@ public class NotificationService implements INotificationServiceExtension { // do nothing } - iNotificationReceivedEvent.getContext().sendBroadcast(intent); + Intent broadcastIntent = new Intent(NOTIFICATION_ACTION); + broadcastIntent.putExtra(CONTENT_TYPE_KEY, content_type); + broadcastIntent.putExtra(NOTIFICATION_BODY_KEY, iNotificationReceivedEvent.getNotification().getBody()); + broadcastIntent.putExtra(NOTIFICATION_TITLE_KEY, iNotificationReceivedEvent.getNotification().getTitle()); + broadcastIntent.putExtra(NOTIFICATION_CONTENT_ID_KEY, id); + broadcastIntent.putExtra(NOTIFICATION_SENIOR_ADDRESS_KEY, senior_current_address); + + iNotificationReceivedEvent.getContext().sendBroadcast(broadcastIntent); if (Constants.GEOFENCING_RADIUS_ADDED.equals(content_type) || Constants.GEOFENCING_RADIUS_UPDATED.equals(content_type) diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java index 6f5e2eb..246a937 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java @@ -86,7 +86,7 @@ public class CgDashBoardFragment extends Fragment implements private static CgDashBoardFragment fragment; - private CgDashBoardFragment(){ + public CgDashBoardFragment(){ // required empty } diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java index f26d707..eb68c49 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java @@ -49,7 +49,7 @@ public class MyPatientFragment extends Fragment implements CgHomeContracts.GetGe private static MyPatientFragment myPatientFragment; - private MyPatientFragment() { + public MyPatientFragment() { // required empty } 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 266b4b9..896b77b 100644 --- a/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java +++ b/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java @@ -103,6 +103,7 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver { return; } + Log.d(GEOFENCE_TAG, "notifyPatient: " + chatsCred[2]); // sending message new SendMessageTask(message, chatsCred[0], chatsCred[1], chatsCred[2], chatsCred[3]).execute(); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3363f6c..b35fd63 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -397,7 +397,7 @@ Instructions: You are about to change emergency number from this contact to 911. Please confirm Your account has been deactivated - Kindly uninstall the SimpliTend apps from your phone as well as the Senior phone.\n\nYou will be able to reactivate your account within the next 30 days installing the SimpliTend app and log into your account. + Kindly uninstall the SimpliTend apps from your phone as well as the Senior phone.\n\nYou will be able to reactivate your account within the next 30 days by installing the SimpliTend app and logging into your account. Your account is disabled/deactivated by admin. To reactivate your account, please contact admin. Your caregiver has deactivated your account. To reactivate account please inform caregiver to activate the account and continue for uninterrupted services. Your account is disabled/deactivated by admin. To reactivate your account, please contact admin.