mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #505 from nextcloud/fixTimSort

Browse source 
try to fix TimSort, but it was just a plain NPE...
This commit is contained in:
Andy Scherzinger 2017-01-04 20:43:11 +01:00 committed by GitHub
commit 0ede6c9127
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
View file

@ -94,8 +94,14 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
@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