diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml index 3136cdc2..1c4e73a9 100644 --- a/android/clientbeta/AndroidManifest.xml +++ b/android/clientbeta/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="1.4.0_b2"> diff --git a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java index 74b4eb21..4f79163e 100644 --- a/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java +++ b/android/libraries/SocialNetLib/src/org/tweetalib/android/TwitterModifyStatuses.java @@ -123,7 +123,7 @@ public void setWorkerCallbacks(ModifyStatusesWorkerCallbacks callbacks) { */ /* - * + * */ FinishedCallback getModifyStatusesCallback(Integer callbackHandle) { return mFinishedCallbackMap.get(callbackHandle); @@ -258,14 +258,13 @@ protected ModifyStatusesTaskOutput doInBackground(ModifyStatusesTaskInput... inp if (input.mStatuses != null) { for (int i = 0; i < input.mStatuses.getStatusCount(); i++) { TwitterStatus twitterStatus = input.mStatuses.getStatus(i); - if (twitterStatus.mIsFavorited != favorite) { - AdnPost post = appdotnetApi.setAdnFavorite(twitterStatus.mId, favorite); - if (post != null) { - twitterStatus = new TwitterStatus(post); - twitterStatus.setFavorite(favorite); - contentFeed.add(twitterStatus); - } + AdnPost post = appdotnetApi.setAdnFavorite(twitterStatus.mId, favorite); + + if (post != null) { + twitterStatus = new TwitterStatus(post); + twitterStatus.setFavorite(favorite); + contentFeed.add(twitterStatus); } } } @@ -292,27 +291,27 @@ protected ModifyStatusesTaskOutput doInBackground(ModifyStatusesTaskInput... inp if (input.mStatuses != null) { for (int i = 0; i < input.mStatuses.getStatusCount(); i++) { TwitterStatus twitterStatus = input.mStatuses.getStatus(i); - if (twitterStatus.mIsFavorited != favorite) { - try { - twitter4j.Status status; - if (favorite) { - status = twitter.createFavorite(twitterStatus.mId); - } else { - status = twitter.destroyFavorite(twitterStatus.mId); - } - - // Yuck: See the comment for - // TwitterStatus.setFavorite() for - // reasons for this - twitterStatus = new TwitterStatus(status); - twitterStatus.setFavorite(favorite); - - contentFeed.add(twitterStatus); - } catch (TwitterException e) { - // we might get errors setting the favorite - // state to the same - // value again. - // Just ignore those ones... + try { + twitter4j.Status status; + if (favorite) { + status = twitter.createFavorite(twitterStatus.mId); + } else { + status = twitter.destroyFavorite(twitterStatus.mId); + } + + // Yuck: See the comment for + // TwitterStatus.setFavorite() for + // reasons for this + twitterStatus = new TwitterStatus(status); + twitterStatus.setFavorite(favorite); + + contentFeed.add(twitterStatus); + } catch (TwitterException e) { + e.printStackTrace(); + errorDescription = e.getErrorMessage(); + Log.e("api-call", errorDescription, e); + if (e.getRateLimitStatus() != null && e.getRateLimitStatus().getRemaining() <= 0) { + throw e; } } } diff --git a/android/libraries/TweetLanesCore/res/xml/changelog.xml b/android/libraries/TweetLanesCore/res/xml/changelog.xml index c0105afb..07b29dbf 100644 --- a/android/libraries/TweetLanesCore/res/xml/changelog.xml +++ b/android/libraries/TweetLanesCore/res/xml/changelog.xml @@ -10,6 +10,7 @@ Fix - Rotate flip on landscape refresh Fix - Prevent infinite refresh loop Fix - Correct issue with conversations appearing under the wrong statuses + Fix - Favorites now correctly get sent to twitter Fix - Various errors reported by fatal crashes