diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 03d9c98..2792bda 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,6 +1,18 @@ + + + + + + + + + + + + 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 8a9568c..d706b13 100644 --- a/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java +++ b/app/src/main/java/com/app/simplitend/callwhitelisting/CallService.java @@ -35,7 +35,7 @@ public class CallService extends CallScreeningService { Log.d(CALL_BLOCKING_WORk, "CALLED 911"); WorkManager.getInstance(this).cancelAllWork(); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(5, TimeUnit.MINUTES) + .setInitialDelay(30, TimeUnit.MINUTES) .build(); WorkManager.getInstance(this).enqueue(workRequest); 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 61f5ccf..bb71959 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 @@ -356,7 +356,7 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac if ("911".equals(phone_number)){ WorkManager.getInstance(requireContext()).cancelAllWork(); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(5, TimeUnit.MINUTES) + .setInitialDelay(30, TimeUnit.MINUTES) .build(); WorkManager.getInstance(requireContext()).enqueue(workRequest); diff --git a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/AddReminderFragment.java b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/AddReminderFragment.java index 4119cd1..0109e69 100644 --- a/app/src/main/java/com/app/simplitend/patientprofile/medreminder/AddReminderFragment.java +++ b/app/src/main/java/com/app/simplitend/patientprofile/medreminder/AddReminderFragment.java @@ -411,21 +411,19 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh binding.quantity.setError("Required"); }else{ try { - long quantity = Long.parseLong(binding.quantity.getText().toString().trim()); + double quantity = Double.parseDouble(binding.quantity.getText().toString().trim()); if (quantity <= 0){ allOkay = false; binding.quantity.setError("Must be greater than 0"); } + }catch (NumberFormatException e){ + allOkay = false; + binding.quantity.setError("Invalid quantity"); }catch (Exception e){ // do nothing } } -// if (binding.getDate.getText().toString().trim().isEmpty()) { -// allOkay = false; -// binding.getDate.setError("Required"); -// } - if (allOkay) { boolean anyOneSelected = false; for (int i = 0; i < week_state.length; i++) {