From b08b23cebc56bc9ea0ad3cfcca2d26834e615d11 Mon Sep 17 00:00:00 2001
From: zHd4 <computersystembase@gmail.com>
Date: Fri, 6 Dec 2024 19:08:18 +0100
Subject: [PATCH] Fix compile errors in ImportManagerV2

---
 .../data/importer/v2/ImportManagerV2.java     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/app/notesr/manager/data/importer/v2/ImportManagerV2.java b/app/src/main/java/app/notesr/manager/data/importer/v2/ImportManagerV2.java
index 3db97d99..38672557 100644
--- a/app/src/main/java/app/notesr/manager/data/importer/v2/ImportManagerV2.java
+++ b/app/src/main/java/app/notesr/manager/data/importer/v2/ImportManagerV2.java
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Map;
 
 import app.notesr.R;
 import app.notesr.exception.ImportFailedException;
@@ -77,30 +78,33 @@ private void importData() throws ImportFailedException, IOException {
         File fileInfoJsonFile = new File(tempDir, FILES_INFO_JSON_FILE_NAME);
         File dataBlocksDir = new File(tempDir, DATA_BLOCKS_DIR_NAME);
 
-        JsonParser notesParser = createJsonParser(notesJsonFile);
-        JsonParser filesInfoParser = createJsonParser(fileInfoJsonFile);
-
-        NotesImporter notesImporter = createNotesImporter(notesParser);
-        FilesImporter filesImporter = createFilesImporter(filesInfoParser, dataBlocksDir);
+        JsonParser notesParser = getJsonParser(notesJsonFile);
+        JsonParser filesInfoParser = getJsonParser(fileInfoJsonFile);
 
+        NotesImporter notesImporter = getNotesImporter(notesParser);
         notesImporter.importNotes();
-        filesImporter.importFiles();
+
+        getFilesImporter(filesInfoParser, dataBlocksDir, notesImporter.getAdaptedIdMap()).importFiles();
     }
 
-    private JsonParser createJsonParser(File file) throws IOException {
+    private JsonParser getJsonParser(File file) throws IOException {
         JsonFactory factory = new JsonFactory();
         return factory.createParser(file);
     }
 
-    private NotesImporter createNotesImporter(JsonParser parser) {
+    private NotesImporter getNotesImporter(JsonParser parser) {
         return new NotesImporter(parser, getNotesTable(), getTimestampFormatter());
     }
 
-    private FilesImporter createFilesImporter(JsonParser parser, File dataBlocksDir) {
+    private FilesImporter getFilesImporter(
+            JsonParser parser,
+            File dataBlocksDir,
+            Map<String, String> adaptedNotesIdMap) {
         return new FilesImporter(
                 parser,
                 getFilesInfoTable(),
                 getDataBlocksTable(),
+                adaptedNotesIdMap,
                 dataBlocksDir,
                 getTimestampFormatter()
         );