diff --git a/.travis.yml b/.travis.yml
index 2598e3e7..2573011b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,11 @@ sudo: false
 language: android
 android:
   components:
-  - build-tools-22.0.1
-  - android-19
+  - platform-tools
+  - tools
+  - build-tools-23.0.3
+  - android-23
+  - sys-img-armeabi-v7a-android-23
 branches:
   only:
   - master
@@ -32,8 +35,9 @@ env:
   - secure: gPCBnpGLA2sdSMtfhT+/InThmXNEU8XrrS54uuIP8iXBLvVe0yZrNl76GbMosV0ry3YtDngsmsbHwRjPPb0+3mTTdAqZ60HHzGaNPgEm6b5t0t4bpJ3LW9osLZsuf9jRsI2LD66zxblaMrK2+8hN/dUrj707ijsZHp3SPSQJ6g8=
   - secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8=
   - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=
+  - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro=
   matrix:
-  - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+  - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
 addons:
   coverity_scan:
     project:
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98463b39..f4427996 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="23" />
 
 </manifest>
 
diff --git a/LICENSE.md b/LICENSE.md
index 32f729d6..2fb472bd 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,7 +2,7 @@
 
 ownCloud Android Library is available under MIT license
 
-Copyright (C) 2014 ownCloud Inc.
+Copyright (C) 2016 ownCloud GmbH.
 Copyright (C) 2012 Bartek Przybylski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/build.gradle b/build.gradle
index 2fc53f41..a3e0ccca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 
@@ -18,8 +18,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {
@@ -45,9 +45,7 @@ android {
         release.setRoot('build-types/release')
     }
 
-    android {
-        lintOptions {
-            abortOnError false
-        }
+    lintOptions {
+        abortOnError false
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a..13372aef 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae7c4dd2..122a0dca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 19 11:03:11 CET 2015
+#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/project.properties b/project.properties
index 91d2b024..b2ef7dcc 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-23
 android.library=true
diff --git a/res/values/empty.xml b/res/values/empty.xml
index 7ae3b8bf..e999cb06 100644
--- a/res/values/empty.xml
+++ b/res/values/empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index 0dcaaa73..568299b0 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="23" />
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity 	android:name="MainActivity"
                   	android:label="@string/app_name"
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 5e4ae3c9..ab862f2b 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {
diff --git a/sample_client/gradle/wrapper/gradle-wrapper.jar b/sample_client/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a..13372aef 100644
Binary files a/sample_client/gradle/wrapper/gradle-wrapper.jar and b/sample_client/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties
index 1e61d1fd..122a0dca 100644
--- a/sample_client/gradle/wrapper/gradle-wrapper.properties
+++ b/sample_client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/sample_client/project.properties b/sample_client/project.properties
index f3419563..d8387c3b 100644
--- a/sample_client/project.properties
+++ b/sample_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-23
 android.library.reference.1=..
diff --git a/sample_client/res/layout/file_in_list.xml b/sample_client/res/layout/file_in_list.xml
index 44fecf97..2f988433 100644
--- a/sample_client/res/layout/file_in_list.xml
+++ b/sample_client/res/layout/file_in_list.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/layout/main.xml b/sample_client/res/layout/main.xml
index 19036f46..c011ce78 100644
--- a/sample_client/res/layout/main.xml
+++ b/sample_client/res/layout/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/values-v11/styles.xml b/sample_client/res/values-v11/styles.xml
index 9b676069..20688bd3 100644
--- a/sample_client/res/values-v11/styles.xml
+++ b/sample_client/res/values-v11/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/values/dimensions.xml b/sample_client/res/values/dimensions.xml
index db094b92..ec1d01cd 100644
--- a/sample_client/res/values/dimensions.xml
+++ b/sample_client/res/values/dimensions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/values/setup.xml b/sample_client/res/values/setup.xml
index 3e5a6939..b6662b75 100644
--- a/sample_client/res/values/setup.xml
+++ b/sample_client/res/values/setup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/values/strings.xml b/sample_client/res/values/strings.xml
index 6c2b0a7d..63a37cd9 100644
--- a/sample_client/res/values/strings.xml
+++ b/sample_client/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/res/values/styles.xml b/sample_client/res/values/styles.xml
index db285708..0d0a7732 100644
--- a/sample_client/res/values/styles.xml
+++ b/sample_client/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java b/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java
index bf643ce3..23806628 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 11ea54f2..09db872f 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
index aa34f2e3..89584466 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudAccount.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudAccount.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
@@ -46,6 +47,8 @@ public class OwnCloudAccount {
     private Uri mBaseUri; 
     
     private OwnCloudCredentials mCredentials;
+
+    private String mDisplayName;
     
     private String mSavedAccountName;
 
@@ -68,10 +71,40 @@ public class OwnCloudAccount {
 
         mSavedAccount = savedAccount;
         mSavedAccountName = savedAccount.name;
+        mCredentials = null;    // load of credentials is delayed
+
+        AccountManager ama = AccountManager.get(context.getApplicationContext());
+        String baseUrl = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_OC_BASE_URL);
+        if (baseUrl == null ) {
+            throw new AccountNotFoundException(mSavedAccount, "Account not found", null);
+        }
         mBaseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, mSavedAccount));
-        mCredentials = null;
+        mDisplayName = ama.getUserData(mSavedAccount, AccountUtils.Constants.KEY_DISPLAY_NAME);
     }
 
+
+    /**
+     * Constructor for non yet saved OC accounts.
+     *
+     * @param baseUri           URI to the OC server to get access to.
+     * @param credentials       Credentials to authenticate in the server. NULL is valid for anonymous credentials.
+     */
+    public OwnCloudAccount(Uri baseUri, OwnCloudCredentials credentials) {
+        if (baseUri == null) {
+            throw new IllegalArgumentException("Parameter 'baseUri' cannot be null");
+        }
+        mSavedAccount = null;
+        mSavedAccountName = null;
+        mBaseUri = baseUri;
+        mCredentials = credentials != null ?
+            credentials : OwnCloudCredentialsFactory.getAnonymousCredentials();
+        String username = mCredentials.getUsername();
+        if (username != null) {
+            mSavedAccountName = AccountUtils.buildAccountName(mBaseUri, username);
+        }
+    }
+
+
     /**
      * Method for deferred load of account attributes from AccountManager
      *
@@ -94,53 +127,6 @@ public class OwnCloudAccount {
 		}
 	}
 
-    /*
-    public OwnCloudAccount(Account savedAccount, Context context)
-    		throws AccountNotFoundException, AuthenticatorException, 
-    		IOException, OperationCanceledException {
-    	
-    	if (savedAccount == null) {
-    		throw new IllegalArgumentException("Parameter 'savedAccount' cannot be null");
-    	}
-    	if (context == null) {
-    		throw new IllegalArgumentException("Parameter 'context' cannot be null");
-    	}
-    	
-    	mSavedAccountName = savedAccount.name;
-        mBaseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, savedAccount));
-        mCredentials = AccountUtils.getCredentialsForAccount(context, savedAccount);
-        if (mCredentials == null) {
-        	mCredentials = OwnCloudCredentialsFactory.getAnonymousCredentials();
-        }
-    }
-    */
-
-    /**
-     * Constructor for non yet saved OC accounts.
-     *
-     * @param baseUri           URI to the OC server to get access to.
-     * @param credentials       Credentials to authenticate in the server. NULL is valid for anonymous credentials.
-     */
-    public OwnCloudAccount(Uri baseUri, OwnCloudCredentials credentials) {
-        if (baseUri == null) {
-            throw new IllegalArgumentException("Parameter 'baseUri' cannot be null");
-        }
-        mSavedAccount = null;
-        mSavedAccountName = null;
-        mBaseUri = baseUri;
-        mCredentials = credentials != null ? 
-        		credentials : OwnCloudCredentialsFactory.getAnonymousCredentials();
-        String username = mCredentials.getUsername();
-        if (username != null) {
-        	mSavedAccountName = AccountUtils.buildAccountName(mBaseUri, username);
-        }
-    }
-    
-
-	public boolean isAnonymous() {
-        return (mCredentials == null);
-    }   // TODO no more
-    
     public Uri getBaseUri() {
         return mBaseUri;
     }
@@ -153,5 +139,16 @@ public class OwnCloudAccount {
     	return mSavedAccountName;
     }
 
-    
+    public String getDisplayName() {
+        if (mDisplayName != null && mDisplayName.length() > 0) {
+            return mDisplayName;
+        } else if (mCredentials != null) {
+            return mCredentials.getUsername();
+        } else if (mSavedAccount != null) {
+            return AccountUtils.getUsernameForAccount(mSavedAccount);
+        } else {
+            return null;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
index 02b515d8..a64aa525 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -47,6 +47,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        
         
         client.getParams().setAuthenticationPreemptive(true);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getState().setCredentials(
         		AuthScope.ANY, 
         		new UsernamePasswordCredentials(mUsername, mPassword)
diff --git a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
index c3461e02..f0bb13a7 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -49,6 +49,7 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 	    client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        
 	    
 	    client.getParams().setAuthenticationPreemptive(true);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
 	    client.getState().setCredentials(
 	    		AuthScope.ANY, 
 	    		new BearerCredentials(mAccessToken)
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 037d8fb4..cef5d173 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,14 +36,13 @@ import org.apache.commons.httpclient.HttpConnectionManager;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.HttpVersion;
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.methods.HeadMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.params.HttpParams;
-import org.apache.http.HttpStatus;
-import org.apache.http.params.CoreProtocolPNames;
 
 import android.net.Uri;
 
@@ -60,6 +59,7 @@ public class OwnCloudClient extends HttpClient {
     public static final int MAX_REDIRECTIONS_COUNT = 3;
     private static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     private static final boolean PARAM_SINGLE_COOKIE_HEADER_VALUE = true;
+    private static final String PARAM_PROTOCOL_VERSION = "http.protocol.version";
     
     private static byte[] sExhaustBuffer = new byte[1024];
     
@@ -89,7 +89,7 @@ public class OwnCloudClient extends HttpClient {
         String userAgent = OwnCloudClientManagerFactory.getUserAgent();
         getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
         getParams().setParameter(
-        		CoreProtocolPNames.PROTOCOL_VERSION, 
+        		PARAM_PROTOCOL_VERSION,
         		HttpVersion.HTTP_1_1);
         
         getParams().setCookiePolicy(
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 740aed54..27285353 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,7 @@ public class OwnCloudClientFactory {
     /** Default timeout for establishing a connection */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
-    
+
     /**
      * Creates a OwnCloudClient setup for an ownCloud account
      * 
@@ -83,7 +83,7 @@ public class OwnCloudClientFactory {
                 am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
         OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);
 
-        String username = account.name.substring(0, account.name.lastIndexOf('@'));
+        String username = AccountUtils.getUsernameForAccount(account);
         if (isOauth2) {
             String accessToken = am.blockingGetAuthToken(
             		account, 
@@ -137,7 +137,7 @@ public class OwnCloudClientFactory {
                 am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
         OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);
 
-        String username = account.name.substring(0, account.name.lastIndexOf('@'));
+        String username = AccountUtils.getUsernameForAccount(account);
         if (isOauth2) {    // TODO avoid a call to getUserData here
             AccountManagerFuture<Bundle> future =  am.getAuthToken(
             		account,  
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
index e16723f1..856a11ba 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
index bd54a481..6396d09b 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
index 96a727e6..0a148682 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
index e854fd67..c9ea3421 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,8 @@ package com.owncloud.android.lib.common;
 
 public class OwnCloudCredentialsFactory {
 
+	public static final String CREDENTIAL_CHARSET = "UTF-8";
+
 	private static OwnCloudAnonymousCredentials sAnonymousCredentials;
 
 	public static OwnCloudCredentials newBasicCredentials(String username, String password) {
diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
index e2d67ee8..5a5b28b7 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -41,6 +41,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 	@Override
 	public void applyTo(OwnCloudClient client) {
         client.getParams().setAuthenticationPreemptive(false);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
         client.setFollowRedirects(false);
         
diff --git a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java b/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
index 35ddbda5..362d2a6e 100644
--- a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
+++ b/src/com/owncloud/android/lib/common/SimpleFactoryManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 22fe0c01..f2c1d756 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java
index 1dfd8b21..43dc79a1 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index 62eeed7b..33f02137 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -145,7 +145,23 @@ public class AccountUtils {
         
         return baseurl;
     }
-    
+
+
+    /**
+     * Get the username corresponding to an OC account.
+     *
+     * @param account   An OC account
+     * @return          Username for the given account, extracted from the account.name
+     */
+    public static String getUsernameForAccount(Account account) {
+        String username = null;
+        try {
+            username = account.name.substring(0, account.name.lastIndexOf('@'));
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Couldn't get a username for the given account", e);
+        }
+        return username;
+    }
 
     /**
      * 
@@ -168,7 +184,7 @@ public class AccountUtils {
         		account, 
         		AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
 
-        String username = account.name.substring(0, account.name.lastIndexOf('@'));
+        String username = AccountUtils.getUsernameForAccount(account);
 
         if (isOauth2) {    
             String accessToken = am.blockingGetAuthToken(
@@ -363,6 +379,12 @@ public class AccountUtils {
          * OC account version
          */
         public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version";
+
+		/**
+		 * User's display name
+		 */
+		public static final String KEY_DISPLAY_NAME = "oc_display_name";
+
     }
 
 }
diff --git a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
index 773f7beb..8717590d 100644
--- a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
+++ b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
index e9a9867b..8495a370 100644
--- a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
+++ b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java b/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java
index c3132475..75a5cc75 100644
--- a/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java
+++ b/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/BearerCredentials.java b/src/com/owncloud/android/lib/common/network/BearerCredentials.java
index d253046f..8de3ec76 100644
--- a/src/com/owncloud/android/lib/common/network/BearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/network/BearerCredentials.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java b/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java
index 1b7f3987..6c50855c 100644
--- a/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java
+++ b/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
index 02c2fd59..8a88723b 100644
--- a/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.network;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -58,7 +59,9 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
     Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private ByteBuffer mBuffer = ByteBuffer.allocate(4096);
 
-    public ChunkFromFileChannelRequestEntity(final FileChannel channel, final String contentType, long chunkSize, final File file) {
+    public ChunkFromFileChannelRequestEntity(
+        final FileChannel channel, final String contentType, long chunkSize, final File file
+    ) {
         super();
         if (channel == null) {
             throw new IllegalArgumentException("File may not be null");
@@ -119,15 +122,20 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
     public void writeRequest(final OutputStream out) throws IOException {
         int readCount = 0;
         Iterator<OnDatatransferProgressListener> it = null;
-        
-       try {
+
+        try {
             mChannel.position(mOffset);
             long size = mFile.length();
             if (size == 0) size = -1;
             long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
             while (mChannel.position() < maxCount) {
                 readCount = mChannel.read(mBuffer);
-                out.write(mBuffer.array(), 0, readCount);
+                try {
+                    out.write(mBuffer.array(), 0, readCount);
+                } catch (IOException io) {
+                    // work-around try catch to filter exception in writing
+                    throw new FileRequestEntity.WriteException(io);
+                }
                 mBuffer.clear();
                 if (mTransferred < maxCount) {  // condition to avoid accumulate progress for repeated chunks
                     mTransferred += readCount;
@@ -139,12 +147,21 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
                     }
                 }
             }
-            
+
         } catch (IOException io) {
-            Log_OC.e(TAG, io.getMessage());
-            throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);   
-            
+            // any read problem will be handled as if the file is not there
+            if (io instanceof FileNotFoundException) {
+                throw io;
+            } else {
+                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
+                fnf.initCause(io);
+                throw fnf;
+            }
+
+        } catch (FileRequestEntity.WriteException we) {
+            throw we.getWrapped();
         }
+            
     }
 
 }
\ No newline at end of file
diff --git a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
index d2e1db9f..a7d6fd0e 100644
--- a/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
+++ b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,6 +26,7 @@
 package com.owncloud.android.lib.common.network;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
@@ -100,12 +101,9 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
     
     @Override
     public void writeRequest(final OutputStream out) throws IOException {
-        //byte[] tmp = new byte[4096];
         ByteBuffer tmp = ByteBuffer.allocate(4096);
         int readResult = 0;
         
-        // TODO(bprzybylski): each mem allocation can throw OutOfMemoryError we need to handle it
-        //                    globally in some fashionable manner
         RandomAccessFile raf = new RandomAccessFile(mFile, "r");
         FileChannel channel = raf.getChannel();
         Iterator<OnDatatransferProgressListener> it = null;
@@ -114,7 +112,12 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
         if (size == 0) size = -1;
         try {
             while ((readResult = channel.read(tmp)) >= 0) {
-                out.write(tmp.array(), 0, readResult);
+                try {
+                    out.write(tmp.array(), 0, readResult);
+                } catch (IOException io) {
+                    // work-around try catch to filter exception in writing
+                    throw new WriteException(io);
+                }
                 tmp.clear();
                 transferred += readResult;
                 synchronized (mDataTransferListeners) {
@@ -124,14 +127,39 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
                     }
                 }
             }
-            
+
         } catch (IOException io) {
-            Log_OC.e("FileRequestException", io.getMessage());
-            throw new RuntimeException("Ugly solution to workaround the default policy of retries when the server falls while uploading ; temporal fix; really", io);   
-            
+            // any read problem will be handled as if the file is not there
+            if (io instanceof FileNotFoundException) {
+                throw io;
+            } else {
+                FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
+                fnf.initCause(io);
+                throw fnf;
+            }
+
+        } catch (WriteException we) {
+            throw we.getWrapped();
+
         } finally {
-            channel.close();
-            raf.close();
+            try {
+                channel.close();
+                raf.close();
+            } catch (IOException io) {
+                // ignore failures closing source file
+            }
+        }
+    }
+
+    protected static class WriteException extends Exception {
+        IOException mWrapped;
+
+        WriteException(IOException wrapped) {
+            mWrapped = wrapped;
+        }
+
+        public IOException getWrapped() {
+            return mWrapped;
         }
     }
 
diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
index dc5f151a..a6e422b5 100644
--- a/src/com/owncloud/android/lib/common/network/NetworkUtils.java
+++ b/src/com/owncloud/android/lib/common/network/NetworkUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
index 1998352b..a36694cf 100644
--- a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
+++ b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
index df9ad201..2868ac8c 100644
--- a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
+++ b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/RedirectionPath.java b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
index f4962763..eb8a8919 100644
--- a/src/com/owncloud/android/lib/common/network/RedirectionPath.java
+++ b/src/com/owncloud/android/lib/common/network/RedirectionPath.java
@@ -2,7 +2,7 @@
  *
  *   @author David A. Velasco
  *
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@
 
 package com.owncloud.android.lib.common.network;
 
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
 
 import java.util.Arrays;
 
@@ -53,7 +53,6 @@ public class RedirectionPath {
     private String[] mLocations = null;
 
     private int mLastLocation = -1;
-    private int maxRedirections;
 
     /**
      * Public constructor.
diff --git a/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java b/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java
index 58d3b874..7e6caadc 100644
--- a/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java
+++ b/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
index 64d21e7e..59f4a4bf 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index c5d2e829..3e9c986d 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012 Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java b/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java
index 63d28319..4629a6a1 100644
--- a/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java
+++ b/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java
@@ -1,6 +1,6 @@
 
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java b/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java
index 3031adc5..495b8749 100644
--- a/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java
+++ b/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java b/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java
index 91f7248c..c637618b 100644
--- a/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java
+++ b/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 777d268f..bb8ea421 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -306,7 +306,8 @@ public abstract class RemoteOperation implements Runnable {
         	 * 						to trigger authentication update */
             if (mCallerActivity != null && mAccount != null && mContext != null &&
                     !result.isSuccess() &&
-                    (result.getCode() == ResultCode.UNAUTHORIZED || result.isIdPRedirection())) {
+                    ResultCode.UNAUTHORIZED.equals(result.getCode())
+                ) {
                 /// possible fail due to lack of authorization
                 // in an operation performed in foreground
                 OwnCloudCredentials cred = mClient.getCredentials();
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index 28709905..cce359b6 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.common.operations;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
@@ -108,7 +109,10 @@ public class RemoteOperationResult implements Serializable {
 		PARTIAL_MOVE_DONE,
         PARTIAL_COPY_DONE,
         SHARE_WRONG_PARAMETER,
-        WRONG_SERVER_RESPONSE, INVALID_CHARACTER_DETECT_IN_SERVER
+        WRONG_SERVER_RESPONSE,
+        INVALID_CHARACTER_DETECT_IN_SERVER,
+        DELAYED_FOR_WIFI,
+        LOCAL_FILE_NOT_FOUND
     }
 
     private boolean mSuccess = false;
@@ -180,6 +184,9 @@ public class RemoteOperationResult implements Serializable {
                 }
             }
         }
+        if (isIdPRedirection()) {
+            mCode = ResultCode.UNAUTHORIZED;    // overrides default ResultCode.UNKNOWN
+        }
     }
 
     public RemoteOperationResult(boolean success, String bodyResponse, int httpCode) {
@@ -254,6 +261,9 @@ public class RemoteOperationResult implements Serializable {
                 mCode = ResultCode.SSL_ERROR;
             }
 
+        } else if (e instanceof FileNotFoundException) {
+            mCode = ResultCode.LOCAL_FILE_NOT_FOUND;
+
         } else {
             mCode = ResultCode.UNKNOWN_ERROR;
         }
diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 2bacc883..6acf7c92 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
index f9f9d346..c95034b5 100644
--- a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2014 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
index 79a7de2f..5ee762e9 100644
--- a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index b9c404c3..530c10d8 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -36,8 +36,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index e6a4b73c..6cb2da33 100644
--- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java
index e04e3bbf..4edda969 100644
--- a/src/com/owncloud/android/lib/resources/files/FileUtils.java
+++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index 919b7926..5ab7adc3 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
index 12c2017f..dc44fcae 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ package com.owncloud.android.lib.resources.files;
 
 import java.util.ArrayList;
 
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
index 1e93aa22..ef2a06fa 100644
--- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import java.util.ArrayList;
 
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 6be850b2..0c65affb 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
index 5ae333fc..6aafa1c7 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 0ceaf227..ecbf815d 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 422b17cf..0f1b7cf7 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -32,9 +32,11 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.params.HttpMethodParams;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.FileRequestEntity;
@@ -87,8 +89,16 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 	@Override
 	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
+		DefaultHttpMethodRetryHandler oldRetryHandler =
+			(DefaultHttpMethodRetryHandler) client.getParams().getParameter(HttpMethodParams.RETRY_HANDLER);
 
 		try {
+			// prevent that uploads are retried automatically by network library
+			client.getParams().setParameter(
+				HttpMethodParams.RETRY_HANDLER,
+				new DefaultHttpMethodRetryHandler(0, false)
+			);
+
 			mPutMethod = new PutMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath));
 
 			if (mCancellationRequested.get()) {
@@ -114,6 +124,12 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 			} else {
 				result = new RemoteOperationResult(e);
 			}
+		} finally {
+			// reset previous retry handler
+			client.getParams().setParameter(
+				HttpMethodParams.RETRY_HANDLER,
+				oldRetryHandler
+			);
 		}
 		return result;
 	}
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index 39fab768..7990a05e 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@
 
 package com.owncloud.android.lib.resources.shares;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.http.HttpStatus;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
index 10d4cb1e..165a28fa 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 
 /** 
  * Get the data about a Share resource, known its remote ID.
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
index 67ad558d..b9d279e7 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java
@@ -2,7 +2,7 @@
  *
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -78,7 +78,7 @@ public class GetRemoteShareesOperation extends RemoteOperation{
 
     // Arguments - constant values
     private static final String VALUE_FORMAT = "json";
-    private static final String VALUE_ITEM_TYPE = "search";         //  to get the server search for users / groups
+    private static final String VALUE_ITEM_TYPE = "file";         //  to get the server search for users / groups
 
 
     // JSON Node names
@@ -87,15 +87,12 @@ public class GetRemoteShareesOperation extends RemoteOperation{
     private static final String NODE_EXACT = "exact";
     private static final String NODE_USERS = "users";
     private static final String NODE_GROUPS = "groups";
+    private static final String NODE_REMOTES = "remotes";
     public static final String NODE_VALUE = "value";
     public static final String PROPERTY_LABEL = "label";
     public static final String PROPERTY_SHARE_TYPE = "shareType";
     public static final String PROPERTY_SHARE_WITH = "shareWith";
 
-    // Result types
-    public static final Byte USER_TYPE = 0;
-    public static final Byte GROUP_TYPE = 1;
-
     private String mSearchString;
     private int mPage;
     private int mPerPage;
@@ -146,17 +143,21 @@ public class GetRemoteShareesOperation extends RemoteOperation{
                 JSONObject respExact = respData.getJSONObject(NODE_EXACT);
                 JSONArray respExactUsers = respExact.getJSONArray(NODE_USERS);
                 JSONArray respExactGroups = respExact.getJSONArray(NODE_GROUPS);
+                JSONArray respExactRemotes = respExact.getJSONArray(NODE_REMOTES);
                 JSONArray respPartialUsers = respData.getJSONArray(NODE_USERS);
                 JSONArray respPartialGroups = respData.getJSONArray(NODE_GROUPS);
+                JSONArray respPartialRemotes = respData.getJSONArray(NODE_REMOTES);
                 JSONArray[] jsonResults = {
                         respExactUsers,
                         respExactGroups,
+                        respExactRemotes,
                         respPartialUsers,
-                        respPartialGroups
+                        respPartialGroups,
+                        respPartialRemotes
                 };
 
                 ArrayList<Object> data = new ArrayList<Object>(); // For result data
-                for (int i=0; i<4; i++) {
+                for (int i=0; i<6; i++) {
                     for(int j=0; j< jsonResults[i].length(); j++){
                         JSONObject jsonResult = jsonResults[i].getJSONObject(j);
                         data.add(jsonResult);
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
index 6076b40f..f2bbe161 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,9 +26,9 @@
 
 package com.owncloud.android.lib.resources.shares;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
index 5681a60c..05a45b08 100644
--- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@
 
 package com.owncloud.android.lib.resources.shares;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/shares/OCShare.java b/src/com/owncloud/android/lib/resources/shares/OCShare.java
index 0fe3aeb2..6bbf6458 100644
--- a/src/com/owncloud/android/lib/resources/shares/OCShare.java
+++ b/src/com/owncloud/android/lib/resources/shares/OCShare.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -40,11 +40,13 @@ import com.owncloud.android.lib.resources.files.FileUtils;
  *
  */
 public class OCShare implements Parcelable, Serializable {
-	
-	/** Generated - should be refreshed every time the class changes!! */
-	private static final long serialVersionUID = 4124975224281327921L;
 
-	private static final String TAG = OCShare.class.getSimpleName();
+    /**
+     * Generated - should be refreshed every time the class changes!!
+     */
+    private static final long serialVersionUID = 4124975224281327921L;
+
+    private static final String TAG = OCShare.class.getSimpleName();
 
     public static final int DEFAULT_PERMISSION = -1;
     public static final int READ_PERMISSION_FLAG = 1;
@@ -53,14 +55,33 @@ public class OCShare implements Parcelable, Serializable {
     public static final int DELETE_PERMISSION_FLAG = 8;
     public static final int SHARE_PERMISSION_FLAG = 16;
     public static final int MAXIMUM_PERMISSIONS_FOR_FILE =
-            READ_PERMISSION_FLAG +
-            UPDATE_PERMISSION_FLAG +
-            SHARE_PERMISSION_FLAG
+        READ_PERMISSION_FLAG +
+        UPDATE_PERMISSION_FLAG +
+        SHARE_PERMISSION_FLAG
     ;
     public static final int MAXIMUM_PERMISSIONS_FOR_FOLDER =
-            MAXIMUM_PERMISSIONS_FOR_FILE +
-            CREATE_PERMISSION_FLAG +
-            DELETE_PERMISSION_FLAG
+        MAXIMUM_PERMISSIONS_FOR_FILE +
+        CREATE_PERMISSION_FLAG +
+        DELETE_PERMISSION_FLAG
+    ;
+    public static final int FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9 =
+        READ_PERMISSION_FLAG +
+        UPDATE_PERMISSION_FLAG
+    ;
+    public static final int FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9 =
+        READ_PERMISSION_FLAG +
+        UPDATE_PERMISSION_FLAG +
+        SHARE_PERMISSION_FLAG
+    ;
+    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 =
+        READ_PERMISSION_FLAG +
+        UPDATE_PERMISSION_FLAG +
+        CREATE_PERMISSION_FLAG +
+        DELETE_PERMISSION_FLAG
+    ;
+    public static final int FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 =
+        FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 +
+        SHARE_PERMISSION_FLAG
     ;
 
     private long mId;
diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
index 68a94db4..65e68f0c 100644
--- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java b/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java
index 85fcf7ff..9a4763db 100644
--- a/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java
+++ b/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
index 8105f146..0d1bbbb6 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareType.java b/src/com/owncloud/android/lib/resources/shares/ShareType.java
index 95efbd79..a2d3c101 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareType.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareType.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,8 @@ public enum ShareType {
     GROUP (1),
     PUBLIC_LINK (3),
     EMAIL (4),
-    CONTACT (5);
+    CONTACT (5),
+    FEDERATED (6);
     
     private int value;
     
@@ -72,6 +73,8 @@ public enum ShareType {
             return EMAIL;
         case 5:
             return CONTACT;
+        case 6:
+            return FEDERATED;
         }
         return null;
     }
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java
index ae4bc8b8..056565d5 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
index f8b8cb00..a17bda02 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -353,7 +353,6 @@ public class ShareXMLParser {
 				share.setSharedWithDisplayName(readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME));
 
 			} else if (name.equalsIgnoreCase(NODE_URL)) {
-				share.setShareType(ShareType.PUBLIC_LINK);
 				String value = readNode(parser, NODE_URL);
 				share.setShareLink(value);
 
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 00178ed8..34d4c3cb 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -25,28 +25,28 @@
 
 package com.owncloud.android.lib.resources.shares;
 
-        import android.net.Uri;
-        import android.util.Pair;
+import android.net.Uri;
+import android.util.Pair;
 
-        import com.owncloud.android.lib.common.OwnCloudClient;
-        import com.owncloud.android.lib.common.operations.RemoteOperation;
-        import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-        import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
 
-        import org.apache.commons.httpclient.methods.PutMethod;
-        import org.apache.commons.httpclient.methods.StringRequestEntity;
-        import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
 
-        import java.text.DateFormat;
-        import java.text.SimpleDateFormat;
-        import java.util.ArrayList;
-        import java.util.Calendar;
-        import java.util.List;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
 
 /**
  * Updates parameters of an existing Share resource, known its remote ID.
- *
+ * <p/>
  * Allow updating several parameters, triggering a request to the server per parameter.
  */
 
@@ -57,42 +57,57 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
     private static final String PARAM_PASSWORD = "password";
     private static final String PARAM_EXPIRATION_DATE = "expireDate";
     private static final String PARAM_PERMISSIONS = "permissions";
+    private static final String PARAM_PUBLIC_UPLOAD = "publicUpload";
     private static final String FORMAT_EXPIRATION_DATE = "yyyy-MM-dd";
-    private static final String ENTITY_CONTENT_TYPE  = "application/x-www-form-urlencoded";
+    private static final String ENTITY_CONTENT_TYPE = "application/x-www-form-urlencoded";
     private static final String ENTITY_CHARSET = "UTF-8";
 
 
-    /** Identifier of the share to update */
+    /**
+     * Identifier of the share to update
+     */
     private long mRemoteId;
 
-    /** Password to set for the public link */
+    /**
+     * Password to set for the public link
+     */
     private String mPassword;
 
-    /** Expiration date to set for the public link */
+    /**
+     * Expiration date to set for the public link
+     */
     private long mExpirationDateInMillis;
 
-    /** Access permissions for the file bound to the share */
+    /**
+     * Access permissions for the file bound to the share
+     */
     private int mPermissions;
 
+    /**
+     * Upload permissions for the public link (only folders)
+     */
+    private Boolean mPublicUpload;
+
 
     /**
      * Constructor. No update is initialized by default, need to be applied with setters below.
      *
-     * @param remoteId  Identifier of the share to update.
+     * @param remoteId Identifier of the share to update.
      */
     public UpdateRemoteShareOperation(long remoteId) {
         mRemoteId = remoteId;
         mPassword = null;               // no update
         mExpirationDateInMillis = 0;    // no update
+        mPublicUpload = null;
     }
 
 
     /**
      * Set password to update in Share resource.
      *
-     * @param password      Password to set to the target share.
-     *                      Empty string clears the current password.
-     *                      Null results in no update applied to the password.
+     * @param password Password to set to the target share.
+     *                 Empty string clears the current password.
+     *                 Null results in no update applied to the password.
      */
     public void setPassword(String password) {
         mPassword = password;
@@ -102,10 +117,10 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
     /**
      * Set expiration date to update in Share resource.
      *
-     * @param expirationDateInMillis    Expiration date to set to the target share.
-     *                                  A negative value clears the current expiration date.
-     *                                  Zero value (start-of-epoch) results in no update done on
-     *                                  the expiration date.
+     * @param expirationDateInMillis Expiration date to set to the target share.
+     *                               A negative value clears the current expiration date.
+     *                               Zero value (start-of-epoch) results in no update done on
+     *                               the expiration date.
      */
     public void setExpirationDate(long expirationDateInMillis) {
         mExpirationDateInMillis = expirationDateInMillis;
@@ -115,13 +130,23 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
     /**
      * Set permissions to update in Share resource.
      *
-     * @param permissions       Permissions date to set to the target share.
-     *                          Values <= 0 result in no update applied to the permissions.
+     * @param permissions Permissions to set to the target share.
+     *                    Values <= 0 result in no update applied to the permissions.
      */
     public void setPermissions(int permissions) {
         mPermissions = permissions;
     }
 
+    /**
+     * Enable upload permissions to update in Share resource.
+     *
+     * @param publicUpload  Upload permission to set to the target share.
+     *                      Null results in no update applied to the upload permission.
+     */
+    public void setPublicUpload(Boolean publicUpload) {
+        mPublicUpload = publicUpload;
+    }
+
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
@@ -150,17 +175,15 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
             parametersToUpdate.add(new Pair(PARAM_PERMISSIONS, Integer.toString(mPermissions)));
         }
 
-        /* TODO complete rest of parameters
         if (mPublicUpload != null) {
-            parametersToUpdate.add(new Pair("publicUpload", mPublicUpload.toString());
+            parametersToUpdate.add(new Pair(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)));
         }
-        */
 
         /// perform required PUT requests
         PutMethod put = null;
         String uriString = null;
 
-        try{
+        try {
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
@@ -174,9 +197,9 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 put = new PutMethod(uriString);
                 put.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
                 put.setRequestEntity(new StringRequestEntity(
-                    parameter.first + "=" + parameter.second,
-                    ENTITY_CONTENT_TYPE,
-                    ENTITY_CHARSET
+                        parameter.first + "=" + parameter.second,
+                        ENTITY_CONTENT_TYPE,
+                        ENTITY_CHARSET
                 ));
 
                 status = client.executeMethod(put);
@@ -195,6 +218,9 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
                 } else {
                     result = new RemoteOperationResult(false, status, put.getResponseHeaders());
                 }
+                if (!result.isSuccess()) {
+                    break;
+                }
             }
 
         } catch (Exception e) {
diff --git a/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java b/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java
index 55ad934e..a2eeae84 100644
--- a/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java
+++ b/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   @author masensio
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 0b64dbf8..d963e1e8 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -32,8 +32,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
index 2b4def0a..8d5aa7a0 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/status/OCCapability.java b/src/com/owncloud/android/lib/resources/status/OCCapability.java
index e69c1ce8..111f59ad 100644
--- a/src/com/owncloud/android/lib/resources/status/OCCapability.java
+++ b/src/com/owncloud/android/lib/resources/status/OCCapability.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
index 9607cdc9..a37f51a0 100644
--- a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
+++ b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   Copyright (C) 2012  Bartek Przybylski
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,7 +36,9 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
             0x04000000);
     public static final OwnCloudVersion owncloud_v4_5 = new OwnCloudVersion(
             0x04050000);
-    
+
+    public static final int MINIMUN_VERSION_FOR_CHUNKED_UPLOADS = 0x04050000; // 4.5
+
     public static final int MINIMUM_VERSION_FOR_SHARING_API = 0x05001B00; // 5.0.27
 
     public static final int MINIMUM_VERSION_WITH_FORBIDDEN_CHARS = 0x08010000; // 8.1
@@ -48,9 +50,11 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     public static final int VERSION_8 = 0x08000000; // 8.0
 
     public static final int MINIMUM_VERSION_CAPABILITIES_API = 0x08010000; // 8.1
-    
+
+    private static final int MINIMUM_VERSION_WITH_NOT_RESHAREABLE_FEDERATED = 0x09010000;   // 9.1
+
     private static final int MAX_DOTS = 3;
-    
+
     // format is in version
     // 0xAABBCCDD
     // for version AA.BB.CC.DD
@@ -125,8 +129,12 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
 
     	return versionValue; 
     }
-    
-    
+
+
+    public boolean isChunkedUploadSupported() {
+        return (mVersion >= MINIMUN_VERSION_FOR_CHUNKED_UPLOADS);
+    }
+
     public boolean isSharedSupported() {
     	return (mVersion >= MINIMUM_VERSION_FOR_SHARING_API);
     }
@@ -150,6 +158,8 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     public boolean isVersionWithCapabilitiesAPI(){
         return (mVersion>= MINIMUM_VERSION_CAPABILITIES_API);
     }
-    
-    
+
+    public boolean isNotReshareableFederatedSupported() {
+        return (mVersion >= MINIMUM_VERSION_WITH_NOT_RESHAREABLE_FEDERATED);
+    }
 }
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
new file mode 100644
index 00000000..ed06e613
--- /dev/null
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
@@ -0,0 +1,129 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2016 ownCloud GmbH.
+ *   
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *   
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *   
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.resources.users;
+
+import java.util.ArrayList;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.json.JSONObject;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+
+/**
+ * Gets information (id, display name, and e-mail address) about the user logged in.
+ *
+ * @author masensio
+ * @author David A. Velasco
+ */
+
+public class GetRemoteUserInfoOperation extends RemoteOperation {
+
+    private static final String TAG = GetRemoteUserInfoOperation.class.getSimpleName();
+
+    // OCS Route
+    private static final String OCS_ROUTE = "/index.php/ocs/cloud/user?format=json";
+
+    // JSON Node names
+    private static final String NODE_OCS = "ocs";
+    private static final String NODE_DATA = "data";
+    private static final String NODE_ID = "id";
+    private static final String NODE_DISPLAY_NAME = "display-name";
+    private static final String NODE_EMAIL = "email";
+
+    public GetRemoteUserInfoOperation() {
+    }
+
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result = null;
+        int status = -1;
+        GetMethod get = null;
+
+        //Get the user
+        try {
+            get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
+            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            status = client.executeMethod(get);
+            if (isSuccess(status)) {
+                String response = get.getResponseBodyAsString();
+                Log_OC.d(TAG, "Successful response: " + response);
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
+                JSONObject respData = respOCS.getJSONObject(NODE_DATA);
+
+                UserInfo userInfo = new UserInfo();
+                userInfo.mId = respData.getString(NODE_ID);
+                userInfo.mDisplayName = respData.getString(NODE_DISPLAY_NAME);
+                userInfo.mEmail = respData.getString(NODE_EMAIL);
+
+                // Result
+                result = new RemoteOperationResult(true, status, get.getResponseHeaders());
+                // Username in result.data
+                ArrayList<Object> data = new ArrayList<Object>();
+                data.add(userInfo);
+                result.setData(data);
+
+            } else {
+                result = new RemoteOperationResult(false, status, get.getResponseHeaders());
+                String response = get.getResponseBodyAsString();
+                Log_OC.e(TAG, "Failed response while getting user information ");
+                if (response != null) {
+                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
+                } else {
+                    Log_OC.e(TAG, "*** status code: " + status);
+                }
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Exception while getting OC user information", e);
+
+        } finally {
+            if (get != null) {
+                get.releaseConnection();
+            }
+        }
+
+        return result;
+    }
+
+    private boolean isSuccess(int status) {
+        return (status == HttpStatus.SC_OK);
+    }
+
+
+    public static class UserInfo {
+        public String mId = "";
+        public String mDisplayName = "";
+        public String mEmail = "";
+    }
+
+}
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
deleted file mode 100644
index d6b85a7a..00000000
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
- *   
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *   
- *   The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
- *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *   THE SOFTWARE.
- *
- */
-
-package com.owncloud.android.lib.resources.users;
-
-import java.util.ArrayList;
-
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
-import org.json.JSONObject;
-
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-
-/**
- * @author masensio
- *
- * Get the UserName for a SAML connection, from a JSON with the format:
- * 		id
- * 		display-name
- * 		email
- */
-
-public class GetRemoteUserNameOperation extends RemoteOperation {
-	
-	private static final String TAG = GetRemoteUserNameOperation.class.getSimpleName();
-
-	// OCS Route
-	private static final String OCS_ROUTE ="/index.php/ocs/cloud/user?format=json";
-
-	// JSON Node names
-	private static final String NODE_OCS = "ocs";
-	private static final String NODE_DATA = "data";
-	private static final String NODE_ID = "id";
-	private static final String NODE_DISPLAY_NAME= "display-name";
-	private static final String NODE_EMAIL= "email";
-
-	private String mUserName;
-
-	public String getUserName() {
-		return mUserName;
-	}
-
-	
-	public GetRemoteUserNameOperation() {
-	}
-
-	@Override
-	protected RemoteOperationResult run(OwnCloudClient client) {
-		RemoteOperationResult result = null;
-		int status = -1;
-		GetMethod get = null;
-
-		//Get the user
-		try {
-			get = new GetMethod(client.getBaseUri() + OCS_ROUTE);
-			get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-			status = client.executeMethod(get);
-			if(isSuccess(status)) {
-				 String response = get.getResponseBodyAsString();
-				 Log_OC.d(TAG, "Successful response: " + response);
-
-				 // Parse the response
-				 JSONObject respJSON = new JSONObject(response);
-				 JSONObject respOCS = respJSON.getJSONObject(NODE_OCS);
-				 JSONObject respData = respOCS.getJSONObject(NODE_DATA);
-				 String id = respData.getString(NODE_ID);
-				 String displayName = respData.getString(NODE_DISPLAY_NAME);
-				 String email = respData.getString(NODE_EMAIL);
-				 
-				 // Result
-				 result = new RemoteOperationResult(true, status, get.getResponseHeaders());
-				 // Username in result.data
-                 ArrayList<Object> data = new ArrayList<Object>();
-                 data.add(displayName);
-                 result.setData(data);
-				 mUserName =  displayName;
-				 
-				 Log_OC.d(TAG, "*** Parsed user information: " + id + " - " + displayName + " - " + email);
-				 
-			} else {
-				result = new RemoteOperationResult(false, status, get.getResponseHeaders());
-				String response = get.getResponseBodyAsString();
-				Log_OC.e(TAG, "Failed response while getting user information ");
-				if (response != null) {
-					Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-				} else {
-					Log_OC.e(TAG, "*** status code: " + status);
-				}
-			}
-		} catch (Exception e) {
-			result = new RemoteOperationResult(e);
-			Log_OC.e(TAG, "Exception while getting OC user information", e);
-			
-		} finally {
-			get.releaseConnection();
-		}
-        
-		return result;
-	}
-
-    private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
-    }
-    
-}
diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml
index 66fd795d..018d7259 100644
--- a/test_client/AndroidManifest.xml
+++ b/test_client/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -39,7 +39,7 @@
 
 	<uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="23" />
 
     <application
         android:allowBackup="true"
diff --git a/test_client/build.gradle b/test_client/build.gradle
index e815f1f3..38beb6ae 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -1,18 +1,27 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.0.0'
+    }
+}
+
 apply plugin: 'com.android.application'
 
+
 repositories {
     mavenCentral()
 }
 
 dependencies {
     compile 'commons-httpclient:commons-httpclient:3.1'
-    compile 'com.android.support:support-v4:20.0.0'
     compile project(':')
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {
diff --git a/test_client/custom_rules.xml b/test_client/custom_rules.xml
index cb014b3a..669f008f 100644
--- a/test_client/custom_rules.xml
+++ b/test_client/custom_rules.xml
@@ -15,6 +15,20 @@
 			</then>
 		</if>
 		
+		<!-- Replace OC server URL 2 if set in environment -->
+		<if>
+			<condition>
+				<isset property="env.OCTEST_SERVER_BASE_URL_2" />
+			</condition>
+			<then>
+				<replaceregexp
+					file="res/values/setup.xml"
+					match='("server_base_url_2"&gt;)\s*(&lt;)'
+					replace="\1${env.OCTEST_SERVER_BASE_URL_2}\2"
+					byline="true" />
+			</then>
+		</if>
+		
 		<!-- Replace test username if set in environment -->
 		<if>
 			<condition>
diff --git a/test_client/gradle/wrapper/gradle-wrapper.jar b/test_client/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a..13372aef 100644
Binary files a/test_client/gradle/wrapper/gradle-wrapper.jar and b/test_client/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/test_client/gradle/wrapper/gradle-wrapper.properties b/test_client/gradle/wrapper/gradle-wrapper.properties
index 1e61d1fd..122a0dca 100644
--- a/test_client/gradle/wrapper/gradle-wrapper.properties
+++ b/test_client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/test_client/project.properties b/test_client/project.properties
index f3419563..d8387c3b 100644
--- a/test_client/project.properties
+++ b/test_client/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-23
 android.library.reference.1=..
diff --git a/test_client/res/layout/activity_test.xml b/test_client/res/layout/activity_test.xml
index a4d04304..b4ff20f3 100644
--- a/test_client/res/layout/activity_test.xml
+++ b/test_client/res/layout/activity_test.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/menu/test.xml b/test_client/res/menu/test.xml
index 00c2bd48..0d512270 100644
--- a/test_client/res/menu/test.xml
+++ b/test_client/res/menu/test.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values-sw600dp/dimens.xml b/test_client/res/values-sw600dp/dimens.xml
index b1aaeeea..01992a47 100644
--- a/test_client/res/values-sw600dp/dimens.xml
+++ b/test_client/res/values-sw600dp/dimens.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values-sw720dp-land/dimens.xml b/test_client/res/values-sw720dp-land/dimens.xml
index 72404b71..403f038f 100644
--- a/test_client/res/values-sw720dp-land/dimens.xml
+++ b/test_client/res/values-sw720dp-land/dimens.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values-v11/styles.xml b/test_client/res/values-v11/styles.xml
index 05a1737d..26513a6b 100644
--- a/test_client/res/values-v11/styles.xml
+++ b/test_client/res/values-v11/styles.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values-v14/styles.xml b/test_client/res/values-v14/styles.xml
index 962f3819..b6097989 100644
--- a/test_client/res/values-v14/styles.xml
+++ b/test_client/res/values-v14/styles.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values/dimens.xml b/test_client/res/values/dimens.xml
index e4debf0e..a93fed9e 100644
--- a/test_client/res/values/dimens.xml
+++ b/test_client/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values/setup.xml b/test_client/res/values/setup.xml
index f72929ab..0f4c5c70 100644
--- a/test_client/res/values/setup.xml
+++ b/test_client/res/values/setup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 <resources>
     <string name="build_number"></string>
     <string name="server_base_url"></string>
+    <string name="server_base_url_2"></string>
     <string name="username"></string>
     <string name="password"></string>
     <string name ="user_agent">Mozilla/5.0 (Android) ownCloud test project</string>
diff --git a/test_client/res/values/strings.xml b/test_client/res/values/strings.xml
index dd8817f5..2f986d8a 100644
--- a/test_client/res/values/strings.xml
+++ b/test_client/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/res/values/styles.xml b/test_client/res/values/styles.xml
index cfa93a23..7146f7a6 100644
--- a/test_client/res/values/styles.xml
+++ b/test_client/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
index 63209386..9be2fab8 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/SelfSignedConfidentSslSocketFactory.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
index c399bb49..18770120 100644
--- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
+++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.util.Log;
 import android.view.Menu;
 
@@ -227,8 +226,8 @@ public class TestActivity extends Activity {
 	public RemoteOperationResult downloadFile(RemoteFile remoteFile, String temporalFolder) {
 		// Create folder 
 		String path =  "/owncloud/tmp/" + temporalFolder;
-		File sdCard = Environment.getExternalStorageDirectory();
-		File folder = new File(sdCard.getAbsolutePath() + "/" + path);
+		File privateFolder = getFilesDir();
+		File folder = new File(privateFolder.getAbsolutePath() + "/" + path);
 		folder.mkdirs();
 		
 		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile.getRemotePath(), folder.getAbsolutePath());
diff --git a/test_client/tests/AndroidManifest.xml b/test_client/tests/AndroidManifest.xml
index 45bf00d9..b5aaeb57 100644
--- a/test_client/tests/AndroidManifest.xml
+++ b/test_client/tests/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle
index a6b9dc30..418efd2d 100644
--- a/test_client/tests/build.gradle
+++ b/test_client/tests/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
@@ -6,8 +6,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {
diff --git a/test_client/tests/project.properties b/test_client/tests/project.properties
index 4ab12569..916037e3 100644
--- a/test_client/tests/project.properties
+++ b/test_client/tests/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-23
diff --git a/test_client/tests/res/values/strings.xml b/test_client/tests/res/values/strings.xml
index 66f25f1e..54e99265 100644
--- a/test_client/tests/res/values/strings.xml
+++ b/test_client/tests/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2015 ownCloud Inc.
+   Copyright (C) 2016 ownCloud GmbH.
     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
index 468d2de1..013c2489 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2014 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -109,8 +109,6 @@ public class CopyFileTest extends ActivityInstrumentationTestCase2<TestActivity>
 
     private static final String SRC_PATH_TO_FILE_6 = SRC_BASE_FOLDER + FILE6;
 
-    private static final String SRC_PATH_TO_FILE_7 = SRC_BASE_FOLDER + FILE7;
-
     private static final String SRC_PATH_TO_NON_EXISTENT_FILE = SRC_BASE_FOLDER + NO_FILE;
 
     private static final String SRC_PATH_TO_EMPTY_FOLDER = SRC_BASE_FOLDER + EMPTY;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
index 3f9f9d80..a454a7cc 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
index ccc25089..6780e920 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,7 @@ import java.io.File;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.test_project.R;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 /**
@@ -47,6 +48,7 @@ public class CreateShareTest extends RemoteTest {
 	private TestActivity mActivity;
 	private String mFullPath2FileToShare;
 	private String mFullPath2NonExistentFile;
+	private String mRemoteServer;
 	
 	@Override
 	protected void setUp() throws Exception {
@@ -55,6 +57,7 @@ public class CreateShareTest extends RemoteTest {
 	    mActivity = getActivity();
 	    mFullPath2FileToShare = mBaseFolderPath + FILE_TO_SHARE;
 	    mFullPath2NonExistentFile = mBaseFolderPath + NON_EXISTENT_FILE;
+	    mRemoteServer = getActivity().getString(R.string.server_base_url_2);
 	    		
 		File textFile = mActivity.extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME);
 		RemoteOperationResult result = mActivity.uploadFile(
@@ -217,6 +220,82 @@ public class CreateShareTest extends RemoteTest {
 		
 	}
 	
+	/**
+	 * Test creation of federated shares with remote users
+	 */
+	public void testCreateFederatedShareWithUser() {
+		
+		String remoteDomain = mRemoteServer.split("//")[1];
+		
+		/// Successful cases
+		RemoteOperationResult result = mActivity.createShare(
+				mFullPath2FileToShare, 
+				ShareType.FEDERATED, 
+				"admin@" + remoteDomain, 
+				false, 
+				"", 
+				1);
+		assertTrue(result.isSuccess());
+		
+		
+		/// Failed cases
+		
+		// sharee doesn't exist in an existing remote server
+		result = mActivity.createShare(
+				mFullPath2FileToShare, 
+				ShareType.FEDERATED, 
+				"no_exist@" + remoteDomain, 
+				false, 
+				"", 
+				31);
+		assertFalse(result.isSuccess());
+		assertEquals(
+				RemoteOperationResult.ResultCode.SHARE_FORBIDDEN, 
+				result.getCode()
+		);
+		assertTrue(		// error message from server as part of the result
+				result.getData().size() == 1 && 
+				result.getData().get(0) instanceof String
+		);
+		
+		// remote server doesn't exist
+		result = mActivity.createShare(
+				mFullPath2FileToShare,
+				ShareType.FEDERATED,
+				"no_exist",
+				false,
+				"",
+				31);
+		assertFalse(result.isSuccess());
+		assertEquals(
+				RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER,
+				result.getCode()
+		);
+		assertTrue(		// error message from server as part of the result
+				result.getData().size() == 1 &&
+				result.getData().get(0) instanceof String
+		);
+		
+		// file doesn't exist
+		result = mActivity.createShare(
+				mFullPath2NonExistentFile, 
+				ShareType.FEDERATED, 
+				"admin@" + remoteDomain, 
+				false, 
+				"", 
+				31);
+		assertFalse(result.isSuccess());
+		assertEquals(
+				RemoteOperationResult.ResultCode.SHARE_NOT_FOUND, 
+				result.getCode()
+		);
+		assertTrue(		// error message from server as part of the result
+				result.getData().size() == 1 && 
+				result.getData().get(0) instanceof String
+		);
+		
+	}
+	
 	
 	@Override
 	protected void tearDown() throws Exception {
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
index 89cbbebf..4a93a99e 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
index ed04d443..88190e4b 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -94,9 +94,8 @@ public class DownloadFileTest extends RemoteTest {
 	 */
 	public void testDownloadFile() {
 		RemoteOperationResult result = mActivity.downloadFile(
-				new RemoteFile(mFullPath2Image), 
-				mActivity.getFilesDir().getAbsolutePath()
-				);
+			new RemoteFile(mFullPath2Image), ""
+		);
 		mDownloadedFilePath = mFullPath2Image;
 		assertTrue(result.isSuccess());
 		// TODO some checks involving the local file
@@ -107,9 +106,8 @@ public class DownloadFileTest extends RemoteTest {
 	 */
 	public void testDownloadFileSpecialChars() {
 		RemoteOperationResult result = mActivity.downloadFile(
-				new RemoteFile(mFullPath2ImageWitSpecialChars),
-				mActivity.getFilesDir().getAbsolutePath()
-				);
+			new RemoteFile(mFullPath2ImageWitSpecialChars), ""
+		);
 		mDownloadedFilePath = mFullPath2ImageWitSpecialChars;
 		assertTrue(result.isSuccess());
 		// TODO some checks involving the local file
@@ -120,9 +118,8 @@ public class DownloadFileTest extends RemoteTest {
 	 */
 	public void testDownloadFileNotFound() {
 		RemoteOperationResult result = mActivity.downloadFile(
-				new RemoteFile(mFullPath2ImageNotFound), 
-				mActivity.getFilesDir().getAbsolutePath()
-				);
+			new RemoteFile(mFullPath2ImageNotFound), ""
+		);
 		assertFalse(result.isSuccess());
 	}
 	
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
index b00435e1..9893ec27 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
index c80f805c..2c00d87b 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java
@@ -1,6 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -41,6 +41,7 @@ import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.shares.GetRemoteShareesOperation;
+import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.test_project.R;
 import com.owncloud.android.lib.test_project.SelfSignedConfidentSslSocketFactory;
 
@@ -68,7 +69,7 @@ public class GetShareesTest extends RemoteTest {
 
 	private static final String LOG_TAG = GetShareesTest.class.getCanonicalName();
 		
-	String mServerUri, mUser, mPass;
+	String mServerUri, mUser, mPass, mServerUri2;
 	OwnCloudClient mClient = null;
 	
 	public GetShareesTest() {
@@ -125,15 +126,15 @@ public class GetShareesTest extends RemoteTest {
 		RemoteOperationResult result = getShareesOperation.execute(mClient);
 		JSONObject resultItem;
 		JSONObject value;
-		byte type;
+		int type;
 		int userCount = 0, groupCount = 0;
 		assertTrue(result.isSuccess() && result.getData().size() > 0);
 		try {
 			for (int i=0; i<result.getData().size(); i++) {
 				resultItem = (JSONObject) result.getData().get(i);
 	            value = resultItem.getJSONObject(GetRemoteShareesOperation.NODE_VALUE);
-	            type = (byte) value.getInt(GetRemoteShareesOperation.PROPERTY_SHARE_TYPE);
-				if (GetRemoteShareesOperation.GROUP_TYPE.equals(type)) {
+	            type = value.getInt(GetRemoteShareesOperation.PROPERTY_SHARE_TYPE);
+				if (type == ShareType.GROUP.getValue()) {
 					groupCount++;
 				} else {
 					userCount++;
@@ -156,8 +157,8 @@ public class GetShareesTest extends RemoteTest {
 			for (int i=0; i<2; i++) {
 				resultItem = (JSONObject) result.getData().get(i);
 	            value = resultItem.getJSONObject(GetRemoteShareesOperation.NODE_VALUE);
-	            type = (byte) value.getInt(GetRemoteShareesOperation.PROPERTY_SHARE_TYPE);
-				if (GetRemoteShareesOperation.GROUP_TYPE.equals(type)) {
+	            type = value.getInt(GetRemoteShareesOperation.PROPERTY_SHARE_TYPE);
+				if (type == ShareType.GROUP.getValue()) {
 					groupCount++;
 				} else {
 					userCount++;
@@ -190,6 +191,59 @@ public class GetShareesTest extends RemoteTest {
 		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
 	}
 	
+	/**
+	 *  Test get federated sharees
+	 * 
+	 *  Requires OC server 8.2 or later
+	 */
+	public void testGetFederatedShareesOperation() {
+		Log.v(LOG_TAG, "testGetFederatedSharees in");
+
+		/// successful cases
+
+		// search for sharees including "@"
+		GetRemoteShareesOperation getShareesOperation = new GetRemoteShareesOperation("@", 1, 50);
+		RemoteOperationResult result = getShareesOperation.execute(mClient);
+		JSONObject resultItem;
+		JSONObject value;
+		int type;
+		int fedCount = 0;
+		assertTrue(result.isSuccess() && result.getData().size() > 0);
+		try {
+			for (int i=0; i<result.getData().size(); i++) {
+				resultItem = (JSONObject) result.getData().get(i);
+				value = resultItem.getJSONObject(GetRemoteShareesOperation.NODE_VALUE);
+				type = value.getInt(GetRemoteShareesOperation.PROPERTY_SHARE_TYPE);
+				if (type == ShareType.FEDERATED.getValue()) {
+					fedCount++;
+				}
+			}
+			assertTrue(fedCount > 0);
+		} catch (JSONException e) {
+			AssertionFailedError afe = new AssertionFailedError(e.getLocalizedMessage());
+			afe.setStackTrace(e.getStackTrace());
+			throw afe;
+		}
+
+		// search for 'admin' sharee from external server - expecting at least 1 result
+		String remoteSharee = "admin@" + mServerUri2.split("//")[1];
+		getShareesOperation = new GetRemoteShareesOperation(remoteSharee, 1, 50);
+		result = getShareesOperation.execute(mClient);
+		assertTrue(result.isSuccess() && result.getData().size() > 0);
+
+		
+		/// failed cases
+		
+		// search for sharees including wrong page values
+		getShareesOperation = new GetRemoteShareesOperation("@", 0, 50);
+		result = getShareesOperation.execute(mClient);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+		
+		getShareesOperation = new GetRemoteShareesOperation("@", 1, 0);
+		result = getShareesOperation.execute(mClient);
+		assertTrue(!result.isSuccess() && result.getHttpCode() == HttpStatus.SC_BAD_REQUEST);
+	}
+	
 	@Override
 	protected void tearDown() throws Exception {
 	    Log.v(LOG_TAG, "Deleting remote fixture...");
@@ -202,6 +256,7 @@ public class GetShareesTest extends RemoteTest {
 	    Log.v(LOG_TAG, "Setting up client instance to access OC server...");
 		
 		mServerUri = context.getString(R.string.server_base_url);
+		mServerUri2 = context.getString(R.string.server_base_url_2);
 		mUser = context.getString(R.string.username);
 		mPass = context.getString(R.string.password);
 		
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
index 153fa8c5..ded74c53 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
index e83f0478..de17eb36 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientManagerFactoryTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientManagerFactoryTest.java
index 80d4ec8c..91b857ff 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientManagerFactoryTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientManagerFactoryTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
index e11aff8a..fd4b556f 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,9 @@ import java.security.GeneralSecurityException;
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
index 71871eac..ebab5131 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
index a05bccf6..54e78179 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoteTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoteTest.java
index f0089663..69cd4d90 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoteTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoteTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
index 64653861..827ed292 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
index d704faca..f867d3b2 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
index 6122e9f3..3627e1b5 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
index f565cc0e..be6d4738 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
index d839530b..fd8eae04 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ package com.owncloud.android.lib.test_project.test;
 
 import java.io.File;
 import java.security.GeneralSecurityException;
-import java.util.Calendar;
 
 import junit.framework.AssertionFailedError;
 
@@ -207,8 +206,8 @@ public class UpdatePrivateShareTest extends RemoteTest {
 				UpdateRemoteShareOperation updateNoShare = new UpdateRemoteShareOperation(
 						mFileShare.getRemoteId()
 				);
-				updateShare.setPermissions(OCShare.READ_PERMISSION_FLAG);	// minimum permissions
-				result = updateShare.execute(mClient);
+				updateNoShare.setPermissions(OCShare.READ_PERMISSION_FLAG);	// minimum permissions
+				result = updateNoShare.execute(mClient);
 				assertFalse(result.isSuccess());
 			}
 				
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
index 6bc9837f..bfb100ad 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
@@ -1,7 +1,7 @@
 /* ownCloud Android Library is available under MIT license
  *   @author masensio
  *   @author David A. Velasco
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
@@ -64,13 +64,18 @@ public class UpdatePublicShareTest extends RemoteTest {
 	/* File to share and update.*/
 	private static final String FILE_TO_SHARE = "/fileToShare.txt";
 	
+	/* Folder to share and update */
+	private static final String FOLDER_TO_SHARE = "/folderToShare";
+	
 	// Data for tests 
 	private static final String PASSWORD = "password";
 	private static final String PASS_SPECIAL_CHARS = "p@ssw�rd";
 	
 	private String mFullPath2FileToShare;
+	private String mFullPath2FolderToShare;
 	
 	private OCShare mShare;
+	private OCShare mFolderShare;
 	
 	String mServerUri, mUser, mPass;
 	OwnCloudClient mClient = null;
@@ -107,7 +112,7 @@ public class UpdatePublicShareTest extends RemoteTest {
 	    
 	    Log.v(LOG_TAG, "Setting up the remote fixture...");
 	    
-	    // Upload the files
+	    // Upload the file
 	    mFullPath2FileToShare = mBaseFolderPath + FILE_TO_SHARE;
 	    
 	    File textFile = getActivity().extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME);
@@ -126,15 +131,39 @@ public class UpdatePublicShareTest extends RemoteTest {
 				"", 
 				false, 
 				"", 
-				1);
+				OCShare.READ_PERMISSION_FLAG);
 
 	    if (result.isSuccess()){
 	    	mShare = (OCShare) result.getData().get(0);
 	    } else{
-	    	mShare = null;
+	    	Utils.logAndThrow(LOG_TAG, result);
 	    }
 	    
-		Log.v(LOG_TAG, "Remote fixture created.");
+	    // Create the folder
+ 		mFullPath2FolderToShare = mBaseFolderPath + FOLDER_TO_SHARE;
+ 		result = getActivity().createFolder(
+ 				mFullPath2FolderToShare,
+ 				true);
+ 		if (!result.isSuccess()) {
+ 			Utils.logAndThrow(LOG_TAG, result);
+ 		}
+
+ 		// Share the folder publicly via link
+ 		result = getActivity().createShare(
+ 				mFullPath2FolderToShare,
+ 				ShareType.PUBLIC_LINK,
+ 				"",
+ 				false,
+ 				"",
+ 				OCShare.READ_PERMISSION_FLAG);
+
+ 		if (result.isSuccess()){
+ 			mFolderShare = (OCShare) result.getData().get(0);
+ 		} else{
+ 			Utils.logAndThrow(LOG_TAG, result);
+ 		}
+	    
+		Log.v(LOG_TAG, "Remote fixtures created.");
 		
 	}
 	
@@ -164,7 +193,13 @@ public class UpdatePublicShareTest extends RemoteTest {
 			updateShare.setExpirationDate(expirationDateInMillis);
 			result = updateShare.execute(mClient);
 			assertTrue(result.isSuccess());
-					
+
+			// Update the Folder Share with edit permission
+			updateShare = new UpdateRemoteShareOperation(mFolderShare.getRemoteId());
+			updateShare.setPublicUpload(true);
+			result = updateShare.execute(mClient);
+			assertTrue(result.isSuccess());
+
 			// unsuccessful test
 			// Update Share with expiration date in the past
 			updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
@@ -174,6 +209,12 @@ public class UpdatePublicShareTest extends RemoteTest {
 			result = updateShare.execute(mClient);
 			assertFalse(result.isSuccess());
 			
+			// Try to update the file Share with edit permission
+			updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
+			updateShare.setPublicUpload(true);
+			result = updateShare.execute(mClient);
+			assertFalse(result.isSuccess());
+
 			// Unshare the file before the unsuccessful tests
 			RemoveRemoteShareOperation unshare = new RemoveRemoteShareOperation((int) mShare.getRemoteId());
 			result = unshare.execute(mClient);
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
index 2925abe7..07854575 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
index 81fce582..e90cdf07 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2016 ownCloud GmbH.
  *   
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal