Remove all references to DigestUtils, replace with references to new MD5 code

pull/14/head
Sam Bosley 13 years ago
parent df5d9e25af
commit d97d5e6e78

@ -241,7 +241,6 @@ public class ActFmInvoker {
MD5 md5 = new MD5(); MD5 md5 = new MD5();
md5.Update(sigBuilder.toString(), null); md5.Update(sigBuilder.toString(), null);
String signature = md5.asHex(); String signature = md5.asHex();
// String signature = DigestUtils.md5Hex(sigBuilder.toString());
requestBuilder.append("sig").append('=').append(signature); requestBuilder.append("sig").append('=').append(signature);
return requestBuilder.toString(); return requestBuilder.toString();
} }

@ -13,7 +13,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.codec.digest.DigestUtils;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -21,6 +20,7 @@ import org.json.JSONObject;
import android.text.TextUtils; import android.text.TextUtils;
import com.todoroo.andlib.utility.Pair; import com.todoroo.andlib.utility.Pair;
import com.twmacinta.util.MD5;
@SuppressWarnings("nls") @SuppressWarnings("nls")
public class ProducteevInvoker { public class ProducteevInvoker {
@ -657,7 +657,9 @@ public class ProducteevInvoker {
} }
sigBuilder.append(apiSecret); 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); requestBuilder.append("api_sig").append('=').append(signature);
return requestBuilder.toString(); return requestBuilder.toString();
} }

@ -10,7 +10,6 @@ import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity; 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.service.RestClient;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.StatisticsService;
import com.twmacinta.util.MD5;
/** /**
* Invoker for communicating with the Astrid Analytics server * Invoker for communicating with the Astrid Analytics server
@ -116,7 +116,9 @@ public class ABTestInvoker {
} }
sigBuilder.append(API_SECRET); 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)); params.add(new BasicNameValuePair("sig", signature));
try { try {

Loading…
Cancel
Save