Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2024-12-22 05:30:05 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Mariotaku Lee 2014-09-23 11:55:57 +08:00
parent 7226b9954f
commit c99e0e31da
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

6
gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@ -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

8
twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
View File

@ -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) {