Merge branch 'master' of https://github.com/Javran/Twidere-Android into Javran-master
Conflicts: .gitignore
This commit is contained in:
parent
7226b9954f
commit
c99e0e31da
|
@ -5,7 +5,6 @@
|
||||||
local.properties
|
local.properties
|
||||||
|
|
||||||
# Gradle generated files
|
# Gradle generated files
|
||||||
/gradle
|
|
||||||
.gradle/
|
.gradle/
|
||||||
|
|
||||||
# Signing files
|
# Signing files
|
||||||
|
|
Binary file not shown.
|
@ -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
|
|
@ -1294,8 +1294,12 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
|
||||||
if (twitter != null) {
|
if (twitter != null) {
|
||||||
try {
|
try {
|
||||||
final User user = twitter.destroyFriendship(user_id);
|
final User user = twitter.destroyFriendship(user_id);
|
||||||
final String where = Statuses.ACCOUNT_ID + " = " + account_id + " AND " + Statuses.USER_ID + " = "
|
// remove user tweets and retweets
|
||||||
+ user_id;
|
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);
|
mResolver.delete(Statuses.CONTENT_URI, where, null);
|
||||||
return SingleResponse.getInstance(user, null);
|
return SingleResponse.getInstance(user, null);
|
||||||
} catch (final TwitterException e) {
|
} catch (final TwitterException e) {
|
||||||
|
|
Loading…
Reference in New Issue