Merge pull request #284 from nextcloud/logSendCrash

tobiasKaminsky · web-flow · commit 6c06147f4e66 · 2016-10-05T19:28:33.000+02:00
Crash when sending non-existing log
diff --git a/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -541,7 +541,8 @@ private void prepareStreamsToUpload() {
     }
 
     private boolean somethingToUpload() {
-        return (mStreamsToUpload != null && mStreamsToUpload.get(0) != null || uploadTextSnippet());
+        return (mStreamsToUpload != null && mStreamsToUpload.size() > 0 && mStreamsToUpload.get(0) != null ||
+                uploadTextSnippet());
     }
 
     private boolean uploadTextSnippet() {

Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,8 @@ private void prepareStreamsToUpload() {`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`private boolean somethingToUpload() {`
`544`		`- return (mStreamsToUpload != null && mStreamsToUpload.get(0) != null \|\| uploadTextSnippet());`
	`544`	`+ return (mStreamsToUpload != null && mStreamsToUpload.size() > 0 && mStreamsToUpload.get(0) != null \|\|`
	`545`	`+ uploadTextSnippet());`
`545`	`546`	`}`
`546`	`547`
`547`	`548`	`private boolean uploadTextSnippet() {`