fix: preventive measures

Author: Krzysztof Borowy

android/build.gradle

@@ -33,6 +33,10 @@ def useDedicatedExecutor = rootProject.hasProperty('AsyncStorage_dedicatedExecut
         ? rootProject.properties['AsyncStorage_dedicatedExecutor']
         : false
 
+def disableLocalizedCollators = rootProject.hasProperty('AsyncStorage_noLocalizedCollators')
+        ? rootProject.properties['AsyncStorage_noLocalizedCollators']
+        : false
+
 apply plugin: 'com.android.library'
 
 android {
@@ -43,6 +47,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 28)
         buildConfigField "Long", "AsyncStorage_db_size", "${dbSizeInMB}L"
         buildConfigField("boolean", "AsyncStorage_useDedicatedExecutor", "${useDedicatedExecutor}")
+        buildConfigField("boolean", "AsyncStorage_noLocalizedCollators", "${disableLocalizedCollators}")
     }
     lintOptions {
         abortOnError false

android/src/main/java/com/reactnativecommunity/asyncstorage/AsyncStorageModule.java

@@ -15,6 +15,7 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.GuardedAsyncTask;
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -33,7 +34,7 @@
 
 @ReactModule(name = AsyncStorageModule.NAME)
 public final class AsyncStorageModule
-    extends ReactContextBaseJavaModule implements ModuleDataCleaner.Cleanable {
+    extends ReactContextBaseJavaModule implements ModuleDataCleaner.Cleanable, LifecycleEventListener {
 
   // changed name to not conflict with AsyncStorage from RN repo
   public static final String NAME = "RNC_AsyncSQLiteDBStorage";
@@ -91,6 +92,7 @@ public AsyncStorageModule(ReactApplicationContext reactContext) {
   AsyncStorageModule(ReactApplicationContext reactContext, Executor executor) {
     super(reactContext);
     this.executor = new SerialExecutor(executor);
+    reactContext.addLifecycleEventListener(this);
     mReactDatabaseSupplier = ReactDatabaseSupplier.getInstance(reactContext);
   }
 
@@ -118,6 +120,18 @@ public void clearSensitiveData() {
     mReactDatabaseSupplier.clearAndCloseDatabase();
   }
 
+  @Override
+  public void onHostResume() {}
+
+  @Override
+  public void onHostPause() {}
+
+  @Override
+  public void onHostDestroy() {
+    // ensure we close database when activity is destroyed
+    mReactDatabaseSupplier.closeDatabase();
+  }
+
   /**
    * Given an array of keys, this returns a map of (key, value) pairs for the keys found, and
    * (key, null) for the keys that haven't been found.

android/src/main/java/com/reactnativecommunity/asyncstorage/ReactDatabaseSupplier.java

@@ -44,6 +44,7 @@ public class ReactDatabaseSupplier extends SQLiteOpenHelper {
   private Context mContext;
   private @Nullable SQLiteDatabase mDb;
   private long mMaximumDatabaseSize =  BuildConfig.AsyncStorage_db_size * 1024L * 1024L;
+  private boolean disableLocalizedCollators = BuildConfig.AsyncStorage_noLocalizedCollators;
 
   private ReactDatabaseSupplier(Context context) {
     super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -85,7 +86,13 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (tries > 0) {
           deleteDatabase();
         }
-        mDb = getWritableDatabase();
+
+        if(disableLocalizedCollators) {
+          String dbPath = mContext.getDatabasePath(DATABASE_NAME).getPath();
+          mDb = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.NO_LOCALIZED_COLLATORS | SQLiteDatabase.OPEN_READWRITE);
+        } else {
+          mDb = getWritableDatabase();
+        }
         break;
       } catch (SQLiteException e) {
         lastSQLiteException = e;
@@ -151,7 +158,7 @@ private synchronized boolean deleteDatabase() {
     return mContext.deleteDatabase(DATABASE_NAME);
   }
 
-  private synchronized void closeDatabase() {
+  public synchronized void closeDatabase() {
     if (mDb != null && mDb.isOpen()) {
       mDb.close();
       mDb = null;

example/android/gradle.properties

@@ -22,6 +22,7 @@
 
 # Enable dedicated thread pool executor
 AsyncStorage_dedicatedExecutor=true
+AsyncStorage_noLocalizedCollators=true
 
 android.useAndroidX=true
 android.enableJetifier=true