From 2be23eaec586972a5ff86c4f9c34d95188231821 Mon Sep 17 00:00:00 2001 From: masensio Date: Wed, 6 Nov 2013 18:01:31 +0100 Subject: [PATCH] OC-1867: Remove package eu.alefzero.webdav --- .../owncloud/android/authentication/AuthenticatorActivity.java | 2 +- src/com/owncloud/android/files/services/FileDownloader.java | 4 ++-- src/com/owncloud/android/files/services/FileUploader.java | 8 ++++---- src/com/owncloud/android/network/OwnCloudClientUtils.java | 2 +- src/com/owncloud/android/network/ProgressiveDataTransferer.java | 3 ++- .../network}/webdav/ChunkFromFileChannelRequestEntity.java | 3 +-- .../owncloud/android/network}/webdav/FileRequestEntity.java | 3 +-- .../android/network}/webdav/OnDatatransferProgressListener.java | 2 +- .../owncloud/android/network}/webdav/WebdavClient.java | 3 ++- .../owncloud/android/network}/webdav/WebdavEntry.java | 3 ++- .../owncloud/android/network}/webdav/WebdavUtils.java | 2 +- .../owncloud/android/operations/ChunkedUploadFileOperation.java | 6 +++--- src/com/owncloud/android/operations/CreateFolderOperation.java | 2 +- src/com/owncloud/android/operations/DownloadFileOperation.java | 6 +++--- src/com/owncloud/android/operations/ExistenceCheckOperation.java | 4 ++-- src/com/owncloud/android/operations/OAuth2GetAccessToken.java | 2 +- .../owncloud/android/operations/OwnCloudServerCheckOperation.java | 2 +- src/com/owncloud/android/operations/RemoteOperation.java | 2 +- src/com/owncloud/android/operations/RemoveFileOperation.java | 4 ++-- src/com/owncloud/android/operations/RenameFileOperation.java | 4 ++-- src/com/owncloud/android/operations/SynchronizeFileOperation.java | 6 +++--- .../owncloud/android/operations/SynchronizeFolderOperation.java | 6 +++--- src/com/owncloud/android/operations/UpdateOCVersionOperation.java | 2 +- src/com/owncloud/android/operations/UploadFileOperation.java | 8 ++++---- .../android/operations/remote/CreateRemoteFolderOperation.java | 4 ++-- .../owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java | 2 +- src/com/owncloud/android/ui/activity/FileActivity.java | 2 +- src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java | 2 +- src/com/owncloud/android/ui/fragment/FileDetailFragment.java | 2 +- src/com/owncloud/android/ui/preview/FileDownloadFragment.java | 2 +- src/com/owncloud/android/ui/preview/PreviewImageFragment.java | 2 +- src/com/owncloud/android/ui/preview/PreviewMediaFragment.java | 2 +- 32 files changed, 54 insertions(+), 53 deletions(-) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/ChunkFromFileChannelRequestEntity.java (98%) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/FileRequestEntity.java (98%) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/OnDatatransferProgressListener.java (95%) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/WebdavClient.java (99%) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/WebdavEntry.java (99%) rename src/{eu/alefzero => com/owncloud/android/network}/webdav/WebdavUtils.java (98%) diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 53f18bb4..4f65e70b 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -57,6 +57,7 @@ import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.ExistenceCheckOperation; import com.owncloud.android.operations.OAuth2GetAccessToken; import com.owncloud.android.operations.OnRemoteOperationListener; @@ -69,7 +70,6 @@ import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; import com.owncloud.android.utils.OwnCloudVersion; -import eu.alefzero.webdav.WebdavClient; /** * This Activity is used to add an ownCloud account to the App diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 1e2bffa6..dfac27b0 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -31,9 +31,10 @@ import java.util.concurrent.ConcurrentMap; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import eu.alefzero.webdav.OnDatatransferProgressListener; import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.DownloadFileOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; @@ -61,7 +62,6 @@ import android.widget.RemoteViews; import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; -import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 4d2df0fe..1c71dc52 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -46,11 +46,12 @@ import com.owncloud.android.operations.UploadFileOperation; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.OwnCloudVersion; -import eu.alefzero.webdav.OnDatatransferProgressListener; -import eu.alefzero.webdav.WebdavEntry; -import eu.alefzero.webdav.WebdavUtils; import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavEntry; +import com.owncloud.android.network.webdav.WebdavUtils; import android.accounts.Account; import android.accounts.AccountManager; @@ -81,7 +82,6 @@ import com.owncloud.android.ui.activity.InstantUploadActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; -import eu.alefzero.webdav.WebdavClient; public class FileUploader extends Service implements OnDatatransferProgressListener { diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java index 43104d08..8c260b70 100644 --- a/src/com/owncloud/android/network/OwnCloudClientUtils.java +++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java @@ -39,10 +39,10 @@ import org.apache.http.conn.ssl.X509HostnameVerifier; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; -import eu.alefzero.webdav.WebdavClient; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/com/owncloud/android/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/network/ProgressiveDataTransferer.java index c6fa545b..a0a39c88 100644 --- a/src/com/owncloud/android/network/ProgressiveDataTransferer.java +++ b/src/com/owncloud/android/network/ProgressiveDataTransferer.java @@ -19,7 +19,8 @@ package com.owncloud.android.network; import java.util.Collection; -import eu.alefzero.webdav.OnDatatransferProgressListener; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; + public interface ProgressiveDataTransferer { diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/network/webdav/ChunkFromFileChannelRequestEntity.java similarity index 98% rename from src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java rename to src/com/owncloud/android/network/webdav/ChunkFromFileChannelRequestEntity.java index 103cd04a..cb8a8211 100644 --- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java +++ b/src/com/owncloud/android/network/webdav/ChunkFromFileChannelRequestEntity.java @@ -15,7 +15,7 @@ * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; import java.io.File; import java.io.IOException; @@ -32,7 +32,6 @@ import org.apache.commons.httpclient.methods.RequestEntity; import com.owncloud.android.Log_OC; import com.owncloud.android.network.ProgressiveDataTransferer; -import eu.alefzero.webdav.OnDatatransferProgressListener; /** diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/com/owncloud/android/network/webdav/FileRequestEntity.java similarity index 98% rename from src/eu/alefzero/webdav/FileRequestEntity.java rename to src/com/owncloud/android/network/webdav/FileRequestEntity.java index a8f01d63..c42124c9 100644 --- a/src/eu/alefzero/webdav/FileRequestEntity.java +++ b/src/com/owncloud/android/network/webdav/FileRequestEntity.java @@ -16,7 +16,7 @@ * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; import java.io.File; import java.io.IOException; @@ -34,7 +34,6 @@ import org.apache.commons.httpclient.methods.RequestEntity; import com.owncloud.android.Log_OC; import com.owncloud.android.network.ProgressiveDataTransferer; -import eu.alefzero.webdav.OnDatatransferProgressListener; /** diff --git a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java b/src/com/owncloud/android/network/webdav/OnDatatransferProgressListener.java similarity index 95% rename from src/eu/alefzero/webdav/OnDatatransferProgressListener.java rename to src/com/owncloud/android/network/webdav/OnDatatransferProgressListener.java index 5c4783a1..72c92de4 100644 --- a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java +++ b/src/com/owncloud/android/network/webdav/OnDatatransferProgressListener.java @@ -16,7 +16,7 @@ * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; public interface OnDatatransferProgressListener { public void onTransferProgress(long progressRate); diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/com/owncloud/android/network/webdav/WebdavClient.java similarity index 99% rename from src/eu/alefzero/webdav/WebdavClient.java rename to src/com/owncloud/android/network/webdav/WebdavClient.java index 65a8f00a..ac875484 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/com/owncloud/android/network/webdav/WebdavClient.java @@ -16,7 +16,7 @@ * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; import java.io.IOException; import java.io.InputStream; @@ -47,6 +47,7 @@ import com.owncloud.android.MainApp; import com.owncloud.android.network.BearerAuthScheme; import com.owncloud.android.network.BearerCredentials; + import android.net.Uri; public class WebdavClient extends HttpClient { diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/com/owncloud/android/network/webdav/WebdavEntry.java similarity index 99% rename from src/eu/alefzero/webdav/WebdavEntry.java rename to src/com/owncloud/android/network/webdav/WebdavEntry.java index 665a850c..a4aaec1f 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/com/owncloud/android/network/webdav/WebdavEntry.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; import java.util.Date; @@ -25,6 +25,7 @@ import org.apache.jackrabbit.webdav.property.DavPropertySet; import com.owncloud.android.Log_OC; + import android.net.Uri; public class WebdavEntry { diff --git a/src/eu/alefzero/webdav/WebdavUtils.java b/src/com/owncloud/android/network/webdav/WebdavUtils.java similarity index 98% rename from src/eu/alefzero/webdav/WebdavUtils.java rename to src/com/owncloud/android/network/webdav/WebdavUtils.java index 132a1f92..cc2b1b03 100644 --- a/src/eu/alefzero/webdav/WebdavUtils.java +++ b/src/com/owncloud/android/network/webdav/WebdavUtils.java @@ -16,7 +16,7 @@ * */ -package eu.alefzero.webdav; +package com.owncloud.android.network.webdav; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java index 02e1ad04..0c6a134d 100644 --- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java +++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java @@ -30,12 +30,12 @@ import org.apache.commons.httpclient.methods.PutMethod; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.network.ProgressiveDataTransferer; +import com.owncloud.android.network.webdav.ChunkFromFileChannelRequestEntity; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; import android.accounts.Account; -import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; public class ChunkedUploadFileOperation extends UploadFileOperation { diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index 2b72b282..a2e79d63 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -20,10 +20,10 @@ package com.owncloud.android.operations; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.remote.CreateRemoteFolderOperation; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.WebdavClient; /** * Access to remote operation performing the creation of a new folder in the ownCloud server. diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 02098b81..41af05b1 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -34,13 +34,13 @@ import org.apache.http.HttpStatus; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.OnDatatransferProgressListener; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; import android.accounts.Account; import android.webkit.MimeTypeMap; diff --git a/src/com/owncloud/android/operations/ExistenceCheckOperation.java b/src/com/owncloud/android/operations/ExistenceCheckOperation.java index 136fe224..03f62866 100644 --- a/src/com/owncloud/android/operations/ExistenceCheckOperation.java +++ b/src/com/owncloud/android/operations/ExistenceCheckOperation.java @@ -21,9 +21,9 @@ import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.HeadMethod; import com.owncloud.android.Log_OC; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 5d468041..d500cefd 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -10,9 +10,9 @@ import org.json.JSONObject; import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.OAuth2Constants; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; -import eu.alefzero.webdav.WebdavClient; public class OAuth2GetAccessToken extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java index d95b3055..beae8c40 100644 --- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java @@ -24,9 +24,9 @@ import org.json.JSONObject; import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.utils.OwnCloudVersion; -import eu.alefzero.webdav.WebdavClient; import android.content.Context; import android.net.ConnectivityManager; import android.net.Uri; diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java index 604d62ea..e2304b10 100644 --- a/src/com/owncloud/android/operations/RemoteOperation.java +++ b/src/com/owncloud/android/operations/RemoteOperation.java @@ -24,6 +24,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.network.BearerCredentials; import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import android.accounts.Account; @@ -33,7 +34,6 @@ import android.app.Activity; import android.content.Context; import android.os.Handler; -import eu.alefzero.webdav.WebdavClient; /** * Operation which execution involves one or several interactions with an ownCloud server. diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index ffb3a91a..d5f87bfa 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -23,9 +23,9 @@ import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; /** * Remote operation performing the removal of a remote file or folder in the ownCloud server. diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index f9bb4242..78540337 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -28,11 +28,11 @@ import android.accounts.Account; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; /** * Remote operation performing the rename of a remote file (or folder?) in the ownCloud server. diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index b5f6575a..09f13274 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -32,11 +32,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.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavEntry; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavEntry; -import eu.alefzero.webdav.WebdavUtils; public class SynchronizeFileOperation extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index 09683d63..e4b5e61c 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -40,13 +40,13 @@ import android.content.Intent; import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavEntry; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.syncadapter.FileSyncService; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavEntry; -import eu.alefzero.webdav.WebdavUtils; /** diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 1643377b..a0cd4b43 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -29,10 +29,10 @@ import android.content.Context; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.Log_OC; +import com.owncloud.android.network.webdav.WebdavClient; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.OwnCloudVersion; -import eu.alefzero.webdav.WebdavClient; /** * Remote operation that checks the version of an ownCloud server and stores it locally diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index cae1f179..adeb7014 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -38,15 +38,15 @@ import android.accounts.Account; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.network.ProgressiveDataTransferer; +import com.owncloud.android.network.webdav.FileRequestEntity; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.FileRequestEntity; -import eu.alefzero.webdav.OnDatatransferProgressListener; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; /** * Remote operation performing the upload of a file to an ownCloud server diff --git a/src/com/owncloud/android/operations/remote/CreateRemoteFolderOperation.java b/src/com/owncloud/android/operations/remote/CreateRemoteFolderOperation.java index 8b0d802f..7e02afef 100644 --- a/src/com/owncloud/android/operations/remote/CreateRemoteFolderOperation.java +++ b/src/com/owncloud/android/operations/remote/CreateRemoteFolderOperation.java @@ -4,12 +4,12 @@ import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.MkColMethod; import com.owncloud.android.Log_OC; +import com.owncloud.android.network.webdav.WebdavClient; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; /** * Remote operation performing the creation of a new folder in the ownCloud server. diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 34ef4524..4829636b 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -28,6 +28,7 @@ import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.network.webdav.WebdavClient; import android.accounts.Account; import android.accounts.AccountManager; @@ -36,7 +37,6 @@ import android.accounts.OperationCanceledException; import android.content.AbstractThreadedSyncAdapter; import android.content.ContentProviderClient; import android.content.Context; -import eu.alefzero.webdav.WebdavClient; /** * Base synchronization adapter for ownCloud designed to be subclassed for different diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 1faf8b1f..08301375 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -34,8 +34,8 @@ 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.network.webdav.WebdavUtils; -import eu.alefzero.webdav.WebdavUtils; /** * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s . diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index a5219a22..53570424 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -39,8 +39,8 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; +import com.owncloud.android.network.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavClient; /** * Dialog to show the WebView for SAML Authentication diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 75bd4a99..c735447b 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -52,6 +52,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileObserverService; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; import com.owncloud.android.operations.OnRemoteOperationListener; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -66,7 +67,6 @@ import com.owncloud.android.ui.dialog.EditNameDialog; import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.preview.PreviewImageFragment; -import eu.alefzero.webdav.OnDatatransferProgressListener; /** * This Fragment is used to display the details about a file. diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index d3d5fe91..da8c5f9d 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -33,12 +33,12 @@ import android.widget.TextView; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; +import com.owncloud.android.network.webdav.OnDatatransferProgressListener; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import eu.alefzero.webdav.OnDatatransferProgressListener; /** * This Fragment is used to monitor the progress of a file downloading. diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 578c56e8..304d5cf5 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -52,6 +52,7 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.webdav.WebdavUtils; import com.owncloud.android.operations.OnRemoteOperationListener; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -61,7 +62,6 @@ import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import eu.alefzero.webdav.WebdavUtils; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 5ffd52ed..c13e5b1c 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -57,6 +57,7 @@ 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.network.webdav.WebdavUtils; import com.owncloud.android.operations.OnRemoteOperationListener; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -68,7 +69,6 @@ import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.Log_OC; import com.owncloud.android.R; -import eu.alefzero.webdav.WebdavUtils; /** * This fragment shows a preview of a downloaded media file (audio or video). -- 2.11.0