Merge pull request #47 from Wojtach/fix/46-two-db-instances

Fix: Two db instances issue

Author: azaddhirajkumar

android/src/main/java/com/cblreactnative/CblReactnativeModule.kt

@@ -745,13 +745,15 @@ class CblReactnativeModule(reactContext: ReactApplicationContext) :
       }
       try {
         val databaseConfig = DataAdapter.toDatabaseConfigJson(directory, encryptionKey)
-        DatabaseManager.openDatabase(
+        val databaseUniqueName = DatabaseManager.openDatabase(
           name,
           databaseConfig,
           context
         )
         context.runOnUiQueueThread {
-          promise.resolve(null)
+          val result = Arguments.createMap()
+          result.putString("databaseUniqueName", databaseUniqueName)
+          promise.resolve(result)
         }
       } catch (e: Throwable) {
         context.runOnUiQueueThread {

android/src/main/java/com/cblreactnative/cbl-js-kotlin

@@ -940,8 +940,10 @@ class CblReactnative: RCTEventEmitter {
     let hashConfig = AnyHashable(config)
     backgroundQueue.async {
       do {
-        try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])
-        resolve(nil)
+        let databaseUniqueName = try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])
+
+        let resultDict: [String: Any] = ["databaseUniqueName": databaseUniqueName]
+        resolve(resultDict)
       } catch let error as NSError {
         reject("DATABASE_ERROR", error.localizedDescription, nil)
       } catch {

expo-example/cblite-js-tests

@@ -853,7 +853,9 @@ export class CblReactNativeEngine implements ICoreEngine {
     });
   }
 
-  database_Open(args: DatabaseOpenArgs): Promise<void> {
+  database_Open(
+    args: DatabaseOpenArgs
+  ): Promise<{ databaseUniqueName: string }> {
     this.debugLog(
       `::DEBUG:: database_Open: ${args.name} ${args.config.directory} ${args.config.encryptionKey}`
     );
@@ -863,9 +865,9 @@ export class CblReactNativeEngine implements ICoreEngine {
         args.config.directory,
         args.config.encryptionKey
       ).then(
-        () => {
+        (databaseUniqueName) => {
           this.debugLog(`::DEBUG:: database_Open completed`);
-          resolve();
+          resolve(databaseUniqueName);
         },
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (error: any) => {