Log major events in tests

Author: nevenz

app/src/androidTest/java/com/orgzly/android/OrgzlyTest.java

@@ -138,6 +138,9 @@ private void setPreferencesForTests() {
 
         /* Start with the light theme. */
         AppPreferences.colorTheme(context, "light");
+
+        /* Log major events. */
+        AppPreferences.logMajorEvents(context, true);
     }
 
     /**

app/src/main/java/com/orgzly/android/prefs/AppPreferences.java

@@ -337,6 +337,11 @@ public static boolean logMajorEvents(Context context) {
                 context.getResources().getBoolean(R.bool.pref_default_log_major_events));
     }
 
+    public static void logMajorEvents(Context context, boolean value) {
+        String key = context.getResources().getString(R.string.pref_key_log_major_events);
+        getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply();
+    }
+
     public static boolean showSyncNotifications(Context context) {
         return getDefaultSharedPreferences(context).getBoolean(
                 context.getResources().getString(R.string.pref_key_show_sync_notifications),

app/src/main/java/com/orgzly/android/reminders/RemindersBroadcastReceiver.kt

@@ -103,31 +103,35 @@ class RemindersBroadcastReceiver : BroadcastReceiver() {
     private fun notifyForRemindersSinceLastRun(context: Context, now: DateTime, lastRun: LastRun?) {
         if (BuildConfig.LOG_DEBUG) LogUtils.d(TAG)
 
-        val msg = if (lastRun != null) {
+        if (lastRun != null) {
             val notes = NoteReminders.getNoteReminders(
                 context, dataRepository, now, lastRun, NoteReminders.INTERVAL_FROM_LAST_TO_NOW)
 
             if (notes.isNotEmpty()) {
                 // TODO: Show less, show summary
                 val lastNotes = notes.takeLast(20)
 
-                "Triggered: Found ${notes.size} notes (showing ${lastNotes.size}) between $lastRun and $now".also {
-                    RemindersNotifications.showNotifications(context, lastNotes)
+                if (LogMajorEvents.isEnabled()) {
+                    LogMajorEvents.log(
+                        LogMajorEvents.REMINDERS,
+                        "Since last run: Found ${notes.size} notes (showing ${lastNotes.size}) between $lastRun and $now")
                 }
 
+                RemindersNotifications.showNotifications(context, lastNotes)
+
             } else {
-                "Triggered: No notes found between $lastRun and $now"
+                if (LogMajorEvents.isEnabled()) {
+                    LogMajorEvents.log(
+                        LogMajorEvents.REMINDERS,
+                        "Since last run: No notes found between $lastRun and $now")
+                }
             }
 
         } else {
-            "Triggered: No previous run"
-        }
-
-        if (LogMajorEvents.isEnabled()) {
-            LogMajorEvents.log(LogMajorEvents.REMINDERS, msg)
+            if (LogMajorEvents.isEnabled()) {
+                LogMajorEvents.log(LogMajorEvents.REMINDERS, "Since last run: No previous run")
+            }
         }
-
-        if (BuildConfig.LOG_DEBUG) LogUtils.d(TAG, msg)
     }
 
     /**
@@ -156,7 +160,7 @@ class RemindersBroadcastReceiver : BroadcastReceiver() {
                 val inS = inMs.userFriendlyPeriod()
                 LogMajorEvents.log(
                     LogMajorEvents.REMINDERS,
-                    "Next: Found ${notes.size} notes between $lastRun and $now and scheduling the first one in $inS ($inMs ms): \"$title\" (id:$id)"
+                    "Next: Found ${notes.size} notes from $now and scheduling first in $inS ($inMs ms): \"$title\" (id:$id)"
                 )
             }
 

app/src/main/java/com/orgzly/android/reminders/RemindersNotifications.kt

@@ -114,9 +114,10 @@ object RemindersNotifications {
             notificationManager.notify(notificationTag, Notifications.REMINDER_ID, builder.build())
 
             if (LogMajorEvents.isEnabled()) {
+                val note = "\"${noteReminder.payload.title}\" (id:${noteReminder.payload.noteId})"
                 LogMajorEvents.log(
                     LogMajorEvents.REMINDERS,
-                    "Notified (tag:$notificationTag id:${Notifications.REMINDER_ID}): ${noteReminder.payload.title}"
+                    "Notified! (tag:$notificationTag id:${Notifications.REMINDER_ID}): $note"
                 )
             }
         }

app/src/main/java/com/orgzly/android/util/LogMajorEvents.kt

@@ -4,7 +4,7 @@ import android.util.Log
 import com.orgzly.BuildConfig
 import com.orgzly.android.App
 import com.orgzly.android.prefs.AppPreferences
-import org.joda.time.Instant
+import org.joda.time.DateTime
 import java.io.File
 import java.io.FileOutputStream
 import java.io.OutputStreamWriter
@@ -27,7 +27,7 @@ object LogMajorEvents {
 
             // Append to file
             OutputStreamWriter(FileOutputStream(file, true)).use {
-                val msg = "${Instant.now()} $name $str\n"
+                val msg = "${DateTime.now()} $name $str\n"
                 it.append(msg)
             }