From b436adeb7a546a68c9fc1b9b6b67fc00c2ba8ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 15 Jul 2021 08:44:05 +0200
Subject: [PATCH] Move strings for notification and channel to strings.xml
---
.../main/java/org/briarproject/mailbox/MailboxService.kt | 6 ++----
mailbox/src/main/res/values/strings.xml | 2 ++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mailbox/src/main/java/org/briarproject/mailbox/MailboxService.kt b/mailbox/src/main/java/org/briarproject/mailbox/MailboxService.kt
index 450097e2..fd57349d 100644
--- a/mailbox/src/main/java/org/briarproject/mailbox/MailboxService.kt
+++ b/mailbox/src/main/java/org/briarproject/mailbox/MailboxService.kt
@@ -18,11 +18,9 @@ class MailboxService : Service() {
companion object {
private const val CHANNEL_ID = "Briar Mailbox Service"
- private const val CHANNEL_NAME = "Briar Mailbox Channel"
private const val ARG_MESSAGE = "message"
private const val NOTIFICATION_MAIN_ID = 1
- private const val NOTIFICATION_MAIN_TITLE = "Briar Mailbox running"
fun startService(context: Context, message: String) {
val startIntent = Intent(context, MailboxService::class.java)
@@ -45,7 +43,7 @@ class MailboxService : Service() {
)
val notification = NotificationCompat.Builder(this, CHANNEL_ID)
- .setContentTitle(NOTIFICATION_MAIN_TITLE)
+ .setContentTitle(getString(R.string.notification_mailbox_running))
.setContentText(input)
.setSmallIcon(R.drawable.ic_launcher_foreground)
.setContentIntent(pendingIntent)
@@ -62,7 +60,7 @@ class MailboxService : Service() {
private fun createNotificationChannel() {
if (VERSION.SDK_INT >= VERSION_CODES.O) {
val serviceChannel = NotificationChannel(
- CHANNEL_ID, CHANNEL_NAME,
+ CHANNEL_ID, getString(R.string.notification_channel_name),
NotificationManager.IMPORTANCE_DEFAULT
)
diff --git a/mailbox/src/main/res/values/strings.xml b/mailbox/src/main/res/values/strings.xml
index 43372a95..f9642573 100644
--- a/mailbox/src/main/res/values/strings.xml
+++ b/mailbox/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">Briar Mailbox</string>
+ <string name="notification_channel_name">Briar Mailbox Channel</string>
+ <string name="notification_mailbox_running">Briar Mailbox running</string>
</resources>
\ No newline at end of file
--
GitLab