Merge branch 'master' of https://github.com/Javran/Twidere-Android into Javran-master

Conflicts:
	.gitignore

.gitignore

@@ -5,7 +5,6 @@
 local.properties
 
 # Gradle generated files
-/gradle
 .gradle/
 
 # Signing files

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java

@@ -1294,8 +1294,12 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
 			if (twitter != null) {
 				try {
 					final User user = twitter.destroyFriendship(user_id);
-					final String where = Statuses.ACCOUNT_ID + " = " + account_id + " AND " + Statuses.USER_ID + " = "
-							+ user_id;
+					// remove user tweets and retweets
+					final String where
+							= Statuses.ACCOUNT_ID + " = " + account_id
+							+ " AND (" + Statuses.USER_ID + " = " + user_id
+							+ " OR " + Statuses.RETWEETED_BY_USER_ID + " = " + user_id
+							+ ")";
 					mResolver.delete(Statuses.CONTENT_URI, where, null);
 					return SingleResponse.getInstance(user, null);
 				} catch (final TwitterException e) {