From 6ed3a4c3726ead174f073930c3199067d2d9c56d Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 15 Apr 2020 15:01:02 +1000
Subject: [PATCH] Add FIXME

---
 .../securesms/conversation/ConversationActivity.java      | 1 +
 .../securesms/groups/GroupMessageProcessor.java           | 8 ++++----
 src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java   | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 93819bc5f4..7721233336 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2042,6 +2042,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     setStatusBarColor(getResources().getColor(R.color.action_bar_background));
   }
 
+  // FIXME: This name is confusing because we also have updateInputPanel and setInputPanelEnabled
   private void updateInputUI(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
     if (recipient.isGroupRecipient() && !isActiveGroup()) {
       unblockButton.setVisibility(View.GONE);
diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
index 29e591ffb2..52ffa66183 100644
--- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
+++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
@@ -140,18 +140,18 @@ public class GroupMessageProcessor {
     String ourHexEncodedPublicKey = getMasterHexEncodedPublicKey(context, TextSecurePreferences.getLocalNumber(context));
 
     if (group.getGroupType() == SignalServiceGroup.GroupType.SIGNAL) {
-      // Only update group if admin sent the message
+      // Only update group if the group admin sent the message
       String hexEncodedPublicKey = getMasterHexEncodedPublicKey(context, content.getSender());
       if (!groupRecord.getAdmins().contains(Address.fromSerialized(hexEncodedPublicKey))) {
         Log.d("Loki - Group Message", "Received a group update message from a non-admin user for " + id +". Ignoring.");
         return null;
       }
 
-      // We should only process update message if we were in the group
+      // We should only process update messages if we're in the group
       Address ourAddress = Address.fromSerialized(ourHexEncodedPublicKey);
       if (!groupRecord.getMembers().contains(ourAddress) &&
               !group.getMembers().or(Collections.emptyList()).contains(ourHexEncodedPublicKey)) {
-        Log.d("Loki - Group Message", "Received a group update message from a group we are not members in:  " + id + " . Ignoring.");
+        Log.d("Loki - Group Message", "Received a group update message from a group we are not a member of:  " + id + "; ignoring.");
         database.setActive(id, false);
         return null;
       }
@@ -181,7 +181,7 @@ public class GroupMessageProcessor {
     }
 
     // We add any new or removed members to the group context
-    // This will allow us later to iterate over them to check if they left or were added for UI display
+    // This will allow us later to iterate over them to check if they left or were added for UI purposes
     for (Address addedMember : addedMembers) {
       builder.addNewMembers(addedMember.serialize());
     }
diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index c421e3ba8b..96d76d818c 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -1898,7 +1898,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
         boolean isClosedGroup = conversation.getAddress().isSignalGroup();
         boolean isGroupMember = true;
 
-        // Only allow messages from members of a group
+        // Only allow messages from group members
         if (isClosedGroup) {
           String senderHexEncodedPublicKey = content.getSender();
 
@@ -1911,9 +1911,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
             e.printStackTrace();
           }
 
-          Recipient senderMaster = Recipient.from(context, Address.fromSerialized(senderHexEncodedPublicKey), false);
+          Recipient senderMasterAddress = Recipient.from(context, Address.fromSerialized(senderHexEncodedPublicKey), false);
 
-          isGroupMember = groupId.isPresent() && groupDatabase.getGroupMembers(groupId.get(), true).contains(senderMaster);
+          isGroupMember = groupId.isPresent() && groupDatabase.getGroupMembers(groupId.get(), true).contains(senderMasterAddress);
         }
 
         return (isContentMessage && !isGroupActive) || (sender.isBlocked() && !isLeaveMessage) || (isContentMessage && !isGroupMember);