Fixed backup preview date in notification

NilsFo · Oct 19, 2018 · ab68361 · ab68361
1 parent 012b4a5
commit ab68361
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/src/main/java/de/nilsfo/lockscreennotes/receiver/LSNAutoBackupReceiver.java b/app/src/main/java/de/nilsfo/lockscreennotes/receiver/LSNAutoBackupReceiver.java
@@ -1,5 +1,6 @@
 package de.nilsfo.lockscreennotes.receiver;
 
+import android.app.AlarmManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -86,7 +87,11 @@ public int compare(File file, File t1) {
 
 					if (showNotification) {
 						LSNAlarmManager alarmManager = new LSNAlarmManager(context);
-						Date d = new Date(new Date().getTime()+alarmManager.getTimeUntilNextNewAutoBackup());
+
+						int days = Integer.valueOf(preferences.getString("pref_auto_backups_schedule_days", "3"));
+						days = Math.max(days, 1);
+						long interval = AlarmManager.INTERVAL_DAY * days;
+						Date d = new Date(new Date().getTime()+alarmManager.getTimeUntilNextNewAutoBackup()+interval);
 						String formatedDate = new TimeUtils(context).formatDateAbsolute(d, DateFormat.FULL);
 
 						String text =context.getString(R.string.notification_auto_backup_next,formatedDate);

diff --git a/app/src/main/java/de/nilsfo/lockscreennotes/util/NotesNotificationManager.java b/app/src/main/java/de/nilsfo/lockscreennotes/util/NotesNotificationManager.java
@@ -342,11 +342,6 @@ private PendingIntent getIntentToNote(Note note) {
 		intent.putExtra(EditNoteActivity.EXTRA_ACTIVITY_STANDALONE, true);
 
 		int requestCode = (int) (REQUEST_CODE_INTENT_OPEN_APP_EDIT_NOTE_DYNAMIC_BASE + note.getDatabaseID());
-		//return TaskStackBuilder.create(context)
-		//		// add all of DetailsActivity's parents to the stack,
-		//		// followed by DetailsActivity itself
-		//		.addNextIntentWithParentStack(intent)
-		//		.getPendingIntent(requestCode, PendingIntent.FLAG_UPDATE_CURRENT);
 		return PendingIntent.getActivity(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 	}
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -181,5 +181,9 @@
     <string name="error_clipboard_unavailable">Error: Clipboard service not available on this device.</string>
     <string name="error_keyboard_unavailable">Error: Virtual keyboard not available on this device.</string>
     <string name="action_browse">Browse</string>
+    <string name="action_shortcut_add">New note</string>
+    <string name="action_shortcut_add_id">add_new</string>
+    <string name="action_shortcut_general_error">This action is no longer supported.</string>
+    <string name="action_shortcut_add_long">Create a new note</string>
     <string name="lipsum">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</string>
 </resources>