Skip to content

Commit 479db18

Browse files
committed
Merge branch 'master' of https://github.com/realm/realm-java
2 parents 8eb8e96 + dc14781 commit 479db18

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

realm/realm-library/src/main/java/io/realm/Realm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ private static void initializeRealm(Context context, String userAgent) {
321321
checkFilesDirAvailable(context);
322322
RealmCore.loadLibrary(context);
323323
setDefaultConfiguration(new RealmConfiguration.Builder(context).build());
324-
ObjectServerFacade.getSyncFacadeIfPossible().init(context, userAgent);
324+
ObjectServerFacade.getSyncFacadeIfPossible().initialize(context, userAgent);
325325
if (context.getApplicationContext() != null) {
326326
BaseRealm.applicationContext = context.getApplicationContext();
327327
} else {

realm/realm-library/src/main/java/io/realm/internal/ObjectServerFacade.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ObjectServerFacade {
5656
/**
5757
* Initializes the Object Server library
5858
*/
59-
public void init(Context context, String userAgent) {
59+
public void initialize(Context context, String userAgent) {
6060
}
6161

6262
/**

realm/realm-library/src/objectServer/java/io/realm/internal/SyncObjectServerFacade.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class SyncObjectServerFacade extends ObjectServerFacade {
5151
private static volatile Method removeSessionMethod;
5252

5353
@Override
54-
public void init(Context context, String userAgent) {
54+
public void initialize(Context context, String userAgent) {
5555
// Trying to keep things out the public API is no fun :/
5656
// Just use reflection on init. It is a one-time method call so should be acceptable.
5757
//noinspection TryWithIdenticalCatches

0 commit comments

Comments
 (0)