From a242aa6633bbfbd2c7678f07a7fad225c1d5d793 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 10 Jan 2021 11:13:39 +0200
Subject: [PATCH] Fix backup restore

---
 .../org/koitharu/kotatsu/core/backup/RestoreRepository.kt    | 4 ++--
 app/src/main/res/xml/filepaths.xml                           | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
index 5f97f93d4..4a7098c78 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -25,8 +25,8 @@ class RestoreRepository(private val db: MangaDatabase) {
 			val history = parseHistory(item)
 			result += runCatching {
 				db.withTransaction {
-					db.mangaDao.upsert(manga, tags)
 					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
 					db.historyDao.upsert(history)
 				}
 			}
@@ -56,8 +56,8 @@ class RestoreRepository(private val db: MangaDatabase) {
 			val favourite = parseFavourite(item)
 			result += runCatching {
 				db.withTransaction {
-					db.mangaDao.upsert(manga, tags)
 					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
 					db.favouritesDao.upsert(favourite)
 				}
 			}
diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml
index 8d2bc3f69..c6116aaa4 100644
--- a/app/src/main/res/xml/filepaths.xml
+++ b/app/src/main/res/xml/filepaths.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
 	<external-files-path
-		name="manga"
+		name="manga-ext"
 		path="/manga" />
 	<external-files-path
+		name="backups-ext"
+		path="/backups" />
+	<files-path
 		name="backups"
 		path="/backups" />
 </paths>
\ No newline at end of file