APK version 1.1.2 (bugfix on NullPointerException after CameraActivity)

jeisfeld · Oct 3, 2015 · 1dce132 · 1dce132
1 parent 58a91ed
commit 1dce132
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/AugendiagnoseLib/src/de/jeisfeld/augendiagnoselib/activities/CameraActivity.java b/AugendiagnoseLib/src/de/jeisfeld/augendiagnoselib/activities/CameraActivity.java
@@ -1002,6 +1002,8 @@ public void onPictureTaken(final byte[] data) {
 				metadata.setYCenter(0.5f); // MAGIC_NUMBER
 				metadata.setOverlayScaleFactor(((float) overlayCircleRadius) / CIRCLE_BITMAP_SIZE * getDefaultOverlayScaleFactor());
 				metadata.setPupilSize(OverlayPinchImageView.DEFAULT_PUPIL_SIZE);
+				metadata.setPupilXOffset(0f);
+				metadata.setPupilYOffset(0f);
 			}
 
 			// save photo

diff --git a/AugendiagnoseLib/src/de/jeisfeld/augendiagnoselib/components/OverlayPinchImageView.java b/AugendiagnoseLib/src/de/jeisfeld/augendiagnoselib/components/OverlayPinchImageView.java
@@ -340,12 +340,16 @@ public void run() {
 								}
 
 								if (mMetadata.getPupilSize() == null) {
-									mPupilOverlayX = 0;
-									mPupilOverlayY = 0;
 									mPupilOverlayScaleFactor = DEFAULT_PUPIL_SIZE;
 								}
 								else {
 									mPupilOverlayScaleFactor = mMetadata.getPupilSize();
+								}
+								if (mMetadata.getPupilXOffset() == null || mMetadata.getPupilYOffset() == null) {
+									mPupilOverlayX = 0;
+									mPupilOverlayY = 0;
+								}
+								else {
 									mPupilOverlayX = mMetadata.getPupilXOffset();
 									mPupilOverlayY = mMetadata.getPupilYOffset();
 								}