diff --git a/.gitignore b/.gitignore
index 011501c22..e7448a5d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
.idea/workspace.xml
out/
+proguard_logs/
+*.apk
*~
.DS_Store
diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
deleted file mode 100644
index 1fa955d41..000000000
--- a/.idea/libraries/commons_codec.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/gcm.xml b/.idea/libraries/gcm.xml
deleted file mode 100644
index a12ddc69e..000000000
--- a/.idea/libraries/gcm.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/astrid.iml b/astrid/astrid.iml
index 0f4cb1d07..7412fe54d 100644
--- a/astrid/astrid.iml
+++ b/astrid/astrid.iml
@@ -15,6 +15,7 @@
+
@@ -25,7 +26,6 @@
-
@@ -36,7 +36,6 @@
-
diff --git a/astrid/libs/commons-codec-1.3.jar b/astrid/libs/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752a..000000000
Binary files a/astrid/libs/commons-codec-1.3.jar and /dev/null differ
diff --git a/astrid/libs/gcm-src.jar b/astrid/libs/gcm-src.jar
deleted file mode 100644
index e2d9b43e9..000000000
Binary files a/astrid/libs/gcm-src.jar and /dev/null differ
diff --git a/astrid/libs/gcm.jar b/astrid/libs/gcm.jar
deleted file mode 100644
index ac109a830..000000000
Binary files a/astrid/libs/gcm.jar and /dev/null differ
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 b20cac068..58bade02a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -15,14 +15,12 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.TimeZone;
-import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpEntity;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.StringBody;
import org.json.JSONException;
import org.json.JSONObject;
-import android.text.TextUtils;
import android.util.Log;
import org.astrid.R;
@@ -315,8 +313,8 @@ public class ActFmInvoker {
}
sigBuilder.append(APP_SECRET);
- String signature = DigestUtils.md5Hex(sigBuilder.toString());
- requestBuilder.append("sig").append('=').append(signature);
+// String signature = DigestUtils.md5Hex(sigBuilder.toString());
+// requestBuilder.append("sig").append('=').append(signature);
return requestBuilder.toString();
}
diff --git a/astrid/res/layout/billing_activity.xml b/astrid/res/layout/billing_activity.xml
deleted file mode 100644
index a7837a29e..000000000
--- a/astrid/res/layout/billing_activity.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
deleted file mode 100644
index 130c8dc50..000000000
--- a/astrid/res/layout/control_set_assigned.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/no_members_text_view.xml b/astrid/res/layout/no_members_text_view.xml
deleted file mode 100644
index 35571a8b0..000000000
--- a/astrid/res/layout/no_members_text_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/oauth_login_activity.xml b/astrid/res/layout/oauth_login_activity.xml
deleted file mode 100644
index 1a334a3cb..000000000
--- a/astrid/res/layout/oauth_login_activity.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/update_message_link.xml b/astrid/res/layout/update_message_link.xml
deleted file mode 100644
index 018f37067..000000000
--- a/astrid/res/layout/update_message_link.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/web_service_amazon_row.xml b/astrid/res/layout/web_service_amazon_row.xml
deleted file mode 100644
index 934d802c8..000000000
--- a/astrid/res/layout/web_service_amazon_row.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/web_service_row.xml b/astrid/res/layout/web_service_row.xml
deleted file mode 100644
index ee7cf18cd..000000000
--- a/astrid/res/layout/web_service_row.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/web_services_load_button.xml b/astrid/res/layout/web_services_load_button.xml
deleted file mode 100644
index 67ef2801d..000000000
--- a/astrid/res/layout/web_services_load_button.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
index 4a14d7292..76940e502 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;
@@ -23,7 +22,6 @@ import org.json.JSONObject;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.RestClient;
-import com.todoroo.andlib.utility.Preferences;
/**
* Invoker for communicating with the Astrid Analytics server
@@ -102,8 +100,8 @@ public class ABTestInvoker {
}
sigBuilder.append(API_SECRET);
- String signature = DigestUtils.md5Hex(sigBuilder.toString());
- params.add(new BasicNameValuePair("sig", signature));
+// String signature = DigestUtils.md5Hex(sigBuilder.toString());
+// params.add(new BasicNameValuePair("sig", signature));
try {
return new UrlEncodedFormEntity(params, HTTP.UTF_8);
diff --git a/bin/find-unused-drawables.sh b/bin/find-unused-drawables.sh
index 36960682a..185c331ac 100755
--- a/bin/find-unused-drawables.sh
+++ b/bin/find-unused-drawables.sh
@@ -1,16 +1,15 @@
#!/bin/bash
-PROJECT=$(cd `dirname $0`/../astrid; pwd)
-for file in $(ls $PROJECT/res/drawable -l | awk '{ print $8}' | sed 's/\..\+//g'); do
- count=0;
- for SRCFILE in `find $PROJECT -name "*.xml" -print 2> /dev/null`; do
- let "count+=$(grep -c @drawable/$file $SRCFILE)";
- done
- for SRCFILE in `find $PROJECT -name "*.java" -print 2> /dev/null`; do
- let "count+=$(grep -c R.drawable.$file $SRCFILE)";
- done;
- if [ $count -lt 1 ]; then
- echo -e "\e[0;31m$file\e[0m not used";
- else
- echo -e "\e[0;32m$file\e[0m used";
- fi;
-done;
+#PATH="../astrid/res/drawable"
+for file in $(ls -l ../astrid/res/drawable | awk '{ print $9}' | sed 's/\..\+//g'); do
+ if [ ! -f ../astrid/res/drawable/${file} ]; then
+ continue
+ fi;
+ filename=`basename ${file}`
+ filename=${filename%.*}
+ git grep -q ${filename} ..
+ if [ $? -ne 0 ]; then
+ echo -e "${file} not used"
+ fi;
+done;
+ #let "count+=$(grep -c @drawable/$file $SRCFILE)";
+ #let "count+=$(grep -c R.drawable.$file $SRCFILE)";
diff --git a/bin/find-unused-layouts.sh b/bin/find-unused-layouts.sh
new file mode 100755
index 000000000..a7c4eed25
--- /dev/null
+++ b/bin/find-unused-layouts.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+PROJECT=$(cd `dirname $0`/..; pwd)
+pushd ${PROJECT}
+echo ${PROJECT}
+path=astrid/res/layout
+for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do
+ if [ ! -f ${path}/${file} ]; then
+ continue
+ fi;
+ filename=`basename ${file}`
+ filename=${filename%.*}
+ git grep -q ${filename}
+ if [ $? -ne 0 ]; then
+ echo -e "${file} not used"
+ fi;
+done;
+popd