diff --git a/protos/SignalService.proto b/protos/SignalService.proto index dce4018ae35..5fc976738bb 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -689,10 +689,10 @@ message ContactDetails { optional string aci = 9; optional string name = 2; optional Avatar avatar = 3; - optional string color = 4; - optional Verified verified = 5; - optional bytes profileKey = 6; - optional bool blocked = 7; + // reserved 4; // formerly color + // reserved 5; // formerly verified + // reserved 6; // formerly profileKey + // reserved 7; // formerly blocked optional uint32 expireTimer = 8; optional uint32 inboxPosition = 10; } diff --git a/ts/textsecure/ContactsParser.ts b/ts/textsecure/ContactsParser.ts index 14b639b9f0c..d309bc0fe6d 100644 --- a/ts/textsecure/ContactsParser.ts +++ b/ts/textsecure/ContactsParser.ts @@ -197,24 +197,8 @@ function prepareContact( ? DurationInSeconds.fromSeconds(proto.expireTimer) : undefined; - const verified = - proto.verified && proto.verified.destinationAci - ? { - ...proto.verified, - - destinationAci: normalizeAci( - proto.verified.destinationAci, - 'ContactBuffer.verified.destinationAci' - ), - } - : proto.verified; - // We reject incoming contacts with invalid aci information - if ( - (proto.aci && !isAciString(proto.aci)) || - (proto.verified?.destinationAci && - !isAciString(proto.verified.destinationAci)) - ) { + if (proto.aci && !isAciString(proto.aci)) { log.warn('ParseContactsTransform: Dropping contact with invalid aci'); return undefined; @@ -224,7 +208,6 @@ function prepareContact( ...proto, expireTimer, aci, - verified, avatar, number: dropNull(proto.number), };