Use more generic naming for the login notification channel id

woocommerce · May 25, 2018 · 848294d · 848294d
1 parent fa437d3
commit 848294d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
@@ -114,7 +114,7 @@ public String getStepName() {
     private static class LoginNotification {
         static Notification progress(Context context, int progress) {
             return AutoForegroundNotification.progress(context,
-                    context.getString(R.string.notification_channel_normal_id),
+                    context.getString(R.string.login_notification_channel_id),
                     progress,
                     R.string.notification_login_title_in_progress,
                     R.string.notification_logging_in,
@@ -124,7 +124,7 @@ static Notification progress(Context context, int progress) {
 
         static Notification success(Context context) {
             return AutoForegroundNotification.success(context,
-                    context.getString(R.string.notification_channel_normal_id),
+                    context.getString(R.string.login_notification_channel_id),
                     R.string.notification_login_title_success,
                     R.string.notification_logged_in,
                     R.drawable.login_notification_icon,
@@ -133,7 +133,7 @@ static Notification success(Context context) {
 
         static Notification failure(Context context, @StringRes int content) {
             return AutoForegroundNotification.failure(context,
-                    context.getString(R.string.notification_channel_normal_id),
+                    context.getString(R.string.login_notification_channel_id),
                     R.string.notification_login_title_stopped,
                     content,
                     R.drawable.login_notification_icon,

diff --git a/WordPressLoginFlow/src/main/res/values/strings.xml b/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -137,10 +137,9 @@
     This resource will be automatically overwritten in the host project with the real value from google-services.json. -->
     <string name="default_web_client_id">placeholder</string>
 
-    <!-- same as above, we need to have these same-named string resources to be used as channel IDs in a similar way in the
-    host application -->
-    <string name="notification_channel_normal_id">placeholder</string>
-    <string name="notification_channel_important_id">placeholder</string>
+    <!-- Placeholder for notification channel to be used by login service notification.
+     This resource must be overwritten in the host project with a real notification channel id it has configured. -->
+    <string name="login_notification_channel_id">placeholder</string>
 
     <!-- Image Descriptions for Accessibility -->
     <string name="login_site_address_help_image">The site address can be found in the navigation bar of your web browser</string>