Bugfixed: adding a mark with a photo after rotating in camera resulted in a crash. Fixes #1321.

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java

@@ -57,6 +57,8 @@ public class MarkerEditActivity extends AbstractActivity {
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_MARKER_ID = "marker_id";
 
+    private static final String CAMERA_PHOTO_URI_KEY = "camera_photo_uri_key";
+
     private static final String TAG = MarkerEditActivity.class.getSimpleName();
     private Track.Id trackId;
     private Marker marker;
@@ -88,6 +90,10 @@ public class MarkerEditActivity extends AbstractActivity {
         trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
         Marker.Id markerId = getIntent().getParcelableExtra(EXTRA_MARKER_ID);
 
+        if (savedInstanceState != null) {
+            cameraPhotoUri = Uri.parse(savedInstanceState.getString(CAMERA_PHOTO_URI_KEY, ""));
+        }
+
         hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
 
         // Setup UI elements
@@ -167,6 +173,14 @@ public class MarkerEditActivity extends AbstractActivity {
         takePictureFromCamera = null;
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (cameraPhotoUri != null) {
+            outState.putString(CAMERA_PHOTO_URI_KEY, cameraPhotoUri.toString());
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.marker_edit, menu);