Skip to content

Commit c6f3c44

Browse files
committed
Post merge WIP
1 parent 306db1e commit c6f3c44

15 files changed

Lines changed: 109 additions & 18 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/src/main/java/com/amaze/filemanager/database/CloudContract.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ object CloudContract {
5959
OpenMode.GDRIVE,
6060
OpenMode.DROPBOX,
6161
OpenMode.ONEDRIVE,
62+
OpenMode.BOX,
6263
)
6364

6465
val ENABLED_PROVIDER_IDS: Array<String> =

app/src/main/java/com/amaze/filemanager/database/ExplorerDatabase.kt

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,70 @@ abstract class ExplorerDatabase : RoomDatabase() {
327327
internal val MIGRATION_11_12: Migration =
328328
object : Migration(11, DATABASE_VERSION) {
329329
override fun migrate(database: SupportSQLiteDatabase) {
330-
database.execSQL("DROP TABLE IF EXISTS $TABLE_CLOUD_PERSIST")
330+
database.execSQL(
331+
"CREATE TABLE " +
332+
TEMP_TABLE_PREFIX +
333+
TABLE_TAB +
334+
"(" +
335+
COLUMN_TAB_NO +
336+
" INTEGER PRIMARY KEY NOT NULL, " +
337+
COLUMN_PATH +
338+
" TEXT NOT NULL, " +
339+
COLUMN_HOME +
340+
" TEXT NOT NULL)",
341+
)
342+
database.execSQL(
343+
"INSERT INTO " +
344+
TEMP_TABLE_PREFIX +
345+
TABLE_TAB +
346+
"(" +
347+
COLUMN_TAB_NO +
348+
"," +
349+
COLUMN_PATH +
350+
"," +
351+
COLUMN_HOME +
352+
")" +
353+
" SELECT " +
354+
COLUMN_TAB_NO +
355+
"," +
356+
COLUMN_PATH +
357+
"," +
358+
COLUMN_HOME +
359+
" FROM " +
360+
TABLE_TAB,
361+
)
362+
database.execSQL("DROP TABLE $TABLE_TAB")
363+
database.execSQL(
364+
"ALTER TABLE $TEMP_TABLE_PREFIX$TABLE_TAB RENAME TO $TABLE_TAB",
365+
)
366+
367+
database.execSQL(
368+
"CREATE TABLE " +
369+
TEMP_TABLE_PREFIX +
370+
TABLE_ENCRYPTED +
371+
"(" +
372+
COLUMN_ENCRYPTED_ID +
373+
" INTEGER PRIMARY KEY NOT NULL," +
374+
COLUMN_ENCRYPTED_PATH +
375+
" TEXT NOT NULL," +
376+
COLUMN_ENCRYPTED_PASSWORD +
377+
" TEXT NOT NULL)",
378+
)
379+
database.execSQL(
380+
"INSERT INTO " +
381+
TEMP_TABLE_PREFIX +
382+
TABLE_ENCRYPTED +
383+
" SELECT * FROM " +
384+
TABLE_ENCRYPTED,
385+
)
386+
database.execSQL("DROP TABLE $TABLE_ENCRYPTED")
387+
database.execSQL(
388+
"ALTER TABLE " +
389+
TEMP_TABLE_PREFIX +
390+
TABLE_ENCRYPTED +
391+
" RENAME TO " +
392+
TABLE_ENCRYPTED,
393+
)
331394
}
332395
}
333396

app/src/main/java/com/amaze/filemanager/database/models/explorer/CloudEntry.java

Whitespace-only changes.

app/src/main/java/com/amaze/filemanager/filesystem/Operations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ private boolean localDoubleRename(
487487
return false;
488488
}
489489

490-
private Function<DocumentFile, Void> safRenameFile =
490+
private Function<DocumentFile, Unit> safRenameFile =
491491
input -> {
492492
boolean result = false;
493493
try {
@@ -496,7 +496,7 @@ private boolean localDoubleRename(
496496
LOG.warn(getClass().getSimpleName(), "Failed to rename", e);
497497
}
498498
errorCallBack.done(newFile, result);
499-
return null;
499+
return Unit.INSTANCE;
500500
};
501501

502502
@Override

0 commit comments

Comments
 (0)