From a0af174d724e82769b9e2b7bc8bea02143955bea Mon Sep 17 00:00:00 2001
From: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com>
Date: Tue, 22 Dec 2020 00:19:47 +0530
Subject: [PATCH] Erroneous data fixed (#4119)

---
 .../commons/contributions/ContributionController.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
index 9e1de9736..6f5fca967 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@@ -7,10 +7,12 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.filepicker.DefaultCallback;
 import fr.free.nrw.commons.filepicker.FilePicker;
+import fr.free.nrw.commons.filepicker.FilePicker.ImageSource;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.nearby.Place;
@@ -95,6 +97,13 @@ public class ContributionController {
      */
     public void handleActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
         FilePicker.handleActivityResult(requestCode, resultCode, data, activity, new DefaultCallback() {
+
+            @Override
+            public void onCanceled(final ImageSource source, final int type) {
+                super.onCanceled(source, type);
+                defaultKvStore.remove(PLACE_OBJECT);
+            }
+
             @Override
             public void onImagePickerError(Exception e, FilePicker.ImageSource source, int type) {
                 ViewUtil.showShortToast(activity, R.string.error_occurred_in_picking_images);
@@ -123,6 +132,7 @@ public class ContributionController {
         shareIntent.setAction(ACTION_INTERNAL_UPLOADS);
         shareIntent.putParcelableArrayListExtra(EXTRA_FILES, new ArrayList<>(imagesFiles));
         Place place = defaultKvStore.getJson(PLACE_OBJECT, Place.class);
+
         if (place != null) {
             shareIntent.putExtra(PLACE_OBJECT, place);
         }