Skip to content

Commit 6e6f4ea

Browse files
committed
Use client config
1 parent c8e3780 commit 6e6f4ea

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

packages/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/RealmInterop.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ expect object RealmInterop {
519519
// App
520520
fun realm_app_get(
521521
appConfig: RealmAppConfigurationPointer,
522-
syncClientConfig: RealmSyncClientConfigurationPointer,
523522
basePath: String,
524523
): RealmAppPointer
525524
fun realm_app_get_current_user(app: RealmAppPointer): RealmUserPointer?
@@ -599,8 +598,7 @@ expect object RealmInterop {
599598
fun realm_user_refresh_custom_data(app: RealmAppPointer, user: RealmUserPointer, callback: AppCallback<Unit>)
600599

601600
// Sync client config
602-
fun realm_sync_client_config_new(): RealmSyncClientConfigurationPointer
603-
601+
fun realm_app_config_get_sync_client_config(configPointer: RealmAppConfigurationPointer): RealmSyncClientConfigurationPointer
604602
fun realm_sync_client_config_set_default_binding_thread_observer(
605603
syncClientConfig: RealmSyncClientConfigurationPointer,
606604
appId: String

packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/RealmInterop.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@ actual object RealmInterop {
11541154

11551155
actual fun realm_app_get(
11561156
appConfig: RealmAppConfigurationPointer,
1157-
syncClientConfig: RealmSyncClientConfigurationPointer,
11581157
basePath: String
11591158
): RealmAppPointer {
11601159
return LongPointerWrapper(realmc.realm_app_create(appConfig.cptr()), managed = true)
@@ -1310,8 +1309,8 @@ actual object RealmInterop {
13101309
)
13111310
}
13121311

1313-
actual fun realm_sync_client_config_new(): RealmSyncClientConfigurationPointer {
1314-
return LongPointerWrapper(realmc.realm_sync_client_config_new())
1312+
actual fun realm_app_config_get_sync_client_config(configPointer: RealmAppConfigurationPointer): RealmSyncClientConfigurationPointer {
1313+
return LongPointerWrapper(realmc.realm_app_config_get_sync_client_config(configPointer.cptr()))
13151314
}
13161315

13171316
actual fun realm_sync_client_config_set_default_binding_thread_observer(syncClientConfig: RealmSyncClientConfigurationPointer, appId: String) {

packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/RealmInterop.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,6 @@ actual object RealmInterop {
20632063

20642064
actual fun realm_app_get(
20652065
appConfig: RealmAppConfigurationPointer,
2066-
syncClientConfig: RealmSyncClientConfigurationPointer,
20672066
basePath: String
20682067
): RealmAppPointer {
20692068
return CPointerWrapper(realm_wrapper.realm_app_create(appConfig.cptr()), managed = true)
@@ -2466,8 +2465,8 @@ actual object RealmInterop {
24662465
)
24672466
}
24682467

2469-
actual fun realm_sync_client_config_new(): RealmSyncClientConfigurationPointer {
2470-
return CPointerWrapper(realm_wrapper.realm_sync_client_config_new())
2468+
actual fun realm_app_config_get_sync_client_config(configPointer: RealmAppConfigurationPointer): RealmSyncClientConfigurationPointer {
2469+
return CPointerWrapper(realm_wrapper.realm_app_config_get_sync_client_config(configPointer.cptr()))
24712470
}
24722471

24732472
actual fun realm_sync_client_config_set_default_binding_thread_observer(

packages/jni-swig-stub/realm.i

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,6 @@ $result = SWIG_JavaArrayOutLonglong(jenv, (long long *)result, 2);
525525
%ignore "realm_dictionary_add_notification_callback";
526526
%ignore "realm_results_add_notification_callback";
527527

528-
%ignore "realm_app_config_get_sync_client_config";
529-
530528
// Swig doesn't understand __attribute__ so eliminate it
531529
#define __attribute__(x)
532530

packages/library-sync/src/commonMain/kotlin/io/realm/kotlin/mongodb/internal/AppConfigurationImpl.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ public class AppConfigurationImpl @OptIn(ExperimentalKBsonSerializerApi::class)
8989
applicationInfo = info.toString()
9090
}
9191
val sdkInfo = "RealmKotlin/$SDK_VERSION"
92+
9293
val synClientConfig: RealmSyncClientConfigurationPointer = initializeSyncClientConfig(
94+
appConfigPointer,
9395
websocketTransport,
9496
sdkInfo,
9597
applicationInfo.toString()
@@ -158,11 +160,12 @@ public class AppConfigurationImpl @OptIn(ExperimentalKBsonSerializerApi::class)
158160
}
159161

160162
private fun initializeSyncClientConfig(
163+
appConfigPointer: RealmAppConfigurationPointer,
161164
webSocketTransport: WebSocketTransport?,
162165
sdkInfo: String?,
163166
applicationInfo: String?
164167
): RealmSyncClientConfigurationPointer =
165-
RealmInterop.realm_sync_client_config_new()
168+
RealmInterop.realm_app_config_get_sync_client_config(appConfigPointer)
166169
.also { syncClientConfig ->
167170
// Initialize client configuration first
168171
RealmInterop.realm_sync_client_config_set_default_binding_thread_observer(syncClientConfig, appId)

0 commit comments

Comments
 (0)