diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java index ccbb9b00a..f225120d3 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcService.java @@ -235,7 +235,6 @@ public class AccountsGrpcService extends SimpleAccountsGrpc.AccountsImplBase { return ConfirmUsernameHashResponse.newBuilder() .setConfirmedUsernameHash(ConfirmUsernameHashResponse.ConfirmedUsernameHash.newBuilder() - .setUsernameHash(ByteString.copyFrom(updatedAccount.getUsernameHash().orElseThrow())) .setUsernameLinkHandle(UUIDUtil.toByteString(updatedAccount.getUsernameLinkHandle()))) .build(); } catch (final UsernameHashNotAvailableException e) { diff --git a/service/src/main/proto/org/signal/chat/account.proto b/service/src/main/proto/org/signal/chat/account.proto index 36114b349..b980c81eb 100644 --- a/service/src/main/proto/org/signal/chat/account.proto +++ b/service/src/main/proto/org/signal/chat/account.proto @@ -189,8 +189,7 @@ message ConfirmUsernameHashRequest { message ConfirmUsernameHashResponse { message ConfirmedUsernameHash { - // The newly-confirmed username hash. - bytes username_hash = 1; + reserved 1; // username_hash // The server-generated username link handle for the newly-confirmed username. bytes username_link_handle = 2; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java index 9649c2d1f..9a7943ee5 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsGrpcServiceTest.java @@ -394,7 +394,6 @@ class AccountsGrpcServiceTest extends SimpleBaseGrpcTest