|
@@ -60,6 +60,8 @@ import com.owncloud.android.utils.FileStorageUtils;
|
|
|
import com.owncloud.android.utils.ThemeUtils;
|
|
|
|
|
|
import java.io.File;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
import static com.owncloud.android.db.PreferenceManager.getSortOrder;
|
|
|
|
|
@@ -160,8 +162,15 @@ public class UploadFilesActivity extends FileActivity implements
|
|
|
|
|
|
// file upload spinner
|
|
|
mBehaviourSpinner = findViewById(R.id.upload_files_spinner_behaviour);
|
|
|
- ArrayAdapter<CharSequence> behaviourAdapter = ArrayAdapter.createFromResource(this,
|
|
|
- R.array.upload_files_behaviour, android.R.layout.simple_spinner_item);
|
|
|
+
|
|
|
+ List<String> behaviours = new ArrayList<>();
|
|
|
+ behaviours.add(getString(R.string.uploader_upload_files_behaviour_move_to_nextcloud_folder,
|
|
|
+ ThemeUtils.getDefaultDisplayNameForRootFolder()));
|
|
|
+ behaviours.add(getString(R.string.uploader_upload_files_behaviour_only_upload));
|
|
|
+ behaviours.add(getString(R.string.uploader_upload_files_behaviour_upload_and_delete_from_source));
|
|
|
+
|
|
|
+ ArrayAdapter<String> behaviourAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item,
|
|
|
+ behaviours);
|
|
|
behaviourAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
|
mBehaviourSpinner.setAdapter(behaviourAdapter);
|
|
|
mBehaviourSpinner.setSelection(localBehaviour);
|