From 1e68dccd8b3efa28e1ebc5d12d5c9ce4a3260a9f Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 20 Jan 2014 11:59:41 +0100 Subject: [PATCH] Library updated with final names (project and packages) --- oc_framework-test-project/.classpath | 1 - oc_framework-test-project/.project | 2 +- oc_framework-test-project/AndroidManifest.xml | 4 +-- .../oc_framework-test-test/.classpath | 2 +- .../oc_framework-test-test/.project | 2 +- .../oc_framework-test-test/AndroidManifest.xml | 6 ++-- .../test_project}/test/CreateFolderTest.java | 8 ++--- .../test_project}/test/DeleteFileTest.java | 8 ++--- .../test_project}/test/DownloadFileTest.java | 8 ++--- .../test_project}/test/ReadFileTest.java | 6 ++-- .../test_project}/test/ReadFolderTest.java | 6 ++-- .../test_project}/test/RenameFileTest.java | 8 ++--- .../test_project}/test/UploadFileTest.java | 6 ++-- .../test_project}/TestActivity.java | 27 +++++++-------- oc_framework/.project | 2 +- oc_framework/AndroidManifest.xml | 2 +- oc_framework/sample_client/AndroidManifest.xml | 2 +- .../sampleclient/FilesArrayAdapter.java | 4 +-- .../sampleclient/MainActivity.java | 30 ++++++++--------- .../accounts/AccountTypeUtils.java | 2 +- .../accounts/AccountUtils.java | 39 +++++----------------- .../accounts/OwnCloudAccount.java | 6 ++-- .../network/AdvancedSslSocketFactory.java | 2 +- .../network/AdvancedX509TrustManager.java | 2 +- .../network/BearerAuthScheme.java | 2 +- .../network/BearerCredentials.java | 2 +- .../network/CertificateCombinedException.java | 2 +- .../ChunkFromFileChannelRequestEntity.java | 3 +- .../webdav => lib/network}/FileRequestEntity.java | 3 +- .../network/NetworkUtils.java | 4 +-- .../network}/OnDatatransferProgressListener.java | 2 +- .../network/OwnCloudClient.java} | 13 ++++---- .../network}/OwnCloudClientFactory.java | 35 ++++++++++--------- .../network/ProgressiveDataTransferer.java | 3 +- .../network/ServerNameIndicator.java | 2 +- .../network/webdav/WebdavEntry.java | 2 +- .../network/webdav/WebdavUtils.java | 2 +- .../common}/OnRemoteOperationListener.java | 3 +- .../common}/OperationCancelledException.java | 2 +- .../operations/common}/RemoteFile.java | 6 ++-- .../operations/common}/RemoteOperation.java | 34 +++++++++---------- .../operations/common}/RemoteOperationResult.java | 6 ++-- .../remote/ChunkedUploadRemoteFileOperation.java | 12 +++---- .../remote/CreateRemoteFolderOperation.java | 18 +++++----- .../remote/DownloadRemoteFileOperation.java | 18 +++++----- .../remote/ExistenceCheckRemoteOperation.java | 12 +++---- .../remote/GetUserNameRemoteOperation.java | 10 +++--- .../operations/remote/ReadRemoteFileOperation.java | 16 ++++----- .../remote/ReadRemoteFolderOperation.java | 18 +++++----- .../remote/RemoveRemoteFileOperation.java | 12 +++---- .../remote/RenameRemoteFileOperation.java | 16 ++++----- .../remote/UploadRemoteFileOperation.java | 22 ++++++------ .../{oc_framework => lib}/utils/FileUtils.java | 2 +- .../utils/OwnCloudVersion.java | 2 +- .../authentication/AccountAuthenticator.java | 2 +- .../android/authentication/AccountUtils.java | 4 +-- .../authentication/AuthenticatorActivity.java | 36 ++++++++++---------- .../android/files/OwnCloudFileObserver.java | 4 +-- .../android/files/services/FileDownloader.java | 12 +++---- .../android/files/services/FileUploader.java | 24 ++++++------- .../android/operations/CreateFolderOperation.java | 12 +++---- .../android/operations/DownloadFileOperation.java | 12 +++---- .../android/operations/OAuth2GetAccessToken.java | 10 +++--- .../operations/OwnCloudServerCheckOperation.java | 12 +++---- .../android/operations/RemoveFileOperation.java | 12 +++---- .../android/operations/RenameFileOperation.java | 12 +++---- .../operations/SynchronizeFileOperation.java | 12 +++---- .../operations/SynchronizeFolderOperation.java | 24 ++++++------- .../operations/UpdateOCVersionOperation.java | 14 ++++---- .../android/operations/UploadFileOperation.java | 26 +++++++-------- .../syncadapter/AbstractOwnCloudSyncAdapter.java | 12 +++---- .../android/syncadapter/ContactSyncAdapter.java | 2 +- .../android/syncadapter/FileSyncAdapter.java | 4 +-- .../android/ui/activity/AccountSelectActivity.java | 2 +- .../owncloud/android/ui/activity/FileActivity.java | 2 +- .../android/ui/activity/FileDisplayActivity.java | 8 ++--- src/com/owncloud/android/ui/activity/Uploader.java | 4 +-- .../owncloud/android/ui/dialog/EditNameDialog.java | 2 +- .../android/ui/dialog/SamlWebViewDialog.java | 4 +-- .../android/ui/dialog/SslValidatorDialog.java | 6 ++-- .../android/ui/fragment/FileDetailFragment.java | 10 +++--- .../android/ui/fragment/OCFileListFragment.java | 4 +-- .../android/ui/preview/FileDownloadFragment.java | 2 +- .../android/ui/preview/PreviewImageFragment.java | 8 ++--- .../android/ui/preview/PreviewMediaFragment.java | 8 ++--- .../android/ui/preview/PreviewVideoActivity.java | 4 +-- .../owncloud/android/utils/FileStorageUtils.java | 2 +- .../owncloud/android/test/AccountUtilsTest.java | 4 +-- 88 files changed, 379 insertions(+), 406 deletions(-) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/CreateFolderTest.java (93%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/DeleteFileTest.java (89%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/DownloadFileTest.java (93%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/ReadFileTest.java (91%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/ReadFolderTest.java (91%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/RenameFileTest.java (95%) rename oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/test/UploadFileTest.java (96%) rename oc_framework-test-project/src/com/owncloud/android/{oc_framework_test_project => lib/test_project}/TestActivity.java (84%) rename oc_framework/sample_client/src/com/owncloud/android/{oc_framework => lib}/sampleclient/FilesArrayAdapter.java (93%) rename oc_framework/sample_client/src/com/owncloud/android/{oc_framework => lib}/sampleclient/MainActivity.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/accounts/AccountTypeUtils.java (97%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/accounts/AccountUtils.java (74%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/accounts/OwnCloudAccount.java (94%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/AdvancedSslSocketFactory.java (99%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/AdvancedX509TrustManager.java (99%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/BearerAuthScheme.java (99%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/BearerCredentials.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/CertificateCombinedException.java (99%) rename oc_framework/src/com/owncloud/android/{oc_framework/network/webdav => lib/network}/ChunkFromFileChannelRequestEntity.java (97%) rename oc_framework/src/com/owncloud/android/{oc_framework/network/webdav => lib/network}/FileRequestEntity.java (97%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/NetworkUtils.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework/network/webdav => lib/network}/OnDatatransferProgressListener.java (96%) rename oc_framework/src/com/owncloud/android/{oc_framework/network/webdav/WebdavClient.java => lib/network/OwnCloudClient.java} (95%) rename oc_framework/src/com/owncloud/android/{oc_framework/network/webdav => lib/network}/OwnCloudClientFactory.java (81%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/ProgressiveDataTransferer.java (92%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/ServerNameIndicator.java (99%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/webdav/WebdavEntry.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/network/webdav/WebdavUtils.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework/operations => lib/operations/common}/OnRemoteOperationListener.java (96%) rename oc_framework/src/com/owncloud/android/{oc_framework/operations => lib/operations/common}/OperationCancelledException.java (96%) rename oc_framework/src/com/owncloud/android/{oc_framework/operations => lib/operations/common}/RemoteFile.java (96%) rename oc_framework/src/com/owncloud/android/{oc_framework/operations => lib/operations/common}/RemoteOperation.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework/operations => lib/operations/common}/RemoteOperationResult.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/ChunkedUploadRemoteFileOperation.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/CreateRemoteFolderOperation.java (87%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/DownloadRemoteFileOperation.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/ExistenceCheckRemoteOperation.java (91%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/GetUserNameRemoteOperation.java (91%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/ReadRemoteFileOperation.java (87%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/ReadRemoteFolderOperation.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/RemoveRemoteFileOperation.java (88%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/RenameRemoteFileOperation.java (90%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/operations/remote/UploadRemoteFileOperation.java (85%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/utils/FileUtils.java (98%) rename oc_framework/src/com/owncloud/android/{oc_framework => lib}/utils/OwnCloudVersion.java (98%) diff --git a/oc_framework-test-project/.classpath b/oc_framework-test-project/.classpath index 394360f0..51769745 100644 --- a/oc_framework-test-project/.classpath +++ b/oc_framework-test-project/.classpath @@ -3,7 +3,6 @@ - diff --git a/oc_framework-test-project/.project b/oc_framework-test-project/.project index 8c7df640..66824491 100644 --- a/oc_framework-test-project/.project +++ b/oc_framework-test-project/.project @@ -1,6 +1,6 @@ - oc_framework-test-project + ownCloud Android Library Test Project diff --git a/oc_framework-test-project/AndroidManifest.xml b/oc_framework-test-project/AndroidManifest.xml index f09a605d..1ce1eb2f 100644 --- a/oc_framework-test-project/AndroidManifest.xml +++ b/oc_framework-test-project/AndroidManifest.xml @@ -24,7 +24,7 @@ --> @@ -47,7 +47,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > diff --git a/oc_framework-test-project/oc_framework-test-test/.classpath b/oc_framework-test-project/oc_framework-test-test/.classpath index 6c54c1c9..c1044509 100644 --- a/oc_framework-test-project/oc_framework-test-test/.classpath +++ b/oc_framework-test-project/oc_framework-test-test/.classpath @@ -3,8 +3,8 @@ - + diff --git a/oc_framework-test-project/oc_framework-test-test/.project b/oc_framework-test-project/oc_framework-test-test/.project index c490827b..60be749d 100644 --- a/oc_framework-test-project/oc_framework-test-test/.project +++ b/oc_framework-test-project/oc_framework-test-test/.project @@ -1,6 +1,6 @@ - oc_framework-test + ownCloud Android Library Tests oc_framework-test-project diff --git a/oc_framework-test-project/oc_framework-test-test/AndroidManifest.xml b/oc_framework-test-project/oc_framework-test-test/AndroidManifest.xml index b29d32e0..f71a9502 100644 --- a/oc_framework-test-project/oc_framework-test-test/AndroidManifest.xml +++ b/oc_framework-test-project/oc_framework-test-test/AndroidManifest.xml @@ -24,7 +24,7 @@ --> @@ -35,7 +35,7 @@ + android:label="Tests for com.owncloud.android.lib.test_project" + android:targetPackage="com.owncloud.android.lib.test_project" /> \ No newline at end of file diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/CreateFolderTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java similarity index 93% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/CreateFolderTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java index 06608821..af9677f9 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/CreateFolderTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DeleteFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java similarity index 89% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DeleteFileTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java index b3b7c376..5edab941 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DeleteFileTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java similarity index 93% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java index 8c52eab7..2eb523a2 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java similarity index 91% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java index e6887ac5..0c9bd5a3 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFolderTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java similarity index 91% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFolderTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java index 29aae10d..496ea2c5 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFolderTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/RenameFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java similarity index 95% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/RenameFileTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java index 55637ec6..523f3d9b 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/RenameFileTest.java +++ b/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; diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java similarity index 96% rename from oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java rename to oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java index 1406a580..4c862556 100644 --- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java +++ b/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 diff --git a/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java b/oc_framework-test-project/src/com/owncloud/android/lib/test_project/TestActivity.java similarity index 84% rename from oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java rename to oc_framework-test-project/src/com/owncloud/android/lib/test_project/TestActivity.java index 8270fad8..d6caf3c6 100644 --- a/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java +++ b/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) { diff --git a/oc_framework/.project b/oc_framework/.project index 18812a0d..4b5c2951 100644 --- a/oc_framework/.project +++ b/oc_framework/.project @@ -1,6 +1,6 @@ - oc_framework + ownCloud Android Library diff --git a/oc_framework/AndroidManifest.xml b/oc_framework/AndroidManifest.xml index 7c391cd6..30dda12f 100644 --- a/oc_framework/AndroidManifest.xml +++ b/oc_framework/AndroidManifest.xml @@ -24,7 +24,7 @@ --> diff --git a/oc_framework/sample_client/AndroidManifest.xml b/oc_framework/sample_client/AndroidManifest.xml index 4e1ff7a0..6b406176 100644 --- a/oc_framework/sample_client/AndroidManifest.xml +++ b/oc_framework/sample_client/AndroidManifest.xml @@ -24,7 +24,7 @@ --> diff --git a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/FilesArrayAdapter.java b/oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java similarity index 93% rename from oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/FilesArrayAdapter.java rename to oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java index 0020c726..f7f4bda7 100644 --- a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/FilesArrayAdapter.java +++ b/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 { diff --git a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java b/oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java similarity index 90% rename from oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java rename to oc_framework/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java index 79d273a0..0ae446b6 100644 --- a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountTypeUtils.java b/oc_framework/src/com/owncloud/android/lib/accounts/AccountTypeUtils.java similarity index 97% rename from oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountTypeUtils.java rename to oc_framework/src/com/owncloud/android/lib/accounts/AccountTypeUtils.java index 5f814625..b4ed3308 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountTypeUtils.java +++ b/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 diff --git a/oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java b/oc_framework/src/com/owncloud/android/lib/accounts/AccountUtils.java similarity index 74% rename from oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java rename to oc_framework/src/com/owncloud/android/lib/accounts/AccountUtils.java index 5ef2fec7..79983814 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java +++ b/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 diff --git a/oc_framework/src/com/owncloud/android/oc_framework/accounts/OwnCloudAccount.java b/oc_framework/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java similarity index 94% rename from oc_framework/src/com/owncloud/android/oc_framework/accounts/OwnCloudAccount.java rename to oc_framework/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java index 2032504c..9d0de82c 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/accounts/OwnCloudAccount.java +++ b/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"; /** diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java b/oc_framework/src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java similarity index 99% rename from oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java rename to oc_framework/src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java index 89b8b236..72b78b16 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java b/oc_framework/src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java similarity index 99% rename from oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java rename to oc_framework/src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java index 2df79dcd..a92bc873 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java b/oc_framework/src/com/owncloud/android/lib/network/BearerAuthScheme.java similarity index 99% rename from oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java rename to oc_framework/src/com/owncloud/android/lib/network/BearerAuthScheme.java index a7b62e37..10552c33 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/BearerCredentials.java b/oc_framework/src/com/owncloud/android/lib/network/BearerCredentials.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/network/BearerCredentials.java rename to oc_framework/src/com/owncloud/android/lib/network/BearerCredentials.java index 97367c5f..0d5d9024 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/BearerCredentials.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/CertificateCombinedException.java b/oc_framework/src/com/owncloud/android/lib/network/CertificateCombinedException.java similarity index 99% rename from oc_framework/src/com/owncloud/android/oc_framework/network/CertificateCombinedException.java rename to oc_framework/src/com/owncloud/android/lib/network/CertificateCombinedException.java index 464422c2..daec78b8 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/CertificateCombinedException.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java b/oc_framework/src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java similarity index 97% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java rename to oc_framework/src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java index 6a921e91..3c34ef47 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java b/oc_framework/src/com/owncloud/android/lib/network/FileRequestEntity.java similarity index 97% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java rename to oc_framework/src/com/owncloud/android/lib/network/FileRequestEntity.java index 1bc3eb67..9bce93a7 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java +++ b/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; /** diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/NetworkUtils.java b/oc_framework/src/com/owncloud/android/lib/network/NetworkUtils.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/network/NetworkUtils.java rename to oc_framework/src/com/owncloud/android/lib/network/NetworkUtils.java index c94516ae..3a91b243 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/NetworkUtils.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java b/oc_framework/src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java similarity index 96% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java rename to oc_framework/src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java index 0ace2dbb..68c16e04 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java +++ b/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); diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java b/oc_framework/src/com/owncloud/android/lib/network/OwnCloudClient.java similarity index 95% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java rename to oc_framework/src/com/owncloud/android/lib/network/OwnCloudClient.java index eb828d4d..9ec8867f 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java b/oc_framework/src/com/owncloud/android/lib/network/OwnCloudClientFactory.java similarity index 81% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java rename to oc_framework/src/com/owncloud/android/lib/network/OwnCloudClientFactory.java index b90deedb..daea819c 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OwnCloudClientFactory.java +++ b/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 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); diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/ProgressiveDataTransferer.java b/oc_framework/src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java similarity index 92% rename from oc_framework/src/com/owncloud/android/oc_framework/network/ProgressiveDataTransferer.java rename to oc_framework/src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java index 4d803bf2..9819d238 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/ProgressiveDataTransferer.java +++ b/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 { diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/ServerNameIndicator.java b/oc_framework/src/com/owncloud/android/lib/network/ServerNameIndicator.java similarity index 99% rename from oc_framework/src/com/owncloud/android/oc_framework/network/ServerNameIndicator.java rename to oc_framework/src/com/owncloud/android/lib/network/ServerNameIndicator.java index e5a6d68d..b29b7858 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/ServerNameIndicator.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java b/oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavEntry.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java rename to oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavEntry.java index 9d0d61fe..d9844841 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavUtils.java b/oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavUtils.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavUtils.java rename to oc_framework/src/com/owncloud/android/lib/network/webdav/WebdavUtils.java index 7b963fca..7528e6f1 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavUtils.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/OnRemoteOperationListener.java b/oc_framework/src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java similarity index 96% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/OnRemoteOperationListener.java rename to oc_framework/src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java index c87a1905..30f16031 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/OnRemoteOperationListener.java +++ b/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 { diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/OperationCancelledException.java b/oc_framework/src/com/owncloud/android/lib/operations/common/OperationCancelledException.java similarity index 96% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/OperationCancelledException.java rename to oc_framework/src/com/owncloud/android/lib/operations/common/OperationCancelledException.java index b47a8e15..cd73dd8b 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/OperationCancelledException.java +++ b/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 { diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java b/oc_framework/src/com/owncloud/android/lib/operations/common/RemoteFile.java similarity index 96% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java rename to oc_framework/src/com/owncloud/android/lib/operations/common/RemoteFile.java index 9c947c80..3304b1c1 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java +++ b/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 diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperation.java similarity index 90% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperation.java index 7efb588e..44c652bf 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java +++ b/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; } diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java b/oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java rename to oc_framework/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java index 1dc1720a..df6d7471 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java similarity index 90% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java index 6df42642..9fde7c0f 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java similarity index 87% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java index ebbe3e67..f0a325ed 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java +++ b/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); diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java similarity index 90% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java index 6d90e629..35f99f51 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java +++ b/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)); diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ExistenceCheckRemoteOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java similarity index 91% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ExistenceCheckRemoteOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java index e2c936fd..d4b49f91 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ExistenceCheckRemoteOperation.java +++ b/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); } diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/GetUserNameRemoteOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java similarity index 91% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/GetUserNameRemoteOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java index 717fae22..9f5c0ff6 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/GetUserNameRemoteOperation.java +++ b/oc_framework/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java similarity index 87% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java index 5615543e..0410cd62 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFileOperation.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFolderOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java similarity index 90% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFolderOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java index fb03449c..521d73e7 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ReadRemoteFolderOperation.java +++ b/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(); // parse data from remote folder diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RemoveRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java similarity index 88% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RemoveRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java index 1c3570c1..b80fa526 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RemoveRemoteFileOperation.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RenameRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java similarity index 90% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RenameRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java index c3056e5d..7bc5f0cc 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RenameRemoteFileOperation.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/UploadRemoteFileOperation.java b/oc_framework/src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java similarity index 85% rename from oc_framework/src/com/owncloud/android/oc_framework/operations/remote/UploadRemoteFileOperation.java rename to oc_framework/src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java index b23d1ff5..4872aaf1 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/UploadRemoteFileOperation.java +++ b/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); diff --git a/oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java b/oc_framework/src/com/owncloud/android/lib/utils/FileUtils.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java rename to oc_framework/src/com/owncloud/android/lib/utils/FileUtils.java index f6c5e81b..6924c374 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java +++ b/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; diff --git a/oc_framework/src/com/owncloud/android/oc_framework/utils/OwnCloudVersion.java b/oc_framework/src/com/owncloud/android/lib/utils/OwnCloudVersion.java similarity index 98% rename from oc_framework/src/com/owncloud/android/oc_framework/utils/OwnCloudVersion.java rename to oc_framework/src/com/owncloud/android/lib/utils/OwnCloudVersion.java index 868b9bdc..542540c8 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/utils/OwnCloudVersion.java +++ b/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 { public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion( diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java index 78a8575e..49a93552 100644 --- a/src/com/owncloud/android/authentication/AccountAuthenticator.java +++ b/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; diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java index 33c7e6a9..5f0441c5 100644 --- a/src/com/owncloud/android/authentication/AccountUtils.java +++ b/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; diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index ad40a066..3a11ea62 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/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); } diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 68c97e4f..ade4c61c 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/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; diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 0dee6050..c27ec0cc 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/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; diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 4b4de805..fdbe055e 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/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; diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index 1cf1f84d..9ba118e6 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/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); diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index d9be6f04..24990a2d 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/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; diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index d3926453..57295ad6 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/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; diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java index 82096854..f3eca9c2 100644 --- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java +++ b/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); } diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index 0ab8ac3c..5cd668cc 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/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()); diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index be6cdcce..d77020c6 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/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 diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index 71d7f721..6a79e751 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/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; diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index ff387c0f..497058a0 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/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 folderAndFiles, WebdavClient client) { + private void synchronizeData(ArrayList 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 filesToSyncContents, WebdavClient client) { + private void startContentSynchronizations(List filesToSyncContents, OwnCloudClient client) { RemoteOperationResult contentsResult = null; for (SynchronizeFileOperation op: filesToSyncContents) { contentsResult = op.execute(client); // returns without waiting for upload or download finishes diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 7e330604..ca4387ce 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/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; diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index 9ceb9751..faa8154b 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/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(); diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 74d26868..6dcf531c 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/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; } diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java index db7f4c29..f80824fe 100644 --- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java +++ b/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; diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index 058cfbc4..c47a251f 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/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; diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 3632b5e4..9f8bcfdd 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/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; diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 937d45dd..3d2323fb 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/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; diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 04f525ed..04d0eeec 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/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; diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java index 85c9e40d..07e6e959 100644 --- a/src/com/owncloud/android/ui/activity/Uploader.java +++ b/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 local = new ArrayList(); ArrayList remote = new ArrayList(); /* 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); diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java index 862715fd..14a74c59 100644 --- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java +++ b/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; /** diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index 91c607e4..a90a7adb 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/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; diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index a50ecc95..dd4046b5 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/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; /** diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index ec43bd19..49895260 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/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; diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index c75eedb4..91abe7d1 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/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; diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index bacba8c9..8ca2be33 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/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; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 0ae6868b..8555fa77 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/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; diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index b21f333a..464ea6db 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/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; diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 59d96555..9e6a2803 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/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. diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index d4042f50..639caef7 100644 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/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; diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java index 03667ff7..150034bd 100644 --- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java +++ b/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; -- 2.11.0