fixed review comments

res/layout/folder_sync_item_header.xml

@@ -12,11 +12,11 @@
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
   You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"

res/values-sw600dp/dims.xml

@@ -2,19 +2,21 @@
 <!--
   Nextcloud Android client application
 
-  Copyright (C) 2016 Nextcloud
+  Copyright (C) 2016 Andy Scherzinger
+  Copyright (C) 2016 Nextcloud.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
   <integer name="media_grid_width">6</integer>

res/xml/folder_sync_preferences.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
-	                        android:title="@string/prefs_instant_upload"
-	                        android:summary="@string/prefs_instant_upload_summary"/>
-        <com.owncloud.android.ui.PreferenceWithLongSummary
-							android:title="@string/prefs_instant_upload_path_title"
-							android:key="instant_upload_path" />
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-							android:title="@string/prefs_instant_upload_path_use_subfolders_title"
-                            android:summary="@string/prefs_instant_upload_path_use_subfolders_summary"
-							android:key="instant_upload_path_use_subfolders" />
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:dependency="instant_uploading"
-			android:disableDependentsState="true"
-	        android:title="@string/instant_upload_on_wifi"
-	        android:key="instant_upload_on_wifi"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/instant_upload_on_charging"
-			android:key="instant_upload_on_charging"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:key="instant_video_uploading"
-	        android:title="@string/prefs_instant_video_upload"
-	        android:summary="@string/prefs_instant_video_upload_summary" />
-	    <com.owncloud.android.ui.PreferenceWithLongSummary
-							android:title="@string/prefs_instant_video_upload_path_title"
-							android:key="instant_video_upload_path" />
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/prefs_instant_upload_path_use_subfolders_title"
-			android:summary="@string/prefs_instant_upload_path_use_subfolders_summary"
-			android:key="instant_video_upload_path_use_subfolders" />
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-	        				android:title="@string/instant_video_upload_on_wifi"
-	        				android:key="instant_video_upload_on_wifi"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:title="@string/instant_video_upload_on_charging"
-			android:key="instant_video_upload_on_charging"/>
-		<com.owncloud.android.ui.dialog.OwnCloudListPreference android:key="prefs_instant_behaviour"
-			android:dialogTitle="@string/prefs_instant_behaviour_dialogTitle"
-			android:title="@string/prefs_instant_behaviour_title"
-			android:entries="@array/pref_behaviour_entries"
-			android:entryValues="@array/pref_behaviour_entryValues"
-			android:defaultValue="NOTHING"
-			android:summary="%s"
-			/>
-	    <!-- DISABLED FOR RELEASE UNTIL FIXED
-	    CheckBoxPreference android:key="log_to_file"
-	                        android:title="@string/prefs_log_title"
-	                        android:summary="@string/prefs_log_summary"/>
-		<Preference 		android:key="log_history"
-	                        android:title="@string/prefs_log_title_history"
-	                        android:summary="@string/prefs_log_summary_history"/ -->
-                        
-    </PreferenceCategory>
-
-	<PreferenceCategory android:title="@string/prefs_category_details">
-		<android.preference.CheckBoxPreference android:title="@string/prefs_passcode" android:key="set_pincode" />
-	</PreferenceCategory>
-
-	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
-		<Preference android:title="@string/prefs_calendar_contacts"
-					android:key="calendar_contacts"
-					android:summary="@string/prefs_calendar_contacts_summary" />
-		<Preference android:title="@string/prefs_help" android:key="help" />
-		<Preference android:title="@string/prefs_recommend" android:key="recommend" />
-		<Preference android:title="@string/prefs_feedback" android:key="feedback" />
-		<Preference android:title="@string/actionbar_logger" android:key="logger" />
-		<Preference android:title="@string/prefs_imprint" android:key="imprint" />
-		<Preference android:title="@string/about_title" android:id="@+id/about_app" android:key="about_app" />
-	</PreferenceCategory>
-
-</PreferenceScreen>

src/com/owncloud/android/datamodel/MediaFolder.java

@@ -12,11 +12,11 @@
  * <p>
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  * <p>
  * You should have received a copy of the GNU Affero General Public
- * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.datamodel;
 
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by scherzia on 22.09.2016.
+ * Business object representing a media folder with all information that are gathered via media queries.
  */
 public class MediaFolder {
     public String folderName;