From: jabarros <jabarros@solidgear.es>
Date: Fri, 26 Dec 2014 10:10:22 +0000 (+0100)
Subject: Merge branch 'develop' into obeySortOrder_fixmerge
X-Git-Tag: oc-android-1.7.0_signed~47^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4257aa1d9c53facbd1b59cc037b14dadeec5d2f2

Merge branch 'develop' into obeySortOrder_fixmerge
---

4257aa1d9c53facbd1b59cc037b14dadeec5d2f2
diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 0206eb92,f5837493..3bec9167
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -101,7 -109,7 +109,8 @@@ import com.owncloud.android.ui.preview.
  import com.owncloud.android.ui.preview.PreviewVideoActivity;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.ErrorMessageAdapter;
 +import com.owncloud.android.utils.FileStorageUtils;
+ import com.owncloud.android.utils.UriUtils;
  
  
  /**
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 563d31ed,1df1211c..be470614
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -380,10 -510,14 +379,18 @@@ public class FileListListAdapter extend
          editor.putBoolean("sortAscending", ascending);
          editor.commit();
          
 -        mSortOrder = order;
 -        mSortAscending = ascending;
 +        FileStorageUtils.mSortOrder = order;
 +        FileStorageUtils.mSortAscending = ascending;
          
 -        sortDirectory();
++
 +        mFiles = FileStorageUtils.sortFolder(mFiles);
 +        notifyDataSetChanged();
-     }    
++
+     }    
+     
+     private CharSequence showRelativeTimestamp(OCFile file){
+         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),
+                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
+     }
++
  }