From c8dd96ed0580c8b1405a35eccbacb635fcca0323 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Fri, 12 Feb 2016 18:57:59 +0530 Subject: [PATCH 1/2] MD5: re-add removed trailing 0's --- .../src/main/java/com/shalzz/attendance/Miscellaneous.java | 7 ++++++- .../com/shalzz/attendance/controllers/UserAccount.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/attendance/src/main/java/com/shalzz/attendance/Miscellaneous.java b/attendance/src/main/java/com/shalzz/attendance/Miscellaneous.java index c5d5a439..77fc6f01 100644 --- a/attendance/src/main/java/com/shalzz/attendance/Miscellaneous.java +++ b/attendance/src/main/java/com/shalzz/attendance/Miscellaneous.java @@ -176,7 +176,12 @@ public static String md5(String s) { } m.update(s.getBytes(),0,s.length()); - return new BigInteger(1, m.digest()).toString(16); + String hashtext = new BigInteger(1,m.digest()).toString(16); + // Now we need to zero pad it if you actually want the full 32 chars. + while(hashtext.length() < 32 ){ + hashtext = "0"+hashtext; + } + return hashtext; } /** diff --git a/attendance/src/main/java/com/shalzz/attendance/controllers/UserAccount.java b/attendance/src/main/java/com/shalzz/attendance/controllers/UserAccount.java index d251b7c7..19ea0b70 100644 --- a/attendance/src/main/java/com/shalzz/attendance/controllers/UserAccount.java +++ b/attendance/src/main/java/com/shalzz/attendance/controllers/UserAccount.java @@ -29,6 +29,7 @@ import com.android.volley.Response; import com.android.volley.VolleyError; +import com.shalzz.attendance.BuildConfig; import com.shalzz.attendance.DatabaseHandler; import com.shalzz.attendance.Miscellaneous; import com.shalzz.attendance.activity.LoginActivity; @@ -66,6 +67,8 @@ public UserAccount(Context context) { */ public void Login(final String username, final String password) { + if(BuildConfig.DEBUG) + Log.d("User Account",Miscellaneous.md5(password)); String creds = String.format("%s:%s", username, Miscellaneous.md5(password)); misc.showProgressDialog("Logging in...", false, pdCancelListener()); DataAPI.getUser( loginSuccessListener(), myErrorListener(), creds); From ab502ad8aff0b0f87af6c5cdf43a019373030270 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Fri, 12 Feb 2016 19:06:33 +0530 Subject: [PATCH 2/2] Patch release v2.4.3 --- attendance/src/main/AndroidManifest.xml | 4 ++-- attendance/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/attendance/src/main/AndroidManifest.xml b/attendance/src/main/AndroidManifest.xml index 054d6382..718c84f0 100644 --- a/attendance/src/main/AndroidManifest.xml +++ b/attendance/src/main/AndroidManifest.xml @@ -20,8 +20,8 @@ + android:versionCode="243" + android:versionName="2.4.3" > diff --git a/attendance/src/main/res/values/strings.xml b/attendance/src/main/res/values/strings.xml index 514b5986..9b203505 100644 --- a/attendance/src/main/res/values/strings.xml +++ b/attendance/src/main/res/values/strings.xml @@ -26,7 +26,7 @@ 2.4 - v2.4.2 + v2.4.3 ca-app-pub-3940256099942544/6300978111