From f5410c1ffc88f394359c72ad67de8b39adb28262 Mon Sep 17 00:00:00 2001 From: Yuji Konishi Date: Tue, 9 Oct 2012 14:31:32 +0900 Subject: [PATCH] FOO --- .../EverClip/src/com/yuji/ec/utility/Encryption.java | 3 ++- workspace/EverClip/src/com/yuji/ec/utility/OAuthUtil.java | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/workspace/EverClip/src/com/yuji/ec/utility/Encryption.java b/workspace/EverClip/src/com/yuji/ec/utility/Encryption.java index 4e004d4..4a79a23 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/Encryption.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/Encryption.java @@ -128,7 +128,8 @@ public class Encryption { throws NoSuchAlgorithmException, InvalidKeySpecException { char[] password = generatePassword(context); - KeySpec keySpec = new PBEKeySpec(password, SALT, 1024, 256); + //KeySpec keySpec = new PBEKeySpec(password, SALT, 1024, 256); + KeySpec keySpec = new PBEKeySpec(password, SALT, 256, 64); SecretKeyFactory factory = SecretKeyFactory .getInstance("PBEWITHSHAAND256BITAES-CBC-BC"); SecretKey secretKey = factory.generateSecret(keySpec); diff --git a/workspace/EverClip/src/com/yuji/ec/utility/OAuthUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/OAuthUtil.java index 58caeb3..f816c3a 100644 --- a/workspace/EverClip/src/com/yuji/ec/utility/OAuthUtil.java +++ b/workspace/EverClip/src/com/yuji/ec/utility/OAuthUtil.java @@ -12,8 +12,12 @@ import com.evernote.client.oauth.android.EvernoteSession; import com.yuji.ec.common.Constant; public class OAuthUtil { + // 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 CONSUMER_KEY = "yuji-k64613"; - private static final String CONSUMER_SECRET = "98b2cbf35f747d2d"; private static final String APP_DATA_PATH = "/Android/data/com.yuji.ec/temp/"; private static final String EVERNOTE_HOST = "www.evernote.com"; @@ -21,6 +25,7 @@ public class OAuthUtil { private static final String APP_VERSION = "1.1.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, -- 2.11.0