Merge branch 'develop' into feature/modularize-editor

wordpress-mobile · Feb 24, 2015 · 2b40042 · 2b40042
2 parents 80d824c + d370d2b
commit 2b40042
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
@@ -15,7 +15,8 @@
  */
 public class AppLog {
     // T for Tag
-    public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING, SIMPERIUM, SUGGESTION}
+    public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING,
+        SIMPERIUM, SUGGESTION}
     public static final String TAG = "WordPress";
     public static final int HEADER_LINE_COUNT = 2;
 

diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java
@@ -12,6 +12,7 @@
 public class SwipeToRefreshHelper implements OnRefreshListener {
     private SwipeRefreshLayout mSwipeRefreshLayout;
     private RefreshListener mRefreshListener;
+    private boolean mRefreshing;
 
     public interface RefreshListener {
         public void onRefreshStarted();
@@ -33,7 +34,20 @@ public void init(Activity activity, SwipeRefreshLayout swipeRefreshLayout, Refre
     }
 
     public void setRefreshing(boolean refreshing) {
-        mSwipeRefreshLayout.setRefreshing(refreshing);
+        mRefreshing = refreshing;
+        // Delayed refresh, it fixes https://code.google.com/p/android/issues/detail?id=77712
+        // 50ms seems a good compromise (always worked during tests) and fast enough so user can't notice the delay
+        if (refreshing) {
+            mSwipeRefreshLayout.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    // use mRefreshing so if the refresh takes less than 50ms, loading indicator won't show up.
+                    mSwipeRefreshLayout.setRefreshing(mRefreshing);
+                }
+            }, 50);
+        } else {
+            mSwipeRefreshLayout.setRefreshing(false);
+        }
     }
 
     public boolean isRefreshing() {