Merge branch 'dev'

shalzz · Feb 12, 2016 · 16625d5 · 16625d5
2 parents 21f8267 + ab502ad
commit 16625d5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/attendance/src/main/AndroidManifest.xml b/attendance/src/main/AndroidManifest.xml
@@ -20,8 +20,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.shalzz.attendance"
-    android:versionCode="242"
-    android:versionName="2.4.2" >
+    android:versionCode="243"
+    android:versionName="2.4.3" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git 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
@@ -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);

diff --git a/attendance/src/main/res/values/strings.xml b/attendance/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
     <!--Semantic versioning: MAJOR.MINOR.PATCH-->
     <!-- DON'T update this for PATCH release -->
     <string name="user_version" translatable="false">2.4</string>
-    <string name="pref_version_summary" translatable="false">v2.4.2</string>
+    <string name="pref_version_summary" translatable="false">v2.4.3</string>
 
     <!--API keys-->
     <string name="test_banner_ad_unit_id" translatable="false">ca-app-pub-3940256099942544/6300978111</string>