Correct encrypted database issue where not all databases are encrypted.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / Global.java

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index b0da172..0ff914e 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -138,8 +138,6 @@ public class Global {
     public static boolean enableCarriageReturnFix = false;\r
     public static boolean enableHTMLEntitiesFix = false;\r
     \r
-    //public static String name = null;   \r
-    \r
     // Used to set & retrieve ini & Windows registry settings\r
     public static QSettings    settings;     // Set & get ini settings\r
     public static boolean isConnected;    // Are we connected to Evernote\r
@@ -1221,7 +1219,7 @@ public class Global {
     // get the url (full path) of the searchable word database\r
     public static String getIndexDatabaseUrl() {\r
                settings.beginGroup("General");\r
-               String val  = (String)settings.value("DatabaseURL", "");\r
+               String val  = (String)settings.value("IndexDatabaseURL", "");\r
                settings.endGroup();\r
                if (val.equals(""))\r
                        val = "jdbc:h2:"+Global.getFileManager().getDbDirPath(Global.indexDatabaseName);\r
@@ -1231,7 +1229,7 @@ public class Global {
     // Get the url (full path) of the attachment database\r
     public static String getResourceDatabaseUrl() {\r
                settings.beginGroup("General");\r
-               String val  = (String)settings.value("DatabaseURL", "");\r
+               String val  = (String)settings.value("ResourceDatabaseURL", "");\r
                settings.endGroup();\r
                if (val.equals(""))\r
                        val = "jdbc:h2:"+Global.getFileManager().getDbDirPath(Global.resourceDatabaseName);\r
@@ -1242,6 +1240,16 @@ public class Global {
                settings.setValue("DatabaseURL", value);\r
                settings.endGroup();\r
     }\r
+    public static void setIndexDatabaseUrl(String value) {\r
+               settings.beginGroup("General");\r
+               settings.setValue("IndexDatabaseURL", value);\r
+               settings.endGroup();\r
+    }\r
+    public static void setResourceDatabaseUrl(String value) {\r
+               settings.beginGroup("General");\r
+               settings.setValue("ResourceDatabaseURL", value);\r
+               settings.endGroup();\r
+    }\r
     public static String getDatabaseUserid() {\r
                settings.beginGroup("General");\r
                String val  = (String)settings.value("databaseUserid", "");\r
@@ -1951,5 +1959,6 @@ public class Global {
                return null;\r
     }\r
 \r
+\r
 }\r
 \r