From 9010591ffcdc8ab95ed6fb66dde563bfdfd45a83 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 16 Sep 2022 11:53:48 +0800
Subject: [PATCH] Import Download label first, Fix #245

---
 app/src/main/java/com/hippo/ehviewer/EhDB.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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<DownloadInfo> downloadInfoList = oldRoomDatabase.downloadsDao().list();
-                manager.addDownload(downloadInfoList, false);
-            } catch (Exception ignored) {}
-
             // Download label
+            DownloadManager manager = EhApplication.getDownloadManager(context);
             try {
                 List<DownloadLabel> downloadLabelList = oldRoomDatabase.downloadLabelDao().list();
                 manager.addDownloadLabel(downloadLabelList);
             } catch (Exception ignored) {}
 
+            // Downloads
+            try {
+                List<DownloadInfo> downloadInfoList = oldRoomDatabase.downloadsDao().list();
+                manager.addDownload(downloadInfoList, false);
+            } catch (Exception ignored) {}
+
             // Download dirname
             try {
                 List<DownloadDirname> downloadDirnameList = oldRoomDatabase.downloadDirnameDao().list();