From d6092388a546766dd7f29902f4dd94368c395007 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 30 Sep 2019 02:28:22 +0200 Subject: [PATCH] Bundle: Use constant keys to address values --- app/src/main/java/org/mercury_im/messenger/Notifications.java | 4 ++-- .../messenger/ui/chatlist/ChatListRecyclerViewAdapter.java | 4 ++-- .../ui/roster/contacts/ContactListRecyclerViewAdapter.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mercury_im/messenger/Notifications.java b/app/src/main/java/org/mercury_im/messenger/Notifications.java index 46a3d42..4be61af 100644 --- a/app/src/main/java/org/mercury_im/messenger/Notifications.java +++ b/app/src/main/java/org/mercury_im/messenger/Notifications.java @@ -26,8 +26,8 @@ public class Notifications { Intent tapAction = new Intent(context, ChatActivity.class); tapAction.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - tapAction.putExtra("JID", chat.jid.toString()); - tapAction.putExtra("ACCOUNT", chat.accountId); + tapAction.putExtra(ChatActivity.EXTRA_JID, chat.jid.toString()); + tapAction.putExtra(ChatActivity.EXTRA_ACCOUNT, chat.accountId); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, tapAction, 0); NotificationCompat.Builder builder = new NotificationCompat.Builder(context, diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java index fc0fe44..8f47514 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java @@ -45,8 +45,8 @@ public class ChatListRecyclerViewAdapter holder.itemView.setOnClickListener(view -> { Intent intent = new Intent(holder.context, ChatActivity.class); - intent.putExtra("JID", model.jid.toString()); - intent.putExtra("ACCOUNT", model.accountId); + intent.putExtra(ChatActivity.EXTRA_JID, model.jid.toString()); + intent.putExtra(ChatActivity.EXTRA_ACCOUNT, model.accountId); holder.context.startActivity(intent); }); diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListRecyclerViewAdapter.java index 2576dc0..5e6e39f 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListRecyclerViewAdapter.java @@ -76,8 +76,8 @@ public class ContactListRecyclerViewAdapter view.setOnClickListener(view -> { Intent intent = new Intent(context, ChatActivity.class); - intent.putExtra("JID", jid.toString()); - intent.putExtra("ACCOUNT", contactModel.getEntity().getAccountId()); + intent.putExtra(ChatActivity.EXTRA_JID, jid.toString()); + intent.putExtra(ChatActivity.EXTRA_ACCOUNT, contactModel.getEntity().getAccountId()); context.startActivity(intent); });