lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-18 02:51:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize import;

Browse source 
send notification;
add todo;
make notification launch apk
This commit is contained in:
jacques 2020-09-19 18:01:42 +02:00
parent 9291e2ecbe
commit dd08171f46
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/net/foucry/pilldroid/PillDroidJobService.java
View file

@ -2,15 +2,16 @@ package net.foucry.pilldroid;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.job.JobParameters; import android.app.job.JobParameters;
import android.app.job.JobService; import android.app.job.JobService;
import android.content.Intent;
import android.icu.util.Calendar; import android.icu.util.Calendar;
import android.util.Log; import android.util.Log;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import java.util.Date;
import java.util.List; import java.util.List;
@ -49,34 +50,26 @@ public class PillDroidJobService extends JobService {
List<Medicament> medicaments = dbHelper.getAllDrugs(); List<Medicament> medicaments = dbHelper.getAllDrugs();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime();
long dateSchedule;
Medicament firstMedicament = null; Medicament firstMedicament = null;
try { try {
firstMedicament = medicaments.get(0); firstMedicament = medicaments.get(0);
} }
catch (Exception ignored){} catch (Exception e){
Log.e(TAG, e.toString());
e.printStackTrace();
}
// TODO: remove comments when save drugs will wor again
if (firstMedicament != null) { if (firstMedicament != null) {
if (firstMedicament.getPrise() != 0) { //if (firstMedicament.getPrise() != 0) {
Date dateAlert = UtilDate.removeDaysToDate(firstMedicament.getAlertThreshold(), firstMedicament.getDateEndOfStock()); scheduleNotification();
//}
if (dateAlert.getTime() < now.getTime()) {
dateSchedule = now.getTime() + 120000; // If dateAlert < now we schedule an alert for now + 120 seconds
} else {
dateSchedule = dateAlert.getTime(); // If dateAlert > now we use dateAlert as scheduleDate
}
long delay = dateSchedule - now.getTime();
scheduleNotification(delay);
}
} }
Log.d(TAG, "Job finished"); Log.d(TAG, "Job finished");
jobFinished(params, false); jobFinished(params, true);
} }
@ -89,16 +82,17 @@ public class PillDroidJobService extends JobService {
/** /**
* Schedule Notification for the delay * Schedule Notification for the delay
* @param delay long - date for the notification in millisecond
*/ */
private void scheduleNotification(long delay) { private void scheduleNotification() {
Log.d(TAG, "scheduleNotification delay == " + delay);
createNotificationChannel(); createNotificationChannel();
Intent intent = new Intent(this, MedicamentListActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent,0);
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID) NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID)
.setSmallIcon(R.drawable.ic_pill) .setSmallIcon(R.drawable.ic_pill)
.setContentTitle(getString(R.string.app_name)) .setContentTitle(getString(R.string.app_name))
.setContentText(getString(R.string.notification_text)) .setContentText(getString(R.string.notification_text))
.setPriority(NotificationCompat.PRIORITY_DEFAULT) .setPriority(NotificationCompat.PRIORITY_DEFAULT)
.setContentIntent(pendingIntent)
.setAutoCancel(true); .setAutoCancel(true);
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);