Fix null pointer exception.

miklobit · Oct 13, 2015 · bc242a1 · bc242a1
1 parent 4d007d5
commit bc242a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java
@@ -2315,7 +2315,7 @@ private void afterAllAnimations() {
 			mStaleView = null;
 		}
 
-		if (mCurrentView instanceof ODKView) {
+		if (mCurrentView != null && mCurrentView instanceof ODKView) {
 			((ODKView) mCurrentView).setFocus(this);
 		}
 		mBeenSwiped = false;
@@ -2682,7 +2682,7 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
 			int xPixelLimit = (int) (dm.xdpi * .25);
 			int yPixelLimit = (int) (dm.ydpi * .25);
 
-			if (mCurrentView instanceof ODKView) {
+			if (mCurrentView != null && mCurrentView instanceof ODKView) {
 				if (((ODKView) mCurrentView).suppressFlingGesture(e1, e2,
 						velocityX, velocityY)) {
 					return false;