From 5cb5ec86372cc7e707519a17ca323bcde534f283 Mon Sep 17 00:00:00 2001
From: scharel <github@scharel.rocks>
Date: Thu, 1 Jul 2021 19:10:12 +0200
Subject: [PATCH] Use the model of NotesApp

---
 qml/harbour-nextcloudnotes.qml         |  3 ++-
 qml/pages/NotesPage.qml                |  2 +-
 src/apps/notes/notesapp.cpp            |  4 ++--
 translations/harbour-nextcloudnotes.ts | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/qml/harbour-nextcloudnotes.qml b/qml/harbour-nextcloudnotes.qml
index 8c95674..a49de71 100644
--- a/qml/harbour-nextcloudnotes.qml
+++ b/qml/harbour-nextcloudnotes.qml
@@ -80,8 +80,9 @@ ApplicationWindow
         Connections {
             target: appSettings
             onCurrentAccountChanged: {
-                account.path = appSettings.path + "/accounts/" + appSettings.currentAccount
                 console.log("Current account: " + account.username + "@" + account.url)
+                account.path = appSettings.path + "/accounts/" + appSettings.currentAccount
+                notesApp.model().account = appSettings.currentAccount
             }
         }
 
diff --git a/qml/pages/NotesPage.qml b/qml/pages/NotesPage.qml
index 1768032..0523a1a 100644
--- a/qml/pages/NotesPage.qml
+++ b/qml/pages/NotesPage.qml
@@ -88,7 +88,7 @@ Page {
 
         currentIndex: -1
 
-        model: notesModel
+        model: notesApp.model()
 
         delegate: BackgroundItem {
             id: note
diff --git a/src/apps/notes/notesapp.cpp b/src/apps/notes/notesapp.cpp
index a04175d..2f14b44 100644
--- a/src/apps/notes/notesapp.cpp
+++ b/src/apps/notes/notesapp.cpp
@@ -88,7 +88,7 @@ bool NotesApp::createNote(const QJsonObject& note, bool local) {
 }
 
 bool NotesApp::updateNote(const int id, const QJsonObject& note, bool local) {
-    qDebug() << "Updating note: " << id;
+    qDebug() << "Updating note:" << id;
     bool done = true;
     if (!m_notes.contains(QJsonValue(note))) {
         done = false;
@@ -156,7 +156,7 @@ void NotesApp::updateReply(QNetworkReply* reply) {
     QByteArray data = reply->readAll();
     //qDebug() << data;
     QJsonDocument json = QJsonDocument::fromJson(data);
-    qDebug() << json;
+    //qDebug() << json;
     if (json.isObject()) {
         QJsonObject obj = json.object();
         updateNote(obj.value("id").toInt(), obj, true);
diff --git a/translations/harbour-nextcloudnotes.ts b/translations/harbour-nextcloudnotes.ts
index d3d69a4..70d8403 100644
--- a/translations/harbour-nextcloudnotes.ts
+++ b/translations/harbour-nextcloudnotes.ts
@@ -912,27 +912,27 @@ You can also use other markdown syntax inside them.</source>
 <context>
     <name>harbour-nextcloudnotes</name>
     <message>
-        <location filename="../qml/harbour-nextcloudnotes.qml" line="115"/>
+        <location filename="../qml/harbour-nextcloudnotes.qml" line="116"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/harbour-nextcloudnotes.qml" line="116"/>
+        <location filename="../qml/harbour-nextcloudnotes.qml" line="117"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/harbour-nextcloudnotes.qml" line="117"/>
+        <location filename="../qml/harbour-nextcloudnotes.qml" line="118"/>
         <source>Synced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/harbour-nextcloudnotes.qml" line="131"/>
+        <location filename="../qml/harbour-nextcloudnotes.qml" line="132"/>
         <source>API error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/harbour-nextcloudnotes.qml" line="124"/>
+        <location filename="../qml/harbour-nextcloudnotes.qml" line="125"/>
         <source>File error</source>
         <translation type="unfinished"></translation>
     </message>