Fix #218.

Don't call Refresh Listener until we've finished scrolling

Author: Chris Banes

library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java

@@ -347,22 +347,10 @@ public final boolean onTouchEvent(MotionEvent event) {
 				if (mIsBeingDragged) {
 					mIsBeingDragged = false;
 
-					if (mState == State.RELEASE_TO_REFRESH) {
-
-						if (null != mOnRefreshListener) {
-							setState(State.REFRESHING, true);
-							mOnRefreshListener.onRefresh(this);
-							return true;
-
-						} else if (null != mOnRefreshListener2) {
-							setState(State.REFRESHING, true);
-							if (mCurrentMode == Mode.PULL_FROM_START) {
-								mOnRefreshListener2.onPullDownToRefresh(this);
-							} else if (mCurrentMode == Mode.PULL_FROM_END) {
-								mOnRefreshListener2.onPullUpToRefresh(this);
-							}
-							return true;
-						}
+					if (mState == State.RELEASE_TO_REFRESH
+							&& (null != mOnRefreshListener || null != mOnRefreshListener2)) {
+						setState(State.REFRESHING, true);
+						return true;
 					}
 
 					// If we're already refreshing, just scroll back to the top
@@ -746,19 +734,31 @@ protected void onRefreshing(final boolean doScroll) {
 
 		if (doScroll) {
 			if (mShowViewWhileRefreshing) {
+
+				// Call Refresh Listener when the Scroll has finished
+				OnSmoothScrollFinishedListener listener = new OnSmoothScrollFinishedListener() {
+					@Override
+					public void onSmoothScrollFinished() {
+						callRefreshListener();
+					}
+				};
+
 				switch (mCurrentMode) {
 					case MANUAL_REFRESH_ONLY:
 					case PULL_FROM_END:
-						smoothScrollTo(getFooterSize());
+						smoothScrollTo(getFooterSize(), listener);
 						break;
 					default:
 					case PULL_FROM_START:
-						smoothScrollTo(-getHeaderSize());
+						smoothScrollTo(-getHeaderSize(), listener);
 						break;
 				}
 			} else {
 				smoothScrollTo(0);
 			}
+		} else {
+			// We're not scrolling, so just call Refresh Listener now
+			callRefreshListener();
 		}
 	}
 
@@ -995,6 +995,17 @@ protected final void smoothScrollTo(int scrollValue) {
 		smoothScrollTo(scrollValue, getPullToRefreshScrollDuration());
 	}
 
+	/**
+	 * Smooth Scroll to position using the default duration of
+	 * {@value #SMOOTH_SCROLL_DURATION_MS} ms.
+	 * 
+	 * @param scrollValue - Position to scroll to
+	 * @param listener - Listener for scroll
+	 */
+	protected final void smoothScrollTo(int scrollValue, OnSmoothScrollFinishedListener listener) {
+		smoothScrollTo(scrollValue, getPullToRefreshScrollDuration(), 0, listener);
+	}
+
 	/**
 	 * Smooth Scroll to position using the longer default duration of
 	 * {@value #SMOOTH_SCROLL_LONG_DURATION_MS} ms.
@@ -1047,6 +1058,18 @@ private void addRefreshableView(Context context, T refreshableView) {
 				LayoutParams.MATCH_PARENT));
 	}
 
+	private void callRefreshListener() {
+		if (null != mOnRefreshListener) {
+			mOnRefreshListener.onRefresh(this);
+		} else if (null != mOnRefreshListener2) {
+			if (mCurrentMode == Mode.PULL_FROM_START) {
+				mOnRefreshListener2.onPullDownToRefresh(this);
+			} else if (mCurrentMode == Mode.PULL_FROM_END) {
+				mOnRefreshListener2.onPullUpToRefresh(this);
+			}
+		}
+	}
+
 	@SuppressWarnings("deprecation")
 	private void init(Context context, AttributeSet attrs) {
 		switch (getPullToRefreshScrollDirection()) {