Merge remote-tracking branch 'remotes/upstream/sortInUploadFilesActivity' into beta

diff --cc CHANGELOG.md
index cc2f6a6,308e8a7..79e012b
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,14 -1,31 +1,15 @@@
 -
 -## 1.7.1 (April 2015)
 -
 -- Share link even with password enforced by server
 -- Get the app ready for oc 8.1 servers
 -- Added option to create new folder in uploads from external apps
 -- Improved management of deleted users
 -- Bugs fixed
 -  + Fixed crash on Android 2.x devices
 -  + Improvements on uploads
 -
 -## 1.7.0 (February 2015)
 -
 -- Download full folders
 -- Grid view for images
 -- Remote thumbnails (OC Server 8.0+)
 -- Added number of files and folders at the end of the list
 -- "Open with" in contextual menu
 -- Downloads added to Media Provider
 -- Uploads:
 -  + Local thumbnails in section "Files"
 -  + Multiple selection in "Content from other apps" (Android 4.3+)
 -- Gallery: 
 -  + proper handling of EXIF
 -  + obey sorting in the list of files
 -- Settings view updated
 -- Improved subjects in e-mails
 -- Bugs fixed
 -
 -
 -
 +# 2015-10-29
 +- PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged
 +- PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged
 +- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged
 +- PR [#1205](https://github.com/owncloud/android/pull/1205) "Switch between online and offline files" merged
 +- PR [#1195](https://github.com/owncloud/android/pull/1195) "Resize Cache" merged
 +- PR [#1187](https://github.com/owncloud/android/pull/1187) "Video: Big thumbnails" merged
++- PR [#1058](https://github.com/owncloud/android/pull/1058) "add sort to UploadFileActiviy" merged
 +
 +
 +# 2015-10-26
 +- start of branch
 +- PR [#745](https://github.com/owncloud/android/pull/745) merged
 +- PR [#1044](https://github.com/owncloud/android/pull/1044) merged: < 8.1: GalleryPlus app needed, >= 8.2 Gallery app needed
 +- PR [#1111](https://github.com/owncloud/android/pull/1111) merged

diff --cc src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 9a3ce17,fa5c9cd..9341dd0
--- 1/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
--- 2/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@@ -20,8 -20,13 +20,11 @@@
  
  package com.owncloud.android.ui.activity;
  
 -import java.io.File;
 -
  import android.accounts.Account;
+ import android.app.AlertDialog;
+ import android.content.DialogInterface;
  import android.content.Intent;
+ import android.content.SharedPreferences;
  import android.os.AsyncTask;
  import android.os.Bundle;
  import android.os.Environment;

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index a6839e5,a5f11ce..af3bdf0
--- 1/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@@ -37,10 -39,9 +39,11 @@@ import android.widget.TextView
  
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 +import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.utils.BitmapUtils;
  import com.owncloud.android.utils.DisplayUtils;
 +import com.owncloud.android.utils.MimetypeIconUtil;
+ import com.owncloud.android.utils.FileStorageUtils;
  
  /**
   * This Adapter populates a ListView with all files and directories contained

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

diff --cc src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index f10f5b3,caff31c..42cbf09
--- 1/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@@ -80,9 -77,10 +80,9 @@@ public class PreviewImagePagerAdapter e
  
          mAccount = account;
          mStorageManager = storageManager;
 -        // TODO Enable when "On Device" is recovered ?
 -        mImageFiles = mStorageManager.getFolderImages(parentFolder/*, false*/);
 +        mImageFiles = mStorageManager.getFolderImages(parentFolder, false);
          
-         mImageFiles = FileStorageUtils.sortFolder(mImageFiles);
+         mImageFiles = FileStorageUtils.sortOcFolder(mImageFiles);
          
          mObsoleteFragments = new HashSet<Object>();
          mObsoletePositions = new HashSet<Integer>();

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

diff --cc src/third_parties/daveKoeller/AlphanumComparator.java
index 47cf143,d087957..0324493
--- 1/src/third_parties/daveKoeller/AlphanumComparator.java
--- 2/src/third_parties/daveKoeller/AlphanumComparator.java
+++ b/src/third_parties/daveKoeller/AlphanumComparator.java
@@@ -23,7 -23,7 +23,8 @@@
   */\r
  \r
  package third_parties.daveKoeller;\r
 +import java.text.Collator;\r
+ import java.io.File;\r
  import java.util.Comparator;\r
  \r
  import com.owncloud.android.datamodel.OCFile;\r