fix unnecessary resize of book view - e.g. while dialog with on-screen keyboard is shown, or orientation changed during active dialog: fix №123

Author: buggins

android/src/org/coolreader/crengine/BaseActivity.java

@@ -193,6 +193,21 @@ protected void onCreate(Bundle savedInstanceState) {
 		bindCRDBService();
 	}
 
+	protected BaseDialog currentDialog;
+	public void onDialogCreated(BaseDialog dlg) {
+		currentDialog = dlg;
+	}
+	public void onDialogClosed(BaseDialog dlg) {
+    	if (currentDialog == dlg) {
+    		currentDialog = null;
+		}
+	}
+	public BaseDialog getCurrentDialog() {
+    	return currentDialog;
+	}
+	public boolean isDialogActive() {
+    	return currentDialog != null;
+	}
 
 	@Override
 	protected void onDestroy() {

android/src/org/coolreader/crengine/BaseDialog.java

@@ -243,13 +243,16 @@ protected View createLayout( View view )
 
 	protected void onCreate() {
 		// when dialog is created
+		Log.d("DLG","BaseDialog.onCreate()");
+		activity.onDialogCreated(this);
 	}
 
 	protected void onClose() {
 		// when dialog is closed
+		Log.d("DLG","BaseDialog.onClose()");
+		activity.onDialogClosed(this);
 	}
-	
-	
+
 
 	/**
 	 * Set View's gesture handlers for LTR and RTL horizontal fling

android/src/org/coolreader/crengine/OPDSUtil.java

@@ -38,7 +38,7 @@
 @SuppressLint("SimpleDateFormat")
 public class OPDSUtil {
 
-	public static final boolean EXTENDED_LOG = true; // set to false for production
+	public static final boolean EXTENDED_LOG = false; // set to false for production
     public static final int CONNECT_TIMEOUT = 60000;
     public static final int READ_TIMEOUT = 60000;
 	/*

android/src/org/coolreader/crengine/ReaderView.java

@@ -109,7 +109,7 @@ public boolean onTrackballEvent(MotionEvent event) {
 
 		@Override
 		protected void onSizeChanged(final int w, final int h, int oldw, int oldh) {
-			log.i("onSizeChanged(" + w + ", " + h + ")");
+			log.i("onSizeChanged(" + w + ", " + h + ")" + " activity.isDialogActive=" + getActivity().isDialogActive());
 			super.onSizeChanged(w, h, oldw, oldh);
 			requestResize(w, h);
 		}
@@ -119,6 +119,7 @@ public void onWindowVisibilityChanged(int visibility) {
 			if (visibility == VISIBLE) {
 				mActivity.einkRefresh();
 				startStats();
+				checkSize();
 			} else
 				stopStats();
 			super.onWindowVisibilityChanged(visibility);
@@ -129,6 +130,7 @@ public void onWindowFocusChanged(boolean hasWindowFocus) {
 			if (hasWindowFocus) {
 				mActivity.einkRefresh();
 				startStats();
+				checkSize();
 			} else
 				stopStats();
 			super.onWindowFocusChanged(hasWindowFocus);
@@ -3448,6 +3450,10 @@ private void checkSize() {
 		boolean changed = (requestedWidth != internalDX) || (requestedHeight != internalDY);
 		if (!changed)
 			return;
+		if (getActivity().isDialogActive()) {
+			log.d("checkSize() : dialog is active, skipping resize");
+			return;
+		}
 //		if (mIsOnFront || !mOpened) {
 		log.d("checkSize() : calling resize");
 		resize();