From eeff36b6a107606c8f46611c8d6c15c68636beed Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 17 Oct 2016 18:55:33 +0200 Subject: [PATCH] Use correct array of options Resolves: #336 --- res/values/attrs.xml | 5 +++++ .../owncloud/android/ui/activity/UploadFilesActivity.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 33c4f0f811..6b5afce136 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -32,4 +32,9 @@ @string/menu_item_sort_by_date @string/menu_item_sort_by_size + + + @string/menu_item_sort_by_name + @string/menu_item_sort_by_date + \ No newline at end of file diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index 1b87294e3b..784db2d1ae 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -30,7 +30,6 @@ import android.os.Bundle; import android.os.Environment; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.view.Menu; import android.view.MenuItem; @@ -210,7 +209,7 @@ public class UploadFilesActivity extends FileActivity implements AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.actionbar_sort_title) - .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder , + .setSingleChoiceItems(R.array.menu_items_sort_by_options_local, sortOrder, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { switch (which){