From c8d2d466276ed23d101a153c048a7eda0ba6bb80 Mon Sep 17 00:00:00 2001 From: jabarros Date: Thu, 23 Oct 2014 18:06:59 +0200 Subject: [PATCH] Fixed. When trying to open the app in Galaxy mini 2, a crash appears --- .../owncloud/android/ui/adapter/FileListListAdapter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 1bf28eae..9a2a0d3a 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -430,7 +430,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { Collections.sort(mFiles, new Comparator() { public int compare(OCFile o1, OCFile o2) { if (o1.isFolder() && o2.isFolder()) { - return val * Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp()); + Long obj1 = o1.getModificationTimestamp(); + return val * obj1.compareTo(o2.getModificationTimestamp()); } else if (o1.isFolder()) { return -1; @@ -439,7 +440,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { } else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){ return 0; } else { - return val * Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp()); + Long obj1 = o1.getModificationTimestamp(); + return val * obj1.compareTo(o2.getModificationTimestamp()); } } }); @@ -460,8 +462,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { Collections.sort(mFiles, new Comparator() { public int compare(OCFile o1, OCFile o2) { if (o1.isFolder() && o2.isFolder()) { - return val * Long.compare(getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1))), - getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2)))); + Long obj1 = getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1))); + return val * obj1.compareTo(getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2)))); } else if (o1.isFolder()) { return -1; @@ -470,7 +472,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { } else if (o1.getFileLength() == 0 || o2.getFileLength() == 0){ return 0; } else { - return val * Long.compare(o1.getFileLength(), o2.getFileLength()); + Long obj1 = o1.getFileLength(); + return val * obj1.compareTo(o2.getFileLength()); } } }); -- 2.11.0