From d97d5e6e7866c5ec0d31cf2dd982f1cd1ad163bd Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 1 Feb 2013 15:49:54 -0800
Subject: [PATCH] Remove all references to DigestUtils, replace with references
 to new MD5 code

---
 .../com/todoroo/astrid/actfm/sync/ActFmInvoker.java         | 1 -
 .../todoroo/astrid/producteev/api/ProducteevInvoker.java    | 6 ++++--
 .../com/todoroo/astrid/service/abtesting/ABTestInvoker.java | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index b3b1f40f1..f8cf829ad 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -241,7 +241,6 @@ public class ActFmInvoker {
         MD5 md5 = new MD5();
         md5.Update(sigBuilder.toString(), null);
         String signature = md5.asHex();
-//        String signature = DigestUtils.md5Hex(sigBuilder.toString());
         requestBuilder.append("sig").append('=').append(signature);
         return requestBuilder.toString();
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
index 2bc2cc827..dd1878b20 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/api/ProducteevInvoker.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -21,6 +20,7 @@ import org.json.JSONObject;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.utility.Pair;
+import com.twmacinta.util.MD5;
 
 @SuppressWarnings("nls")
 public class ProducteevInvoker {
@@ -657,7 +657,9 @@ public class ProducteevInvoker {
         }
 
         sigBuilder.append(apiSecret);
-        String signature = DigestUtils.md5Hex(sigBuilder.toString());
+        MD5 md5 = new MD5();
+        md5.Update(sigBuilder.toString(), null);
+        String signature = md5.asHex();
         requestBuilder.append("api_sig").append('=').append(signature);
         return requestBuilder.toString();
     }
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
index c4b93cc65..3c75eea7c 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
@@ -10,7 +10,6 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -25,6 +24,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.service.StatisticsService;
+import com.twmacinta.util.MD5;
 
 /**
  * Invoker for communicating with the Astrid Analytics server
@@ -116,7 +116,9 @@ public class ABTestInvoker {
         }
 
         sigBuilder.append(API_SECRET);
-        String signature = DigestUtils.md5Hex(sigBuilder.toString());
+        MD5 md5 = new MD5();
+        md5.Update(sigBuilder.toString(), null);
+        String signature = md5.asHex();
         params.add(new BasicNameValuePair("sig", signature));
 
         try {