Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 03:48:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set avatar to null on Account when request is false (#78)

Browse Source
This commit is contained in:
Ehren Kret
2020-06-29 15:53:31 -05:00
committed by GitHub
parent a68d91b54c
commit 25a5a8db68
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
View File

@@ -2,6 +2,7 @@ package org.whispersystems.textsecuregcm.controllers;
import com.amazonaws.services.s3.AmazonS3;
import com.codahale.metrics.annotation.Timed;
import io.dropwizard.auth.Auth;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.Hex;
@@ -51,8 +52,6 @@ import java.time.ZonedDateTime;
import java.util.Optional;
import java.util.UUID;
import io.dropwizard.auth.Auth;
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
@Path("/v1/profile")
public class ProfileController {
@@ -125,7 +124,7 @@ public class ProfileController {
}
account.setProfileName(request.getName());
if (avatar != null) account.setAvatar(avatar);
account.setAvatar(avatar);
accountsManager.update(account);
if (response.isPresent()) return Response.ok(response).build();