JNI+mm: Generate certificate if non-default key type is specified.

webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 179 matching lines @@
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
 }
 
 @synthesize delegate = _delegate;
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                   configuration:(RTCConfiguration *)configuration
                     constraints:(RTCMediaConstraints *)constraints
                        delegate:(id<RTCPeerConnectionDelegate>)delegate {
   NSParameterAssert(factory);
+  std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
+      configuration.nativeConfiguration);
+  if (!config)
+    return nullptr;

[tkchin_webrtc, 2016/05/13 17:48:06]

ObjC style requires braces

nil not nullptr. 
if (!nativeConfiguration) {
  return nil;
}

[hbos, 2016/05/16 12:49:05]

Done.

   if (self = [super init]) {
     _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self));
-    webrtc::PeerConnectionInterface::RTCConfiguration config =
-        configuration.nativeConfiguration;
     std::unique_ptr<webrtc::MediaConstraints> nativeConstraints =
         constraints.nativeConstraints;
     _peerConnection =
-        factory.nativeFactory->CreatePeerConnection(config,
+        factory.nativeFactory->CreatePeerConnection(*config,
                                                     nativeConstraints.get(),
                                                     nullptr,
                                                     nullptr,
                                                     _observer.get());
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
   }
   return self;
 }
 
@@ skipping 26 matching lines @@
   return [[self class] iceConnectionStateForNativeState:
       _peerConnection->ice_connection_state()];
 }
 
 - (RTCIceGatheringState)iceGatheringState {
   return [[self class] iceGatheringStateForNativeState:
       _peerConnection->ice_gathering_state()];
 }
 
 - (BOOL)setConfiguration:(RTCConfiguration *)configuration {
-  return _peerConnection->SetConfiguration(configuration.nativeConfiguration);
+  std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
+      configuration.nativeConfiguration);
+  if (!config)
+    return false;

[tkchin_webrtc, 2016/05/13 17:48:06]

BOOL is not a boolean

if (!nativeConfiguration) {
  return NO;
}

[hbos, 2016/05/16 12:49:05]

Done.

+  return _peerConnection->SetConfiguration(*config);
 }
 
 - (void)close {
   _peerConnection->Close();
 }
 
 - (void)addIceCandidate:(RTCIceCandidate *)candidate {
   std::unique_ptr<const webrtc::IceCandidateInterface> iceCandidate(
       candidate.nativeCandidate);
   _peerConnection->AddIceCandidate(iceCandidate.get());
@@ skipping 234 matching lines @@
     case RTCStatsOutputLevelDebug:
       return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
   }
 }
 
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }
 
 @end