Merge pull request #2520 from nextcloud/doNotSortOnGetFolderContent

Do not sort on getFolderContent

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -851,8 +851,6 @@ public class FileDataStorageManager {
             c.close();
         }
 
-        Collections.sort(ret);
-
         return ret;
     }
 

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -70,6 +70,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import third_parties.daveKoeller.AlphanumComparator;
 
 import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP;
 import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_LAST_BACKUP;
@@ -242,6 +243,8 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
                     List<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager()
                             .getFolderContent(backupFolder, false);
 
+                    Collections.sort(backupFiles, new AlphanumComparator<>());
+
                     if (backupFiles == null || backupFiles.size() == 0) {
                         contactsDatePickerBtn.setVisibility(View.GONE);
                     } else {