fix(chunk): wake up database when find

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jan 30, 2019 · 37d7985 · 37d7985
1 parent 9029d4f
commit 37d7985
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java b/client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java
@@ -15,13 +15,12 @@
 
 public class CoreModule extends ReactContextBaseJavaModule {
     private Logger logger = new Logger("chat.berty.io");
-    private String filesDir = "";
+
     private ReactApplicationContext reactContext;
     private MobileNotification notificationDriver = Core.getNotificationDriver();
 
     public CoreModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        this.filesDir = reactContext.getFilesDir().getAbsolutePath();
 
         String storagePath = reactContext.getFilesDir().getAbsolutePath();
         try {

diff --git a/client/react-native/ios/modules/core/CoreModule.swift b/client/react-native/ios/modules/core/CoreModule.swift
@@ -30,23 +30,11 @@ class CoreModule: NSObject {
     }
   }
 
-  func getFilesDir() throws -> String {
-    let filesDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
-    let filesPath = filesDir?.path
-    let fileExist = FileManager.default.fileExists(atPath: filesPath!)
-
-    // do this in gomobile and set storage as global in gomobile
-    if fileExist == false {
-      try FileManager.default.createDirectory(at: filesDir!, withIntermediateDirectories: true, attributes: nil)
-    }
-    return filesPath!
-  }
-
   @objc func initialize(_ resolve: RCTPromiseResolveBlock!, reject: RCTPromiseRejectBlock!) {
     var err: NSError?
 
     do {
-      CoreInitialize(logger, Core.storagePath(), &err)
+      CoreInitialize(logger, Core.deviceInfo().getStoragePath(), &err)
       if let error = err {
         throw error
       }
@@ -61,7 +49,7 @@ class CoreModule: NSObject {
     var err: NSError?
 
     do {
-      let list = CoreListAccounts(try self.getFilesDir(), &err)
+      let list = CoreListAccounts(&err)
       if let error = err {
         throw error
       }
@@ -76,10 +64,8 @@ class CoreModule: NSObject {
     var err: NSError?
 
     do {
-      let datastore = try self.getFilesDir()
 
       guard let coreOptions = CoreMobileOptions()?
-        .withDatastorePath(datastore)?
         .withLoggerDriver(logger)?
         .withNickname(nickname as String)
         else {
@@ -122,7 +108,7 @@ class CoreModule: NSObject {
     var err: NSError?
 
     do {
-      CoreDropDatabase(try self.getFilesDir(), &err)
+      CoreDropDatabase(&err)
       if let error = err {
         throw error
       }

diff --git a/core/chunk/storage.go b/core/chunk/storage.go
@@ -96,7 +96,7 @@ func cleanDatabase() error {
 	return nil
 }
 
-func save(chunk *Chunk) error {
+func wakeUpDatabase() {
 	for db == nil || db.DB().Ping() != nil {
 		if err := openDatabase(); err != nil {
 			logger().Error(err.Error())
@@ -105,13 +105,18 @@ func save(chunk *Chunk) error {
 			break
 		}
 	}
+}
+
+func save(chunk *Chunk) error {
+	wakeUpDatabase()
 	if err := db.Save(chunk).Error; err != nil {
 		return errorcodes.ErrChunkSave.Wrap(err)
 	}
 	return nil
 }
 
 func findAllSlices() ([][]*Chunk, error) {
+	wakeUpDatabase()
 	firstChunks := []*Chunk{}
 	if err := db.Where(&Chunk{Index: 0}).Find(&firstChunks).Error; err != nil {
 		return nil, errorcodes.ErrChunkFindAllSlices.Wrap(err)
@@ -128,6 +133,7 @@ func findAllSlices() ([][]*Chunk, error) {
 }
 
 func findSliceByID(sliceID string) ([]*Chunk, error) {
+	wakeUpDatabase()
 	slice := []*Chunk{}
 	if err := db.Order("index").Where(&Chunk{SliceID: sliceID}).Find(&slice).Error; err != nil {
 		return nil, errorcodes.ErrChunkFindSliceByID.Wrap(err)