Hashmap update and initating the C4BtSocketFactory

Author: Aniket392

common/main/cpp/MetadataHelper.cc

@@ -50,7 +50,16 @@ namespace litecore::jni {
         // Create HashMap
         jclass hashMapClass = env->FindClass("java/util/HashMap");
         jmethodID hashMapInit = env->GetMethodID(hashMapClass, "<init>", "(I)V");
-        jobject hashMap = env->NewObject(hashMapClass, hashMapInit);
+
+
+        size_t rawSize = metadata.size();
+        jint size = (rawSize > 10000) ? 0 : static_cast<jint>(rawSize);
+
+        jobject hashMap = env->NewObject(hashMapClass, hashMapInit, size);
+        if (env->ExceptionCheck()) {
+            env->ExceptionClear();
+            return env->NewObject(hashMapClass, hashMapInit, 0);
+        }
 
         // Put method for HashMap
         jmethodID hashMapPut = env->GetMethodID(

common/main/cpp/com_couchbase_lite_internal_core_impl_NativeC4PeerDiscoveryProvider.h

@@ -4,7 +4,7 @@
 #define COUCHBASE_LITE_JAVA_EE_ROOT_COM_COUCHBASE_LITE_INTERNAL_CORE_IMPL_NATIVEC4PEERDISCOVERYPROVIDER_H
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C" {
 #endif
 
 JNIEXPORT jlong JNICALL
@@ -50,7 +50,7 @@ JNIEXPORT jlongArray JNICALL
 Java_com_couchbase_lite_internal_core_impl_NativeC4PeerDiscoveryProvider_peersWithProvider(
         JNIEnv *env, jclass thiz, jlong providerPtr);
 
-JNIEXPORT jstring JNICALL
+JNIEXPORT jbyteArray JNICALL
 Java_com_couchbase_lite_internal_core_impl_NativeC4PeerDiscoveryProvider_serviceUuidFromPeerGroup(
         JNIEnv* env, jclass, jstring peerGroup);
 

common/main/cpp/native_c4peerdiscoveryprovider.cc

@@ -127,6 +127,7 @@ namespace litecore::jni {
             jint envState = attachJVM(&env, "startBrowsing");
             if ((envState != JNI_OK) && (envState != JNI_EDETACHED))
                 return;
+            jniLog("Start Browsing");
 
             // Call Java BLE service to start scanning
             env->CallStaticVoidMethod(
@@ -162,6 +163,7 @@ namespace litecore::jni {
                 return;
 
             jstring jDisplayName = UTF8ToJstring(env, displayName.data(), displayName.size());
+            jniLog("Start Publishing");
             jobject jMetadata = metadataToJavaMap(env, metadata);
 
             env->CallStaticVoidMethod(
@@ -253,6 +255,7 @@ namespace litecore::jni {
             if ((envState != JNI_OK) && (envState != JNI_EDETACHED))
                 return;
 
+            jniLog("Update Metadata");
             jobject jMetadata = metadataToJavaMap(env, metadata);
 
             env->CallStaticVoidMethod(
@@ -360,21 +363,21 @@ namespace litecore::p2p {
 
 
 #ifdef __cplusplus
-extern "C++" {
+extern "C" {
 #endif
 
 //-------------------------------------------------------------------------
 // com.couchbase.lite.internal.core.impl.NativeC4MultipeerReplicator
 //-------------------------------------------------------------------------
 
 
-JNIEXPORT jstring JNICALL
+JNIEXPORT jbyteArray JNICALL
 Java_com_couchbase_lite_internal_core_impl_NativeC4PeerDiscoveryProvider_serviceUuidFromPeerGroup(
         JNIEnv* env, jclass, jstring peerGroup) {
     std::string pg = JstringToUTF8(env, peerGroup);
     auto uuid = litecore::p2p::btle::ServiceUUIDFromPeerGroup(pg);
     C4Slice s = {&uuid, sizeof(uuid)};
-    return toJString(env, s);
+    return toJByteArray(env, s);
 }
 
 JNIEXPORT jlong JNICALL

common/main/cpp/native_glue.cc

@@ -163,6 +163,7 @@ JNI_OnLoad(JavaVM *jvm, void *ignore) {
         #ifdef __ANDROID__
         && initC4MultipeerReplicator(env)
         && initC4PeerDiscoveryProvider(env)
+        && initC4BTSocketFactory(env)
         #endif
         #endif
         && initC4Socket(env)) {