From 079779f15ae939961708e917d311c9a6e48f7c46 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 4 Feb 2020 13:07:54 +1100 Subject: [PATCH] =?UTF-8?q?Rename=20Loki=20Messenger=20Updates=20=E2=86=92?= =?UTF-8?q?=20Session=20Updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/thoughtcrime/securesms/ApplicationContext.java | 4 ++-- .../securesms/contacts/ContactSelectionListItem.java | 2 +- .../securesms/conversation/ConversationActivity.java | 4 ++-- .../thoughtcrime/securesms/conversation/ConversationItem.java | 4 ++-- .../securesms/loki/redesign/views/ConversationView.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 848979ea37..203c84df9f 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -516,7 +516,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc } private LokiRSSFeed lokiMessengerUpdatesFeed() { - return new LokiRSSFeed("loki.network.messenger-updates.feed", "https://loki.network/category/messenger-updates/feed", "Loki Messenger Updates", false); + return new LokiRSSFeed("loki.network.messenger-updates.feed", "https://loki.network/category/messenger-updates/feed", "Session Updates", false); } public void createDefaultPublicChatsIfNeeded() { @@ -563,7 +563,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc lokiNewsFeedPoller = null; }); } - // The user can't delete the Loki Messenger Updates RSS feed + // The user can't delete the Session Updates RSS feed if (lokiMessengerUpdatesFeedPoller == null) { lokiMessengerUpdatesFeedPoller = new LokiRSSFeedPoller(this, lokiMessengerUpdatesFeed()); } diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java index 9e84fc776c..eb41cc5035 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java @@ -149,7 +149,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM Collections.sort(users); // Sort to provide a level of stability profilePictureView.setHexEncodedPublicKey(users.size() > 0 ? users.get(0) : ""); profilePictureView.setAdditionalHexEncodedPublicKey(users.size() > 1 ? users.get(1) : ""); - profilePictureView.setRSSFeed(name.equals("Loki News") || name.equals("Loki Messenger Updates")); + profilePictureView.setRSSFeed(name.equals("Loki News") || name.equals("Session Updates")); } else { profilePictureView.setHexEncodedPublicKey(this.number); profilePictureView.setAdditionalHexEncodedPublicKey(null); diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 1c783585ce..4bad0eea90 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -2077,7 +2077,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) { - if (recipient.isGroupRecipient() && (recipient.getName().equals("Loki News") || recipient.getName().equals("Loki Messenger Updates"))) { + if (recipient.isGroupRecipient() && (recipient.getName().equals("Loki News") || recipient.getName().equals("Session Updates"))) { unblockButton.setVisibility(View.GONE); composePanel.setVisibility(View.GONE); makeDefaultSmsButton.setVisibility(View.GONE); @@ -3187,7 +3187,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } else if (recipient.isMuted()) { muteIndicatorImageView.setVisibility(View.VISIBLE); actionBarSubtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault())); - } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Loki Messenger Updates") && !recipient.getName().equals("Loki News")) { + } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) { LokiPublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadId); if (publicChat != null) { Integer userCount = DatabaseFactory.getLokiAPIDatabase(this).getUserCount(publicChat.getChannel(), publicChat.getServer()); diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java index 8f20b5b4c6..d63da04f01 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -801,7 +801,7 @@ public class ConversationItem extends LinearLayout int groupThreadMargin = (int)(getResources().getDimension(R.dimen.large_spacing) + getResources().getDimension(R.dimen.small_profile_picture_size)); int defaultMargin = 0; String threadName = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(messageRecord.getThreadId()).getName(); - boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Loki Messenger Updates")); + boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Session Updates")); layoutParams.setMarginStart((groupThread && !isRSSFeed) ? groupThreadMargin : defaultMargin); bodyBubble.setLayoutParams(layoutParams); if (profilePictureView == null) return; @@ -983,7 +983,7 @@ public class ConversationItem extends LinearLayout private void setAuthor(@NonNull MessageRecord current, @NonNull Optional previous, @NonNull Optional next, boolean isGroupThread) { String threadName = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(current.getThreadId()).getName(); - boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Loki Messenger Updates")); + boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Session Updates")); if (isGroupThread && !isRSSFeed && !current.isOutgoing()) { contactPhotoHolder.setVisibility(VISIBLE); diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt index b60bf70b14..c34a111ce9 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt @@ -53,7 +53,7 @@ class ConversationView : LinearLayout { val randomUsers = users.sorted() // Sort to provide a level of stability profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: "" profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: "" - profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Loki Messenger Updates" + profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Session Updates" } else { profilePictureView.hexEncodedPublicKey = thread.recipient.address.toString() profilePictureView.additionalHexEncodedPublicKey = null