TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 12:06:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix group name clearing after avatar change.

Browse Source
This commit is contained in:
Alan Evans
2020-06-07 13:41:39 -03:00
committed by Greyson Parrelli
parent 8dbcb255ad
commit d8f3e032c7
5 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
View File

@@ -68,12 +68,13 @@ public final class GroupManager {
@NonNull GroupId groupId,
@Nullable byte[] avatar,
boolean avatarChanged,
@Nullable String name)
@NonNull String name,
boolean nameChanged)
throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException, GroupChangeBusyException
{
if (groupId.isV2()) {
try (GroupManagerV2.GroupEditor edit = new GroupManagerV2(context).edit(groupId.requireV2())) {
return edit.updateGroupTitleAndAvatar(name, avatar, avatarChanged);
return edit.updateGroupTitleAndAvatar(nameChanged ? name : null, avatar, avatarChanged);
}
} else {
List<Recipient> members = DatabaseFactory.getGroupDatabase(context)