Library updated with final names (project and packages)

oc_framework-test-project/.classpath

@@ -3,7 +3,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry exported="true" kind="lib" path="/oc_framework/bin/oc_framework.jar" sourcepath="/oc_framework"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>

oc_framework-test-project/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>oc_framework-test-project</name>
+	<name>ownCloud Android Library Test Project</name>
 	<comment></comment>
 	<projects>
 	</projects>

oc_framework-test-project/AndroidManifest.xml

@@ -24,7 +24,7 @@
  -->
  
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.owncloud.android.oc_framework_test_project"
+    package="com.owncloud.android.lib.test_project"
     android:versionCode="1"
     android:versionName="1.0" >
     
@@ -47,7 +47,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.owncloud.android.oc_framework_test_project.TestActivity"
+            android:name="com.owncloud.android.lib.test_project.TestActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

oc_framework-test-project/oc_framework-test-test/.classpath

@@ -3,8 +3,8 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/oc_framework-test-project"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ownCloud Android Library Test Project"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

oc_framework-test-project/oc_framework-test-test/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>oc_framework-test</name>
+	<name>ownCloud Android Library Tests</name>
 	<comment></comment>
 	<projects>
 		<project>oc_framework-test-project</project>

oc_framework-test-project/oc_framework-test-test/AndroidManifest.xml

@@ -24,7 +24,7 @@
  -->
  
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.owncloud.android.oc_framework_test_project.test"
+    package="com.owncloud.android.lib.test_project.test"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -35,7 +35,7 @@
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:label="Tests for com.owncloud.android.oc_framework_test_project"
-        android:targetPackage="com.owncloud.android.oc_framework_test_project" />
+        android:label="Tests for com.owncloud.android.lib.test_project"
+        android:targetPackage="com.owncloud.android.lib.test_project" />
 
 </manifest>

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/CreateFolderTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java

@@ -21,14 +21,14 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DeleteFileTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java

@@ -22,11 +22,11 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java

@@ -22,14 +22,14 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java

@@ -21,10 +21,10 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFolderTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java

@@ -22,10 +22,10 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/RenameFileTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java

@@ -22,11 +22,11 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 

oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java → oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project.test;
+package com.owncloud.android.lib.test_project.test;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -37,8 +37,8 @@ import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework_test_project.TestActivity;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.test_project.TestActivity;
 
 /**
  * Class to test Update File Operation

oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java → oc_framework-test-project/src/com/owncloud/android/lib/test_project/TestActivity.java

@@ -15,21 +15,22 @@
  *
  */
 
-package com.owncloud.android.oc_framework_test_project;
+package com.owncloud.android.lib.test_project;
 
 import java.io.File;
 
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.remote.ChunkedUploadRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.CreateRemoteFolderOperation;
-import com.owncloud.android.oc_framework.operations.remote.DownloadRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
-import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.RenameRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOperation;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.remote.ChunkedUploadRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.CreateRemoteFolderOperation;
+import com.owncloud.android.lib.operations.remote.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.operations.remote.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.RenameRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.UploadRemoteFileOperation;
+import com.owncloud.android.lib.test_project.R;
 
 import android.net.Uri;
 import android.os.Bundle;
@@ -52,7 +53,7 @@ public class TestActivity extends Activity {
 	private static final boolean mChunked = true;
 	
 	//private Account mAccount = null;
-	private WebdavClient mClient;
+	private OwnCloudClient mClient;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

oc_framework/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>oc_framework</name>
+	<name>ownCloud Android Library</name>
 	<comment></comment>
 	<projects>
 	</projects>

oc_framework/AndroidManifest.xml

@@ -24,7 +24,7 @@
  -->
  
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.owncloud.android.oc_framework"
+    package="com.owncloud.android.lib"
     android:versionCode="1"
     android:versionName="1.0" >
 

oc_framework/sample_client/AndroidManifest.xml

@@ -24,7 +24,7 @@
  -->
  
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.owncloud.android.oc_framework.sampleclient"
+      package="com.owncloud.android.lib.sampleclient"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-permission android:name="android.permission.INTERNET" />

oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/FilesArrayAdapter.java → oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java

@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.oc_framework.sampleclient;
+package com.owncloud.android.lib.sampleclient;
 
 import android.content.Context;
 import android.view.View;
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.owncloud.android.oc_framework.operations.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteFile;
 
 public class FilesArrayAdapter extends ArrayAdapter<RemoteFile> {
 	

oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java → oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.sampleclient;
+package com.owncloud.android.lib.sampleclient;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,19 +31,19 @@ import java.io.InputStream;
 import java.util.Iterator;
 import java.util.List;
 
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.remote.DownloadRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
-import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOperation;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.accounts.AccountUtils;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.remote.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.operations.remote.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.UploadRemoteFileOperation;
+import com.owncloud.android.lib.utils.FileUtils;
 
 import android.app.Activity;
 import android.content.res.AssetManager;
@@ -63,7 +63,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 	
 	private Handler mHandler;
 	
-	private WebdavClient mClient; 
+	private OwnCloudClient mClient; 
 	
 	private FilesArrayAdapter mFilesAdapter;
 	

oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountTypeUtils.java → oc_framework/src/com/owncloud/android/lib/accounts/AccountTypeUtils.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.accounts;
+package com.owncloud.android.lib.accounts;
 
 /**
  * @author masensio

oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java → oc_framework/src/com/owncloud/android/lib/accounts/AccountUtils.java

@@ -23,9 +23,9 @@
  *
  */
 
-package com.owncloud.android.oc_framework.accounts;
+package com.owncloud.android.lib.accounts;
 
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -43,9 +43,13 @@ public class AccountUtils {
     public static final String STATUS_PATH = "/status.php";
 
     /**
+     * Returns the proper URL path to access the WebDAV interface of an ownCloud server,
+     * according to its version and the authorization method used.
      * 
-     * @param version version of owncloud
-     * @return webdav path for given OC version, null if OC version unknown
+     * @param	version         	Version of ownCloud server.
+     * @param 	supportsOAuth		If true, access with OAuth 2 authorization is considered. 
+     * @param 	supportsSamlSso		If true, and supportsOAuth is false, access with SAML-based single-sign-on is considered.
+     * @return 						WebDAV path for given OC version, null if OC version unknown
      */
     public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth, boolean supportsSamlSso) {
         if (version != null) {
@@ -66,33 +70,6 @@ public class AccountUtils {
         return null;
     }
     
-//    /**
-//     * Returns the proper URL path to access the WebDAV interface of an ownCloud server,
-//     * according to its version and the authorization method used.
-//     * 
-//     * @param   version         Version of ownCloud server.
-//     * @param   authTokenType   Authorization token type, matching some of the AUTH_TOKEN_TYPE_* constants in {@link AccountAuthenticator}. 
-//     * @return                  WebDAV path for given OC version and authorization method, null if OC version is unknown.
-//     */
-//    public static String getWebdavPath(OwnCloudVersion version, String authTokenType) {
-//        if (version != null) {
-//            if (MainApp.getAuthTokenTypeAccessToken().equals(authTokenType)) {
-//                return ODAV_PATH;
-//            }
-//            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(authTokenType)) {
-//                return SAML_SSO_PATH;
-//            }
-//            if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)
-//                return WEBDAV_PATH_4_0;
-//            if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0
-//                    || version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)
-//                return WEBDAV_PATH_2_0;
-//            if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)
-//                return WEBDAV_PATH_1_2;
-//        }
-//        return null;
-//    }
-    
     /**
      * Constructs full url to host and webdav resource basing on host version
      * @param context

oc_framework/src/com/owncloud/android/oc_framework/accounts/OwnCloudAccount.java → oc_framework/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.accounts;
+package com.owncloud.android.lib.accounts;
 
 import android.accounts.Account;
 import android.os.Parcel;
@@ -42,14 +42,14 @@ public class OwnCloudAccount extends Account {
 	     * Value under this key should handle path to webdav php script. Will be
 	     * removed and usage should be replaced by combining
 	     * {@link com.owncloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and
-	     * {@link com.owncloud.android.oc_framework.utils.utils.OwnCloudVersion}
+	     * {@link com.owncloud.android.lib.utils.utils.OwnCloudVersion}
 	     * 
 	     * @deprecated
 	     */
 	    public static final String KEY_OC_URL = "oc_url";
 	    /**
 	     * Version should be 3 numbers separated by dot so it can be parsed by
-	     * {@link com.owncloud.android.oc_framework.utils.utils.OwnCloudVersion}
+	     * {@link com.owncloud.android.lib.utils.utils.OwnCloudVersion}
 	     */
 	    public static final String KEY_OC_VERSION = "oc_version";
 	    /**

oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java → oc_framework/src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.io.IOException;
 import java.net.InetAddress;

oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java → oc_framework/src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;

oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java → oc_framework/src/com/owncloud/android/lib/network/BearerAuthScheme.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.util.Map;
 

oc_framework/src/com/owncloud/android/oc_framework/network/BearerCredentials.java → oc_framework/src/com/owncloud/android/lib/network/BearerCredentials.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.util.LangUtils;

oc_framework/src/com/owncloud/android/oc_framework/network/CertificateCombinedException.java → oc_framework/src/com/owncloud/android/lib/network/CertificateCombinedException.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertificateException;

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java → oc_framework/src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,7 +36,6 @@ import java.util.Set;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
-import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
 
 import android.util.Log;
 

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java → oc_framework/src/com/owncloud/android/lib/network/FileRequestEntity.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,7 +40,6 @@ import org.apache.commons.httpclient.methods.RequestEntity;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
 
 
 /**

oc_framework/src/com/owncloud/android/oc_framework/network/NetworkUtils.java → oc_framework/src/com/owncloud/android/lib/network/NetworkUtils.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -57,7 +57,7 @@ public class NetworkUtils {
     /** Default timeout for establishing a connection */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
-    /** Connection manager for all the WebdavClients */
+    /** Connection manager for all the OwnCloudClients */
     private static MultiThreadedHttpConnectionManager mConnManager = null;
     
     private static Protocol mDefaultHttpsProtocol = null;

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java → oc_framework/src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network;
 
 public interface OnDatatransferProgressListener {
     public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileAbsoluteName);

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java → oc_framework/src/com/owncloud/android/lib/network/OwnCloudClient.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,20 +48,19 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.http.HttpStatus;
 import org.apache.http.params.CoreProtocolPNames;
 
-import com.owncloud.android.oc_framework.network.BearerAuthScheme;
-import com.owncloud.android.oc_framework.network.BearerCredentials;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
 
 import android.net.Uri;
 import android.util.Log;
 
-public class WebdavClient extends HttpClient {
+public class OwnCloudClient extends HttpClient {
     private static final int MAX_REDIRECTIONS_COUNT = 3;
     
     private Uri mUri;
     private Credentials mCredentials;
     private boolean mFollowRedirects;
     private String mSsoSessionCookie;
-    final private static String TAG = WebdavClient.class.getSimpleName();
+    final private static String TAG = OwnCloudClient.class.getSimpleName();
     public static final String USER_AGENT = "Android-ownCloud";
     
     static private byte[] sExhaustBuffer = new byte[1024];
@@ -69,9 +68,9 @@ public class WebdavClient extends HttpClient {
     /**
      * Constructor
      */
-    public WebdavClient(HttpConnectionManager connectionMgr) {
+    public OwnCloudClient(HttpConnectionManager connectionMgr) {
         super(connectionMgr);
-        Log.d(TAG, "Creating WebdavClient");
+        Log.d(TAG, "Creating OwnCloudClient");
         getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT);
         getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
         mFollowRedirects = true;

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java → oc_framework/src/com/owncloud/android/lib/network/OwnCloudClientFactory.java

@@ -22,16 +22,15 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
-import com.owncloud.android.oc_framework.accounts.AccountTypeUtils;
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
-import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.oc_framework.network.NetworkUtils;
+import com.owncloud.android.lib.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.accounts.AccountUtils;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -56,26 +55,26 @@ public class OwnCloudClientFactory {
 
     
     /**
-     * Creates a WebdavClient setup for an ownCloud account
+     * Creates a OwnCloudClient setup for an ownCloud account
      * 
      * Do not call this method from the main thread.
      * 
      * @param account                       The ownCloud account
      * @param appContext                    Android application context
-     * @return                              A WebdavClient object ready to be used
+     * @return                              A OwnCloudClient object ready to be used
      * @throws AuthenticatorException       If the authenticator failed to get the authorization token for the account.
      * @throws OperationCanceledException   If the authenticator operation was cancelled while getting the authorization token for the account. 
      * @throws IOException                  If there was some I/O error while getting the authorization token for the account.
      * @throws AccountNotFoundException     If 'account' is unknown for the AccountManager
      */
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
-        //Log_OC.d(TAG, "Creating WebdavClient associated to " + account.name);
+    public static OwnCloudClient createOwnCloudClient (Account account, Context appContext) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
+        //Log_OC.d(TAG, "Creating OwnCloudClient associated to " + account.name);
        
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
         AccountManager am = AccountManager.get(appContext);
         boolean isOauth2 = am.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2) != null;   // TODO avoid calling to getUserData here
         boolean isSamlSso = am.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
-        WebdavClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
+        OwnCloudClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
         if (isOauth2) {    
             String accessToken = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypeAccessToken(account.type), false);
             client.setBearerCredentials(accessToken);   // TODO not assume that the access token is a bearer token
@@ -95,12 +94,12 @@ public class OwnCloudClientFactory {
     }
     
     
-    public static WebdavClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
+    public static OwnCloudClient createOwnCloudClient (Account account, Context appContext, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
         Uri uri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account));
         AccountManager am = AccountManager.get(appContext);
         boolean isOauth2 = am.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2) != null;   // TODO avoid calling to getUserData here
         boolean isSamlSso = am.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
-        WebdavClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
+        OwnCloudClient client = createOwnCloudClient(uri, appContext, !isSamlSso);
         
         if (isOauth2) {    // TODO avoid a call to getUserData here
             AccountManagerFuture<Bundle> future =  am.getAuthToken(account,  AccountTypeUtils.getAuthTokenTypeAccessToken(account.type), null, currentActivity, null, null);
@@ -130,13 +129,13 @@ public class OwnCloudClientFactory {
     }
     
     /**
-     * Creates a WebdavClient to access a URL and sets the desired parameters for ownCloud client connections.
+     * Creates a OwnCloudClient to access a URL and sets the desired parameters for ownCloud client connections.
      * 
      * @param uri       URL to the ownCloud server
-     * @param context   Android context where the WebdavClient is being created.
-     * @return          A WebdavClient object ready to be used
+     * @param context   Android context where the OwnCloudClient is being created.
+     * @return          A OwnCloudClient object ready to be used
      */
-    public static WebdavClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
+    public static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
         try {
             NetworkUtils.registerAdvancedSslContext(true, context);
         }  catch (GeneralSecurityException e) {
@@ -146,7 +145,7 @@ public class OwnCloudClientFactory {
             Log.e(TAG, "The local server truststore could not be read. Default SSL management in the system will be used for HTTPS connections", e);
         }
         
-        WebdavClient client = new WebdavClient(NetworkUtils.getMultiThreadedConnManager());
+        OwnCloudClient client = new OwnCloudClient(NetworkUtils.getMultiThreadedConnManager());
         
         client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
         client.setBaseUri(uri);

oc_framework/src/com/owncloud/android/oc_framework/network/ProgressiveDataTransferer.java → oc_framework/src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java

@@ -22,11 +22,10 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.util.Collection;
 
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
 
 
 public interface ProgressiveDataTransferer {

oc_framework/src/com/owncloud/android/oc_framework/network/ServerNameIndicator.java → oc_framework/src/com/owncloud/android/lib/network/ServerNameIndicator.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network;
+package com.owncloud.android.lib.network;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java → oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavEntry.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network.webdav;
 
 import java.util.Date;
 

oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavUtils.java → oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavUtils.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.network.webdav;
+package com.owncloud.android.lib.network.webdav;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

oc_framework/src/com/owncloud/android/oc_framework/operations/OnRemoteOperationListener.java → oc_framework/src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java

@@ -23,7 +23,8 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations;
+package com.owncloud.android.lib.operations.common;
+
 
 public interface OnRemoteOperationListener {
 

oc_framework/src/com/owncloud/android/oc_framework/operations/OperationCancelledException.java → oc_framework/src/com/owncloud/android/lib/operations/common/OperationCancelledException.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations;
+package com.owncloud.android.lib.operations.common;
 
 public class OperationCancelledException extends Exception {
 

oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java → oc_framework/src/com/owncloud/android/lib/operations/common/RemoteFile.java

@@ -22,15 +22,15 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations;
+package com.owncloud.android.lib.operations.common;
 
 import java.io.Serializable;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavEntry;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.network.webdav.WebdavEntry;
+import com.owncloud.android.lib.utils.FileUtils;
 
 /**
  *  Contains the data of a Remote File from a WebDavEntry

oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java → oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperation.java

@@ -22,16 +22,16 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations;
+package com.owncloud.android.lib.operations.common;
 
 import java.io.IOException;
 
 import org.apache.commons.httpclient.Credentials;
 
-import com.owncloud.android.oc_framework.network.BearerCredentials;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.network.BearerCredentials;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 
 
 
@@ -62,7 +62,7 @@ public abstract class RemoteOperation implements Runnable {
     private Context mContext = null;
     
 	/** Object to interact with the remote server */
-	private WebdavClient mClient = null;
+	private OwnCloudClient mClient = null;
 	
 	/** Callback object to notify about the execution of the remote operation */
 	private OnRemoteOperationListener mListener = null;
@@ -77,7 +77,7 @@ public abstract class RemoteOperation implements Runnable {
 	/**
 	 *  Abstract method to implement the operation in derived classes.
 	 */
-	protected abstract RemoteOperationResult run(WebdavClient client); 
+	protected abstract RemoteOperationResult run(OwnCloudClient client); 
 	
 
     /**
@@ -85,7 +85,7 @@ public abstract class RemoteOperation implements Runnable {
      * 
      * Do not call this method from the main thread.
      * 
-     * This method should be used whenever an ownCloud account is available, instead of {@link #execute(WebdavClient)}. 
+     * This method should be used whenever an ownCloud account is available, instead of {@link #execute(OwnCloudClient)}. 
      * 
      * @param account   ownCloud account in remote ownCloud server to reach during the execution of the operation.
      * @param context   Android context for the component calling the method.
@@ -116,9 +116,9 @@ public abstract class RemoteOperation implements Runnable {
 	 * @param client	Client object to reach an ownCloud server during the execution of the operation.
 	 * @return			Result of the operation.
 	 */
-	public final RemoteOperationResult execute(WebdavClient client) {
+	public final RemoteOperationResult execute(OwnCloudClient client) {
 		if (client == null)
-			throw new IllegalArgumentException("Trying to execute a remote operation with a NULL WebdavClient");
+			throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
 		mClient = client;
 		return run(client);
 	}
@@ -127,7 +127,7 @@ public abstract class RemoteOperation implements Runnable {
     /**
      * Asynchronously executes the remote operation
      * 
-     * This method should be used whenever an ownCloud account is available, instead of {@link #execute(WebdavClient)}. 
+     * This method should be used whenever an ownCloud account is available, instead of {@link #execute(OwnCloudClient)}. 
      * 
      * @param account           ownCloud account in remote ownCloud server to reach during the execution of the operation.
      * @param context           Android context for the component calling the method.
@@ -163,9 +163,9 @@ public abstract class RemoteOperation implements Runnable {
 	 * @param listenerHandler	Handler associated to the thread where the methods of the listener objects must be called.
 	 * @return					Thread were the remote operation is executed.
 	 */
-	public final Thread execute(WebdavClient client, OnRemoteOperationListener listener, Handler listenerHandler) {
+	public final Thread execute(OwnCloudClient client, OnRemoteOperationListener listener, Handler listenerHandler) {
 		if (client == null) {
-			throw new IllegalArgumentException("Trying to execute a remote operation with a NULL WebdavClient");
+			throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
 		}
 		mClient = client;
 		
@@ -185,7 +185,7 @@ public abstract class RemoteOperation implements Runnable {
 	}
 	
     /**
-     * Synchronously retries the remote operation using the same WebdavClient in the last call to {@link RemoteOperation#execute(WebdavClient)}
+     * Synchronously retries the remote operation using the same OwnCloudClient in the last call to {@link RemoteOperation#execute(OwnCloudClient)}
      * 
      * @param listener          Listener to be notified about the execution of the operation.
      * @param listenerHandler   Handler associated to the thread where the methods of the listener objects must be called.
@@ -196,7 +196,7 @@ public abstract class RemoteOperation implements Runnable {
     }
     
     /**
-     * Asynchronously retries the remote operation using the same WebdavClient in the last call to {@link RemoteOperation#execute(WebdavClient, OnRemoteOperationListener, Handler)}
+     * Asynchronously retries the remote operation using the same OwnCloudClient in the last call to {@link RemoteOperation#execute(OwnCloudClient, OnRemoteOperationListener, Handler)}
      * 
      * @param listener          Listener to be notified about the execution of the operation.
      * @param listenerHandler   Handler associated to the thread where the methods of the listener objects must be called.
@@ -209,7 +209,7 @@ public abstract class RemoteOperation implements Runnable {
 	
 	/**
 	 * Asynchronous execution of the operation 
-	 * started by {@link RemoteOperation#execute(WebdavClient, OnRemoteOperationListener, Handler)}, 
+	 * started by {@link RemoteOperation#execute(OwnCloudClient, OnRemoteOperationListener, Handler)}, 
 	 * and result posting.
 	 * 
 	 * TODO refactor && clean the code; now it's a mess
@@ -287,7 +287,7 @@ public abstract class RemoteOperation implements Runnable {
      * 
      * @return      Current client instance to access the remote server.
      */
-    public final WebdavClient getClient() {
+    public final OwnCloudClient getClient() {
         return mClient;
     }
 

oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java → oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations;
+package com.owncloud.android.lib.operations.common;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -42,8 +42,8 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 import org.json.JSONException;
 
-import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.oc_framework.network.CertificateCombinedException;
+import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.network.CertificateCombinedException;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,10 +34,10 @@ import java.util.Random;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.PutMethod;
 
-import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
-import com.owncloud.android.oc_framework.network.webdav.ChunkFromFileChannelRequestEntity;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.network.ChunkFromFileChannelRequestEntity;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.ProgressiveDataTransferer;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
 
 
 import android.util.Log;
@@ -54,7 +54,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
 	}
     
     @Override
-    protected int uploadFile(WebdavClient client) throws HttpException, IOException {
+    protected int uploadFile(OwnCloudClient client) throws HttpException, IOException {
         int status = -1;
 
         FileChannel channel = null;

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java

@@ -22,19 +22,19 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+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.utils.FileUtils;
 
 
 
@@ -73,7 +73,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
      * @param   client      Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         MkColMethod mkcol = null;
         
@@ -107,7 +107,7 @@ public class CreateRemoteFolderOperation extends RemoteOperation {
     }
 
     
-    private RemoteOperationResult createParentFolder(String parentPath, WebdavClient client) {
+    private RemoteOperationResult createParentFolder(String parentPath, OwnCloudClient client) {
         RemoteOperation operation = new CreateRemoteFolderOperation(parentPath,
                                                                 mCreateFullPath);
         return operation.execute(client);

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -40,12 +40,12 @@ import org.apache.http.HttpStatus;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.OperationCancelledException;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.OperationCancelledException;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 /**
  * Remote operation performing the download of a remote file in the ownCloud server.
@@ -72,7 +72,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
 	}
 
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
         
         /// download will be performed to a temporal file, then moved to the final location
@@ -94,7 +94,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
 	}
 
 	
-    protected int downloadFile(WebdavClient client, File targetFile) throws HttpException, IOException, OperationCancelledException {
+    protected int downloadFile(OwnCloudClient client, File targetFile) throws HttpException, IOException, OperationCancelledException {
         int status = -1;
         boolean savedFile = false;
         mGet = new GetMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ExistenceCheckRemoteOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java

@@ -22,15 +22,15 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.HeadMethod;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -68,7 +68,7 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation {
     
 
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
         if (!isOnline()) {
             return new RemoteOperationResult(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
         }

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/GetUserNameRemoteOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.io.IOException;
 
@@ -27,9 +27,9 @@ import org.json.JSONObject;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 
 /**
@@ -70,7 +70,7 @@ public class GetUserNameRemoteOperation extends RemoteOperation {
 	}
 
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         int status = -1;
         

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java

@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.util.ArrayList;
 
@@ -32,12 +32,12 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavEntry;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavEntry;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 
 /**
@@ -71,7 +71,7 @@ public class ReadRemoteFileOperation extends RemoteOperation {
      * @param client		Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
     	PropFindMethod propfind = null;
     	RemoteOperationResult result = null;
 

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFolderOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.util.ArrayList;
 
@@ -33,12 +33,12 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavEntry;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavEntry;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 /**
  * Remote operation performing the read of remote file or folder in the ownCloud server.
@@ -69,7 +69,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
      * @param   client      Client object to communicate with the remote ownCloud server.
      */
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
         PropFindMethod query = null;
         
@@ -133,7 +133,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
      *                          retrieved.  
      *  @return                
      */
-    private void readData(MultiStatus dataInServer, WebdavClient client) {   	
+    private void readData(MultiStatus dataInServer, OwnCloudClient client) {   	
         mFolderAndFiles = new ArrayList<RemoteFile>();
         
         // parse data from remote folder 

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RemoveRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java

@@ -22,17 +22,17 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 /**
  * Remote operation performing the removal of a remote file or folder in the ownCloud server.
@@ -63,7 +63,7 @@ public class RemoveRemoteFileOperation extends RemoteOperation {
 	 * @param client	Client object to communicate with the remote ownCloud server.
 	 */
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
         DeleteMethod delete = null;
         

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RenameRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.io.File;
 
@@ -30,12 +30,12 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
 
 import android.util.Log;
 
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+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.utils.FileUtils;
 
 
 /**
@@ -84,7 +84,7 @@ public class RenameRemoteFileOperation extends RemoteOperation {
      * @param   client      Client object to communicate with the remote ownCloud server.
      */
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
 		
 		LocalMoveMethod move = null;

oc_framework/src/com/owncloud/android/oc_framework/operations/remote/UploadRemoteFileOperation.java → oc_framework/src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.operations.remote;
+package com.owncloud.android.lib.operations.remote;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,14 +35,14 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.http.HttpStatus;
 
-import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
-import com.owncloud.android.oc_framework.network.webdav.FileRequestEntity;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.OperationCancelledException;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.FileRequestEntity;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.network.ProgressiveDataTransferer;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.OperationCancelledException;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 
 /**
  * Remote operation performing the upload of a remote file to the ownCloud server.
@@ -71,7 +71,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 	}
 
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
 		RemoteOperationResult result = null;
 
 		try {
@@ -103,7 +103,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 		return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT));
 	}
 
-	protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException {
+	protected int uploadFile(OwnCloudClient client) throws HttpException, IOException, OperationCancelledException {
 		int status = -1;
 		try {
 			File f = new File(mStoragePath);

oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java → oc_framework/src/com/owncloud/android/lib/utils/FileUtils.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.utils;
+package com.owncloud.android.lib.utils;
 
 import java.io.File;
 

oc_framework/src/com/owncloud/android/oc_framework/utils/OwnCloudVersion.java → oc_framework/src/com/owncloud/android/lib/utils/OwnCloudVersion.java

@@ -23,7 +23,7 @@
  *
  */
 
-package com.owncloud.android.oc_framework.utils;
+package com.owncloud.android.lib.utils;
 
 public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion(

src/com/owncloud/android/authentication/AccountAuthenticator.java

@@ -28,7 +28,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.widget.Toast;
 
-import com.owncloud.android.oc_framework.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.accounts.AccountTypeUtils;
 import com.owncloud.android.utils.Log_OC;
 
 

src/com/owncloud/android/authentication/AccountUtils.java

@@ -19,8 +19,8 @@
 package com.owncloud.android.authentication;
 
 import com.owncloud.android.MainApp;
-import com.owncloud.android.oc_framework.accounts.AccountTypeUtils;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -53,23 +53,23 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
-import com.owncloud.android.oc_framework.accounts.AccountTypeUtils;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.lib.accounts.AccountTypeUtils;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.operations.OAuth2GetAccessToken;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
 import com.owncloud.android.operations.OwnCloudServerCheckOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.ExistenceCheckRemoteOperation;
-import com.owncloud.android.oc_framework.operations.remote.GetUserNameRemoteOperation;
+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.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.operations.remote.GetUserNameRemoteOperation;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 import com.owncloud.android.utils.Log_OC;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
 
 /**
  * This Activity is used to add an ownCloud account to the App
@@ -524,8 +524,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 getString(R.string.oauth2_redirect_uri),       
                 getString(R.string.oauth2_grant_type),
                 queryParameters);
-        //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());
-        WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext(), true);
+        //OwnCloudClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());
+        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext(), true);
         operation.execute(client, this, mHandler);
     }
 
@@ -589,7 +589,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mServerStatusIcon = R.drawable.progress_small;
             showServerStatus();
             mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);
-            WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(uri), this, true);
+            OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(uri), this, true);
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);
         } else {
             mServerStatusText = 0;
@@ -716,7 +716,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
         /// test credentials accessing the root folder
         mAuthCheckOperation = new  ExistenceCheckRemoteOperation("", this, false);
-        WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);
+        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);
         client.setBasicCredentials(username, password);
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);
     }
@@ -765,7 +765,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
         /// test credentials accessing the root folder
         mAuthCheckOperation = new  ExistenceCheckRemoteOperation("", this, false);
-        WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);
+        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);
       
     }
@@ -1115,7 +1115,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mAuthToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN);
             Log_OC.d(TAG, "Got ACCESS TOKEN: " + mAuthToken);
             mAuthCheckOperation = new ExistenceCheckRemoteOperation("", this, false);
-            WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);
+            OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);
             client.setBearerCredentials(mAuthToken);
             mAuthCheckOperation.execute(client, this, mHandler);
 
@@ -1598,7 +1598,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mAuthToken = sessionCookie;
 
             GetUserNameRemoteOperation getUserOperation = new GetUserNameRemoteOperation();            
-            WebdavClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl), getApplicationContext(), true);
+            OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl), getApplicationContext(), true);
             client.setSsoSessionCookie(mAuthToken);
             getUserOperation.execute(client, this, mHandler);
         }

src/com/owncloud/android/files/OwnCloudFileObserver.java

@@ -22,9 +22,9 @@ import java.io.File;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 import com.owncloud.android.utils.Log_OC;
 

src/com/owncloud/android/files/services/FileDownloader.java

@@ -33,12 +33,12 @@ import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.operations.DownloadFileOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
@@ -79,7 +79,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
-    private WebdavClient mDownloadClient = null;
+    private OwnCloudClient mDownloadClient = null;
     private Account mLastAccount = null;
     private FileDataStorageManager mStorageManager;
     

src/com/owncloud/android/files/services/FileUploader.java

@@ -34,18 +34,18 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.operations.UploadFileOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.ExistenceCheckRemoteOperation;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFileOperation;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.ui.activity.FailedUploadActivity;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -108,7 +108,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
-    private WebdavClient mUploadClient = null;
+    private OwnCloudClient mUploadClient = null;
     private Account mLastAccount = null;
     private FileDataStorageManager mStorageManager;
 

src/com/owncloud/android/operations/CreateFolderOperation.java

@@ -19,11 +19,11 @@ package com.owncloud.android.operations;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.remote.CreateRemoteFolderOperation;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.remote.CreateRemoteFolderOperation;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
 
@@ -58,7 +58,7 @@ public class CreateFolderOperation extends RemoteOperation implements OnRemoteOp
 
 
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         CreateRemoteFolderOperation operation = new CreateRemoteFolderOperation(mRemotePath, mCreateFullPath);
         RemoteOperationResult result =  operation.execute(client);
         

src/com/owncloud/android/operations/DownloadFileOperation.java

@@ -23,11 +23,11 @@ import java.util.Iterator;
 import java.util.Set;
 
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.remote.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.remote.DownloadRemoteFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
 
@@ -118,7 +118,7 @@ public class DownloadFileOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         File newFile = null;
         boolean moved = true;

src/com/owncloud/android/operations/OAuth2GetAccessToken.java

@@ -9,10 +9,10 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.owncloud.android.authentication.OAuth2Constants;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.utils.Log_OC;
 
 
@@ -48,7 +48,7 @@ public class OAuth2GetAccessToken extends RemoteOperation {
     }
     
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         PostMethod postMethod = null;
         

src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java

@@ -23,10 +23,10 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
 import com.owncloud.android.utils.Log_OC;
 
 import android.content.Context;
@@ -55,7 +55,7 @@ public class OwnCloudServerCheckOperation extends RemoteOperation {
         return mOCVersion;
     }
 
-    private boolean tryConnection(WebdavClient wc, String urlSt) {
+    private boolean tryConnection(OwnCloudClient wc, String urlSt) {
         boolean retval = false;
         GetMethod get = null;
         try {
@@ -117,7 +117,7 @@ public class OwnCloudServerCheckOperation extends RemoteOperation {
     }
 
 	@Override
-	protected RemoteOperationResult run(WebdavClient client) {
+	protected RemoteOperationResult run(OwnCloudClient client) {
         if (!isOnline()) {
         	return new RemoteOperationResult(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
         }

src/com/owncloud/android/operations/RemoveFileOperation.java

@@ -19,11 +19,11 @@ package com.owncloud.android.operations;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.RemoveRemoteFileOperation;
 
 
 /**
@@ -69,7 +69,7 @@ public class RemoveFileOperation extends RemoteOperation {
      * @param   client      Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         
         RemoveRemoteFileOperation operation = new RemoveRemoteFileOperation(mFileToRemove.getRemotePath());

src/com/owncloud/android/operations/RenameFileOperation.java

@@ -22,11 +22,11 @@ import java.io.IOException;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.RenameRemoteFileOperation;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.RenameRemoteFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
 
@@ -77,7 +77,7 @@ public class RenameFileOperation extends RemoteOperation {
      * @param   client      Client object to communicate with the remote ownCloud server.
      */
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         
         // check if the new name is valid in the local file system

src/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -22,11 +22,11 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFileOperation;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.ReadRemoteFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
 
@@ -72,7 +72,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
 
 
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
 
         RemoteOperationResult result = null;
         mTransferWasRequested = false;

src/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -36,13 +36,13 @@ import android.content.Intent;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.ReadRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.operations.common.RemoteFile;
 import com.owncloud.android.syncadapter.FileSyncService;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
@@ -155,7 +155,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
      * {@inheritDoc}
      */
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         mFailsInFavouritesFound = 0;
         mConflictsFound = 0;
@@ -180,7 +180,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     }
 
 
-    private RemoteOperationResult checkForChanges(WebdavClient client) {
+    private RemoteOperationResult checkForChanges(OwnCloudClient client) {
         mRemoteFolderChanged = false;
         RemoteOperationResult result = null;
         String remotePath = null;
@@ -216,7 +216,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     }
 
 
-    private RemoteOperationResult fetchAndSyncRemoteFolder(WebdavClient client) {
+    private RemoteOperationResult fetchAndSyncRemoteFolder(OwnCloudClient client) {
         String remotePath = mLocalFolder.getRemotePath();
         ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(remotePath);
         RemoteOperationResult result = operation.execute(client);
@@ -256,7 +256,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
      *                          retrieved.  
      *  @return                 'True' when any change was made in the local data, 'false' otherwise.
      */
-    private void synchronizeData(ArrayList<RemoteFile> folderAndFiles, WebdavClient client) {
+    private void synchronizeData(ArrayList<RemoteFile> folderAndFiles, OwnCloudClient client) {
         // get 'fresh data' from the database
         mLocalFolder = mStorageManager.getFileByPath(mLocalFolder.getRemotePath());
         
@@ -348,7 +348,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
      * @param filesToSyncContents       Synchronization operations to execute.
      * @param client                    Interface to the remote ownCloud server.
      */
-    private void startContentSynchronizations(List<SynchronizeFileOperation> filesToSyncContents, WebdavClient client) {
+    private void startContentSynchronizations(List<SynchronizeFileOperation> filesToSyncContents, OwnCloudClient client) {
         RemoteOperationResult contentsResult = null;
         for (SynchronizeFileOperation op: filesToSyncContents) {
             contentsResult = op.execute(client);   // returns without waiting for upload or download finishes

src/com/owncloud/android/operations/UpdateOCVersionOperation.java

@@ -23,12 +23,12 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.network.OwnCloudClient;
+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.utils.OwnCloudVersion;
 import com.owncloud.android.utils.Log_OC;
 
 import android.accounts.Account;
@@ -56,7 +56,7 @@ public class UpdateOCVersionOperation extends RemoteOperation {
     
     
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         AccountManager accountMngr = AccountManager.get(mContext); 
         String statUrl = accountMngr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL);
         statUrl += AccountUtils.STATUS_PATH;

src/com/owncloud/android/operations/UploadFileOperation.java

@@ -33,16 +33,16 @@ import org.apache.commons.httpclient.methods.RequestEntity;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-import com.owncloud.android.oc_framework.operations.OperationCancelledException;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.oc_framework.operations.remote.ChunkedUploadRemoteFileOperation;
-import com.owncloud.android.oc_framework.operations.remote.ExistenceCheckRemoteOperation;
-import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOperation;
+import com.owncloud.android.lib.network.ProgressiveDataTransferer;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.OperationCancelledException;
+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.ChunkedUploadRemoteFileOperation;
+import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.operations.remote.UploadRemoteFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.Log_OC;
 
@@ -186,7 +186,7 @@ public class UploadFileOperation extends RemoteOperation {
     }
 
     @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
         boolean localCopyPassed = false, nameCheckPassed = false;
         File temporalFile = null, originalFile = new File(mOriginalStoragePath), expectedFile = null;
@@ -376,7 +376,7 @@ public class UploadFileOperation extends RemoteOperation {
      * @param string
      * @return
      */
-    private String getAvailableRemotePath(WebdavClient wc, String remotePath) throws Exception {
+    private String getAvailableRemotePath(OwnCloudClient wc, String remotePath) throws Exception {
         boolean check = existsFile(wc, remotePath);
         if (!check) {
             return remotePath;
@@ -408,7 +408,7 @@ public class UploadFileOperation extends RemoteOperation {
         }
     }
 
-    private boolean existsFile(WebdavClient client, String remotePath){
+    private boolean existsFile(OwnCloudClient client, String remotePath){
         ExistenceCheckRemoteOperation existsOperation = new ExistenceCheckRemoteOperation(remotePath, mContext, false);
         RemoteOperationResult result = existsOperation.execute(client);
         return result.isSuccess();

src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -25,10 +25,10 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.lib.accounts.AccountUtils;
+import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.network.OwnCloudClientFactory;
+import com.owncloud.android.lib.network.OwnCloudClient;
 
 
 import android.accounts.Account;
@@ -56,7 +56,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     private ContentProviderClient mContentProviderClient;
     private FileDataStorageManager mStoreManager;
 
-    private WebdavClient mClient = null;
+    private OwnCloudClient mClient = null;
 
     public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
         super(context, autoInitialize);
@@ -105,7 +105,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         mClient = OwnCloudClientFactory.createOwnCloudClient(account, getContext());
     }
     
-    protected WebdavClient getClient() {
+    protected OwnCloudClient getClient() {
         return mClient;
     }
     

src/com/owncloud/android/syncadapter/ContactSyncAdapter.java

@@ -25,7 +25,7 @@ import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
 
 
 import android.accounts.Account;

src/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -30,10 +30,10 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UpdateOCVersionOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.Log_OC;

src/com/owncloud/android/ui/activity/AccountSelectActivity.java

@@ -48,7 +48,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
+import com.owncloud.android.lib.accounts.OwnCloudAccount;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.Log_OC;
 import com.owncloud.android.MainApp;

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -33,7 +33,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
 import com.owncloud.android.utils.Log_OC;
 
 

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -68,10 +68,10 @@ import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+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.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

src/com/owncloud/android/ui/activity/Uploader.java

@@ -329,13 +329,13 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 
     public void uploadFiles() {
         try {
-            //WebdavClient webdav = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
+            //OwnCloudClient webdav = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
 
             ArrayList<String> local = new ArrayList<String>();
             ArrayList<String> remote = new ArrayList<String>();
             
             /* TODO - mCreateDir can never be true at this moment; we will replace wdc.createDirectory by CreateFolderOperation when that is fixed 
-            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
+            OwnCloudClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
             // create last directory in path if necessary
             if (mCreateDir) {
                 wdc.createDirectory(mUploadPath);

src/com/owncloud/android/ui/dialog/EditNameDialog.java

@@ -31,7 +31,7 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.utils.FileUtils;
 
 
 /**

src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java

@@ -38,7 +38,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
+import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.utils.Log_OC;
 
 
@@ -181,7 +181,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
         webSettings.setBuiltInZoomControls(true);
         webSettings.setLoadWithOverviewMode(false);
         webSettings.setSavePassword(false);
-        webSettings.setUserAgentString(WebdavClient.USER_AGENT);
+        webSettings.setUserAgentString(OwnCloudClient.USER_AGENT);
         webSettings.setSaveFormData(false);
         
         return rootView;

src/com/owncloud/android/ui/dialog/SslValidatorDialog.java

@@ -39,9 +39,9 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.owncloud.android.oc_framework.network.CertificateCombinedException;
-import com.owncloud.android.oc_framework.network.NetworkUtils;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.CertificateCombinedException;
+import com.owncloud.android.lib.network.NetworkUtils;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.utils.Log_OC;
 
 /**

src/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -50,11 +50,11 @@ import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+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.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -28,8 +28,8 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileHandler;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

src/com/owncloud/android/ui/preview/FileDownloadFragment.java

@@ -37,7 +37,7 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener;
+import com.owncloud.android.lib.network.OnDatatransferProgressListener;
 
 
 /**

src/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -52,10 +52,10 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;

src/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -57,10 +57,10 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.media.MediaControlView;
 import com.owncloud.android.media.MediaService;
 import com.owncloud.android.media.MediaServiceBinder;
-import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.lib.network.webdav.WebdavUtils;
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;

src/com/owncloud/android/ui/preview/PreviewVideoActivity.java

@@ -37,8 +37,8 @@ import android.os.Bundle;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.accounts.AccountUtils;
+import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException;
 
 /**
  *  Activity implementing a basic video player.

src/com/owncloud/android/utils/FileStorageUtils.java

@@ -22,7 +22,7 @@ import java.io.File;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.oc_framework.operations.RemoteFile;
+import com.owncloud.android.lib.operations.common.RemoteFile;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

tests/src/com/owncloud/android/test/AccountUtilsTest.java

@@ -18,8 +18,8 @@
 
 package com.owncloud.android.test;
 
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.utils.OwnCloudVersion;
+import com.owncloud.android.lib.accounts.AccountUtils;
+import com.owncloud.android.lib.utils.OwnCloudVersion;
 
 import android.test.AndroidTestCase;