Merge pull request #1388 from nextcloud/fixSyncedFolderPreferencesDialogFragment

Adding a fallback when setting the span text crashes

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -387,11 +387,19 @@ public class DisplayUtils {
      * @param style    the style to be applied
      */
     public static SpannableStringBuilder createTextWithSpan(String text, String spanText, StyleSpan style) {
+        if (text == null) {
+            return null;
+        }
+
         SpannableStringBuilder sb = new SpannableStringBuilder(text);
+        if(spanText == null) {
+            return sb;
+        }
+
         int start = text.lastIndexOf(spanText);
 
         if (start < 0) {
-            start++;
+            return sb;
         }
 
         int end = start + spanText.length();

src/main/res/layout/synced_folders_settings_layout.xml

@@ -119,7 +119,7 @@
                         android:layout_below="@id/local_folder_title"
                         android:ellipsize="middle"
                         android:maxLines="2"
-                        android:text="@string/choose_remote_folder"
+                        android:text="@string/choose_local_folder"
                         android:textColor="?android:attr/textColorSecondary"/>
 
                 </RelativeLayout>