Skip to content

Commit 41358dc

Browse files
ShaMan123tido64
authored andcommitted
fix: DexMerger throws an error due to duplicate imports of the package (#111)
1 parent 60b8d57 commit 41358dc

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
import java.util.HashSet;
3131
import java.util.concurrent.Executor;
3232

33-
import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.KEY_COLUMN;
34-
import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.TABLE_CATALYST;
35-
import static com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier.VALUE_COLUMN;
36-
3733
@ReactModule(name = AsyncStorageModule.NAME)
3834
public final class AsyncStorageModule
3935
extends ReactContextBaseJavaModule implements ModuleDataCleaner.Cleanable {
@@ -135,13 +131,13 @@ protected void doInBackgroundGuarded(Void... params) {
135131
return;
136132
}
137133

138-
String[] columns = {KEY_COLUMN, VALUE_COLUMN};
134+
String[] columns = {ReactDatabaseSupplier.KEY_COLUMN, ReactDatabaseSupplier.VALUE_COLUMN};
139135
HashSet<String> keysRemaining = new HashSet<>();
140136
WritableArray data = Arguments.createArray();
141137
for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
142138
int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
143139
Cursor cursor = mReactDatabaseSupplier.get().query(
144-
TABLE_CATALYST,
140+
ReactDatabaseSupplier.TABLE_CATALYST,
145141
columns,
146142
AsyncLocalStorageUtil.buildKeySelection(keyCount),
147143
AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount),
@@ -208,7 +204,7 @@ protected void doInBackgroundGuarded(Void... params) {
208204
return;
209205
}
210206

211-
String sql = "INSERT OR REPLACE INTO " + TABLE_CATALYST + " VALUES (?, ?);";
207+
String sql = "INSERT OR REPLACE INTO " + ReactDatabaseSupplier.TABLE_CATALYST + " VALUES (?, ?);";
212208
SQLiteStatement statement = mReactDatabaseSupplier.get().compileStatement(sql);
213209
WritableMap error = null;
214210
try {
@@ -279,7 +275,7 @@ protected void doInBackgroundGuarded(Void... params) {
279275
for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
280276
int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
281277
mReactDatabaseSupplier.get().delete(
282-
TABLE_CATALYST,
278+
ReactDatabaseSupplier.TABLE_CATALYST,
283279
AsyncLocalStorageUtil.buildKeySelection(keyCount),
284280
AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount));
285281
}
@@ -405,9 +401,9 @@ protected void doInBackgroundGuarded(Void... params) {
405401
return;
406402
}
407403
WritableArray data = Arguments.createArray();
408-
String[] columns = {KEY_COLUMN};
404+
String[] columns = {ReactDatabaseSupplier.KEY_COLUMN};
409405
Cursor cursor = mReactDatabaseSupplier.get()
410-
.query(TABLE_CATALYST, columns, null, null, null, null, null);
406+
.query(ReactDatabaseSupplier.TABLE_CATALYST, columns, null, null, null, null, null);
411407
try {
412408
if (cursor.moveToFirst()) {
413409
do {

0 commit comments

Comments
 (0)