Merge branch 'master' of http://git.code.sf.net/p/nevernote/code into develop

Conflicts:
	src/cx/fbn/nevernote/Global.java
	src/cx/fbn/nevernote/oauth/OAuthWindow.java
	src/cx/fbn/nevernote/threads/SyncRunner.java

diff --git a/changelog.txt b/changelog.txt
index 4dce289..5eac388 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,9 +1,15 @@
+NixNote (1.6) stable; urgency=high
+  * Correct minor bug with linked accounts.
+  * Switch to new authentication key per Evernote's request
+
 NixNote (1.5) stable; urgency=high
   * Correct bug causing repeted deletion errors on Evernote servers.
   * Correct bug causing notes to be marked as unsynchronized when tags have been updated.
   * Correct various oauth errors.
 
 NixNote (1.4) stable; urgency=low
+  * Corrected error synchronizing linked accounts.
+  * Switched to new authentication key per Evernote's request.
   * Added better proxy support for OAuth
   * Search text dialog box won't clear if clicking "all notes".
   * Tag names are taken into account when searching text (changed or new notes only).

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index fd74338..149c60a 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -234,8 +234,8 @@ public class Global {
                //messageLevel = 1;
                setMessageLevel(msglevel);
                keepRunning = true;  // Make sure child threads stay running
-               disableUploads = disableUploads();  // Should we upload anything?  Normally false.\r
-               //disableUploads = true;  //***** DELETE THIS LINE *******\r
+               disableUploads = disableUploads();  // Should we upload anything?  Normally false.
+               //disableUploads = true;  //***** DELETE THIS LINE *******
                enableCarriageReturnFix = enableCarriageReturnFix();  // Enable test fix?
                enableHTMLEntitiesFix = enableHtmlEntitiesFix();  // Enable test fix?
                
@@ -742,9 +742,9 @@ public class Global {
                settings.beginGroup("General");
                Integer len;
                try {
-                       len = (Integer)settings.value("recognitionWeight", 30);\r
+                       len = (Integer)settings.value("recognitionWeight", 30);
                } catch (Exception e) {
-                       len = 80;\r
+                       len = 80;
                }
                settings.endGroup();
                return len;

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 808138a..eb84dba 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -3680,7 +3680,7 @@ public class NeverNote extends QMainWindow{
        OAuthTokenizer tokenizer = new OAuthTokenizer();
        AESEncrypter aes = new AESEncrypter();
        try {
-                       aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("oauth.txt")));
+                       aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("oauthkey.txt")));
                } catch (FileNotFoundException e) {
                        // File not found, so we'll just get empty strings anyway. 
                }
@@ -3743,7 +3743,7 @@ public class NeverNote extends QMainWindow{
                }
                aes.setString(window.response);
                try {
-                               aes.encrypt(new FileOutputStream(Global.getFileManager().getHomeDirFile("oauth.txt")));
+                               aes.encrypt(new FileOutputStream(Global.getFileManager().getHomeDirFile("oauthkey.txt")));
                        } catch (FileNotFoundException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();

diff --git a/src/cx/fbn/nevernote/threads/SyncRunner.java b/src/cx/fbn/nevernote/threads/SyncRunner.java
index bff002a..15b993c 100644 (file)
--- a/src/cx/fbn/nevernote/threads/SyncRunner.java
+++ b/src/cx/fbn/nevernote/threads/SyncRunner.java
@@ -427,7 +427,7 @@ public class SyncRunner extends QObject implements Runnable {
                        //*****************************************
                        //* Sync linked/shared notebooks 
                        //*****************************************
-                       //syncLinkedNotebooks();
+                       syncLinkedNotebooks();
                        //conn.getNoteTable().getDirty();
                        //disableUploads = true;   /// DELETE THIS LINE!!!!
                        if (!disableUploads) {
@@ -495,22 +495,22 @@ public class SyncRunner extends QObject implements Runnable {
                        try {
                                if (expunged.get(i).type.equalsIgnoreCase("TAG")) {
                                        logger.log(logger.EXTREME, "Tag expunged");
-                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "TAG"); \r
+                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "TAG"); 
                                        updateSequenceNumber = noteStore.expungeTag(authToken, expunged.get(i).guid);
                                        conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);
                                        conn.getSyncTable().setLastSequenceDate(sequenceDate);
-                                       conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);                              \r
+                                       conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);                              
                                }
                                if      (expunged.get(i).type.equalsIgnoreCase("NOTEBOOK")) {
                                        logger.log(logger.EXTREME, "Notebook expunged");
-                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "NOTEBOOK");\r
+                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "NOTEBOOK");
                                        updateSequenceNumber = noteStore.expungeNotebook(authToken, expunged.get(i).guid);
                                        conn.getSyncTable().setLastSequenceDate(sequenceDate);
                                        conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);
                                }
                                if (expunged.get(i).type.equalsIgnoreCase("NOTE")) {
                                        logger.log(logger.EXTREME, "Note expunged");
-                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "NOTE");\r
+                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "NOTE");
                                        updateSequenceNumber = noteStore.deleteNote(authToken, expunged.get(i).guid);
                                        refreshNeeded = true;
                                        conn.getSyncTable().setLastSequenceDate(sequenceDate);
@@ -518,7 +518,7 @@ public class SyncRunner extends QObject implements Runnable {
                                }
                                if (expunged.get(i).type.equalsIgnoreCase("SAVEDSEARCH")) {
                                        logger.log(logger.EXTREME, "saved search expunged");
-                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "SAVEDSEARCH");\r
+                                       conn.getDeletedTable().expungeDeletedItem(expunged.get(i).guid, "SAVEDSEARCH");
                                        updateSequenceNumber = noteStore.expungeSearch(authToken, expunged.get(i).guid);
                                        conn.getSyncTable().setLastSequenceDate(sequenceDate);
                                        conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);
@@ -563,11 +563,11 @@ public class SyncRunner extends QObject implements Runnable {
                        Note enNote = notes.get(i);
                        try {
                                if (enNote.getUpdateSequenceNum() > 0 && (enNote.isActive() == false || enNote.getDeleted() > 0)) {
-                                       // Check that the note is valid.  \r
-                                       if (enNote.isActive() == true || enNote.getDeleted() == 0) {\r
-                                               conn.getNoteTable().deleteNote(enNote.getGuid());\r
-                                               enNote = conn.getNoteTable().getNote(enNote.getGuid(), false, false, false, false, false);\r
-                                       }\r
+                                       // Check that the note is valid.  
+                                       if (enNote.isActive() == true || enNote.getDeleted() == 0) {
+                                               conn.getNoteTable().deleteNote(enNote.getGuid());
+                                               enNote = conn.getNoteTable().getNote(enNote.getGuid(), false, false, false, false, false);
+                                       }
                                        if (syncDeletedContent) {
                                                logger.log(logger.EXTREME, "Deleted note found & synch content selected");
                                                Note delNote = conn.getNoteTable().getNote(enNote.getGuid(), true, true, true, true, true);
@@ -588,7 +588,7 @@ public class SyncRunner extends QObject implements Runnable {
                                        conn.getSyncTable().setUpdateSequenceNumber(updateSequenceNumber);
                                }                               
                        } catch (EDAMUserException e) {
-                               logger.log(logger.LOW, "*** EDAM User Excepton syncLocalNotes "+e);\r
+                               logger.log(logger.LOW, "*** EDAM User Excepton syncLocalNotes "+e);
                                //status.message.emit("Error sending local note: " +e.getParameter());
                                //logger.log(logger.LOW, e.toString()); 
                                //error = true;
@@ -601,7 +601,7 @@ public class SyncRunner extends QObject implements Runnable {
                                logger.log(logger.LOW, e.toString());           
                                error = true;
                        } catch (EDAMNotFoundException e) {
-                               logger.log(logger.LOW, "*** EDAM Not Found Excepton syncLocalNotes " +e);\r
+                               logger.log(logger.LOW, "*** EDAM Not Found Excepton syncLocalNotes " +e);
                                //status.message.emit("Error deleting local note: " +e +" - Continuing");
                                //logger.log(logger.LOW, e.toString());         
                                //error = true;
@@ -1057,7 +1057,7 @@ public class SyncRunner extends QObject implements Runnable {
                logger.log(logger.HIGH, "Entering SyncRunner.syncRemoteToLocal");
 
                List<Note> dirtyNotes = conn.getNoteTable().getDirty();
-               dirtyNoteGuids = new ArrayList<String>();\r
+               dirtyNoteGuids = new ArrayList<String>();
                for (int i=0; i<dirtyNotes.size() && keepRunning; i++) {
                        dirtyNoteGuids.add(dirtyNotes.get(i).getGuid());
                }
@@ -1159,10 +1159,10 @@ public class SyncRunner extends QObject implements Runnable {
                                        conn.getNoteTable().updateNoteSequence(guid.get(i), 0);
                                        notebookGuid = localNote.getNotebookGuid();
                                }
-                               // If the note is in a local notebook (which means we moved it) or if the \r
-                               // note returned is null (which means it is already deleted or flagged expunged) \r
-                               // we delete it.\r
-                               if (!conn.getNotebookTable().isNotebookLocal(notebookGuid) || localNote == null) {\r
+                               // If the note is in a local notebook (which means we moved it) or if the 
+                               // note returned is null (which means it is already deleted or flagged expunged) 
+                               // we delete it.
+                               if (!conn.getNotebookTable().isNotebookLocal(notebookGuid) || localNote == null) {
                                        logger.log(logger.EXTREME, "Expunging local note from database");
                                        conn.getNoteTable().expungeNote(guid.get(i), true, false);
                                }
@@ -1314,17 +1314,17 @@ public class SyncRunner extends QObject implements Runnable {
        }
        // Sync remote notes
        private void syncRemoteNotes(Client noteStore, List<Note> note, boolean fullSync, String token) {
-\r
+
                if (note != null) {
-                       \r
-                       logger.log(logger.EXTREME, "Entering SyncRunner.syncRemoteNotes");\r
-                       logger.log(logger.LOW, "Local Dirty Notes: ");\r
-                       logger.log(logger.LOW, "Remote Dirty Notes:");\r
-                       for (int i=0; i<note.size();i++) {\r
-                               logger.log(logger.LOW, i +" : " +note.get(i).getGuid() + " : " +note.get(i).getTitle() );\r
-                       }\r
-                       logger.log(logger.LOW, "---");\r
-                       \r
+                       
+                       logger.log(logger.EXTREME, "Entering SyncRunner.syncRemoteNotes");
+                       logger.log(logger.LOW, "Local Dirty Notes: ");
+                       logger.log(logger.LOW, "Remote Dirty Notes:");
+                       for (int i=0; i<note.size();i++) {
+                               logger.log(logger.LOW, i +" : " +note.get(i).getGuid() + " : " +note.get(i).getTitle() );
+                       }
+                       logger.log(logger.LOW, "---");
+                       
                        for (int i=0; i<note.size() && keepRunning; i++) {
                                Note n = getEvernoteNote(noteStore, note.get(i).getGuid(), true, fullSync, true,true, token);
                                syncRemoteNote(n, fullSync, token);
@@ -1345,7 +1345,7 @@ public class SyncRunner extends QObject implements Runnable {
                        // are different we move the local copy to a local notebook (making sure
                        // to copy all resources) and we accept the new one.                    
                        boolean conflictingNote = true;
-                       logger.log(logger.EXTREME, "Checking for duplicate note " +n.getGuid() +" : " +n.getTitle());\r
+                       logger.log(logger.EXTREME, "Checking for duplicate note " +n.getGuid() +" : " +n.getTitle());
                        if (dirtyNoteGuids != null && dirtyNoteGuids.contains(n.getGuid())) { 
                                logger.log(logger.EXTREME, "Conflict check beginning");
                                conflictingNote = checkForConflict(n);
@@ -1452,13 +1452,13 @@ public class SyncRunner extends QObject implements Runnable {
                logger.log(logger.EXTREME, "Checking note sequence number  " +n.getGuid());
                Note oldNote = conn.getNoteTable().getNote(n.getGuid(), false, false, false, false, false);
                logger.log(logger.EXTREME, "Local/Remote sequence numbers: " +oldNote.getUpdateSequenceNum()+"/"+n.getUpdateSequenceNum());
-               logger.log(logger.LOW, "Remote Note Title:" +n.getTitle());\r
-               logger.log(logger.LOW, "Local Note Title:" +oldNote.getTitle());\r
-               if (oldNote.getUpdateSequenceNum() == n.getUpdateSequenceNum()) {\r
-                       return false;\r
-               } \r
-               boolean oldIsDirty = conn.getNoteTable().isNoteDirty(n.getGuid());\r
-               if (!oldIsDirty) \r
+               logger.log(logger.LOW, "Remote Note Title:" +n.getTitle());
+               logger.log(logger.LOW, "Local Note Title:" +oldNote.getTitle());
+               if (oldNote.getUpdateSequenceNum() == n.getUpdateSequenceNum()) {
+                       return false;
+               } 
+               boolean oldIsDirty = conn.getNoteTable().isNoteDirty(n.getGuid());
+               if (!oldIsDirty) 
                        return false;
                return true;
        }
@@ -1640,15 +1640,15 @@ public class SyncRunner extends QObject implements Runnable {
            //if (authResult != null) {
                //user = authResult.getUser(); 
                //authToken = authResult.getAuthenticationToken(); 
-           if (user == null || noteStoreUrlBase == null) {\r
-               logger.log(logger.LOW, "Error retrieving user information.  Aborting.");\r
-               System.err.println("Error retrieving user information.");\r
-               isConnected = false;    \r
-                       QMessageBox mb = new QMessageBox(QMessageBox.Icon.Critical, tr("Connection Error"), tr("Error retrieving user information.  Synchronization not complete"));\r
-                       mb.exec();\r
-                       return false;\r
-               \r
-           }\r
+           if (user == null || noteStoreUrlBase == null) {
+               logger.log(logger.LOW, "Error retrieving user information.  Aborting.");
+               System.err.println("Error retrieving user information.");
+               isConnected = false;    
+                       QMessageBox mb = new QMessageBox(QMessageBox.Icon.Critical, tr("Connection Error"), tr("Error retrieving user information.  Synchronization not complete"));
+                       mb.exec();
+                       return false;
+               
+           }
                noteStoreUrl = noteStoreUrlBase + user.getShardId();
                syncSignal.saveAuthToken.emit(authToken);
                syncSignal.saveNoteStore.emit(localNoteStore);
@@ -2048,7 +2048,7 @@ public class SyncRunner extends QObject implements Runnable {
                        return;
                List<Note> dirtyNotes = conn.getNoteTable().getDirtyLinkedNotes();
                if (dirtyNoteGuids == null) 
-                       dirtyNoteGuids = new ArrayList<String>();\r
+                       dirtyNoteGuids = new ArrayList<String>();
 
                for (int i=0; i<dirtyNotes.size() && keepRunning; i++) {
                        dirtyNoteGuids.add(dirtyNotes.get(i).getGuid());