Skip to content

ReactSoftKeyboardMonitor - fix crash when window is null #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2020
Merged

ReactSoftKeyboardMonitor - fix crash when window is null #783

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c39f073
ReactSoftKeyboardMonitor - fix crash when window is null
M-i-k-e-l May 19, 2020
fb4c76c
Fix
M-i-k-e-l May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions ...ndroid/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactSoftKeyboardMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.graphics.Rect;
import android.view.ViewTreeObserver;
import android.view.Window;

import androidx.annotation.Nullable;

Expand All @@ -21,12 +22,14 @@ public interface Listener {
@Override
public void onGlobalLayout() {
Integer viewportVisibleHeight = getViewportVisibleHeight();
if (viewportVisibleHeight.equals(mLastViewportVisibleHeight)) {
if (viewportVisibleHeight == null || viewportVisibleHeight.equals(mLastViewportVisibleHeight)) {
return;
}
mLastViewportVisibleHeight = viewportVisibleHeight;

if (viewportVisibleHeight < mMaxViewportVisibleHeight) {
mLastViewportVisibleHeight = viewportVisibleHeight;
if (mMaxViewportVisibleHeight == null) {
mMaxViewportVisibleHeight = viewportVisibleHeight;
} else if (viewportVisibleHeight < mMaxViewportVisibleHeight) {
mExternalListener.onSoftKeyboardVisible(!mSoftKeyboardUp);
refreshKeyboardHeight();
mSoftKeyboardUp = true;
Expand All @@ -42,15 +45,15 @@ public void onGlobalLayout() {
* root-view height normally remains unaffected during immediate layout. We therefore keep the maximal view-port size so we could
* concurrently compare heights in each layout.
*/
private int mMaxViewportVisibleHeight;
private Integer mMaxViewportVisibleHeight;

private Integer mLastViewportVisibleHeight;

/**
* Soft-keyboard *height* (when visible) is deduced by the effect on the root react-view height. This is ineffective in trying to
* monitor keyboard appearance -- only for height measuring.
*/
private int mLocallyVisibleHeight;
private Integer mLocallyVisibleHeight;

private boolean mSoftKeyboardUp;
private Integer mKeyboardHeight;
Expand Down Expand Up @@ -84,7 +87,11 @@ public Integer getKeyboardHeight() {
return mKeyboardHeight;
}

return (int) (.5f * mLocallyVisibleHeight);
if (mLocallyVisibleHeight != null) {
return (int) (.5f * mLocallyVisibleHeight);
}

return null;
}

private void registerReactRootViewLayoutListener() {
Expand Down Expand Up @@ -123,17 +130,28 @@ public void run() {
return;
}

if (mLocallyVisibleHeight > locallyVisibleHeight) {
if (mLocallyVisibleHeight == null) {
mLocallyVisibleHeight = locallyVisibleHeight;
mKeyboardHeight = mLocallyVisibleHeight;
} else if (mLocallyVisibleHeight > locallyVisibleHeight) {
mKeyboardHeight = mLocallyVisibleHeight - locallyVisibleHeight;
} else {
mKeyboardHeight = locallyVisibleHeight;
}
}
});
}

private int getViewportVisibleHeight() {
private Integer getViewportVisibleHeight() {
Integer visibleHeight = null;
final Rect visibleArea = new Rect();
getWindow().getDecorView().getWindowVisibleDisplayFrame(visibleArea);
return visibleArea.height();
Window window = getWindow();
if (window != null) {
window.getDecorView().getWindowVisibleDisplayFrame(visibleArea);
visibleHeight = visibleArea.height();
}

return visibleHeight;
}

private Integer getLocallyVisibleHeight() {
Expand Down