X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=workspace%2FEverMemo%2Fsrc%2Fcom%2Fyuji%2Fem%2Futility%2FOAuthUtil.java;fp=workspace%2FEverMemo%2Fsrc%2Fcom%2Fyuji%2Fem%2Futility%2FOAuthUtil.java;h=250de9616c28dd740807ec0f197bf3b666fccb2e;hb=3f7501c189fcf47cfdfb9a872d405e172a1b2567;hp=8a0e01419779b5c67c06fc9b33e2b62dd874d0de;hpb=52b2fb7b7da5c738d5308ff95e9685c8fdf589cd;p=evermemo%2Fsource.git

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/OAuthUtil.java b/workspace/EverMemo/src/com/yuji/em/utility/OAuthUtil.java
index 8a0e014..250de96 100644
--- a/workspace/EverMemo/src/com/yuji/em/utility/OAuthUtil.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/OAuthUtil.java
@@ -13,7 +13,11 @@ import com.yuji.em.common.Constant;
 
 public class OAuthUtil {
 	private static final String CONSUMER_KEY = "yuji-k64613";
-	private static final String CONSUMER_SECRET = "98b2cbf35f747d2d";
+	// TODO
+	// Debian
+	//private static final String CONSUMER_SECRET = "G5r7t1nHC+AIf6dYHuIVC7Jr/iVIMtgMZ0PObN6xV2Q=";
+	// Mac
+	private static final String CONSUMER_SECRET = "a/E89hlW9foWMh/ReopNucX+/WQ9WTs4YwvHP1cGH9s=" ;	
 	private static final String APP_DATA_PATH = "/Android/data/com.yuji.em/temp/";
 	private static final String EVERNOTE_HOST = "www.evernote.com";
 
@@ -21,6 +25,7 @@ public class OAuthUtil {
 	private static final String APP_VERSION = "1.0.0";
 
 	private static OAuthUtil instance = null;
+	private static String consumerSecret = null;
 	private EvernoteSession session;
 
 	public static OAuthUtil getInstance() {
@@ -35,8 +40,14 @@ public class OAuthUtil {
 	}
 
 	public EvernoteSession setupSession(Context context) {
+		if (consumerSecret == null){
+			Encryption en = Encryption.getInstance();
+			//String s = en.getEncrypted(context, "");
+			consumerSecret = en.getDecrypted(context, CONSUMER_SECRET);
+		}
+		
 		ApplicationInfo info = new ApplicationInfo(CONSUMER_KEY,
-				CONSUMER_SECRET, EVERNOTE_HOST, APP_NAME, APP_VERSION);
+				consumerSecret, EVERNOTE_HOST, APP_NAME, APP_VERSION);
 
 		// Retrieve persisted authentication information
 		session = new EvernoteSession(info,