Merge branch 'Upstream_develop' into Upstream_release

chrislacy · Mar 3, 2014 · e823db1 · e823db1
2 parents dd4cb91 + f75a8c2
commit e823db1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
     android:versionCode="56"
-    android:versionName="1.4.0_b1">
+    android:versionName="1.4.0_b2">
 
     <uses-sdk android:targetSdkVersion="17"
         android:minSdkVersion="14" />

diff --git 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
@@ -10,6 +10,7 @@
         <change>Fix - Rotate flip on landscape refresh</change>
         <change>Fix - Prevent infinite refresh loop</change>
         <change>Fix - Correct issue with conversations appearing under the wrong statuses</change>
+        <change>Fix - Favorites now correctly get sent to twitter</change>
         <change>Fix - Various errors reported by fatal crashes</change>
     </release>
     <release version="1.3.0" versioncode="55">