From 95cd3070f0d6f91f9405805031326bae7500a17c Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Wed, 22 May 2013 13:51:22 -0400
Subject: [PATCH] - Upgrade to 1.6 - Remove comment preventing synced notebooks
 from working.  Oops. - Use new API key & oauth file.

---
 src/cx/fbn/nevernote/Global.java            | 4 ++--
 src/cx/fbn/nevernote/NeverNote.java         | 4 ++--
 src/cx/fbn/nevernote/oauth/OAuthWindow.java | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 89b5966..767a978 100644
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -63,8 +63,8 @@ import cx.fbn.nevernote.utilities.Pair;
 
 public class Global {
 	// Set current version and the known versions.
-	public static String version = "1.5";
-	public static String[] validVersions = {"1.5", "1.4", "1.3", "1.2", "1.1", "1.0", "0.99", "0.98", "0.97", "0.96"};
+	public static String version = "1.6";
+	public static String[] validVersions = {"1.6", "1.5", "1.4", "1.3", "1.2", "1.1", "1.0", "0.99", "0.98", "0.97", "0.96"};
     public static String username = ""; 
     //public static String password = "";     
     
diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 681df70..2769347 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -3468,7 +3468,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. 
 		}
@@ -3530,7 +3530,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/oauth/OAuthWindow.java b/src/cx/fbn/nevernote/oauth/OAuthWindow.java
index 128b2fe..e19fa3e 100644
--- a/src/cx/fbn/nevernote/oauth/OAuthWindow.java
+++ b/src/cx/fbn/nevernote/oauth/OAuthWindow.java
@@ -40,8 +40,13 @@ import cx.fbn.nevernote.Global;
 import cx.fbn.nevernote.utilities.ApplicationLogger;
 
 public class OAuthWindow extends QDialog {
-	private final static String consumerKey = "baumgarr"; 
-	private final static String consumerSecret = "60d4cdedb074b0ac";
+	// Old consumer key
+	//private final static String consumerKey = "baumgarr"; 
+	//private final static String consumerSecret = "60d4cdedb074b0ac";
+	
+	private final static String consumerKey = "baumgarr-3523"; 
+	private final static String consumerSecret = "8d5ee175f8a5d3ec";
+	
 	public String response;
 
 	private final String temporaryCredUrl;	  
-- 
2.11.0