Merge branch 'master' into develop

diff --cc owncloud-android-library
index 1df8349,b3ac14f..cd4414a
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 1df8349e216bd264b9e4e48f32b4c839ef973870
 -Subproject commit b3ac14f575da5100eecff00de744d9330b668f66
++Subproject commit cd4414a7bda686c84e1ca75dd10bcbf9b3f57f83

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 65b94c4,61e31b4..b59ac6e
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -106,7 -106,7 +106,7 @@@ implements  OnRemoteOperationListener, 
      private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
      private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r
      private static final String KEY_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED";\r
--    private static final String KEY_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED";\r
++    //private static final String KEY_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED";\r
  \r
      private static final String AUTH_ON = "on";\r
      private static final String AUTH_OFF = "off";\r
@@@ -238,17 -237,16 +237,16 @@@
  \r
              /// retrieve extras from intent\r
              mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
--            if (mAccount != null) {\r
 -                String ocVersion = mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION);\r
 -                String ocVersionString = mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING);\r
++            if (mAccount != null) {
 +                String ocVersion = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);\r
++                String ocVersionString = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION_STRING);
                  if (ocVersion != null) {\r
-                     mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+                     mDiscoveredVersion = new OwnCloudVersion(ocVersion, ocVersionString);\r
                  }\r
 -                mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL));\r
 +                mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL));\r
                  mHostUrlInput.setText(mHostBaseUrl);\r
                  String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
--                mUsernameInput.setText(userName);\r
-                 mIsSharedSupported = Boolean.getBoolean(mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_SHARE_API));\r
++                mUsernameInput.setText(userName);
                  \r
              }\r
              initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
@@@ -1298,14 -1292,14 +1292,15 @@@
              if (isOAuth || isSaml) {\r
                  mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
              }\r
--            /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
-             mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
 -            mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION,         mDiscoveredVersion.getVersion());\r
 -            mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING,  mDiscoveredVersion.getVersionString());\r
 -            mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL,   mHostBaseUrl);\r
++            /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA
++            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION,         mDiscoveredVersion.getVersion());\r
++            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING,  mDiscoveredVersion.getVersionString());\r
 +            mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL,   mHostBaseUrl);\r
-             mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SHARE_API, Boolean.toString(mIsSharedSupported));\r
++            
              if (isSaml) {\r
 -                mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); \r
 +                mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); \r
              } else if (isOAuth) {\r
 -                mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2, "TRUE");  \r
 +                mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_OAUTH2, "TRUE");  \r
              }\r
      \r
              setAccountAuthenticatorResult(intent.getExtras());\r

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
index 1ddbd4a,c14d84d..8843897
--- 1/src/com/owncloud/android/files/FileOperationsHelper.java
--- 2/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -28,11 -28,12 +28,13 @@@ import android.widget.Toast
  
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.lib.accounts.OwnCloudAccount;
 -import com.owncloud.android.lib.network.webdav.WebdavUtils;
 -import com.owncloud.android.lib.utils.OwnCloudVersion;
++
 +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
 +import com.owncloud.android.lib.common.network.WebdavUtils;
++import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  import com.owncloud.android.services.OperationsService;
  import com.owncloud.android.ui.activity.FileActivity;
- import com.owncloud.android.ui.dialog.ActivityChooserDialog;
+ import com.owncloud.android.ui.dialog.ShareLinkToDialog;
  import com.owncloud.android.utils.Log_OC;
  
  /**
@@@ -135,7 -136,10 +137,11 @@@ public class FileOperationsHelper 
      public boolean isSharedSupported(FileActivity callerActivity) {
          if (callerActivity.getAccount() != null) {
              AccountManager accountManager = AccountManager.get(callerActivity);
-             return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_SUPPORTS_SHARE_API));
 -            String version = accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_OC_VERSION);
 -            String versionString = accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_OC_VERSION_STRING);
++
++            String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION);
++            String versionString = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION_STRING);
+             return (new OwnCloudVersion(version, versionString)).isSharedSupported();
+             //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
          }
          return false;
      }

diff --cc src/com/owncloud/android/files/services/FileUploader.java
index 6fc3327,0cffa28..2f96356
--- 1/src/com/owncloud/android/files/services/FileUploader.java
--- 2/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -253,7 -253,10 +253,11 @@@ public class FileUploader extends Servi
              }
          }
  
-         OwnCloudVersion ocv = new OwnCloudVersion(AccountManager.get(this).getUserData(account, Constants.KEY_OC_VERSION));
+         AccountManager aMgr = AccountManager.get(this);
 -        String version = aMgr.getUserData(account, OwnCloudAccount.Constants.KEY_OC_VERSION);
 -        String versionString = aMgr.getUserData(account, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING);
++        String version = aMgr.getUserData(account, Constants.KEY_OC_VERSION);
++        String versionString = aMgr.getUserData(account, Constants.KEY_OC_VERSION_STRING);
+         OwnCloudVersion ocv = new OwnCloudVersion(version, versionString);
++        
          boolean chunked = FileUploader.chunkedUploadIsSupported(ocv);
          AbstractList<String> requestedUploads = new Vector<String>();
          String uploadKey = null;

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index ac1acea,97641c6..5d95707
--- 1/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -37,15 -37,16 +37,18 @@@ import android.content.Intent
  
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.lib.network.OwnCloudClient;
 -import com.owncloud.android.lib.operations.common.OCShare;
 -import com.owncloud.android.lib.operations.common.RemoteOperation;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 -import com.owncloud.android.lib.operations.remote.GetSharesForFileRemoteOperation;
 -import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation;
 -import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
 -import com.owncloud.android.lib.operations.common.RemoteFile;
 -import com.owncloud.android.lib.utils.FileUtils;
++
 +import com.owncloud.android.lib.common.OwnCloudClient;
 +import com.owncloud.android.lib.resources.shares.OCShare;
 +import com.owncloud.android.lib.common.operations.RemoteOperation;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;
++import com.owncloud.android.lib.resources.files.FileUtils;
 +import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
 +import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 +import com.owncloud.android.lib.resources.files.RemoteFile;
++
  import com.owncloud.android.syncadapter.FileSyncAdapter;
  import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.utils.Log_OC;

diff --cc src/com/owncloud/android/operations/UnshareLinkOperation.java
index 218573e,2471e53..77ca822
--- 1/src/com/owncloud/android/operations/UnshareLinkOperation.java
--- 2/src/com/owncloud/android/operations/UnshareLinkOperation.java
+++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java
@@@ -20,12 -20,13 +20,15 @@@ package com.owncloud.android.operations
  import android.content.Context;
  
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.lib.network.OwnCloudClient;
 -import com.owncloud.android.lib.operations.common.OCShare;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 -import com.owncloud.android.lib.operations.common.ShareType;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation;
 -import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation;
++
 +import com.owncloud.android.lib.common.OwnCloudClient;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
 +import com.owncloud.android.lib.resources.shares.OCShare;
 +import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
++import com.owncloud.android.lib.resources.shares.ShareType;
++
  import com.owncloud.android.operations.common.SyncOperation;
  import com.owncloud.android.utils.Log_OC;
  

diff --cc src/com/owncloud/android/operations/UpdateOCVersionOperation.java
index 22fdc93,7fb123a..c878ede
--- 1/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
--- 2/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
+++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
@@@ -74,10 -76,13 +76,15 @@@ public class UpdateOCVersionOperation e
                  if (response != null) {
                      JSONObject json = new JSONObject(response);
                      if (json != null && json.getString("version") != null) {
-                         OwnCloudVersion ocver = new OwnCloudVersion(json.getString("version"));
-                         if (ocver.isVersionValid()) {
-                             accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION, ocver.toString());
-                             Log_OC.d(TAG, "Got new OC version " + ocver.toString());
++
+                         String version = json.getString("version");
+                         String versionstring = json.getString("versionstring");
+                         mOwnCloudVersion = new OwnCloudVersion(version, versionstring);
+                         if (mOwnCloudVersion.isVersionValid()) {
 -                            accountMngr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION, mOwnCloudVersion.getVersion());
 -                            accountMngr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING, mOwnCloudVersion.getVersionString());
++                            accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION, mOwnCloudVersion.getVersion());
++                            accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING, mOwnCloudVersion.getVersionString());
+                             Log_OC.d(TAG, "Got new OC version " + mOwnCloudVersion.toString());
++
                              result = new RemoteOperationResult(ResultCode.OK);
                              
                          } else {

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge