From db555b1445aa5ca1da631df642871a33e41ac569 Mon Sep 17 00:00:00 2001
From: ShaMan123 <34343793+ShaMan123@users.noreply.github.com>
Date: Sun, 26 May 2019 00:20:24 +0300
Subject: [PATCH] fix compilation error

When building DexMerger throws an error due to duplicate imports of the package
---
 .../asyncstorage/AsyncStorageModule.java         | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/android/src/main/java/com/reactnativecommunity/asyncstorage/AsyncStorageModule.java b/android/src/main/java/com/reactnativecommunity/asyncstorage/AsyncStorageModule.java
index f15a5132..a0bf845e 100644
--- a/android/src/main/java/com/reactnativecommunity/asyncstorage/AsyncStorageModule.java
+++ b/android/src/main/java/com/reactnativecommunity/asyncstorage/AsyncStorageModule.java
@@ -30,10 +30,6 @@
 import java.util.HashSet;
 import java.util.concurrent.Executor;
 
-import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.KEY_COLUMN;
-import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.TABLE_CATALYST;
-import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.VALUE_COLUMN;
-
 @ReactModule(name = AsyncStorageModule.NAME)
 public final class AsyncStorageModule
     extends ReactContextBaseJavaModule implements ModuleDataCleaner.Cleanable {
@@ -135,13 +131,13 @@ protected void doInBackgroundGuarded(Void... params) {
           return;
         }
 
-        String[] columns = {KEY_COLUMN, VALUE_COLUMN};
+        String[] columns = {ReactDatabaseSupplier.KEY_COLUMN, ReactDatabaseSupplier.VALUE_COLUMN};
         HashSet<String> keysRemaining = new HashSet<>();
         WritableArray data = Arguments.createArray();
         for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
           int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
           Cursor cursor = mReactDatabaseSupplier.get().query(
-              TABLE_CATALYST,
+              ReactDatabaseSupplier.TABLE_CATALYST,
               columns,
               AsyncLocalStorageUtil.buildKeySelection(keyCount),
               AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount),
@@ -208,7 +204,7 @@ protected void doInBackgroundGuarded(Void... params) {
           return;
         }
 
-        String sql = "INSERT OR REPLACE INTO " + TABLE_CATALYST + " VALUES (?, ?);";
+        String sql = "INSERT OR REPLACE INTO " + ReactDatabaseSupplier.TABLE_CATALYST + " VALUES (?, ?);";
         SQLiteStatement statement = mReactDatabaseSupplier.get().compileStatement(sql);
         WritableMap error = null;
         try {
@@ -279,7 +275,7 @@ protected void doInBackgroundGuarded(Void... params) {
           for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
             int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
             mReactDatabaseSupplier.get().delete(
-                TABLE_CATALYST,
+                    ReactDatabaseSupplier.TABLE_CATALYST,
                 AsyncLocalStorageUtil.buildKeySelection(keyCount),
                 AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount));
           }
@@ -405,9 +401,9 @@ protected void doInBackgroundGuarded(Void... params) {
           return;
         }
         WritableArray data = Arguments.createArray();
-        String[] columns = {KEY_COLUMN};
+        String[] columns = {ReactDatabaseSupplier.KEY_COLUMN};
         Cursor cursor = mReactDatabaseSupplier.get()
-            .query(TABLE_CATALYST, columns, null, null, null, null, null);
+            .query(ReactDatabaseSupplier.TABLE_CATALYST, columns, null, null, null, null, null);
         try {
           if (cursor.moveToFirst()) {
             do {