|
30 | 30 | import java.util.HashSet; |
31 | 31 | import java.util.concurrent.Executor; |
32 | 32 |
|
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 | | - |
37 | 33 | @ReactModule(name = AsyncStorageModule.NAME) |
38 | 34 | public final class AsyncStorageModule |
39 | 35 | extends ReactContextBaseJavaModule implements ModuleDataCleaner.Cleanable { |
@@ -135,13 +131,13 @@ protected void doInBackgroundGuarded(Void... params) { |
135 | 131 | return; |
136 | 132 | } |
137 | 133 |
|
138 | | - String[] columns = {KEY_COLUMN, VALUE_COLUMN}; |
| 134 | + String[] columns = {ReactDatabaseSupplier.KEY_COLUMN, ReactDatabaseSupplier.VALUE_COLUMN}; |
139 | 135 | HashSet<String> keysRemaining = new HashSet<>(); |
140 | 136 | WritableArray data = Arguments.createArray(); |
141 | 137 | for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) { |
142 | 138 | int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS); |
143 | 139 | Cursor cursor = mReactDatabaseSupplier.get().query( |
144 | | - TABLE_CATALYST, |
| 140 | + ReactDatabaseSupplier.TABLE_CATALYST, |
145 | 141 | columns, |
146 | 142 | AsyncLocalStorageUtil.buildKeySelection(keyCount), |
147 | 143 | AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount), |
@@ -208,7 +204,7 @@ protected void doInBackgroundGuarded(Void... params) { |
208 | 204 | return; |
209 | 205 | } |
210 | 206 |
|
211 | | - String sql = "INSERT OR REPLACE INTO " + TABLE_CATALYST + " VALUES (?, ?);"; |
| 207 | + String sql = "INSERT OR REPLACE INTO " + ReactDatabaseSupplier.TABLE_CATALYST + " VALUES (?, ?);"; |
212 | 208 | SQLiteStatement statement = mReactDatabaseSupplier.get().compileStatement(sql); |
213 | 209 | WritableMap error = null; |
214 | 210 | try { |
@@ -279,7 +275,7 @@ protected void doInBackgroundGuarded(Void... params) { |
279 | 275 | for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) { |
280 | 276 | int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS); |
281 | 277 | mReactDatabaseSupplier.get().delete( |
282 | | - TABLE_CATALYST, |
| 278 | + ReactDatabaseSupplier.TABLE_CATALYST, |
283 | 279 | AsyncLocalStorageUtil.buildKeySelection(keyCount), |
284 | 280 | AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount)); |
285 | 281 | } |
@@ -405,9 +401,9 @@ protected void doInBackgroundGuarded(Void... params) { |
405 | 401 | return; |
406 | 402 | } |
407 | 403 | WritableArray data = Arguments.createArray(); |
408 | | - String[] columns = {KEY_COLUMN}; |
| 404 | + String[] columns = {ReactDatabaseSupplier.KEY_COLUMN}; |
409 | 405 | 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); |
411 | 407 | try { |
412 | 408 | if (cursor.moveToFirst()) { |
413 | 409 | do { |
|
0 commit comments