formattting

Author: davidliu

android/src/main/java/com/oney/WebRTCModule/DataPacketCryptorManager.java

@@ -15,7 +15,8 @@ public class DataPacketCryptorManager {
     private boolean isDisposed = false;
 
     public DataPacketCryptorManager(FrameCryptorAlgorithm algorithm, FrameCryptorKeyProvider keyProvider) {
-        dataPacketCryptor = DataPacketCryptorFactory.createDataPacketCryptor(FrameCryptorAlgorithm.AES_GCM, keyProvider);
+        dataPacketCryptor =
+                DataPacketCryptorFactory.createDataPacketCryptor(FrameCryptorAlgorithm.AES_GCM, keyProvider);
     }
 
     @Nullable

android/src/main/java/com/oney/WebRTCModule/RTCCryptoManager.java

@@ -383,11 +383,13 @@ public void dataPacketCryptorFactoryCreateDataPacketCryptor(ReadableMap params,
 
         FrameCryptorKeyProvider keyProvider = keyProviders.get(keyProviderId);
         if (keyProvider == null) {
-            result.reject("dataPacketCryptorFactoryCreateDataPacketCryptorFailed", "keyProvider not found", (Throwable) null);
+            result.reject(
+                    "dataPacketCryptorFactoryCreateDataPacketCryptorFailed", "keyProvider not found", (Throwable) null);
             return;
         }
 
-        DataPacketCryptorManager cryptor = new DataPacketCryptorManager(frameCryptorAlgorithmFromInt(algorithm), keyProvider);
+        DataPacketCryptorManager cryptor =
+                new DataPacketCryptorManager(frameCryptorAlgorithmFromInt(algorithm), keyProvider);
 
         String dataPacketCryptorId = UUID.randomUUID().toString();
         dataPacketCryptors.put(dataPacketCryptorId, cryptor);
@@ -438,11 +440,7 @@ public void dataPacketCryptorDecrypt(ReadableMap params, @NonNull Promise result
             return;
         }
 
-        DataPacketCryptor.EncryptedPacket packet = new DataPacketCryptor.EncryptedPacket(
-                payload,
-                iv,
-                keyIndex
-        );
+        DataPacketCryptor.EncryptedPacket packet = new DataPacketCryptor.EncryptedPacket(payload, iv, keyIndex);
 
         byte[] decryptedData = cryptor.decrypt(participantId, packet);
 

ios/RCTWebRTC/WebRTCModule+RTCFrameCryptor.m

@@ -489,28 +489,26 @@ - (NSString *)stringFromState:(RTCFrameCryptorState)state {
                   : (nonnull NSDictionary *)constraints resolver
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject) {
-    
     NSNumber *algorithm = constraints[@"algorithm"];
     NSString *keyProviderId = constraints[@"keyProviderId"];
     if (keyProviderId == nil) {
         reject(@"dataPacketCryptorFactoryCreateDataPacketCryptorFailed", @"Invalid keyProviderId", nil);
         return;
     }
-    
+
     RTCFrameCryptorKeyProvider *keyProvider = self.keyProviders[keyProviderId];
-    if(keyProvider == nil) {
+    if (keyProvider == nil) {
         reject(@"getKeyProviderForIdFailed", @"Invalid keyProviderId", nil);
         return;
     }
-    
-    RTCDataPacketCryptor *cryptor = [[RTCDataPacketCryptor alloc] initWithAlgorithm:[self getAlgorithm:algorithm] keyProvider:keyProvider];
+
+    RTCDataPacketCryptor *cryptor = [[RTCDataPacketCryptor alloc] initWithAlgorithm:[self getAlgorithm:algorithm]
+                                                                        keyProvider:keyProvider];
     NSString *cryptorId = [[NSUUID UUID] UUIDString];
-    
+
     self.dataPacketCryptors[cryptorId] = cryptor;
 
-    resolve(@{
-        @"dataPacketCryptorId" : cryptorId
-    });
+    resolve(@{@"dataPacketCryptorId" : cryptorId});
 }
 
 RCT_EXPORT_METHOD(dataPacketCryptorEncrypt
@@ -521,33 +519,32 @@ - (NSString *)stringFromState:(RTCFrameCryptorState)state {
     NSString *participantId = constraints[@"participantId"];
     NSNumber *keyIndex = constraints[@"keyIndex"];
     NSData *data = [self bytesFromMap:constraints key:@"data" isBase64Key:nil];
-    
+
     RTCDataPacketCryptor *cryptor = self.dataPacketCryptors[cryptorId];
-    
+
     if (cryptor == nil) {
         reject(@"dataPacketCryptorEncryptFailed", @"data packet cryptor not found", nil);
         return;
     }
-    
+
     RTCEncryptedPacket *packet = [cryptor encrypt:participantId keyIndex:[keyIndex unsignedIntValue] data:data];
-    
-    if (packet == nil ) {
+
+    if (packet == nil) {
         reject(@"dataPacketCryptorEncryptFailed", @"packet encryption failed", nil);
         return;
     }
-    
+
     resolve(@{
         @"payload" : [packet.data base64EncodedStringWithOptions:0],
         @"iv" : [packet.iv base64EncodedStringWithOptions:0],
-        @"keyIndex": [NSNumber numberWithUnsignedInt:packet.keyIndex]
+        @"keyIndex" : [NSNumber numberWithUnsignedInt:packet.keyIndex]
     });
 }
 
 RCT_EXPORT_METHOD(dataPacketCryptorDecrypt
                   : (nonnull NSDictionary *)constraints resolver
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject) {
-    
     NSString *cryptorId = constraints[@"dataPacketCryptorId"];
     NSString *participantId = constraints[@"participantId"];
     NSNumber *keyIndex = constraints[@"keyIndex"];
@@ -557,27 +554,26 @@ - (NSString *)stringFromState:(RTCFrameCryptorState)state {
     RTCDataPacketCryptor *cryptor = self.dataPacketCryptors[cryptorId];
 
     if (cryptor == nil) {
-    reject(@"dataPacketCryptorDecryptFailed", @"data packet cryptor not found", nil);
-    return;
+        reject(@"dataPacketCryptorDecryptFailed", @"data packet cryptor not found", nil);
+        return;
     }
 
-    RTCEncryptedPacket *packet = [[RTCEncryptedPacket alloc] initWithData:payload iv:iv keyIndex:[keyIndex unsignedIntValue]];
-    NSData *decryptedData = [cryptor decrypt:participantId encryptedPacket: packet];
+    RTCEncryptedPacket *packet = [[RTCEncryptedPacket alloc] initWithData:payload
+                                                                       iv:iv
+                                                                 keyIndex:[keyIndex unsignedIntValue]];
+    NSData *decryptedData = [cryptor decrypt:participantId encryptedPacket:packet];
 
-    if (decryptedData == nil ) {
+    if (decryptedData == nil) {
         reject(@"dataPacketCryptorDecryptFailed", @"packet decryption failed", nil);
         return;
     }
 
-    resolve(@{
-        @"data" : [decryptedData base64EncodedStringWithOptions:0]
-    });
+    resolve(@{@"data" : [decryptedData base64EncodedStringWithOptions:0]});
 }
 RCT_EXPORT_METHOD(dataPacketCryptorDispose
                   : (nonnull NSDictionary *)constraints resolver
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject) {
-    
     NSString *cryptorId = constraints[@"dataPacketCryptorId"];
 
     RTCDataPacketCryptor *cryptor = self.dataPacketCryptors[cryptorId];
@@ -586,7 +582,7 @@ - (NSString *)stringFromState:(RTCFrameCryptorState)state {
         reject(@"dataPacketCryptorDisposeFailed", @"data packet cryptor not found", nil);
         return;
     }
-    
+
     [self.dataPacketCryptors removeObjectForKey:cryptorId];
     resolve(@{@"result" : @"success"});
 }