From: Nick Clarke <memorius@gmail.com>
Date: Mon, 19 Jul 2010 15:04:18 +0000 (+1200)
Subject: Change generation of files/paths in home dir to use FileManager
X-Git-Tag: version0.1.1~442
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=abc74d82922cc69ae096c6bc9111bbd0c134cdce;hp=77a42db3804daa3199c0b7e4ab8fe612396c93a3

Change generation of files/paths in home dir to use FileManager
---

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 3153cd9..7af20d5 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -873,7 +873,8 @@ public class NeverNote extends QMainWindow{
 */
 	}
 	private void unlockApplication() {
-		String fileName = Global.currentDir +"nevernote.lock";
+	        // NFC TODO: should this be removed? Looks like H2 now handles the locking, which it will clean up itself. See #lockApplication.
+		String fileName = Global.getFileManager().getHomeDirPath("nevernote.lock");
 		if (QFile.exists(fileName)) {
 			QFile.remove(fileName);
 		}
@@ -1846,7 +1847,7 @@ public class NeverNote extends QMainWindow{
 		QTextEdit textBox = new QTextEdit();
 		layout.addWidget(textBox);
 		textBox.setReadOnly(true);
-		QFile file = new QFile(Global.getDirectoryPath()+"release.txt");
+		QFile file = new QFile(Global.getFileManager().getHomeDirPath("release.txt"));
 		if (!file.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly,
                 QIODevice.OpenModeFlag.Text)))
 			return;
@@ -2238,7 +2239,7 @@ public class NeverNote extends QMainWindow{
     	
     	AESEncrypter aes = new AESEncrypter();
     	try {
-			aes.decrypt(new FileInputStream(Global.getDirectoryPath()+"secure.txt"));
+			aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("secure.txt")));
 		} catch (FileNotFoundException e) {
 			// File not found, so we'll just get empty strings anyway. 
 		}
diff --git a/src/cx/fbn/nevernote/dialog/ConfigDialog.java b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
index a4b8eea..ab985b8 100644
--- a/src/cx/fbn/nevernote/dialog/ConfigDialog.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
@@ -136,7 +136,7 @@ public class ConfigDialog extends QDialog {
 		Global.setTagBehavior(appearancePage.getTagBehavior());
     	FileOutputStream out = null;
 		try {
-			out = new FileOutputStream(Global.getDirectoryPath()+"secure.txt");
+			out = new FileOutputStream(Global.getFileManager().getHomeDirFile("secure.txt"));
 		} catch (FileNotFoundException e) {
 			// if it isn't found we'll write it.
 		}
@@ -278,7 +278,7 @@ public class ConfigDialog extends QDialog {
 		if (Global.username.equalsIgnoreCase("") || Global.password.equalsIgnoreCase("")) {
 	    	AESEncrypter aes = new AESEncrypter();
 	    	try {
-				aes.decrypt(new FileInputStream(Global.getDirectoryPath()+"secure.txt"));
+				aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("secure.txt")));
 			} catch (FileNotFoundException e) {
 				// File not found, so we'll just get empty strings anyway. 
 			}
diff --git a/src/cx/fbn/nevernote/gui/ShortcutKeys.java b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
index 8adc9a8..920f560 100644
--- a/src/cx/fbn/nevernote/gui/ShortcutKeys.java
+++ b/src/cx/fbn/nevernote/gui/ShortcutKeys.java
@@ -273,7 +273,7 @@ public class ShortcutKeys {
 	
 	// Read in the custom keys (if they exist)
 	private void loadCustomKeys() {
-		File file = new File(Global.getDirectoryPath()+"shortcuts.txt");
+		File file = Global.getFileManager().getHomeDirFile("shortcuts.txt");
 		try {
 			Scanner scanner = new Scanner(file);
 			while ( scanner.hasNextLine() ){