aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/util/Util.java
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-09-08 10:20:35 -0700
committerScott Jackson <daneren2005@gmail.com>2015-09-08 10:20:35 -0700
commit53a8678ddf44cbcbfe7e411ee434a244ffb80689 (patch)
treebf32f5245d7a5c33bd8c15bcebc8c5b9a4698c4f /app/src/main/java/github/daneren2005/dsub/util/Util.java
parent0853f6721ae5eefb62b06a74d2b47b42a094a05c (diff)
downloaddsub-53a8678ddf44cbcbfe7e411ee434a244ffb80689.tar.gz
dsub-53a8678ddf44cbcbfe7e411ee434a244ffb80689.tar.bz2
dsub-53a8678ddf44cbcbfe7e411ee434a244ffb80689.zip
Remove md5 since it returns same values as md5Hex
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util/Util.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Util.java26
1 files changed, 1 insertions, 25 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java
index cee31112..ec73afa7 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -405,7 +405,7 @@ public final class Util {
Pair<String, String> values = tokens.get(instance);
if(values == null) {
String salt = new BigInteger(130, getRandom()).toString(32);
- String token = md5(password + salt);
+ String token = md5Hex(password + salt);
values = new Pair<>(salt, token);
tokens.put(instance, values);
}
@@ -936,30 +936,6 @@ public final class Util {
return new String(out);
}
- public static final String md5(final String s) {
- final String MD5 = "MD5";
- try {
- // Create MD5 Hash
- MessageDigest digest = java.security.MessageDigest.getInstance(MD5);
- digest.update(s.getBytes());
- byte messageDigest[] = digest.digest();
-
- // Create Hex String
- StringBuilder hexString = new StringBuilder();
- for (byte aMessageDigest : messageDigest) {
- String h = Integer.toHexString(0xFF & aMessageDigest);
- while (h.length() < 2)
- h = "0" + h;
- hexString.append(h);
- }
-
- return hexString.toString();
- } catch (NoSuchAlgorithmException e) {
- Log.e(TAG, "Can't execute md5", e);
- return "";
- }
- }
-
/**
* Calculates the MD5 digest and returns the value as a 32 character hex string.
*