diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java index de2f3610d..c7178172e 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhDB.java +++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java @@ -490,20 +490,19 @@ public class EhDB { EhDatabase oldRoomDatabase = Room.databaseBuilder(context, EhDatabase.class, tmpDBName) .createFromFile(file).allowMainThreadQueries().build(); - - // Downloads - DownloadManager manager = EhApplication.getDownloadManager(context); - try { - List downloadInfoList = oldRoomDatabase.downloadsDao().list(); - manager.addDownload(downloadInfoList, false); - } catch (Exception ignored) {} - // Download label + DownloadManager manager = EhApplication.getDownloadManager(context); try { List downloadLabelList = oldRoomDatabase.downloadLabelDao().list(); manager.addDownloadLabel(downloadLabelList); } catch (Exception ignored) {} + // Downloads + try { + List downloadInfoList = oldRoomDatabase.downloadsDao().list(); + manager.addDownload(downloadInfoList, false); + } catch (Exception ignored) {} + // Download dirname try { List downloadDirnameList = oldRoomDatabase.downloadDirnameDao().list();