TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-22 20:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where adding attachment duplicates recipient count.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-02-23 15:57:32 -08:00
parent 3dd27ed59a
commit e80de7de2b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/components/RecipientsPanel.java
View File

@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.components;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
@ -32,9 +33,11 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException; import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* Panel component combining both an editable field with a button for * Panel component combining both an editable field with a button for
@ -79,12 +82,23 @@ public class RecipientsPanel extends RelativeLayout {
} }
public void addRecipients(Recipients recipients) { public void addRecipients(Recipients recipients) {
Set<Recipient> panelRecipients;
try {
panelRecipients = new HashSet<Recipient>(getRecipients().getRecipientsList());
} catch (RecipientFormattingException e) {
Log.w("RecipientsPanel", e);
panelRecipients = new HashSet<Recipient>();
}
List<Recipient> recipientList = recipients.getRecipientsList(); List<Recipient> recipientList = recipients.getRecipientsList();
Iterator<Recipient> iterator = recipientList.iterator(); Iterator<Recipient> iterator = recipientList.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
Recipient recipient = iterator.next(); Recipient recipient = iterator.next();
addRecipient(recipient.getName(), recipient.getNumber()); if (!panelRecipients.contains(recipient)) {
addRecipient(recipient.getName(), recipient.getNumber());
}
} }
} }