Fix urgent crashes A and E

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -27,6 +27,7 @@
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.upload.FileUtils;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
@@ -68,7 +69,6 @@ public class CommonsApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-
         ApplicationlessInjection
                 .getInstance(this)
                 .getCommonsApplicationComponent()
@@ -81,6 +81,8 @@ public void onCreate() {
         if (setupLeakCanary() == RefWatcher.DISABLED) {
             return;
         }
+        // Empty temp directory in case some temp files are created and never removed.
+        ContributionUtils.emptyTemporaryDirectory();
 
         Timber.plant(new Timber.DebugTree());
 

app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java

@@ -51,16 +51,10 @@ public void setMedia(Media media) {
             return;
         }
 
-        if(media.getFilename() != null) {
-            if (thumbnailUrlCache.get(media.getFilename()) != null) {
-                setImageUrl(thumbnailUrlCache.get(media.getFilename()));
-            } else {
-                setImageUrl(null);
-                currentThumbnailTask = new ThumbnailFetchTask(media, mwApi);
-                currentThumbnailTask.execute(media.getFilename());
-            }
-        } else { // local image
-            setImageUrl(media.getLocalUri().toString());
+        if (media.getFilename() != null && thumbnailUrlCache.get(media.getFilename()) != null) {
+            setImageUrl(thumbnailUrlCache.get(media.getFilename()));
+        } else {
+            setImageUrl(null);
             currentThumbnailTask = new ThumbnailFetchTask(media, mwApi);
             currentThumbnailTask.execute(media.getFilename());
         }

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -46,6 +46,7 @@ public Contribution[] newArray(int i) {
     private String decimalCoords;
     private boolean isMultiple;
     private String wikiDataEntityId;
+    private Uri contentProviderUri;
 
     public Contribution(Uri contentUri, String filename, Uri localUri, String imageUrl, Date timestamp,
                         int state, long dataLength, Date dateUploaded, long transferred,
@@ -236,4 +237,12 @@ public String getWikiDataEntityId() {
     public void setWikiDataEntityId(String wikiDataEntityId) {
         this.wikiDataEntityId = wikiDataEntityId;
     }
+
+    public void setContentProviderUri(Uri contentProviderUri) {
+        this.contentProviderUri = contentProviderUri;
+    }
+
+    public Uri getContentProviderUri() {
+        return contentProviderUri;
+    }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -7,9 +7,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.FileProvider;
+import android.util.Log;
 
 import java.io.File;
 import java.util.Date;
@@ -28,8 +30,8 @@
 
 public class ContributionController {
 
-    private static final int SELECT_FROM_GALLERY = 1;
-    private static final int SELECT_FROM_CAMERA = 2;
+    public static final int SELECT_FROM_GALLERY = 1;
+    public static final int SELECT_FROM_CAMERA = 2;
 
     private Fragment fragment;
 
@@ -91,16 +93,15 @@ public void startGalleryPick() {
         fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
     }
 
-    public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload, String wikiDataEntityId) {
-        Timber.d("Is direct upload %s and the Wikidata entity ID is %s", isDirectUpload, wikiDataEntityId);
+    public void handleImagePicked(int requestCode, @Nullable Uri uri, boolean isDirectUpload, String wikiDataEntityId) {
         FragmentActivity activity = fragment.getActivity();
         Timber.d("handleImagePicked() called with onActivityResult()");
         Intent shareIntent = new Intent(activity, ShareActivity.class);
         shareIntent.setAction(ACTION_SEND);
         switch (requestCode) {
             case SELECT_FROM_GALLERY:
                 //Handles image picked from gallery
-                Uri imageData = data.getData();
+                Uri imageData = uri;
                 shareIntent.setType(activity.getContentResolver().getType(imageData));
                 shareIntent.putExtra(EXTRA_STREAM, imageData);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_GALLERY);

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

@@ -38,6 +38,7 @@
 import fr.free.nrw.commons.quiz.QuizChecker;
 import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.upload.UploadService;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -199,6 +200,9 @@ public void deleteUpload(int i) {
         Contribution c = contributionDao.fromCursor(allContributions);
         if (c.getState() == STATE_FAILED) {
             Timber.d("Deleting failed contrib %s", c.toString());
+            // If upload fails and then user decides to cancel upload at all, which means contribution
+            // object will be deleted. So we have to delete temp file for that contribution.
+            ContributionUtils.removeTemporaryFile(c.getLocalUri());
             contributionDao.delete(c);
         } else {
             Timber.d("Skipping deletion for non-failed contrib %s", c.toString());

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -3,11 +3,13 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -31,6 +33,7 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.nearby.NearbyActivity;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import timber.log.Timber;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -117,7 +120,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);
-            controller.handleImagePicked(requestCode, data, false, 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, false, null);
+            } else {
+                controller.handleImagePicked(requestCode, data.getData(), false, null);
+            }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -24,9 +24,7 @@
 import fr.free.nrw.commons.wikidata.WikidataEditListenerImpl;
 
 import static android.content.Context.MODE_PRIVATE;
-import static fr.free.nrw.commons.contributions.ContributionsContentProvider.CONTRIBUTION_AUTHORITY;
 import static fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.RECENT_SEARCH_AUTHORITY;
-import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MODIFICATIONS_AUTHORITY;
 
 @Module
 @SuppressWarnings({"WeakerAccess", "unused"})

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -51,6 +52,7 @@
 import fr.free.nrw.commons.category.QueryContinue;
 import fr.free.nrw.commons.notification.Notification;
 import fr.free.nrw.commons.notification.NotificationUtils;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import in.yuvi.http.fluent.Http;
 import io.reactivex.Observable;
 import io.reactivex.Single;
@@ -856,25 +858,30 @@ public UploadResult uploadFile(String filename,
                                    long dataLength,
                                    String pageContents,
                                    String editSummary,
-                                   final ProgressListener progressListener) throws IOException {
+                                   final ProgressListener progressListener,
+                                   Uri fileUri,
+                                   Uri contentProviderUri) throws IOException {
+
         ApiResult result = api.upload(filename, file, dataLength, pageContents, editSummary, progressListener::onProgress);
 
         Log.e("WTF", "Result: " + result.toString());
 
         String resultStatus = result.getString("/api/upload/@result");
+
         if (!resultStatus.equals("Success")) {
             String errorCode = result.getString("/api/error/@code");
             Timber.e(errorCode);
             return new UploadResult(resultStatus, errorCode);
         } else {
+            // If success we have to remove file from temp directory
+            ContributionUtils.removeTemporaryFile(fileUri);
             Date dateUploaded = parseMWDate(result.getString("/api/upload/imageinfo/@timestamp"));
             String canonicalFilename = "File:" + result.getString("/api/upload/@filename").replace("_", " "); // Title vs Filename
             String imageUrl = result.getString("/api/upload/imageinfo/@url");
             return new UploadResult(resultStatus, dateUploaded, canonicalFilename, imageUrl);
         }
     }
 
-
     @Override
     @NonNull
     public Single<Integer> getUploadCount(String userName) {

app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.mwapi;
 
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -54,7 +55,7 @@ public interface MediaWikiApi {
     List<String> searchCategory(String title, int offset);
 
     @NonNull
-    UploadResult uploadFile(String filename, InputStream file, long dataLength, String pageContents, String editSummary, ProgressListener progressListener) throws IOException;
+    UploadResult uploadFile(String filename, InputStream file, long dataLength, String pageContents, String editSummary, ProgressListener progressListener, Uri fileUri, Uri contentProviderUri) throws IOException;
 
     @Nullable
     String edit(String editToken, String processedPageContent, String filename, String summary) throws IOException;

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

@@ -30,6 +30,7 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import fr.free.nrw.commons.utils.UriDeserializer;
 import timber.log.Timber;
 
@@ -147,7 +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);
-            controller.handleImagePicked(requestCode, data, true, directPrefs.getString(WIKIDATA_ENTITY_ID_PREF, 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);
+            } else {
+                controller.handleImagePicked(requestCode, data.getData(), true, null);
+            }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

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

@@ -56,6 +56,7 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.contributions.ContributionController;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import fr.free.nrw.commons.utils.UriDeserializer;
 import fr.free.nrw.commons.utils.ViewUtil;
 import timber.log.Timber;
@@ -765,10 +766,17 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
+
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
-            controller.handleImagePicked(requestCode, data, true, directPrefs.getString(WIKIDATA_ENTITY_ID_PREF, 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);
+            } else {
+                controller.handleImagePicked(requestCode, data.getData(), true, null);
+            }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

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

@@ -14,6 +14,7 @@
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.File;