webrtc/sdk/android/src/jni/classreferenceholder.cc - Issue 2557803002: Add disabled certificate check support to IceServer PeerConnection API.

Unified Diff: webrtc/sdk/android/src/jni/classreferenceholder.cc

Issue 2557803002: Add disabled certificate check support to IceServer PeerConnection API. (Closed)

Patch Set: Fix unused tlsOpts with no assert, second try with ATTRIBUTE_UNUSED. Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « webrtc/sdk/android/api/org/webrtc/PeerConnection.java ('k') | webrtc/sdk/android/src/jni/peerconnection_jni.cc » ('j') | webrtc/sdk/android/src/jni/peerconnection_jni.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/sdk/android/src/jni/classreferenceholder.cc

diff --git a/webrtc/sdk/android/src/jni/classreferenceholder.cc b/webrtc/sdk/android/src/jni/classreferenceholder.cc

index 565f47f4b49e618209bec79bb7a139ba1ed81fb9..bcfdef773e67231d9e674c0be1cd7d25452b0b97 100644

--- a/webrtc/sdk/android/src/jni/classreferenceholder.cc

+++ b/webrtc/sdk/android/src/jni/classreferenceholder.cc

@@ -82,6 +82,7 @@ ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {

LoadClass(jni, "org/webrtc/PeerConnection$IceGatheringState");

LoadClass(jni, "org/webrtc/PeerConnection$IceTransportsType");

LoadClass(jni, "org/webrtc/PeerConnection$TcpCandidatePolicy");

+ LoadClass(jni, "org/webrtc/PeerConnection$TlsCertificatePolicy");

magjed_webrtc 2016/12/16 11:57:54 There is no need to add this unless you want to ho

hnsl1 2016/12/16 14:18:39 Without this line I get this runtime JNI crash: #

magjed_webrtc 2016/12/19 08:54:05 You are still using the globally cached FindClass

You are still using the globally cached FindClass function in classreferenceholder.h from the GetJavaEnumName function. Can you try changing: jclass enumClass = FindClass(jni, className.c_str()); to: jclass enumClass = jni->FindClass(className.c_str()); in GetJavaEnumName in webrtc/sdk/android/src/jni/jni_helpers.cc? If that doesn't work, then it's ok to do it like this, and we can clean it up some other day. It's not a big deal, but I don't like the current design where we load almost every class at start time and store them globally here.

LoadClass(jni, "org/webrtc/PeerConnection$CandidateNetworkPolicy");

LoadClass(jni, "org/webrtc/PeerConnection$KeyType");

LoadClass(jni, "org/webrtc/PeerConnection$SignalingState");