Aditya.Gaikwad/SimpliTend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

,

Browse Source
This commit is contained in:
14Sandee
2023-11-27 21:03:43 +05:30
parent 89e08ee024
commit 3c3d108098
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/app/simplitend/apputils/AppUtil.java
View File

@@ -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,

9
app/src/main/java/com/app/simplitend/apputils/NotificationService.java
View File

@@ -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)

2
app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
View File

@@ -86,7 +86,7 @@ public class CgDashBoardFragment extends Fragment implements
private static CgDashBoardFragment fragment;
private CgDashBoardFragment(){
public CgDashBoardFragment(){
// required empty
}

2
app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
View File

@@ -49,7 +49,7 @@ public class MyPatientFragment extends Fragment implements CgHomeContracts.GetGe
private static MyPatientFragment myPatientFragment;
private MyPatientFragment() {
public MyPatientFragment() {
// required empty
}

1
app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java
View File

@@ -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();
}

2
app/src/main/res/values/strings.xml
View File

@@ -397,7 +397,7 @@
<string name="instructions_title">Instructions:</string>
<string name="you_are_about_to_change_emergency_number_from_this_contact_to_911_please_confirm">You are about to change emergency number from this contact to 911. Please confirm</string>
<string name="your_account_has_been_deactivated">Your account has been deactivated</string>
<string name="re_activate_msg_cg_by_cg">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.</string>
<string name="re_activate_msg_cg_by_cg">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.</string>
<string name="re_activate_msg_cg_by_admin">Your account is disabled/deactivated by admin. To reactivate your account, please contact admin.</string>
<string name="re_activate_msg_patient_by_cg">Your caregiver has deactivated your account. To reactivate account please inform caregiver to activate the account and continue for uninterrupted services.</string>
<string name="re_activate_msg_patient_by_admin">Your account is disabled/deactivated by admin. To reactivate your account, please contact admin.</string>