From fe9478b46b8a54702686bc1f6cf6e3ce55e8c7ce Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Wed, 3 May 2017 11:27:02 +0200
Subject: [PATCH] Fix bug on upload blocked at 100% event if it's done Fixes
 #18

---
 .../goblim/activity/UploadActivity.java       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java b/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java
index f1a922f..12706c6 100644
--- a/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java
+++ b/app/src/main/java/fr/mobdev/goblim/activity/UploadActivity.java
@@ -302,6 +302,9 @@ public class UploadActivity extends AppCompatActivity {
                 }
                 if(linkIntent != null) {
                     resetImages();
+                    fileInError.clear();
+                    errorMsg.clear();
+                    results.clear();
                     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
                     startActivity(linkIntent);
                 }
@@ -533,25 +536,35 @@ public class UploadActivity extends AppCompatActivity {
         if(resultCode == RESULT_OK){
             //retrieve uri from the request image activity and prepare
             ClipData clip = null;
+            boolean hasAddUri = false;
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)
                 clip = returnIntent.getClipData();
 
             if(clip == null) {
                 Uri imageUri = returnIntent.getData();
+                if(imageUri == null)
+                    return;
                 uris.add(imageUri);
+                hasAddUri = true;
                 updateSpanCount();
                 adapter.addUri(this,imageUri);
             } else {
                 for(int i = 0; clip != null && i < clip.getItemCount(); i++) {
                     Uri imageUri = clip.getItemAt(i).getUri();
+                    if(imageUri == null)
+                        continue;
                     uris.add(imageUri);
+                    hasAddUri = true;
                     updateSpanCount();
-                    adapter.addUri(this,imageUri);
+                    adapter.addUri(this, imageUri);
+
                 }
             }
 
-            Button uploadBt = (Button) findViewById(R.id.upload_button);
-            uploadBt.setEnabled(false);
+            if(hasAddUri) {
+                Button uploadBt = (Button) findViewById(R.id.upload_button);
+                uploadBt.setEnabled(false);
+            }
         }
     }