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

remove (o1 == 0 || o2 == 0 ) return 0 as this is ambiguous and confuses TimSort

Browse source
This commit is contained in:
tobiasKaminsky 2016-10-16 09:53:07 +02:00
parent b346d7bdc1
commit 3298a806d8
1 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/com/owncloud/android/utils/FileStorageUtils.java
View file

@ -281,12 +281,8 @@ public class FileStorageUtils {
Collections.sort(files, new Comparator<OCFile>() {
public int compare(OCFile o1, OCFile o2) {
if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
return 0;
} else {
Long obj1 = o1.getModificationTimestamp();
return multiplier * obj1.compareTo(o2.getModificationTimestamp());
}
Long obj1 = o1.getModificationTimestamp();
return multiplier * obj1.compareTo(o2.getModificationTimestamp());
}
});
@ -304,12 +300,8 @@ public class FileStorageUtils {
Collections.sort(files, new Comparator<File>() {
public int compare(File o1, File o2) {
if (o1.lastModified() == 0 || o2.lastModified() == 0){
return 0;
} else {
Long obj1 = o1.lastModified();
return multiplier * obj1.compareTo(o2.lastModified());
}
Long obj1 = o1.lastModified();
return multiplier * obj1.compareTo(o2.lastModified());
}
});
@ -327,17 +319,14 @@ public class FileStorageUtils {
public int compare(OCFile o1, OCFile o2) {
if (o1.isFolder() && o2.isFolder()) {
Long obj1 = o1.getFileLength();
return multiplier * obj1., o2.getFileLength());
}
else if (o1.isFolder()) {
return multiplier * obj1.compareTo(o2.getFileLength());
} else if (o1.isFolder()) {
return -1;
} else if (o2.isFolder()) {
return 1;
} else if (o1.getFileLength() == 0 || o2.getFileLength() == 0){
return 0;
} else {
Long obj1 = o1.getFileLength();
return multiplier * Long.compare(obj1, o2.getFileLength());
return multiplier * obj1.compareTo(o2.getFileLength());
}
}
});
@ -358,13 +347,10 @@ public class FileStorageUtils {
if (o1.isDirectory() && o2.isDirectory()) {
Long obj1 = getFolderSize(o1);
return multiplier * obj1.compareTo(getFolderSize(o2));
}
else if (o1.isDirectory()) {
} else if (o1.isDirectory()) {
return -1;
} else if (o2.isDirectory()) {
return 1;
} else if (o1.length() == 0 || o2.length() == 0){
return 0;
} else {
Long obj1 = o1.length();
return multiplier * obj1.compareTo(o2.length());