Fixes crash when uploading image via share without logging in

Author: ShridharGoel

app/build.gradle

@@ -26,6 +26,7 @@ dependencies {
         transitive = true
     }
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
+    //noinspection GradleCompatible
     implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:design:$SUPPORT_LIB_VERSION"

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

@@ -152,8 +152,8 @@ public void uploadActionInitiated(String title, String description) {
         this.title = title;
         this.description = description;
 
- 
-        if(sessionManager.getCurrentAccount()!=null) {
+
+        if (sessionManager.getCurrentAccount() != null) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 // Check for Storage permission that is required for upload.
                 // Do not allow user to proceed without permission, otherwise will crash
@@ -167,11 +167,10 @@ public void uploadActionInitiated(String title, String description) {
                 uploadBegins();
             }
         }
-
         else  //Send user to login activity
         {
             Toast.makeText(this, "You need to login first!", Toast.LENGTH_SHORT).show();
-            Intent loginIntent=new Intent(ShareActivity.this, LoginActivity.class);
+            Intent loginIntent = new Intent(ShareActivity.this, LoginActivity.class);
             startActivity(loginIntent);
         }
     }
@@ -207,20 +206,13 @@ private void uploadBegins() {
             Timber.d("Cache the categories found");
         }
 
-            uploadController.startUpload(title, mediaUri, description, mimeType, source, decimalCoords, c -> {
-                ShareActivity.this.contribution = c;
-                showPostUpload();
-            });
-
-    }
-
+        uploadController.startUpload(title,mediaUri,description,mimeType,source,decimalCoords,wikiDataEntityId,c ->
 
-
-        uploadController.startUpload(title, mediaUri, description, mimeType, source, decimalCoords, wikiDataEntityId, c -> {
-            ShareActivity.this.contribution = c;
-            showPostUpload();
-        });
-    }
+    {
+        ShareActivity.this.contribution = c;
+        showPostUpload();
+    });
+}
 
     /**
      * Starts CategorizationFragment after uploadBegins.
@@ -679,3 +671,4 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     }
 }
+

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

@@ -83,13 +83,13 @@ public void cleanup() {
 
     /**
      * Starts a new upload task.
-     *
      * @param title         the title of the contribution
      * @param mediaUri      the media URI of the contribution
      * @param description   the description of the contribution
      * @param mimeType      the MIME type of the contribution
      * @param source        the source of the contribution
      * @param decimalCoords the coordinates in decimal. (e.g. "37.51136|-77.602615")
+     * @param wikiDataEntityId
      * @param onComplete    the progress tracker
      */
     public void startUpload(String title, Uri mediaUri, String description, String mimeType, String source, String decimalCoords, String wikiDataEntityId, ContributionUploadProgress onComplete) {