Merge pull request #505 from nextcloud/fixTimSort

try to fix TimSort, but it was just a plain NPE...
nextcloud · Jan 4, 2017 · 0ede6c9 · 0ede6c9
2 parents ade4194 + 1219844
commit 0ede6c9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java b/src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
@@ -94,8 +94,14 @@ public String getGroupName() {
 
             @Override
             public int compare(OCUpload upload1, OCUpload upload2) {
-                if (upload1.getUploadStatus().equals(UploadStatus.UPLOAD_IN_PROGRESS)) {
-                    if (!upload2.getUploadStatus().equals(UploadStatus.UPLOAD_IN_PROGRESS)) {
+                if (upload1 == null){
+                    return -1;
+                }
+                if (upload2 == null){
+                    return 1;
+                }
+                if (UploadStatus.UPLOAD_IN_PROGRESS.equals(upload1.getUploadStatus())) {
+                    if (!UploadStatus.UPLOAD_IN_PROGRESS.equals(upload2.getUploadStatus())) {
                         return -1;
                     }
                     // both are in progress