From 1a1d50f8b61a06791188ff8251327826c2b3e99d Mon Sep 17 00:00:00 2001
From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Jun 2016 11:26:06 +0200
Subject: [PATCH 1/4] Fix crash when adding a saml account

---
 .../android/authentication/AuthenticatorActivity.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 5c4dc5f6b2d8..ae9cb1f45952 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1041,7 +1041,12 @@ private void onGetUserNameFinish(RemoteOperationResult result) {
         mWaitingForOpId = Long.MAX_VALUE;
         if (result.isSuccess()) {
             boolean success = false;
-            String username = (String) result.getData().get(0);
+            String username;
+            if (result.getData().get(0) instanceof UserInfo) {
+                username = ((UserInfo) result.getData().get(0)).mDisplayName;
+            } else {
+                username = (String) result.getData().get(0);
+            }
 
             if ( mAction == ACTION_CREATE) {
                 mUsernameInput.setText(username);

From 848779305616e4bc5165ee7a0b45ca95bd81267f Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 19 Jul 2016 16:26:41 +0200
Subject: [PATCH 2/4] fix compile error after merge

---
 .../android/authentication/AuthenticatorActivity.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ae9cb1f45952..64f46b5b62c0 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1042,8 +1042,8 @@ private void onGetUserNameFinish(RemoteOperationResult result) {
         if (result.isSuccess()) {
             boolean success = false;
             String username;
-            if (result.getData().get(0) instanceof UserInfo) {
-                username = ((UserInfo) result.getData().get(0)).mDisplayName;
+            if (result.getData().get(0) instanceof GetRemoteUserInfoOperation.UserInfo) {
+                username = ((GetRemoteUserInfoOperation.UserInfo) result.getData().get(0)).mDisplayName;
             } else {
                 username = (String) result.getData().get(0);
             }

From 40788c7b5d59e762ab3d1c1c303d497f53856da2 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 21 Jul 2016 13:27:28 +0200
Subject: [PATCH 3/4] 1.2.0 RC1 preparations

---
 AndroidManifest.xml |  4 ++--
 CHANGELOG.md        | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b2ebb6b7439f..7bfa737d982e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10010099"
-    android:versionName="1.1.0">
+    android:versionCode="10020001"
+    android:versionName="1.2.0 RC1">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9cef351daab..b70233bdf52f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.2.0 (2016)
+
+- Multi select capabilities
+- confirmation dialog on account removal
+- offline available filter in main menu
+- sorting capability when choosing files to be uploaded
+- video thumbnails if activated on server
+- thumbnails during upload
+- fixed user agent for file firewalling
+- showing server side folder sizes
+- text in test preview can now be selected
+- search suggestions fixed for user/group search during sharing
+- minor bugfixes
+
 ## 1.1.0 (July 6, 2016)
 
 - New main menu to switch accounts easily

From e865658f624bc519d08a5e58e150447be46a68a6 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 21 Jul 2016 13:45:43 +0200
Subject: [PATCH 4/4] corrected paddings/margin to material design 16/8 dp

---
 res/layout/edit_box_dialog.xml     |  3 ++-
 res/layout/files_folder_picker.xml | 18 ++++++++++++++++--
 res/layout/upload_files_layout.xml |  3 ++-
 res/layout/uploader_layout.xml     |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/res/layout/edit_box_dialog.xml b/res/layout/edit_box_dialog.xml
index 18b4de82dab8..21d84e9beef3 100644
--- a/res/layout/edit_box_dialog.xml
+++ b/res/layout/edit_box_dialog.xml
@@ -21,7 +21,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="clip_horizontal"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="@dimen/standard_padding">
 
     <EditText
         android:id="@+id/user_input"
diff --git a/res/layout/files_folder_picker.xml b/res/layout/files_folder_picker.xml
index f37fa194bb68..7b1eb21589a4 100644
--- a/res/layout/files_folder_picker.xml
+++ b/res/layout/files_folder_picker.xml
@@ -29,12 +29,25 @@
 		android:layout_height="0dip"
         android:layout_weight="1"
 		android:id="@+id/fragment_container" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:src="@drawable/uploader_list_separator"/>
+
+	</LinearLayout>
 	
 	<LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:orientation="horizontal" >
+        android:orientation="horizontal"
+		android:padding="@dimen/standard_padding">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/folder_picker_btn_cancel"
@@ -42,7 +55,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_cancel"
+			android:layout_marginRight="@dimen/standard_half_margin"/>
 
         <android.support.v7.widget.AppCompatButton
 		    android:id="@+id/folder_picker_btn_choose"
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 69a65ff2b863..adc02ad93361 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -93,7 +93,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_cancel"
+            android:layout_marginRight="@dimen/standard_half_margin"/>
 
         <android.support.v7.widget.AppCompatButton
 		    android:id="@+id/upload_files_btn_upload"
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index e153d0a00d16..56e690cd6f83 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -67,7 +67,8 @@
 		    android:layout_height="wrap_content"
 		    android:layout_gravity="bottom"
 		    android:layout_weight="1"
-		    android:text="@string/common_cancel" />
+		    android:text="@string/common_cancel"
+			android:layout_marginRight="@dimen/standard_half_margin" />
 
 		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/uploader_choose_folder"