arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-05-11 03:18:48 +00:00
Code Issues Releases Wiki Activity

JournalManager: rename Helpers to Crypto.

Browse Source 
These are crypto helpers, this should have been named this way from the start.
This commit is contained in:
Tom Hacohen 2017-03-29 12:11:08 +01:00
parent 225d01c143
commit 0fbee1ea02
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.java
View File

@ -19,7 +19,7 @@ import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import static com.etesync.syncadapter.journalmanager.Helpers.hmac; import static com.etesync.syncadapter.journalmanager.Crypto.hmac;
abstract class BaseManager { abstract class BaseManager {
final static protected MediaType JSON = MediaType.parse("application/json; charset=utf-8"); final static protected MediaType JSON = MediaType.parse("application/json; charset=utf-8");
@ -77,12 +77,12 @@ abstract class BaseManager {
public String getContent(String keyBase64) { public String getContent(String keyBase64) {
// FIXME: probably cache encryption object // FIXME: probably cache encryption object
return new String(new Helpers.Cipher().decrypt(keyBase64, content), Charsets.UTF_8); return new String(new Crypto.Cipher().decrypt(keyBase64, content), Charsets.UTF_8);
} }
void setContent(String keyBase64, String content) { void setContent(String keyBase64, String content) {
// FIXME: probably cache encryption object // FIXME: probably cache encryption object
this.content = new Helpers.Cipher().encrypt(keyBase64, content.getBytes(Charsets.UTF_8)); this.content = new Crypto.Cipher().encrypt(keyBase64, content.getBytes(Charsets.UTF_8));
} }
byte[] calculateHmac(String keyBase64, String uuid) { byte[] calculateHmac(String keyBase64, String uuid) {

6
app/src/main/java/com/etesync/syncadapter/journalmanager/Helpers.java → app/src/main/java/com/etesync/syncadapter/journalmanager/Crypto.java
View File

@ -23,7 +23,7 @@ import java.util.Arrays;
import com.etesync.syncadapter.App; import com.etesync.syncadapter.App;
public class Helpers { public class Crypto {
// FIXME: This should be somewhere else // FIXME: This should be somewhere else
public static String deriveKey(String salt, String password) { public static String deriveKey(String salt, String password) {
final int keySize = 190; final int keySize = 190;
@ -123,7 +123,7 @@ public class Helpers {
return sha256(base.getBytes(Charsets.UTF_8)); return sha256(base.getBytes(Charsets.UTF_8));
} }
static String sha256(byte[] base) { private static String sha256(byte[] base) {
SHA256Digest digest = new SHA256Digest(); SHA256Digest digest = new SHA256Digest();
digest.update(base, 0, base.length); digest.update(base, 0, base.length);
byte[] ret = new byte[digest.getDigestSize()]; byte[] ret = new byte[digest.getDigestSize()];
@ -131,7 +131,7 @@ public class Helpers {
return toHex(ret); return toHex(ret);
} }
public static String toHex(byte[] bytes) { static String toHex(byte[] bytes) {
return Hex.toHexString(bytes).toLowerCase(); return Hex.toHexString(bytes).toLowerCase();
} }
} }

2
app/src/main/java/com/etesync/syncadapter/journalmanager/JournalEntryManager.java
View File

@ -109,7 +109,7 @@ public class JournalEntryManager extends BaseManager {
uuid = previous.getUuid(); uuid = previous.getUuid();
} }
return Helpers.toHex(calculateHmac(keyBase64, uuid)); return Crypto.toHex(calculateHmac(keyBase64, uuid));
} }
} }

4
app/src/main/java/com/etesync/syncadapter/journalmanager/JournalManager.java
View File

@ -17,8 +17,8 @@ import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
import static com.etesync.syncadapter.journalmanager.Helpers.sha256; import static com.etesync.syncadapter.journalmanager.Crypto.sha256;
import static com.etesync.syncadapter.journalmanager.Helpers.toHex; import static com.etesync.syncadapter.journalmanager.Crypto.toHex;
public class JournalManager extends BaseManager { public class JournalManager extends BaseManager {
final static private Type journalType = new TypeToken<List<Journal>>() { final static private Type journalType = new TypeToken<List<Journal>>() {

4
app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java
View File

@ -33,7 +33,7 @@ import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants; import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.InvalidAccountException; import com.etesync.syncadapter.InvalidAccountException;
import com.etesync.syncadapter.R; import com.etesync.syncadapter.R;
import com.etesync.syncadapter.journalmanager.Helpers; import com.etesync.syncadapter.journalmanager.Crypto;
import com.etesync.syncadapter.model.CollectionInfo; import com.etesync.syncadapter.model.CollectionInfo;
import com.etesync.syncadapter.model.JournalEntity; import com.etesync.syncadapter.model.JournalEntity;
import com.etesync.syncadapter.model.ServiceDB; import com.etesync.syncadapter.model.ServiceDB;
@ -112,7 +112,7 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
@Override @Override
public Configuration loadInBackground() { public Configuration loadInBackground() {
config.password = Helpers.deriveKey(config.userName, config.rawPassword); config.password = Crypto.deriveKey(config.userName, config.rawPassword);
return config; return config;
} }
} }