fix refresh of moderator list and removed unused proto

js/modules/crypto.js

@@ -10,13 +10,11 @@ module.exports = {
   concatenateBytes,
   constantTimeEqual,
   decryptAesCtr,
-  decryptDeviceName,
   decryptAttachment,
   decryptFile,
   decryptSymmetric,
   deriveAccessKey,
   encryptAesCtr,
-  encryptDeviceName,
   encryptAttachment,
   encryptFile,
   encryptSymmetric,
@@ -54,55 +52,6 @@ function stringFromBytes(buffer) {
 
 // High-level Operations
 
-async function encryptDeviceName(deviceName, identityPublic) {
-  const plaintext = bytesFromString(deviceName);
-  const ephemeralKeyPair = await libsignal.KeyHelper.generateIdentityKeyPair();
-  const masterSecret = await libsignal.Curve.async.calculateAgreement(
-    identityPublic,
-    ephemeralKeyPair.privKey
-  );
-
-  const key1 = await hmacSha256(masterSecret, bytesFromString('auth'));
-  const syntheticIv = _getFirstBytes(await hmacSha256(key1, plaintext), 16);
-
-  const key2 = await hmacSha256(masterSecret, bytesFromString('cipher'));
-  const cipherKey = await hmacSha256(key2, syntheticIv);
-
-  const counter = getZeroes(16);
-  const ciphertext = await encryptAesCtr(cipherKey, plaintext, counter);
-
-  return {
-    ephemeralPublic: ephemeralKeyPair.pubKey,
-    syntheticIv,
-    ciphertext,
-  };
-}
-
-async function decryptDeviceName(
-  { ephemeralPublic, syntheticIv, ciphertext } = {},
-  identityPrivate
-) {
-  const masterSecret = await libsignal.Curve.async.calculateAgreement(
-    ephemeralPublic,
-    identityPrivate
-  );
-
-  const key2 = await hmacSha256(masterSecret, bytesFromString('cipher'));
-  const cipherKey = await hmacSha256(key2, syntheticIv);
-
-  const counter = getZeroes(16);
-  const plaintext = await decryptAesCtr(cipherKey, ciphertext, counter);
-
-  const key1 = await hmacSha256(masterSecret, bytesFromString('auth'));
-  const ourSyntheticIv = _getFirstBytes(await hmacSha256(key1, plaintext), 16);
-
-  if (!constantTimeEqual(ourSyntheticIv, syntheticIv)) {
-    throw new Error('decryptDeviceName: synthetic IV did not match');
-  }
-
-  return stringFromBytes(plaintext);
-}
-
 // Path structure: 'fa/facdf99c22945b1c9393345599a276f4b36ad7ccdc8c2467f5441b742c2d11fa'
 function getAttachmentLabel(path) {
   const filename = path.slice(3);

libtextsecure/protobufs.js

@@ -30,14 +30,8 @@
     );
   }
 
+  // this is all the Session Protocols
   loadProtoBufs('SignalService.proto');
+  // this is for websocket wrapping of messages
   loadProtoBufs('SubProtocol.proto');
-  loadProtoBufs('DeviceMessages.proto');
-  loadProtoBufs('WhisperTextProtocol.proto');
-
-  // Just for encrypting device names
-  loadProtoBufs('DeviceName.proto');
-
-  // Metadata-specific protos
-  loadProtoBufs('UnidentifiedDelivery.proto');
 })();

libtextsecure/protocol_wrapper.js

@@ -1,7 +1,7 @@
 /* global window, textsecure, SignalProtocolStore, libsignal */
 
 // eslint-disable-next-line func-names
-(function () {
+(function() {
   window.textsecure = window.textsecure || {};
   window.textsecure.storage = window.textsecure.storage || {};
   textsecure.storage.protocol = new SignalProtocolStore();

protos/DeviceMessages.proto

@@ -1,20 +0,0 @@
-package signalservice;
-
-message ProvisioningUuid {
- optional string uuid = 1;
-}
-
-
-message ProvisionEnvelope {
-  optional bytes publicKey = 1;
-  optional bytes body      = 2; // Encrypted ProvisionMessage
-}
-
-message ProvisionMessage {
-  optional bytes  identityKeyPrivate = 2;
-  optional string number             = 3;
-  optional string provisioningCode   = 4;
-  optional string userAgent          = 5;
-  optional bytes profileKey          = 6;
-  optional bool  readReceipts        = 7;
-}

protos/DeviceName.proto

@@ -1,7 +0,0 @@
-package signalservice;
-
-message DeviceName {
-  optional bytes ephemeralPublic = 1;
-  optional bytes syntheticIv     = 2;
-  optional bytes ciphertext      = 3;
-}

protos/UnidentifiedDelivery.proto

@@ -1,39 +0,0 @@
-package signalservice;
-
-option java_package = "org.whispersystems.libsignal.protocol";
-option java_outer_classname = "WhisperProtos";
-
-message ServerCertificate {
-    message Certificate {
-        optional uint32 id  = 1;
-        optional bytes  key = 2;
-    }
-
-    optional bytes certificate = 1;
-    optional bytes signature   = 2;
-}
-
-// This should perhaps be renamed to something like `SenderInfo`
-message SenderCertificate {
-    optional string sender       = 1;
-    optional uint32 senderDevice = 2;
-}
-
-message UnidentifiedSenderMessage {
-
-    message Message {
-        enum Type {
-            PREKEY_MESSAGE = 1;
-            MESSAGE        = 2;
-            FALLBACK_MESSAGE = 3;
-        }
-
-        optional Type              type              = 1;
-        optional SenderCertificate senderCertificate = 2;
-        optional bytes             content           = 3;
-    }
-
-    optional bytes ephemeralPublic  = 1;
-    optional bytes encryptedStatic  = 2;
-    optional bytes encryptedMessage = 3;
-}

ts/components/conversation/Message.tsx

@@ -991,6 +991,10 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
         ToastUtils.pushUserNeedsToHaveJoined();
       } else {
         window.log.info(`${pubkey} added as moderator...`);
+        // refresh the moderator list. Will trigger a refresh
+        const modPubKeys = (await channelAPI.getModerators()) as Array<string>;
+        convo.updateGroupAdmins(modPubKeys);
+
         ToastUtils.pushUserAddedToModerators();
       }
     } catch (e) {