Fix backup restore

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)
 				}
 			}

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>