TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-01 11:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add FIXME

Browse Source
This commit is contained in:
nielsandriesse 2020-04-15 15:01:02 +10:00
parent 7d9eafe8fb
commit 6ed3a4c372
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -2042,6 +2042,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
setStatusBarColor(getResources().getColor(R.color.action_bar_background)); 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) { private void updateInputUI(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
if (recipient.isGroupRecipient() && !isActiveGroup()) { if (recipient.isGroupRecipient() && !isActiveGroup()) {
unblockButton.setVisibility(View.GONE); unblockButton.setVisibility(View.GONE);

8
src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
View File

@ -140,18 +140,18 @@ public class GroupMessageProcessor {
String ourHexEncodedPublicKey = getMasterHexEncodedPublicKey(context, TextSecurePreferences.getLocalNumber(context)); String ourHexEncodedPublicKey = getMasterHexEncodedPublicKey(context, TextSecurePreferences.getLocalNumber(context));
if (group.getGroupType() == SignalServiceGroup.GroupType.SIGNAL) { 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()); String hexEncodedPublicKey = getMasterHexEncodedPublicKey(context, content.getSender());
if (!groupRecord.getAdmins().contains(Address.fromSerialized(hexEncodedPublicKey))) { 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."); Log.d("Loki - Group Message", "Received a group update message from a non-admin user for " + id +". Ignoring.");
return null; 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); Address ourAddress = Address.fromSerialized(ourHexEncodedPublicKey);
if (!groupRecord.getMembers().contains(ourAddress) && if (!groupRecord.getMembers().contains(ourAddress) &&
!group.getMembers().or(Collections.emptyList()).contains(ourHexEncodedPublicKey)) { !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); database.setActive(id, false);
return null; return null;
} }
@ -181,7 +181,7 @@ public class GroupMessageProcessor {
} }
// We add any new or removed members to the group context // 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) { for (Address addedMember : addedMembers) {
builder.addNewMembers(addedMember.serialize()); builder.addNewMembers(addedMember.serialize());
} }

6
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@ -1898,7 +1898,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
boolean isClosedGroup = conversation.getAddress().isSignalGroup(); boolean isClosedGroup = conversation.getAddress().isSignalGroup();
boolean isGroupMember = true; boolean isGroupMember = true;
// Only allow messages from members of a group // Only allow messages from group members
if (isClosedGroup) { if (isClosedGroup) {
String senderHexEncodedPublicKey = content.getSender(); String senderHexEncodedPublicKey = content.getSender();
@ -1911,9 +1911,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
e.printStackTrace(); 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); return (isContentMessage && !isGroupActive) || (sender.isBlocked() && !isLeaveMessage) || (isContentMessage && !isGroupMember);