Merged from 2.8-release

Author: nicolas-raoul

app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java

@@ -148,12 +148,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
+            String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
             if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
                 // If coming from camera, pass null as uri. Because camera photos get saved to a
                 // fixed directory
-                controller.handleImagePicked(requestCode, null, true, null);
+                controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
             } else {
-                controller.handleImagePicked(requestCode, data.getData(), true, null);
+                controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
             }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -806,12 +806,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
+            String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
             if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
                 // If coming from camera, pass null as uri. Because camera photos get saved to a
                 // fixed directory
-                controller.handleImagePicked(requestCode, null, true, null);
+                controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
             } else {
-                controller.handleImagePicked(requestCode, data.getData(), true, null);
+                controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
             }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

@@ -34,6 +34,7 @@
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags;
+import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
 
 public class PlaceRenderer extends Renderer<Place> {
 
@@ -160,6 +161,7 @@ private void storeSharedPrefs() {
         editor.putString("Title", place.getName());
         editor.putString("Desc", place.getLongDescription());
         editor.putString("Category", place.getCategory());
+        editor.putString(WIKIDATA_ENTITY_ID_PREF, place.getWikiDataEntityId());
         editor.apply();
     }
 
@@ -241,4 +243,4 @@ private boolean showMenu() {
         return place.hasCommonsLink() || place.hasWikidataLink();
     }
 
-}
+}

app/src/main/java/fr/free/nrw/commons/upload/UploadController.java

@@ -114,9 +114,6 @@ public void startUpload(String title, Uri contentProviderUri, Uri mediaUri, Stri
             contribution.setTag("mimeType", mimeType);
             contribution.setSource(source);
 
-            //Calls the next overloaded method
-            startUpload(contribution, onComplete);
-
         Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId);
         //TODO: Modify this to include coords
         Account currentAccount = sessionManager.getCurrentAccount();
@@ -136,7 +133,8 @@ public void startUpload(String title, Uri contentProviderUri, Uri mediaUri, Stri
         contribution.setWikiDataEntityId(wikiDataEntityId);
         contribution.setContentProviderUri(contentProviderUri);
 
-
+        //Calls the next overloaded method
+        startUpload(contribution, onComplete);
     }
 
     /**