From afcc7e0ecbd3fc7906b8a88ed99a98868dbee627 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sun, 19 Jun 2016 19:14:54 +1200
Subject: [PATCH] Fix crash if FileNotFound exception thrown

---
 .../main/java/fr/free/nrw/commons/upload/UploadService.java | 6 ++++--
 commons/app/src/main/res/values/strings.xml                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
index 388fa1c70..32482095b 100644
--- a/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
+++ b/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@@ -163,6 +163,7 @@ public class UploadService extends HandlerService<Contribution> {
         return START_REDELIVER_INTENT;
     }
 
+
     private void uploadContribution(Contribution contribution) {
         MWApi api = app.getApi();
 
@@ -171,11 +172,12 @@ public class UploadService extends HandlerService<Contribution> {
 
         String notificationTag = contribution.getLocalUri().toString();
 
-
         try {
             file = this.getContentResolver().openInputStream(contribution.getLocalUri());
         } catch(FileNotFoundException e) {
-            throw new RuntimeException(e);
+            Log.d("Exception", "File not found");
+            Toast fileNotFound = Toast.makeText(this, R.string.upload_failed, Toast.LENGTH_LONG);
+            fileNotFound.show();
         }
 
         Log.d("Commons", "Before execution!");
diff --git a/commons/app/src/main/res/values/strings.xml b/commons/app/src/main/res/values/strings.xml
index 767b6cb3b..e9e5af8e2 100644
--- a/commons/app/src/main/res/values/strings.xml
+++ b/commons/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="logging_in_message">Please wait...</string>
     <string name="login_success">Login success!</string>
     <string name="login_failed">Login failed!</string>
+    <string name="upload_failed">File not found, please try another file</string>
     <string name="authentication_failed">Authentication failed!</string>
     <string name="uploading_started">Upload started!</string>