From 6d73a14343795131127a22001d211d55249477fb Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 6 Jan 2022 13:31:26 +0200
Subject: [PATCH] Fix re-login and hot reload crash (#5894)

---
 ios/Mattermost/MattermostManaged.m       | 40 ++++++++++++++----------
 patches/@nozbe+watermelondb+0.24.0.patch | 39 +++++++++++++++++++++++
 2 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/ios/Mattermost/MattermostManaged.m b/ios/Mattermost/MattermostManaged.m
index e4a93211b..4e77fb41c 100644
--- a/ios/Mattermost/MattermostManaged.m
+++ b/ios/Mattermost/MattermostManaged.m
@@ -60,25 +60,33 @@ RCT_EXPORT_METHOD(isRunningInSplitView:(RCTPromiseResolveBlock)resolve rejecter:
 
 RCT_EXPORT_METHOD(deleteDatabaseDirectory: (NSString *)databaseName  shouldRemoveDirectory: (BOOL) shouldRemoveDirectory callback: (RCTResponseSenderBlock)callback){
   @try {
-      NSDictionary *appGroupDir = [self appGroupSharedDirectory];
-      NSString *databaseDir;
+    NSDictionary *appGroupDir = [self appGroupSharedDirectory];
+    NSString *databaseDir;
 
-      if(databaseName){
-        databaseDir = [NSString stringWithFormat:@"%@/%@%@", appGroupDir[@"databasePath"], databaseName , @".db"];
-      }
+    if(databaseName){
+      databaseDir = [NSString stringWithFormat:@"%@/%@%@", appGroupDir[@"databasePath"], databaseName , @".db"];
+    }
+  
+    if(shouldRemoveDirectory){
+      databaseDir = appGroupDir[@"databasePath"];
+    }
+
+
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error = nil;
+
+    if (!shouldRemoveDirectory && [fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@-wal", databaseDir]]) {
+      [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@-wal", databaseDir] error:nil];
+    }
     
-      if(shouldRemoveDirectory){
-        databaseDir = appGroupDir[@"databasePath"];
-      }
+    if (!shouldRemoveDirectory && [fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@-shm", databaseDir]]) {
+      [fileManager removeItemAtPath:[NSString stringWithFormat:@"%@-shm", databaseDir] error:nil];
+    }
+    
+    BOOL  successCode  = [fileManager removeItemAtPath:databaseDir error:&error];
+    NSNumber *success= [NSNumber numberWithBool:successCode];
 
-
-      NSFileManager *fileManager = [NSFileManager defaultManager];
-      NSError *error = nil;
-
-      BOOL  successCode  = [fileManager removeItemAtPath:databaseDir error:&error];
-      NSNumber *success= [NSNumber numberWithBool:successCode];
-
-      callback(@[(error ?: [NSNull null]), success]);
+    callback(@[(error ?: [NSNull null]), success]);
   }
   @catch (NSException *exception) {
       NSLog(@"%@", exception.reason);
diff --git a/patches/@nozbe+watermelondb+0.24.0.patch b/patches/@nozbe+watermelondb+0.24.0.patch
index 78646e3d7..3551e0001 100644
--- a/patches/@nozbe+watermelondb+0.24.0.patch
+++ b/patches/@nozbe+watermelondb+0.24.0.patch
@@ -24,3 +24,42 @@ index ca31e20..b45c753 100644
              } else {
                  // On some systems there is some kind of lock on `/databases` folder ¯\_(ツ)_/¯
                  context.getDatabasePath("$name.db").path.replace("/databases", "")
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
+index a2bd410..44e1a58 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
++++ b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
+@@ -54,6 +54,7 @@ void Database::destroy() {
+     const std::lock_guard<std::mutex> lock(mutex_);
+     
+     if (isDestroyed_) {
++        db_->markAsDestroyed();
+         return;
+     }
+     isDestroyed_ = true;
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
+index 4108e6c..0fa554c 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
++++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
+@@ -69,6 +69,10 @@ void SqliteDb::destroy() {
+     }
+ }
+ 
++void SqliteDb::markAsDestroyed() {
++    isDestroyed_ = true;
++}
++
+ SqliteDb::~SqliteDb() {
+     destroy();
+ }
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
+index 22cffa7..4b74a7f 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
++++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
+@@ -11,6 +11,7 @@ public:
+     SqliteDb(std::string path);
+     ~SqliteDb();
+     void destroy();
++    void markAsDestroyed();
+ 
+     sqlite3 *sqlite;
+