diff --git a/android/app/src/main/java/com/fabledsword/inkwell/AppUpdate.kt b/android/app/src/main/java/com/fabledsword/inkwell/AppUpdate.kt index e89ee5b..5967be2 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/AppUpdate.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/AppUpdate.kt @@ -43,7 +43,7 @@ import java.io.File * [UpdateReceiver], which is why a failure can be shown rather than guessed at. */ object AppUpdate { - private const val TAG = "InkwellUpdate" + private const val TAG = LogTag.UPDATE /** This build's versionCode — what the server's is compared against. */ fun installedVersionCode(context: Context): Long = diff --git a/android/app/src/main/java/com/fabledsword/inkwell/InkwellApplication.kt b/android/app/src/main/java/com/fabledsword/inkwell/InkwellApplication.kt index b52ba71..7c28782 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/InkwellApplication.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/InkwellApplication.kt @@ -53,6 +53,6 @@ class InkwellApplication : Application() { } private companion object { - const val TAG = "Inkwell" + const val TAG = LogTag.APP } } diff --git a/android/app/src/main/java/com/fabledsword/inkwell/KeystoreTokenSeal.kt b/android/app/src/main/java/com/fabledsword/inkwell/KeystoreTokenSeal.kt index 7c99759..4f1d8ac 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/KeystoreTokenSeal.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/KeystoreTokenSeal.kt @@ -53,7 +53,7 @@ class KeystoreTokenSeal : TokenSeal { } private companion object { - const val TAG = "Inkwell" + const val TAG = LogTag.APP const val KEYSTORE = "AndroidKeyStore" const val ALIAS = "inkwell-device-token" const val KEY_BITS = 256 diff --git a/android/app/src/main/java/com/fabledsword/inkwell/LogTag.kt b/android/app/src/main/java/com/fabledsword/inkwell/LogTag.kt new file mode 100644 index 0000000..9eef97c --- /dev/null +++ b/android/app/src/main/java/com/fabledsword/inkwell/LogTag.kt @@ -0,0 +1,12 @@ +package com.fabledsword.inkwell + +/** + * The tags the app logs under, one per concern, so `adb logcat -s` on one of them + * finds every line about it whichever file wrote it. + */ +internal object LogTag { + const val APP = "Inkwell" + const val UPDATE = "InkwellUpdate" + const val REMINDERS = "InkwellReminders" + const val WORKER = "InkwellWorker" +} diff --git a/android/app/src/main/java/com/fabledsword/inkwell/ReminderNotification.kt b/android/app/src/main/java/com/fabledsword/inkwell/ReminderNotification.kt index 062d394..eafd0d3 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/ReminderNotification.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/ReminderNotification.kt @@ -117,5 +117,5 @@ internal object ReminderNotification { ) private const val CHANNEL = "reminders" - private const val TAG = "InkwellReminders" + private const val TAG = LogTag.REMINDERS } diff --git a/android/app/src/main/java/com/fabledsword/inkwell/ReminderReceiver.kt b/android/app/src/main/java/com/fabledsword/inkwell/ReminderReceiver.kt index e021651..3cf09ab 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/ReminderReceiver.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/ReminderReceiver.kt @@ -67,6 +67,6 @@ class ReminderReceiver : BroadcastReceiver() { const val ACTION_DUE = "com.fabledsword.inkwell.REMINDER_DUE" const val ACTION_DONE = "com.fabledsword.inkwell.REMINDER_DONE" const val ACTION_SNOOZE = "com.fabledsword.inkwell.REMINDER_SNOOZE" - private const val TAG = "InkwellReminders" + private const val TAG = LogTag.REMINDERS } } diff --git a/android/app/src/main/java/com/fabledsword/inkwell/Reminders.kt b/android/app/src/main/java/com/fabledsword/inkwell/Reminders.kt index 2c7f81d..242906c 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/Reminders.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/Reminders.kt @@ -9,7 +9,8 @@ import android.util.Log import androidx.core.app.NotificationManagerCompat import com.fabledsword.inkwell.core.Inkwell import com.fabledsword.inkwell.core.Note -import java.time.OffsetDateTime +import com.fabledsword.inkwell.ui.SNOOZE_HOUR +import com.fabledsword.inkwell.ui.epochMillis /** * Getting a reminder in front of someone at the time they asked for. @@ -51,8 +52,7 @@ object Reminders { */ private const val MISSED_WINDOW_MS = 24L * 60 * 60 * 1000 - private const val SNOOZE_MINUTES = 60L - private const val TAG = "InkwellReminders" + private const val TAG = LogTag.REMINDERS /** * Announce what is due, then schedule the next one. @@ -137,7 +137,7 @@ object Reminders { core: Inkwell, noteId: String, ) { - runCatching { core.snoozeReminder(noteId, SNOOZE_MINUTES) } + runCatching { core.snoozeReminder(noteId, SNOOZE_HOUR) } .onFailure { Log.w(TAG, "could not snooze reminder", it) } ReminderNotification.dismiss(context, noteId) } @@ -194,10 +194,7 @@ object Reminders { // ────────────────────────────── bookkeeping ────────────────────────────── /** Epoch millis of a note's reminder, or null if it has none we can read. */ - private fun at(note: Note): Long? = - note.remindAt?.let { - runCatching { OffsetDateTime.parse(it).toInstant().toEpochMilli() }.getOrNull() - } + private fun at(note: Note): Long? = note.remindAt?.let(::epochMillis) /** * Identity of one OCCURRENCE, not of the note. diff --git a/android/app/src/main/java/com/fabledsword/inkwell/SyncWorker.kt b/android/app/src/main/java/com/fabledsword/inkwell/SyncWorker.kt index f4584c1..18091f7 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/SyncWorker.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/SyncWorker.kt @@ -67,6 +67,6 @@ class SyncWorker( } private companion object { - const val TAG = "InkwellWorker" + const val TAG = LogTag.WORKER } } diff --git a/android/app/src/main/java/com/fabledsword/inkwell/UpdateReceiver.kt b/android/app/src/main/java/com/fabledsword/inkwell/UpdateReceiver.kt index 4db59b1..edbb1ac 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/UpdateReceiver.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/UpdateReceiver.kt @@ -72,6 +72,6 @@ class UpdateReceiver : BroadcastReceiver() { companion object { const val ACTION_INSTALLED = "com.fabledsword.inkwell.UPDATE_INSTALLED" - private const val TAG = "InkwellUpdate" + private const val TAG = LogTag.UPDATE } } diff --git a/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorAction.kt b/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorAction.kt index 32d28e7..7901e60 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorAction.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorAction.kt @@ -114,3 +114,7 @@ sealed interface EditorAction { val previewId: String, ) : EditorAction } + +/** The two snoozes offered: the editor's buttons, and an hour from the notification. */ +internal const val SNOOZE_HOUR = 60L +internal const val SNOOZE_DAY = 1440L diff --git a/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorChrome.kt b/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorChrome.kt index 1449a47..b456de2 100644 --- a/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorChrome.kt +++ b/android/app/src/main/java/com/fabledsword/inkwell/ui/EditorChrome.kt @@ -447,6 +447,3 @@ fun EditorReminderRow( } } } - -private const val SNOOZE_HOUR = 60L -private const val SNOOZE_DAY = 1440L