diff --git a/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java b/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java index 20eae2a..8b0ac80 100644 --- a/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java +++ b/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit; public class CallService extends CallScreeningService { public static final String CONTACT_WHITE_LISTING_TAG = "CONTACT_WHITELISTING"; + public static final long CALL_UNBLOCKING_INTERVAL = 30; private static void endCall(CallResponse.Builder builder) { builder.setDisallowCall(true) @@ -35,7 +36,7 @@ public class CallService extends CallScreeningService { Log.d(CALL_BLOCKING_WORk, "CALLED 911"); WorkManager.getInstance(this).cancelAllWorkByTag(CALL_BLOCKING_WORk); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(30, TimeUnit.MINUTES) + .setInitialDelay(CALL_UNBLOCKING_INTERVAL, TimeUnit.MINUTES) .addTag(CALL_BLOCKING_WORk) .build(); diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/CallReceiver.java b/app/src/main/java/com/app/simplitend/patient_dashboard/CallReceiver.java index 25b43b6..f1ea254 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/CallReceiver.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/CallReceiver.java @@ -1,5 +1,6 @@ package com.app.simplitend.patient_dashboard; +import static com.app.simplitend.callwhitelisting.CallService.CALL_UNBLOCKING_INTERVAL; import static com.app.simplitend.callwhitelisting.CallUnBlockingWorker.CALL_BLOCKING_WORk; import android.content.BroadcastReceiver; @@ -136,7 +137,7 @@ public class CallReceiver extends BroadcastReceiver { Log.d(TAG, "CALLED 911"); WorkManager.getInstance(ctx).cancelAllWorkByTag(TAG); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(30, TimeUnit.MINUTES) + .setInitialDelay(CALL_UNBLOCKING_INTERVAL, TimeUnit.MINUTES) .addTag(CALL_BLOCKING_WORk) .build(); 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 edb5e07..7577101 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 @@ -2,6 +2,7 @@ package com.app.simplitend.patient_dashboard.fragments; import static com.app.simplitend.appblocking.FUAActivity.IS_FROM_DASHBOARD; import static com.app.simplitend.apputils.NotificationService.CONTENT_TYPE_KEY; +import static com.app.simplitend.callwhitelisting.CallService.CALL_UNBLOCKING_INTERVAL; import static com.app.simplitend.callwhitelisting.CallUnBlockingWorker.CALL_BLOCKING_WORk; import static com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity.IS_CAREGIVER; import static com.app.simplitend.patient_dashboard.DirectionToHomeActivity.LAT_KEY; @@ -368,7 +369,7 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac if ("911".equals(sos_phone_number)){ WorkManager.getInstance(requireContext()).cancelAllWorkByTag(CALL_BLOCKING_WORk); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(30, TimeUnit.MINUTES) + .setInitialDelay(CALL_UNBLOCKING_INTERVAL, TimeUnit.MINUTES) .addTag(CALL_BLOCKING_WORk) .build();