Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Return proper Invitation objects in SharingManager

Browse Source 
Fixes #470
This commit is contained in:
Torsten Grote
2016-08-03 16:52:42 -03:00
parent 3bbc8dcc4e
commit 17db03d40a
15 changed files with 135 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java
View File

@@ -12,6 +12,7 @@ import android.widget.TextView;
import org.briarproject.R;
import org.briarproject.android.util.TextAvatarView;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.util.StringUtils;
import java.util.ArrayList;
@@ -48,7 +49,8 @@ abstract class InvitationAdapter extends
final InvitationItem item = getItem(position);
Collection<String> names = new ArrayList<>();
for (Contact c : item.getContacts()) names.add(c.getAuthor().getName());
for (Contact c : item.getNewSharers())
names.add(c.getAuthor().getName());
ui.sharedBy.setText(ctx.getString(R.string.shared_by_format,
StringUtils.join(names, ", ")));
@@ -153,7 +155,7 @@ abstract class InvitationAdapter extends
public boolean areContentsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.isSubscribed() == newItem.isSubscribed() &&
oldItem.getContacts().equals(newItem.getContacts());
oldItem.getNewSharers().equals(newItem.getNewSharers());
}
@Override