Merge branch 'master' of https://github.com/nicolas-raoul/apps-android-commons into nicolas-raoul-master

Author: domdomegg

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

@@ -188,8 +188,10 @@ public void onCreate(Bundle savedInstanceState) {
             mimeType = intent.getType();
         }
 
-        mediaUriString = mediaUri.toString();
-        ImageLoader.getInstance().displayImage(mediaUriString, backgroundImageView);
+        if (mediaUri != null) {
+            mediaUriString = mediaUri.toString();
+            ImageLoader.getInstance().displayImage(mediaUriString, backgroundImageView);
+        }
 
         if(savedInstanceState != null)  {
             contribution = savedInstanceState.getParcelable("contribution");