show themeable cloud name instead of hardcoded nextcloud

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -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);

src/main/res/values/attrs.xml

@@ -20,10 +20,4 @@
 		<item>LOCAL_BEHAVIOUR_MOVE</item>
 		<item>LOCAL_BEHAVIOUR_DELETE</item>
 	</string-array>
-
-	<string-array name="upload_files_behaviour" translatable="false">
-		<item>@string/uploader_upload_files_behaviour_move_to_nextcloud_folder</item>
-		<item>@string/uploader_upload_files_behaviour_only_upload</item>
-		<item>@string/uploader_upload_files_behaviour_upload_and_delete_from_source</item>
-	</string-array>
 </resources>

src/main/res/values/strings.xml

@@ -81,7 +81,7 @@
     <string name="uploader_error_message_source_file_not_found">File selected for upload not found. Please check whether the file exists.</string>
     <string name="uploader_error_message_source_file_not_copied">Could not copy file to a temporary folder. Try to resend it.</string>
     <string name="uploader_upload_files_behaviour">Upload option:</string>
-    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to Nextcloud folder</string>
+    <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to %1$s folder</string>
     <string name="uploader_upload_files_behaviour_only_upload">Keep file in source folder</string>
     <string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Delete file from source folder</string>
     <string name="file_list_seconds_ago">seconds ago</string>