Merge branch 'develop' into obeySortOrder_fixmerge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 0206eb9,f583749..3bec916
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/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 563d31e,1df1211..be47061
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/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);\r
          editor.commit();\r
          \r
 -        mSortOrder = order;\r
 -        mSortAscending = ascending;\r
 +        FileStorageUtils.mSortOrder = order;\r
 +        FileStorageUtils.mSortAscending = ascending;\r
          \r
 -        sortDirectory();\r
++
 +        mFiles = FileStorageUtils.sortFolder(mFiles);\r
 +        notifyDataSetChanged();\r
-     }    
++\r
+     }    \r
+     \r
+     private CharSequence showRelativeTimestamp(OCFile file){\r
+         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
+                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
+     }
++
  }\r

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/utils/FileStorageUtils.java
Simple merge