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

Fix problem with creating group and empty avatar

Browse Source
This commit is contained in:
Moxie Marlinspike
2017-11-27 12:13:57 -08:00
parent c2dbb34b25
commit d9ab1a93f8
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
View File

@@ -21,6 +21,7 @@ import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.color.MaterialColor;
@@ -130,6 +131,7 @@ class RecipientProvider {
String title = groupRecord.get().getTitle();
List<Address> memberAddresses = groupRecord.get().getMembers();
List<Recipient> members = new LinkedList<>();
Long avatarId = null;
for (Address memberAddress : memberAddresses) {
members.add(getRecipient(context, memberAddress, Optional.absent(), Optional.absent(), asynchronous));
@@ -139,7 +141,11 @@ class RecipientProvider {
title = context.getString(R.string.RecipientProvider_unnamed_group);
}
return new RecipientDetails(title, groupRecord.get().getAvatarId(), false, settings.orNull(), members);
if (groupRecord.get().getAvatarId() != 0) {
avatarId = groupRecord.get().getAvatarId();
}
return new RecipientDetails(title, avatarId, false, settings.orNull(), members);
}
return new RecipientDetails(context.getString(R.string.RecipientProvider_unnamed_group), null, false, settings.orNull(), null);