TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-28 18:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename variables

Browse Source
This commit is contained in:
Niels Andriesse 2020-03-12 16:03:21 +11:00
parent 49be17b969
commit f96eebde20
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@ -327,18 +327,18 @@ public class MessageNotifier {
// We can only reply if we are friends with the user or we're messaging a group // We can only reply if we are friends with the user or we're messaging a group
boolean isGroup = recipient.isGroupRecipient(); boolean isGroup = recipient.isGroupRecipient();
boolean isRSS = isGroup && recipient.getAddress().isRSSFeed(); boolean isRSSFeed = isGroup && recipient.getAddress().isRSSFeed();
boolean isFriends = false; boolean isFriend = false;
if (!isGroup) { if (!isGroup) {
isFriends = DatabaseFactory.getLokiThreadDatabase(context).getFriendRequestStatus(threadId) == LokiThreadFriendRequestStatus.FRIENDS; isFriend = DatabaseFactory.getLokiThreadDatabase(context).getFriendRequestStatus(threadId) == LokiThreadFriendRequestStatus.FRIENDS;
// If we're not friends then we need to check if we're friends with any of the linked devices // If we're not friends then we need to check if we're friends with any of the linked devices
if (!isFriends) { if (!isFriend) {
Promise<Boolean, Exception> promise = PromiseUtil.timeout(MultiDeviceUtilities.isFriendsWithAnyLinkedDevice(context, recipient), 5000); Promise<Boolean, Exception> promise = PromiseUtil.timeout(MultiDeviceUtilities.isFriendsWithAnyLinkedDevice(context, recipient), 5000);
isFriends = PromiseUtil.get(promise, false); isFriend = PromiseUtil.get(promise, false);
} }
} }
boolean canReply = (isGroup && !isRSS) || isFriends; boolean canReply = (isGroup && !isRSSFeed) || isFriend;
PendingIntent quickReplyIntent = canReply ? notificationState.getQuickReplyIntent(context, recipient) : null; PendingIntent quickReplyIntent = canReply ? notificationState.getQuickReplyIntent(context, recipient) : null;
PendingIntent remoteReplyIntent = canReply ? notificationState.getRemoteReplyIntent(context, recipient, replyMethod) : null; PendingIntent remoteReplyIntent = canReply ? notificationState.getRemoteReplyIntent(context, recipient, replyMethod) : null;