Android: while adjusting reflow zoom, refresh only the visible page

Also fix a race condition where an attempt to set the zoom might precede
the loading of html into the WebView

1 files changed, 11 insertions, 6 deletions

diff --git a/platform/android/src/com/artifex/mupdfdemo/ReaderView.java b/platform/android/src/com/artifex/mupdfdemo/ReaderView.java
index 9ec572a3..f779372b 100644
--- a/platform/android/src/com/artifex/mupdfdemo/ReaderView.java
+++ b/platform/android/src/com/artifex/mupdfdemo/ReaderView.java
@@ -436,12 +436,9 @@ public class ReaderView
 		mScale = Math.min(Math.max(mScale * detector.getScaleFactor(), min_scale), max_scale);
 
 		if (mReflow) {
-			applyToChildren(new ViewMapper() {
-				@Override
-				void applyToView(View view) {
-					onScaleChild(view, mScale);
-				}
-			});
+			View v = mChildViews.get(mCurrent);
+			if (v != null)
+				onScaleChild(v, mScale);
 		} else {
 			float factor = mScale/previousScale;
 
@@ -472,6 +469,14 @@ public class ReaderView
 	}
 
 	public void onScaleEnd(ScaleGestureDetector detector) {
+		if (mReflow) {
+			applyToChildren(new ViewMapper() {
+				@Override
+				void applyToView(View view) {
+					onScaleChild(view, mScale);
+				}
+			});
+		}
 		mScaling = false;
 	}