From 6c4d342610baa57ead3a064f5975be7b6bb505de Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 14 Feb 2014 12:04:41 +0100 Subject: [PATCH 1/7] Reordered packages --- .../lib/sampleclient/FilesArrayAdapter.java | 2 +- .../lib/sampleclient/MainActivity.java | 26 ++-- .../android/lib/accounts/OwnCloudAccount.java | 116 ------------------ .../{network => common}/OwnCloudClient.java | 7 +- .../OwnCloudClientFactory.java | 18 +-- .../accounts/AccountTypeUtils.java | 2 +- .../{ => common}/accounts/AccountUtils.java | 49 ++++++-- .../network/AdvancedSslSocketFactory.java | 2 +- .../network/AdvancedX509TrustManager.java | 2 +- .../network/BearerAuthScheme.java | 2 +- .../network/BearerCredentials.java | 2 +- .../network/CertificateCombinedException.java | 2 +- .../ChunkFromFileChannelRequestEntity.java | 2 +- .../network/FileRequestEntity.java | 2 +- .../{ => common}/network/NetworkUtils.java | 2 +- .../OnDatatransferProgressListener.java | 2 +- .../network/ProgressiveDataTransferer.java | 2 +- .../network/ServerNameIndicator.java | 2 +- .../network}/WebdavEntry.java | 3 +- .../network}/WebdavUtils.java | 2 +- .../OnRemoteOperationListener.java | 2 +- .../OperationCancelledException.java | 2 +- .../operations}/RemoteOperation.java | 10 +- .../operations}/RemoteOperationResult.java | 6 +- .../ChunkedUploadRemoteFileOperation.java | 10 +- .../files}/CreateRemoteFolderOperation.java | 13 +- .../files}/DownloadRemoteFileOperation.java | 14 +-- .../files}/ExistenceCheckRemoteOperation.java | 10 +- .../{utils => resources/files}/FileUtils.java | 2 +- .../files}/ReadRemoteFileOperation.java | 13 +- .../files}/ReadRemoteFolderOperation.java | 13 +- .../files}/RemoteFile.java | 5 +- .../files}/RemoveRemoteFileOperation.java | 10 +- .../files}/RenameRemoteFileOperation.java | 13 +- .../files}/UploadRemoteFileOperation.java | 18 +-- .../shares}/CreateShareRemoteOperation.java | 14 +-- .../shares}/GetRemoteSharesOperation.java | 13 +- .../GetSharesForFileRemoteOperation.java | 13 +- .../shares}/GetSharesForFileXMLParser.java | 4 +- .../common => resources/shares}/OCShare.java | 4 +- .../shares}/ShareType.java | 2 +- .../shares}/ShareUtils.java | 2 +- .../shares}/ShareXMLParser.java | 5 +- .../status}/OwnCloudServerCheckOperation.java | 12 +- .../status}/OwnCloudVersion.java | 2 +- .../users}/GetUserNameRemoteOperation.java | 8 +- .../lib/test_project/TestActivity.java | 22 ++-- .../test_project/test/CreateFolderTest.java | 4 +- .../lib/test_project/test/DeleteFileTest.java | 4 +- .../test_project/test/DownloadFileTest.java | 4 +- .../lib/test_project/test/ReadFileTest.java | 2 +- .../lib/test_project/test/ReadFolderTest.java | 2 +- .../lib/test_project/test/RenameFileTest.java | 4 +- .../lib/test_project/test/UploadFileTest.java | 2 +- 54 files changed, 208 insertions(+), 303 deletions(-) delete mode 100644 src/com/owncloud/android/lib/accounts/OwnCloudAccount.java rename src/com/owncloud/android/lib/{network => common}/OwnCloudClient.java (97%) rename src/com/owncloud/android/lib/{network => common}/OwnCloudClientFactory.java (90%) rename src/com/owncloud/android/lib/{ => common}/accounts/AccountTypeUtils.java (97%) rename src/com/owncloud/android/lib/{ => common}/accounts/AccountUtils.java (72%) rename src/com/owncloud/android/lib/{ => common}/network/AdvancedSslSocketFactory.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/AdvancedX509TrustManager.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/BearerAuthScheme.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/BearerCredentials.java (98%) rename src/com/owncloud/android/lib/{ => common}/network/CertificateCombinedException.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/ChunkFromFileChannelRequestEntity.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/FileRequestEntity.java (98%) rename src/com/owncloud/android/lib/{ => common}/network/NetworkUtils.java (99%) rename src/com/owncloud/android/lib/{ => common}/network/OnDatatransferProgressListener.java (96%) rename src/com/owncloud/android/lib/{ => common}/network/ProgressiveDataTransferer.java (97%) rename src/com/owncloud/android/lib/{ => common}/network/ServerNameIndicator.java (99%) rename src/com/owncloud/android/lib/{network/webdav => common/network}/WebdavEntry.java (99%) rename src/com/owncloud/android/lib/{network/webdav => common/network}/WebdavUtils.java (98%) rename src/com/owncloud/android/lib/{operations/common => common/operations}/OnRemoteOperationListener.java (96%) rename src/com/owncloud/android/lib/{operations/common => common/operations}/OperationCancelledException.java (96%) rename src/com/owncloud/android/lib/{operations/common => common/operations}/RemoteOperation.java (97%) rename src/com/owncloud/android/lib/{operations/common => common/operations}/RemoteOperationResult.java (98%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/ChunkedUploadRemoteFileOperation.java (93%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/CreateRemoteFolderOperation.java (91%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/DownloadRemoteFileOperation.java (94%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/ExistenceCheckRemoteOperation.java (93%) rename src/com/owncloud/android/lib/{utils => resources/files}/FileUtils.java (98%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/ReadRemoteFileOperation.java (90%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/ReadRemoteFolderOperation.java (93%) rename src/com/owncloud/android/lib/{operations/common => resources/files}/RemoteFile.java (96%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/RemoveRemoteFileOperation.java (91%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/RenameRemoteFileOperation.java (92%) rename src/com/owncloud/android/lib/{operations/remote => resources/files}/UploadRemoteFileOperation.java (89%) rename src/com/owncloud/android/lib/{operations/remote => resources/shares}/CreateShareRemoteOperation.java (92%) rename src/com/owncloud/android/lib/{operations/remote => resources/shares}/GetRemoteSharesOperation.java (87%) rename src/com/owncloud/android/lib/{operations/remote => resources/shares}/GetSharesForFileRemoteOperation.java (90%) rename src/com/owncloud/android/lib/{utils => resources/shares}/GetSharesForFileXMLParser.java (98%) rename src/com/owncloud/android/lib/{operations/common => resources/shares}/OCShare.java (98%) rename src/com/owncloud/android/lib/{operations/common => resources/shares}/ShareType.java (97%) rename src/com/owncloud/android/lib/{utils => resources/shares}/ShareUtils.java (96%) rename src/com/owncloud/android/lib/{utils => resources/shares}/ShareXMLParser.java (98%) rename src/com/owncloud/android/lib/{operations/remote => resources/status}/OwnCloudServerCheckOperation.java (94%) rename src/com/owncloud/android/lib/{utils => resources/status}/OwnCloudVersion.java (98%) rename src/com/owncloud/android/lib/{operations/remote => resources/users}/GetUserNameRemoteOperation.java (95%) diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java b/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java index f7f4bda7..aa94a66b 100644 --- a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java +++ b/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java @@ -29,7 +29,7 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.owncloud.android.lib.operations.common.RemoteFile; +import com.owncloud.android.lib.resources.files.RemoteFile; public class FilesArrayAdapter extends ArrayAdapter { diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java index 7e4e6ed0..40504595 100644 --- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java +++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java @@ -32,19 +32,19 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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 com.owncloud.android.lib.common.accounts.AccountUtils; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.resources.files.RemoteFile; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation; +import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation; +import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.FileUtils; import android.app.Activity; import android.content.res.AssetManager; diff --git a/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java b/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java deleted file mode 100644 index 740bd17f..00000000 --- a/src/com/owncloud/android/lib/accounts/OwnCloudAccount.java +++ /dev/null @@ -1,116 +0,0 @@ -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2014 ownCloud (http://www.owncloud.org/) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - */ - -package com.owncloud.android.lib.accounts; - -import android.accounts.Account; -import android.os.Parcel; -import android.os.Parcelable; - -/** - * Account with extra information specific for ownCloud accounts. - * - * TODO integrate in the main app - * - * @author David A. Velasco - */ -public class OwnCloudAccount extends Account { - - public static class Constants { - /** - * 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.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.lib.utils.utils.OwnCloudVersion} - */ - public static final String KEY_OC_VERSION = "oc_version"; - /** - * Base url should point to owncloud installation without trailing / ie: - * http://server/path or https://owncloud.server - */ - public static final String KEY_OC_BASE_URL = "oc_base_url"; - /** - * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens. - */ - public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2"; - /** - * Flag signaling if the ownCloud server can be accessed with session cookies from SAML-based web single-sign-on. - */ - public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso"; - /** - * Flag signaling if the ownCloud server supports Share API" - */ - public static final String KEY_SUPPORTS_SHARE_API = "oc_supports_share_api"; - } - - private String mAuthTokenType; - - public OwnCloudAccount(String name, String type, String authTokenType) { - super(name, type); - // TODO validate authTokentype as supported - mAuthTokenType = authTokenType; - } - - /** - * Reconstruct from parcel - * - * @param source The source parcel - */ - public OwnCloudAccount(Parcel source) { - super(source); - mAuthTokenType = source.readString(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - dest.writeString(mAuthTokenType); - } - - - public String getAuthTokenType() { - return mAuthTokenType; - } - - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public OwnCloudAccount createFromParcel(Parcel source) { - return new OwnCloudAccount(source); - } - - @Override - public OwnCloudAccount [] newArray(int size) { - return new OwnCloudAccount[size]; - } - }; - -} diff --git a/src/com/owncloud/android/lib/network/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java similarity index 97% rename from src/com/owncloud/android/lib/network/OwnCloudClient.java rename to src/com/owncloud/android/lib/common/OwnCloudClient.java index a974b8d1..b0bf7f75 100644 --- a/src/com/owncloud/android/lib/network/OwnCloudClient.java +++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common; import java.io.IOException; import java.io.InputStream; @@ -48,7 +48,10 @@ import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.http.HttpStatus; import org.apache.http.params.CoreProtocolPNames; -import com.owncloud.android.lib.network.webdav.WebdavUtils; +import com.owncloud.android.lib.common.network.BearerAuthScheme; +import com.owncloud.android.lib.common.network.BearerCredentials; +import com.owncloud.android.lib.common.network.WebdavUtils; + import android.net.Uri; import android.util.Log; diff --git a/src/com/owncloud/android/lib/network/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java similarity index 90% rename from src/com/owncloud/android/lib/network/OwnCloudClientFactory.java rename to src/com/owncloud/android/lib/common/OwnCloudClientFactory.java index a41f5528..70a7d09b 100644 --- a/src/com/owncloud/android/lib/network/OwnCloudClientFactory.java +++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java @@ -22,15 +22,15 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common; import java.io.IOException; import java.security.GeneralSecurityException; -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 com.owncloud.android.lib.common.accounts.AccountTypeUtils; +import com.owncloud.android.lib.common.accounts.AccountUtils; +import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; +import com.owncloud.android.lib.common.network.NetworkUtils; import android.accounts.Account; import android.accounts.AccountManager; @@ -73,8 +73,8 @@ public class OwnCloudClientFactory { Uri webdavUri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account)); Uri uri = Uri.parse(AccountUtils.constructBasicURLForAccount(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; + boolean isOauth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2) != null; // TODO avoid calling to getUserData here + boolean isSamlSso = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; OwnCloudClient client = createOwnCloudClient(webdavUri, appContext, !isSamlSso); client.setBaseUri(uri); @@ -101,8 +101,8 @@ public class OwnCloudClientFactory { Uri webdavUri = Uri.parse(AccountUtils.constructFullURLForAccount(appContext, account)); Uri uri = Uri.parse(AccountUtils.constructBasicURLForAccount(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; + boolean isOauth2 = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_OAUTH2) != null; // TODO avoid calling to getUserData here + boolean isSamlSso = am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; OwnCloudClient client = createOwnCloudClient(webdavUri, appContext, !isSamlSso); client.setBaseUri(uri); diff --git a/src/com/owncloud/android/lib/accounts/AccountTypeUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java similarity index 97% rename from src/com/owncloud/android/lib/accounts/AccountTypeUtils.java rename to src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java index b4ed3308..bf67be2b 100644 --- a/src/com/owncloud/android/lib/accounts/AccountTypeUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.accounts; +package com.owncloud.android.lib.common.accounts; /** * @author masensio diff --git a/src/com/owncloud/android/lib/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java similarity index 72% rename from src/com/owncloud/android/lib/accounts/AccountUtils.java rename to src/com/owncloud/android/lib/common/accounts/AccountUtils.java index fbb840cf..d9b10f89 100644 --- a/src/com/owncloud/android/lib/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -23,9 +23,9 @@ * */ -package com.owncloud.android.lib.accounts; +package com.owncloud.android.lib.common.accounts; -import com.owncloud.android.lib.utils.OwnCloudVersion; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import android.accounts.Account; import android.accounts.AccountManager; @@ -79,10 +79,10 @@ public class AccountUtils { */ public static String constructFullURLForAccount(Context context, Account account) throws AccountNotFoundException { AccountManager ama = AccountManager.get(context); - String baseurl = ama.getUserData(account, OwnCloudAccount.Constants.KEY_OC_BASE_URL); - String strver = ama.getUserData(account, OwnCloudAccount.Constants.KEY_OC_VERSION); - boolean supportsOAuth = (ama.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2) != null); - boolean supportsSamlSso = (ama.getUserData(account, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); + String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL); + String strver = ama.getUserData(account, Constants.KEY_OC_VERSION); + boolean supportsOAuth = (ama.getUserData(account, Constants.KEY_SUPPORTS_OAUTH2) != null); + boolean supportsSamlSso = (ama.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); OwnCloudVersion ver = new OwnCloudVersion(strver); String webdavpath = getWebdavPath(ver, supportsOAuth, supportsSamlSso); @@ -101,7 +101,7 @@ public class AccountUtils { */ public static String constructBasicURLForAccount(Context context, Account account) throws AccountNotFoundException { AccountManager ama = AccountManager.get(context); - String baseurl = ama.getUserData(account, OwnCloudAccount.Constants.KEY_OC_BASE_URL); + String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL); if (baseurl == null ) throw new AccountNotFoundException(account, "Account not found", null); @@ -126,4 +126,39 @@ public class AccountUtils { return mFailedAccount; } } + + + public static class Constants { + /** + * 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.lib.resources.status.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.lib.resources.status.utils.OwnCloudVersion} + */ + public static final String KEY_OC_VERSION = "oc_version"; + /** + * Base url should point to owncloud installation without trailing / ie: + * http://server/path or https://owncloud.server + */ + public static final String KEY_OC_BASE_URL = "oc_base_url"; + /** + * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens. + */ + public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2"; + /** + * Flag signaling if the ownCloud server can be accessed with session cookies from SAML-based web single-sign-on. + */ + public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso"; + /** + * Flag signaling if the ownCloud server supports Share API" + */ + public static final String KEY_SUPPORTS_SHARE_API = "oc_supports_share_api"; + } } diff --git a/src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java similarity index 99% rename from src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java rename to src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java index 72b78b16..c4d6b2a1 100644 --- a/src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java +++ b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.io.IOException; import java.net.InetAddress; diff --git a/src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java similarity index 99% rename from src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java rename to src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java index a92bc873..96a6c9d4 100644 --- a/src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java +++ b/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.security.KeyStore; import java.security.KeyStoreException; diff --git a/src/com/owncloud/android/lib/network/BearerAuthScheme.java b/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java similarity index 99% rename from src/com/owncloud/android/lib/network/BearerAuthScheme.java rename to src/com/owncloud/android/lib/common/network/BearerAuthScheme.java index 10552c33..68e57156 100644 --- a/src/com/owncloud/android/lib/network/BearerAuthScheme.java +++ b/src/com/owncloud/android/lib/common/network/BearerAuthScheme.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.util.Map; diff --git a/src/com/owncloud/android/lib/network/BearerCredentials.java b/src/com/owncloud/android/lib/common/network/BearerCredentials.java similarity index 98% rename from src/com/owncloud/android/lib/network/BearerCredentials.java rename to src/com/owncloud/android/lib/common/network/BearerCredentials.java index 0d5d9024..ad948ca8 100644 --- a/src/com/owncloud/android/lib/network/BearerCredentials.java +++ b/src/com/owncloud/android/lib/common/network/BearerCredentials.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.util.LangUtils; diff --git a/src/com/owncloud/android/lib/network/CertificateCombinedException.java b/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java similarity index 99% rename from src/com/owncloud/android/lib/network/CertificateCombinedException.java rename to src/com/owncloud/android/lib/common/network/CertificateCombinedException.java index daec78b8..83e3e5c1 100644 --- a/src/com/owncloud/android/lib/network/CertificateCombinedException.java +++ b/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.security.cert.CertPathValidatorException; import java.security.cert.CertificateException; diff --git a/src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java similarity index 99% rename from src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java rename to src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java index 3c34ef47..3cd8e50a 100644 --- a/src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java +++ b/src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.io.File; import java.io.IOException; diff --git a/src/com/owncloud/android/lib/network/FileRequestEntity.java b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java similarity index 98% rename from src/com/owncloud/android/lib/network/FileRequestEntity.java rename to src/com/owncloud/android/lib/common/network/FileRequestEntity.java index 9bce93a7..5a65d7ff 100644 --- a/src/com/owncloud/android/lib/network/FileRequestEntity.java +++ b/src/com/owncloud/android/lib/common/network/FileRequestEntity.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.io.File; import java.io.IOException; diff --git a/src/com/owncloud/android/lib/network/NetworkUtils.java b/src/com/owncloud/android/lib/common/network/NetworkUtils.java similarity index 99% rename from src/com/owncloud/android/lib/network/NetworkUtils.java rename to src/com/owncloud/android/lib/common/network/NetworkUtils.java index 3a91b243..206646bd 100644 --- a/src/com/owncloud/android/lib/network/NetworkUtils.java +++ b/src/com/owncloud/android/lib/common/network/NetworkUtils.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.io.File; import java.io.FileInputStream; diff --git a/src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java similarity index 96% rename from src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java rename to src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java index 68c16e04..b7e968a3 100644 --- a/src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java +++ b/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; public interface OnDatatransferProgressListener { public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileAbsoluteName); diff --git a/src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java similarity index 97% rename from src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java rename to src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java index 9819d238..79232c87 100644 --- a/src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java +++ b/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.util.Collection; diff --git a/src/com/owncloud/android/lib/network/ServerNameIndicator.java b/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java similarity index 99% rename from src/com/owncloud/android/lib/network/ServerNameIndicator.java rename to src/com/owncloud/android/lib/common/network/ServerNameIndicator.java index b29b7858..3e7297f8 100644 --- a/src/com/owncloud/android/lib/network/ServerNameIndicator.java +++ b/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network; +package com.owncloud.android.lib.common.network; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; diff --git a/src/com/owncloud/android/lib/network/webdav/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java similarity index 99% rename from src/com/owncloud/android/lib/network/webdav/WebdavEntry.java rename to src/com/owncloud/android/lib/common/network/WebdavEntry.java index d9844841..d80a015e 100644 --- a/src/com/owncloud/android/lib/network/webdav/WebdavEntry.java +++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.network.webdav; +package com.owncloud.android.lib.common.network; import java.util.Date; @@ -33,6 +33,7 @@ import org.apache.jackrabbit.webdav.property.DavPropertySet; + import android.net.Uri; import android.util.Log; diff --git a/src/com/owncloud/android/lib/network/webdav/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java similarity index 98% rename from src/com/owncloud/android/lib/network/webdav/WebdavUtils.java rename to src/com/owncloud/android/lib/common/network/WebdavUtils.java index 7528e6f1..0183dc5a 100644 --- a/src/com/owncloud/android/lib/network/webdav/WebdavUtils.java +++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.network.webdav; +package com.owncloud.android.lib.common.network; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java b/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java similarity index 96% rename from src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java rename to src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java index 30f16031..827e26e1 100644 --- a/src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java +++ b/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.common.operations; public interface OnRemoteOperationListener { diff --git a/src/com/owncloud/android/lib/operations/common/OperationCancelledException.java b/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java similarity index 96% rename from src/com/owncloud/android/lib/operations/common/OperationCancelledException.java rename to src/com/owncloud/android/lib/common/operations/OperationCancelledException.java index cd73dd8b..4d4e0053 100644 --- a/src/com/owncloud/android/lib/operations/common/OperationCancelledException.java +++ b/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.common.operations; public class OperationCancelledException extends Exception { diff --git a/src/com/owncloud/android/lib/operations/common/RemoteOperation.java b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java similarity index 97% rename from src/com/owncloud/android/lib/operations/common/RemoteOperation.java rename to src/com/owncloud/android/lib/common/operations/RemoteOperation.java index 394396be..f784be12 100644 --- a/src/com/owncloud/android/lib/operations/common/RemoteOperation.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperation.java @@ -22,16 +22,16 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.common.operations; import java.io.IOException; import org.apache.commons.httpclient.Credentials; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.network.BearerCredentials; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; diff --git a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java similarity index 98% rename from src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java rename to src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index ba5dd2c0..a68b43db 100644 --- a/src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java +++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.common.operations; 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.lib.accounts.AccountUtils.AccountNotFoundException; -import com.owncloud.android.lib.network.CertificateCombinedException; +import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; +import com.owncloud.android.lib.common.network.CertificateCombinedException; import android.accounts.Account; import android.accounts.AccountsException; diff --git a/src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java similarity index 93% rename from src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java index 51e2bfcd..411c65e4 100644 --- a/src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; 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.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 com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity; +import com.owncloud.android.lib.common.network.ProgressiveDataTransferer; +import com.owncloud.android.lib.common.network.WebdavUtils; import android.util.Log; diff --git a/src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java similarity index 91% rename from src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java rename to src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java index c2389e9b..3c24930c 100644 --- a/src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java +++ b/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java @@ -22,19 +22,18 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.MkColMethod; import android.util.Log; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; diff --git a/src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java similarity index 94% rename from src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java index 12e84765..99f99b05 100644 --- a/src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import java.io.BufferedInputStream; import java.io.File; @@ -41,12 +41,12 @@ import org.apache.http.HttpStatus; import android.util.Log; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.OperationCancelledException; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** * Remote operation performing the download of a remote file in the ownCloud server. diff --git a/src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java similarity index 93% rename from src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java rename to src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java index 8406fb0b..27326a4c 100644 --- a/src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java @@ -22,15 +22,15 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.HeadMethod; -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.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/lib/utils/FileUtils.java b/src/com/owncloud/android/lib/resources/files/FileUtils.java similarity index 98% rename from src/com/owncloud/android/lib/utils/FileUtils.java rename to src/com/owncloud/android/lib/resources/files/FileUtils.java index 6924c374..7850c992 100644 --- a/src/com/owncloud/android/lib/utils/FileUtils.java +++ b/src/com/owncloud/android/lib/resources/files/FileUtils.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.utils; +package com.owncloud.android.lib.resources.files; import java.io.File; diff --git a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java similarity index 90% rename from src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java index 631b5d11..5459765c 100644 --- a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java @@ -21,7 +21,7 @@ * THE SOFTWARE. * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import java.util.ArrayList; @@ -32,12 +32,11 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; import android.util.Log; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavEntry; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** diff --git a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java similarity index 93% rename from src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java rename to src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java index 4dfb04b2..ded2945a 100644 --- a/src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import java.util.ArrayList; @@ -33,12 +33,11 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; import android.util.Log; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavEntry; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** * Remote operation performing the read of remote file or folder in the ownCloud server. diff --git a/src/com/owncloud/android/lib/operations/common/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java similarity index 96% rename from src/com/owncloud/android/lib/operations/common/RemoteFile.java rename to src/com/owncloud/android/lib/resources/files/RemoteFile.java index 9d81a0b4..54807943 100644 --- a/src/com/owncloud/android/lib/operations/common/RemoteFile.java +++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java @@ -22,15 +22,14 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.resources.files; import java.io.Serializable; import android.os.Parcel; import android.os.Parcelable; -import com.owncloud.android.lib.network.webdav.WebdavEntry; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.common.network.WebdavEntry; /** * Contains the data of a Remote File from a WebDavEntry diff --git a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java similarity index 91% rename from src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java index 2677a981..db24b79f 100644 --- a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java @@ -22,17 +22,17 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; import android.util.Log; -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.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** * Remote operation performing the removal of a remote file or folder in the ownCloud server. diff --git a/src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java similarity index 92% rename from src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java index d4fa7c89..24c68a03 100644 --- a/src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; import java.io.File; @@ -30,12 +30,11 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethodBase; import android.util.Log; -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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; /** diff --git a/src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java similarity index 89% rename from src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java rename to src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index c15350df..821a753a 100644 --- a/src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.files; 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.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; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.network.FileRequestEntity; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.network.ProgressiveDataTransferer; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.OperationCancelledException; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** * Remote operation performing the upload of a remote file to the ownCloud server. diff --git a/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java similarity index 92% rename from src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java rename to src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java index 968ca71e..23fca651 100644 --- a/src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.shares; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -33,14 +33,10 @@ import org.apache.http.HttpStatus; import android.util.Log; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.common.ShareType; -import com.owncloud.android.lib.utils.ShareUtils; -import com.owncloud.android.lib.utils.ShareXMLParser; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; /** * Creates a new share. This allows sharing with a user or group or as a link. diff --git a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java similarity index 87% rename from src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java rename to src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java index 0f9c4f65..43db4234 100644 --- a/src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.shares; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -31,13 +31,10 @@ import java.util.ArrayList; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; -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.common.OCShare; -import com.owncloud.android.lib.utils.ShareUtils; -import com.owncloud.android.lib.utils.ShareXMLParser; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import android.util.Log; diff --git a/src/com/owncloud/android/lib/operations/remote/GetSharesForFileRemoteOperation.java b/src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java similarity index 90% rename from src/com/owncloud/android/lib/operations/remote/GetSharesForFileRemoteOperation.java rename to src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java index ad1e6e61..ad636162 100644 --- a/src/com/owncloud/android/lib/operations/remote/GetSharesForFileRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.shares; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -34,13 +34,10 @@ import org.apache.http.HttpStatus; import android.util.Log; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.utils.ShareUtils; -import com.owncloud.android.lib.utils.ShareXMLParser; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; /** * Provide a list shares for a specific file. diff --git a/src/com/owncloud/android/lib/utils/GetSharesForFileXMLParser.java b/src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java similarity index 98% rename from src/com/owncloud/android/lib/utils/GetSharesForFileXMLParser.java rename to src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java index 25c46e15..3df8a301 100644 --- a/src/com/owncloud/android/lib/utils/GetSharesForFileXMLParser.java +++ b/src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.utils; +package com.owncloud.android.lib.resources.shares; import java.io.IOException; import java.io.InputStream; @@ -35,8 +35,6 @@ import org.xmlpull.v1.XmlPullParserFactory; import android.util.Log; import android.util.Xml; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.ShareType; /** * Parser for Share API Response: GetSharesForFile Operation diff --git a/src/com/owncloud/android/lib/operations/common/OCShare.java b/src/com/owncloud/android/lib/resources/shares/OCShare.java similarity index 98% rename from src/com/owncloud/android/lib/operations/common/OCShare.java rename to src/com/owncloud/android/lib/resources/shares/OCShare.java index 9149ab73..f73ee6ab 100644 --- a/src/com/owncloud/android/lib/operations/common/OCShare.java +++ b/src/com/owncloud/android/lib/resources/shares/OCShare.java @@ -22,11 +22,11 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.resources.shares; import java.io.Serializable; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.resources.files.FileUtils; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/com/owncloud/android/lib/operations/common/ShareType.java b/src/com/owncloud/android/lib/resources/shares/ShareType.java similarity index 97% rename from src/com/owncloud/android/lib/operations/common/ShareType.java rename to src/com/owncloud/android/lib/resources/shares/ShareType.java index 920dc3a3..bc89cdb8 100644 --- a/src/com/owncloud/android/lib/operations/common/ShareType.java +++ b/src/com/owncloud/android/lib/resources/shares/ShareType.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.common; +package com.owncloud.android.lib.resources.shares; /** * Enum for Share Type, with values: diff --git a/src/com/owncloud/android/lib/utils/ShareUtils.java b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java similarity index 96% rename from src/com/owncloud/android/lib/utils/ShareUtils.java rename to src/com/owncloud/android/lib/resources/shares/ShareUtils.java index e134ffac..c977c908 100644 --- a/src/com/owncloud/android/lib/utils/ShareUtils.java +++ b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.utils; +package com.owncloud.android.lib.resources.shares; /** * Contains Constants for Share Operation diff --git a/src/com/owncloud/android/lib/utils/ShareXMLParser.java b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java similarity index 98% rename from src/com/owncloud/android/lib/utils/ShareXMLParser.java rename to src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java index 4d456a7f..7ccb39d5 100644 --- a/src/com/owncloud/android/lib/utils/ShareXMLParser.java +++ b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.utils; +package com.owncloud.android.lib.resources.shares; import java.io.IOException; import java.io.InputStream; @@ -35,8 +35,7 @@ import org.xmlpull.v1.XmlPullParserFactory; import android.util.Log; import android.util.Xml; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.ShareType; +import com.owncloud.android.lib.resources.files.FileUtils; /** * Parser for Share API Response diff --git a/src/com/owncloud/android/lib/operations/remote/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java similarity index 94% rename from src/com/owncloud/android/lib/operations/remote/OwnCloudServerCheckOperation.java rename to src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java index 15e54a3e..372f2d9b 100644 --- a/src/com/owncloud/android/lib/operations/remote/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java @@ -22,18 +22,18 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.status; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; import org.json.JSONObject; -import com.owncloud.android.lib.accounts.AccountUtils; -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.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.accounts.AccountUtils; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/lib/utils/OwnCloudVersion.java b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java similarity index 98% rename from src/com/owncloud/android/lib/utils/OwnCloudVersion.java rename to src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java index dd01186d..d547b12b 100644 --- a/src/com/owncloud/android/lib/utils/OwnCloudVersion.java +++ b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java @@ -23,7 +23,7 @@ * */ -package com.owncloud.android.lib.utils; +package com.owncloud.android.lib.resources.status; public class OwnCloudVersion implements Comparable { public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion( diff --git a/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java b/src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java similarity index 95% rename from src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java rename to src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java index 2e8e2338..37a5aa07 100644 --- a/src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.users; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; @@ -30,9 +30,9 @@ import org.json.JSONObject; import android.util.Log; -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.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; /** diff --git a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java index d6caf3c6..f9596bc6 100644 --- a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java +++ b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java @@ -19,17 +19,17 @@ package com.owncloud.android.lib.test_project; import java.io.File; -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.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.files.RemoteFile; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation; +import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation; +import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation; +import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation; +import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation; import com.owncloud.android.lib.test_project.R; import android.net.Uri; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java index af9677f9..a08c4bd9 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java @@ -26,8 +26,8 @@ package com.owncloud.android.lib.test_project.test; import java.text.SimpleDateFormat; import java.util.Date; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java index 5edab941..ec0133e8 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java @@ -24,8 +24,8 @@ package com.owncloud.android.lib.test_project.test; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java index 2eb523a2..860c7938 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java @@ -27,8 +27,8 @@ package com.owncloud.android.lib.test_project.test; import java.text.SimpleDateFormat; import java.util.Date; -import com.owncloud.android.lib.operations.common.RemoteFile; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.RemoteFile; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java index 0c9bd5a3..9d249a4c 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java @@ -23,7 +23,7 @@ */ package com.owncloud.android.lib.test_project.test; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java index 496ea2c5..113a8b54 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java @@ -24,7 +24,7 @@ package com.owncloud.android.lib.test_project.test; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java index 523f3d9b..ec4f174c 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java @@ -24,8 +24,8 @@ package com.owncloud.android.lib.test_project.test; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.test_project.TestActivity; import android.test.ActivityInstrumentationTestCase2; diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java index 4c862556..a1d2b6db 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java @@ -37,7 +37,7 @@ import android.os.Environment; import android.test.ActivityInstrumentationTestCase2; import android.util.Log; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.test_project.TestActivity; /** From 0e4149fa8406b15d1cdd9994749a739dbce1b6cf Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 14 Feb 2014 13:15:15 +0100 Subject: [PATCH 2/7] Rename classes to improve name consistency --- ...n.java => CreateRemoteShareOperation.java} | 6 +- ...a => GetRemoteSharesForFileOperation.java} | 6 +- .../shares/GetSharesForFileXMLParser.java | 351 ------------------ ...ion.java => GetRemoteStatusOperation.java} | 6 +- ...n.java => GetRemoteUserNameOperation.java} | 6 +- 5 files changed, 12 insertions(+), 363 deletions(-) rename src/com/owncloud/android/lib/resources/shares/{CreateShareRemoteOperation.java => CreateRemoteShareOperation.java} (97%) rename src/com/owncloud/android/lib/resources/shares/{GetSharesForFileRemoteOperation.java => GetRemoteSharesForFileOperation.java} (96%) delete mode 100644 src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java rename src/com/owncloud/android/lib/resources/status/{OwnCloudServerCheckOperation.java => GetRemoteStatusOperation.java} (96%) rename src/com/owncloud/android/lib/resources/users/{GetUserNameRemoteOperation.java => GetRemoteUserNameOperation.java} (96%) diff --git a/src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java similarity index 97% rename from src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java rename to src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java index 23fca651..1b470448 100644 --- a/src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java @@ -44,9 +44,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo * @author masensio * */ -public class CreateShareRemoteOperation extends RemoteOperation { +public class CreateRemoteShareOperation extends RemoteOperation { - private static final String TAG = CreateShareRemoteOperation.class.getSimpleName(); + private static final String TAG = CreateRemoteShareOperation.class.getSimpleName(); private static final String PARAM_PATH = "path"; private static final String PARAM_SHARE_TYPE = "shareType"; @@ -82,7 +82,7 @@ public class CreateShareRemoteOperation extends RemoteOperation { * To obtain combinations, add the desired values together. * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. */ - public CreateShareRemoteOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, + public CreateRemoteShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, String password, int permissions) { mPath = path; diff --git a/src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java similarity index 96% rename from src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java rename to src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java index ad636162..86dc3d33 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java @@ -48,9 +48,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo * */ -public class GetSharesForFileRemoteOperation extends RemoteOperation { +public class GetRemoteSharesForFileOperation extends RemoteOperation { - private static final String TAG = GetSharesForFileRemoteOperation.class.getSimpleName(); + private static final String TAG = GetRemoteSharesForFileOperation.class.getSimpleName(); private static final String PARAM_PATH = "path"; private static final String PARAM_RESHARES = "reshares"; @@ -71,7 +71,7 @@ public class GetSharesForFileRemoteOperation extends RemoteOperation { * @param subfiles If set to ‘false’ (default), lists only the folder being shared * If set to ‘true’, all shared files within the folder are returned. */ - public GetSharesForFileRemoteOperation(String path, boolean reshares, boolean subfiles) { + public GetRemoteSharesForFileOperation(String path, boolean reshares, boolean subfiles) { mPath = path; mReshares = reshares; mSubfiles = subfiles; diff --git a/src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java b/src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java deleted file mode 100644 index 3df8a301..00000000 --- a/src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java +++ /dev/null @@ -1,351 +0,0 @@ -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2014 ownCloud (http://www.owncloud.org/) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - */ - -package com.owncloud.android.lib.resources.shares; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - -import android.util.Log; -import android.util.Xml; - - -/** - * Parser for Share API Response: GetSharesForFile Operation - * @author masensio - * - */ -public class GetSharesForFileXMLParser { - - private static final String TAG = GetSharesForFileXMLParser.class.getSimpleName(); - - // No namespaces - private static final String ns = null; - - // NODES for XML Parser - private static final String NODE_OCS = "ocs"; - - private static final String NODE_META = "meta"; - private static final String NODE_STATUS = "status"; - private static final String NODE_STATUS_CODE = "statuscode"; - //private static final String NODE_MESSAGE = "message"; - - private static final String NODE_DATA = "data"; - private static final String NODE_ELEMENT = "element"; - private static final String NODE_ID = "id"; - private static final String NODE_ITEM_TYPE = "item_type"; - private static final String NODE_ITEM_SOURCE = "item_source"; - private static final String NODE_PARENT = "parent"; - private static final String NODE_SHARE_TYPE = "share_type"; - private static final String NODE_SHARE_WITH = "share_with"; - private static final String NODE_FILE_SOURCE = "file_source"; - private static final String NODE_PATH = "path"; - private static final String NODE_PERMISSIONS = "permissions"; - private static final String NODE_STIME = "stime"; - private static final String NODE_EXPIRATION = "expiration"; - private static final String NODE_TOKEN = "token"; - private static final String NODE_STORAGE = "storage"; - private static final String NODE_MAIL_SEND = "mail_send"; - private static final String NODE_SHARE_WITH_DISPLAY_NAME = "share_with_display_name"; - - - private static final String TYPE_FOLDER = "folder"; - - - private String mStatus; - private int mStatusCode; - - // Getters and Setters - public String getStatus() { - return mStatus; - } - - public void setStatus(String status) { - this.mStatus = status; - } - - public int getStatusCode() { - return mStatusCode; - } - - public void setStatusCode(int statusCode) { - this.mStatusCode = statusCode; - } - - // Constructor - public GetSharesForFileXMLParser() { - // TODO Auto-generated constructor stub - } - - /** - * Parse is as response of Share API - * @param is - * @return List of ShareRemoteFiles - * @throws XmlPullParserException - * @throws IOException - */ - public ArrayList parseXMLResponse(InputStream is) throws XmlPullParserException, IOException { - - try { - // XMLPullParser - XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); - factory.setNamespaceAware(true); - - XmlPullParser parser = Xml.newPullParser(); - parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false); - parser.setInput(is, null); - parser.nextTag(); - return readOCS(parser); - - } finally { - is.close(); - } - } - - /** - * Parse OCS node - * @param parser - * @return List of ShareRemoteFiles - * @throws XmlPullParserException - * @throws IOException - */ - private ArrayList readOCS (XmlPullParser parser) throws XmlPullParserException, IOException { - ArrayList shares = new ArrayList(); - parser.require(XmlPullParser.START_TAG, ns , NODE_OCS); - while (parser.next() != XmlPullParser.END_TAG) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - String name = parser.getName(); - // read NODE_META and NODE_DATA - if (name.equalsIgnoreCase(NODE_META)) { - readMeta(parser); - } else if (name.equalsIgnoreCase(NODE_DATA)) { - shares = readData(parser); - } else { - skip(parser); - } - - } - return shares; - - } - - /** - * Parse Meta node - * @param parser - * @throws XmlPullParserException - * @throws IOException - */ - private void readMeta(XmlPullParser parser) throws XmlPullParserException, IOException { - parser.require(XmlPullParser.START_TAG, ns, NODE_META); - Log.d(TAG, "---- NODE META ---"); - while (parser.next() != XmlPullParser.END_TAG) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - String name = parser.getName(); - - if (name.equalsIgnoreCase(NODE_STATUS)) { - setStatus(readNode(parser, NODE_STATUS)); - - } else if (name.equalsIgnoreCase(NODE_STATUS_CODE)) { - setStatusCode(Integer.parseInt(readNode(parser, NODE_STATUS_CODE))); - - } else { - skip(parser); - } - - } - } - - /** - * Parse Data node - * @param parser - * @return - * @throws XmlPullParserException - * @throws IOException - */ - private ArrayList readData(XmlPullParser parser) throws XmlPullParserException, IOException { - ArrayList shares = new ArrayList(); - - parser.require(XmlPullParser.START_TAG, ns, NODE_DATA); - Log.d(TAG, "---- NODE DATA ---"); - while (parser.next() != XmlPullParser.END_TAG) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - String name = parser.getName(); - if (name.equalsIgnoreCase(NODE_ELEMENT)) { - shares.add(readElement(parser)); - } else { - skip(parser); - - } - } - - return shares; - - } - - - /** - * Parse Element node - * @param parser - * @return - * @throws XmlPullParserException - * @throws IOException - */ - private OCShare readElement(XmlPullParser parser) throws XmlPullParserException, IOException { - parser.require(XmlPullParser.START_TAG, ns, NODE_ELEMENT); - - OCShare share = new OCShare(); - - Log.d(TAG, "---- NODE ELEMENT ---"); - while (parser.next() != XmlPullParser.END_TAG) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - - String name = parser.getName(); - - if (name.equalsIgnoreCase(NODE_ELEMENT)) { - share = readElement(parser); - - } else if (name.equalsIgnoreCase(NODE_ID)) { - share.setIdRemoteShared(Integer.parseInt(readNode(parser, NODE_ID))); - - } else if (name.equalsIgnoreCase(NODE_ITEM_TYPE)) { - share.setIsFolder(readNode(parser, NODE_ITEM_TYPE).equalsIgnoreCase(TYPE_FOLDER)); - - } else if (name.equalsIgnoreCase(NODE_ITEM_SOURCE)) { - share.setItemSource(Long.parseLong(readNode(parser, NODE_ITEM_SOURCE))); - - } else if (name.equalsIgnoreCase(NODE_PARENT)) { - readNode(parser, NODE_PARENT); - - } else if (name.equalsIgnoreCase(NODE_SHARE_TYPE)) { - int value = Integer.parseInt(readNode(parser, NODE_SHARE_TYPE)); - share.setShareType(ShareType.fromValue(value)); - - } else if (name.equalsIgnoreCase(NODE_SHARE_WITH)) { - share.setShareWith(readNode(parser, NODE_SHARE_WITH)); - - } else if (name.equalsIgnoreCase(NODE_FILE_SOURCE)) { - share.setFileSource(Long.parseLong(readNode(parser, NODE_FILE_SOURCE))); - - } else if (name.equalsIgnoreCase(NODE_PATH)) { - share.setPath(readNode(parser, NODE_PATH)); - - } else if (name.equalsIgnoreCase(NODE_PERMISSIONS)) { - share.setPermissions(Integer.parseInt(readNode(parser, NODE_PERMISSIONS))); - - } else if (name.equalsIgnoreCase(NODE_STIME)) { - share.setSharedDate(Long.parseLong(readNode(parser, NODE_STIME))); - - } else if (name.equalsIgnoreCase(NODE_EXPIRATION)) { - String value = readNode(parser, NODE_EXPIRATION); - if (!value.isEmpty()) { - share.setExpirationDate(Long.parseLong(readNode(parser, NODE_EXPIRATION))); // check if expiration is in long format or date format - } - - } else if (name.equalsIgnoreCase(NODE_TOKEN)) { - share.setToken(readNode(parser, NODE_TOKEN)); - - } else if (name.equalsIgnoreCase(NODE_STORAGE)) { - readNode(parser, NODE_STORAGE); - } else if (name.equalsIgnoreCase(NODE_MAIL_SEND)) { - readNode(parser, NODE_MAIL_SEND); - - } else if (name.equalsIgnoreCase(NODE_SHARE_WITH_DISPLAY_NAME)) { - share.setSharedWithDisplayName(readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME)); - - } else { - skip(parser); - } - } - - return share; - } - - /** - * Parse a node, to obtain its text. Needs readText method - * @param parser - * @param node - * @return Text of the node - * @throws XmlPullParserException - * @throws IOException - */ - private String readNode (XmlPullParser parser, String node) throws XmlPullParserException, IOException{ - parser.require(XmlPullParser.START_TAG, ns, node); - String value = readText(parser); - Log.d(TAG, "node= " + node + ", value= " + value); - parser.require(XmlPullParser.END_TAG, ns, node); - return value; - } - - /** - * Read the text from a node - * @param parser - * @return Text of the node - * @throws IOException - * @throws XmlPullParserException - */ - private String readText(XmlPullParser parser) throws IOException, XmlPullParserException { - String result = ""; - if (parser.next() == XmlPullParser.TEXT) { - result = parser.getText(); - parser.nextTag(); - } - return result; - } - - /** - * Skip tags in parser procedure - * @param parser - * @throws XmlPullParserException - * @throws IOException - */ - private void skip(XmlPullParser parser) throws XmlPullParserException, IOException { - if (parser.getEventType() != XmlPullParser.START_TAG) { - throw new IllegalStateException(); - } - int depth = 1; - while (depth != 0) { - switch (parser.next()) { - case XmlPullParser.END_TAG: - depth--; - break; - case XmlPullParser.START_TAG: - depth++; - break; - } - } - } -} diff --git a/src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java similarity index 96% rename from src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java rename to src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index 372f2d9b..2636977f 100644 --- a/src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java @@ -48,12 +48,12 @@ import android.util.Log; * */ -public class OwnCloudServerCheckOperation extends RemoteOperation { +public class GetRemoteStatusOperation extends RemoteOperation { /** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs. */ public static final int TRY_CONNECTION_TIMEOUT = 5000; - private static final String TAG = OwnCloudServerCheckOperation.class.getSimpleName(); + private static final String TAG = GetRemoteStatusOperation.class.getSimpleName(); private static final String OCVERSION_SHARED_SUPPORTED = "5.0.13"; @@ -67,7 +67,7 @@ public class OwnCloudServerCheckOperation extends RemoteOperation { private OwnCloudVersion mOCVersion; private OwnCloudVersion mOCVersionString; - public OwnCloudServerCheckOperation(String url, Context context) { + public GetRemoteStatusOperation(String url, Context context) { mUrl = url; mContext = context; mOCVersion = null; diff --git a/src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java similarity index 96% rename from src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java rename to src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java index 37a5aa07..0b422c2e 100644 --- a/src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserNameOperation.java @@ -44,9 +44,9 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; * email */ -public class GetUserNameRemoteOperation extends RemoteOperation { +public class GetRemoteUserNameOperation extends RemoteOperation { - private static final String TAG = GetUserNameRemoteOperation.class.getSimpleName(); + private static final String TAG = GetRemoteUserNameOperation.class.getSimpleName(); // HEADER private static final String HEADER_OCS_API = "OCS-APIREQUEST"; @@ -69,7 +69,7 @@ public class GetUserNameRemoteOperation extends RemoteOperation { } - public GetUserNameRemoteOperation() { + public GetRemoteUserNameOperation() { } @Override From d287820d1818ea1e39055b2e1684467eb64f7951 Mon Sep 17 00:00:00 2001 From: masensio Date: Tue, 4 Feb 2014 14:40:07 +0100 Subject: [PATCH 3/7] OC-2736: Create unit tests for GetShares Operation --- tests/res/values/setup.xml | 32 +++++++++ .../lib/test_project/TestActivity.java | 66 +++++++++++++------ .../test_project/test/DownloadFileTest.java | 2 + .../lib/test_project/test/GetSharesTest.java | 62 +++++++++++++++++ 4 files changed, 142 insertions(+), 20 deletions(-) create mode 100644 tests/res/values/setup.xml create mode 100644 tests/test_cases/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java diff --git a/tests/res/values/setup.xml b/tests/res/values/setup.xml new file mode 100644 index 00000000..4839b1bc --- /dev/null +++ b/tests/res/values/setup.xml @@ -0,0 +1,32 @@ + + + + + + /remote.php/webdav + + + true + diff --git a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java index f9596bc6..07bfaec8 100644 --- a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java +++ b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java @@ -1,17 +1,24 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/* ownCloud Android Library is available under MIT license + * Copyright (C) 2014 ownCloud (http://www.owncloud.org/) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. * */ @@ -30,6 +37,7 @@ import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation; import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation; import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation; import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation; +import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation; import com.owncloud.android.lib.test_project.R; import android.net.Uri; @@ -46,11 +54,12 @@ import android.view.Menu; public class TestActivity extends Activity { - // This account must exists on the simulator / device - private static final String mServerUri = "https://beta.owncloud.com/owncloud/remote.php/webdav"; - private static final String mUser = "testandroid"; - private static final String mPass = "testandroid"; - private static final boolean mChunked = true; + // This account must exists on the server side + private String mServerUri; + private String mWebdavPath; + private String mUser; + private String mPass; + private boolean mChunked; //private Account mAccount = null; private OwnCloudClient mClient; @@ -59,9 +68,18 @@ public class TestActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_test); - Uri uri = Uri.parse(mServerUri); + + mServerUri = getString(R.string.server_base_url); + mWebdavPath = getString(R.string.webdav_path); + mUser = getString(R.string.username); + mPass = getString(R.string.password); + mChunked = getResources().getBoolean(R.bool.chunked); + + Uri uri = Uri.parse(mServerUri + mWebdavPath); mClient = OwnCloudClientFactory.createOwnCloudClient(uri ,getApplicationContext(), true); mClient.setBasicCredentials(mUser, mPass); + mClient.setBaseUri(Uri.parse(mServerUri)); + } @Override @@ -171,4 +189,12 @@ public class TestActivity extends Activity { return result; } + + public RemoteOperationResult getShares(){ + + GetRemoteSharesOperation getOperation = new GetRemoteSharesOperation(); + RemoteOperationResult result = getOperation.execute(mClient); + + return result; + } } diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java index 860c7938..cfb3589b 100644 --- a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java +++ b/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java @@ -127,4 +127,6 @@ public class DownloadFileTest extends ActivityInstrumentationTestCase2 { + + private TestActivity mActivity; + + public GetSharesTest() { + super(TestActivity.class); + + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + setActivityInitialTouchMode(false); + mActivity = getActivity(); + } + + /** + * Test Get Shares: the server must support SHARE API + */ + public void testGetShares() { + RemoteOperationResult result = mActivity.getShares(); + assertTrue(result.isSuccess()); + } +} From 1b840b15af972812dfd0aa4ebbfdc60c80af2c04 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 17 Feb 2014 13:05:15 +0100 Subject: [PATCH 4/7] RemoteRemoteShareOperation relocated with other operations on Shares --- .../shares}/RemoveRemoteShareOperation.java | 4 +--- .../com/owncloud/android/lib/test_project/TestActivity.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) rename src/com/owncloud/android/lib/{operations/remote => resources/shares}/RemoveRemoteShareOperation.java (95%) diff --git a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java similarity index 95% rename from src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java rename to src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java index 67ebc7a1..94182dc4 100644 --- a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java @@ -22,7 +22,7 @@ * */ -package com.owncloud.android.lib.operations.remote; +package com.owncloud.android.lib.resources.shares; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -36,8 +36,6 @@ import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.resources.shares.ShareUtils; -import com.owncloud.android.lib.resources.shares.ShareXMLParser; /** * Remove a share diff --git a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java index 2beda565..f38d900a 100644 --- a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java +++ b/tests/src/com/owncloud/android/lib/test_project/TestActivity.java @@ -39,7 +39,7 @@ import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation; import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation; import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation; import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation; -import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation; +import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation; import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.test_project.R; From 689fbe0ce1f15fbb30576acf7630c7ea9aa9d215 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 17 Feb 2014 14:36:45 +0100 Subject: [PATCH 5/7] Reviewed names and types of parameters --- .../remote/RemoveRemoteShareOperation.java | 14 +++---- .../ChunkedUploadRemoteFileOperation.java | 4 +- .../files/DownloadRemoteFileOperation.java | 8 ++-- .../files/ExistenceCheckRemoteOperation.java | 6 +-- .../files/ReadRemoteFolderOperation.java | 10 ++--- .../files/UploadRemoteFileOperation.java | 8 ++-- .../shares/CreateRemoteShareOperation.java | 42 +++++++++---------- .../GetRemoteSharesForFileOperation.java | 22 +++++----- .../shares/GetRemoteSharesOperation.java | 4 +- .../lib/resources/shares/ShareUtils.java | 2 +- .../status/GetRemoteStatusOperation.java | 1 - 11 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java index 67ebc7a1..932774ff 100644 --- a/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java +++ b/src/com/owncloud/android/lib/operations/remote/RemoveRemoteShareOperation.java @@ -50,16 +50,16 @@ public class RemoveRemoteShareOperation extends RemoteOperation { private static final String TAG = RemoveRemoteShareOperation.class.getSimpleName(); - private int mIdShare; + private int mRemoteShareId; /** * Constructor * - * @param idShare Share ID + * @param remoteShareId Share ID */ - public RemoveRemoteShareOperation(int idShare) { - mIdShare = idShare; + public RemoveRemoteShareOperation(int remoteShareId) { + mRemoteShareId = remoteShareId; } @@ -71,9 +71,9 @@ public class RemoveRemoteShareOperation extends RemoteOperation { DeleteMethod delete = null; try { - String id = "/" + String.valueOf(mIdShare); - delete = new DeleteMethod(client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE + id); - Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE + id); + String id = "/" + String.valueOf(mRemoteShareId); + delete = new DeleteMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH + id); + Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHARING_API_PATH + id); status = client.executeMethod(delete); diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java index 411c65e4..632b660c 100644 --- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java @@ -60,7 +60,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation FileChannel channel = null; RandomAccessFile raf = null; try { - File file = new File(mStoragePath); + File file = new File(mLocalPath); raf = new RandomAccessFile(file, "r"); channel = raf.getChannel(); mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file); @@ -82,7 +82,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation mPutMethod.setRequestEntity(mEntity); status = client.executeMethod(mPutMethod); client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); - Log.d(TAG, "Upload of " + mStoragePath + " to " + mRemotePath + ", chunk index " + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status); + Log.d(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ", chunk index " + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status); if (!isSuccess(status)) break; } diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java index 99f99b05..6b91bb72 100644 --- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java @@ -65,11 +65,11 @@ public class DownloadRemoteFileOperation extends RemoteOperation { private GetMethod mGet; private String mRemotePath; - private String mDownloadFolderPath; + private String mLocalFolderPath; - public DownloadRemoteFileOperation(String remotePath, String downloadFolderPath) { + public DownloadRemoteFileOperation(String remotePath, String localFolderPath) { mRemotePath = remotePath; - mDownloadFolderPath = downloadFolderPath; + mLocalFolderPath = localFolderPath; } @Override @@ -157,7 +157,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation { } private String getTmpPath() { - return mDownloadFolderPath + mRemotePath; + return mLocalFolderPath + mRemotePath; } public void addDatatransferProgressListener (OnDatatransferProgressListener listener) { diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java index 27326a4c..bd2adbd9 100644 --- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java @@ -56,12 +56,12 @@ public class ExistenceCheckRemoteOperation extends RemoteOperation { /** * Full constructor. Success of the operation will depend upon the value of successIfAbsent. * - * @param path Path to append to the URL owned by the client instance. + * @param remotePath Path to append to the URL owned by the client instance. * @param context Android application context. * @param successIfAbsent When 'true', the operation finishes in success if the path does NOT exist in the remote server (HTTP 404). */ - public ExistenceCheckRemoteOperation(String path, Context context, boolean successIfAbsent) { - mPath = (path != null) ? path : ""; + public ExistenceCheckRemoteOperation(String remotePath, Context context, boolean successIfAbsent) { + mPath = (remotePath != null) ? remotePath : ""; mContext = context; mSuccessIfAbsent = successIfAbsent; } diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java index ded2945a..3e95075c 100644 --- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java @@ -126,24 +126,24 @@ public class ReadRemoteFolderOperation extends RemoteOperation { * Read the data retrieved from the server about the contents of the target folder * * - * @param dataInServer Full response got from the server with the data of the target + * @param remoteData Full response got from the server with the data of the target * folder and its direct children. * @param client Client instance to the remote server where the data were * retrieved. * @return */ - private void readData(MultiStatus dataInServer, OwnCloudClient client) { + private void readData(MultiStatus remoteData, OwnCloudClient client) { mFolderAndFiles = new ArrayList(); // parse data from remote folder - WebdavEntry we = new WebdavEntry(dataInServer.getResponses()[0], client.getWebdavUri().getPath()); + WebdavEntry we = new WebdavEntry(remoteData.getResponses()[0], client.getWebdavUri().getPath()); mFolderAndFiles.add(fillOCFile(we)); // loop to update every child RemoteFile remoteFile = null; - for (int i = 1; i < dataInServer.getResponses().length; ++i) { + for (int i = 1; i < remoteData.getResponses().length; ++i) { /// new OCFile instance with the data from the server - we = new WebdavEntry(dataInServer.getResponses()[i], client.getWebdavUri().getPath()); + we = new WebdavEntry(remoteData.getResponses()[i], client.getWebdavUri().getPath()); remoteFile = fillOCFile(we); mFolderAndFiles.add(remoteFile); } diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java index 821a753a..962b1f09 100644 --- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java @@ -54,7 +54,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; public class UploadRemoteFileOperation extends RemoteOperation { - protected String mStoragePath; + protected String mLocalPath; protected String mRemotePath; protected String mMimeType; protected PutMethod mPutMethod = null; @@ -64,8 +64,8 @@ public class UploadRemoteFileOperation extends RemoteOperation { protected RequestEntity mEntity = null; - public UploadRemoteFileOperation(String storagePath, String remotePath, String mimeType) { - mStoragePath = storagePath; + public UploadRemoteFileOperation(String localPath, String remotePath, String mimeType) { + mLocalPath = localPath; mRemotePath = remotePath; mMimeType = mimeType; } @@ -106,7 +106,7 @@ public class UploadRemoteFileOperation extends RemoteOperation { protected int uploadFile(OwnCloudClient client) throws HttpException, IOException, OperationCancelledException { int status = -1; try { - File f = new File(mStoragePath); + File f = new File(mLocalPath); mEntity = new FileRequestEntity(f, mMimeType); synchronized (mDataTransferListeners) { ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners); diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java index d6ebc343..45995508 100644 --- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java @@ -57,7 +57,7 @@ public class CreateRemoteShareOperation extends RemoteOperation { private ArrayList mShares; // List of shares for result, one share in this case - private String mPath; + private String mRemoteFilePath; private ShareType mShareType; private String mShareWith; private boolean mPublicUpload; @@ -66,26 +66,26 @@ public class CreateRemoteShareOperation extends RemoteOperation { /** * Constructor - * @param path Full path of the file/folder being shared. Mandatory argument - * @param shareType ‘0’ = user, ‘1’ = group, ‘3’ = Public link. Mandatory argument - * @param shareWith User/group ID with who the file should be shared. This is mandatory for shareType of 0 or 1 - * @param publicUpload If ‘false’ (default) public cannot upload to a public shared folder. - * If ‘true’ public can upload to a shared folder. Only available for public link shares - * @param password Password to protect a public link share. Only available for public link shares - * @param permissions 1 - Read only – Default for “public” shares - * 2 - Update - * 4 - Create - * 8 - Delete - * 16- Re-share - * 31- All above – Default for “private” shares - * For user or group shares. - * To obtain combinations, add the desired values together. - * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. + * @param remoteFilePath Full path of the file/folder being shared. Mandatory argument + * @param shareType ‘0’ = user, ‘1’ = group, ‘3’ = Public link. Mandatory argument + * @param shareWith User/group ID with who the file should be shared. This is mandatory for shareType of 0 or 1 + * @param publicUpload If ‘false’ (default) public cannot upload to a public shared folder. + * If ‘true’ public can upload to a shared folder. Only available for public link shares + * @param password Password to protect a public link share. Only available for public link shares + * @param permissions 1 - Read only – Default for “public” shares + * 2 - Update + * 4 - Create + * 8 - Delete + * 16- Re-share + * 31- All above – Default for “private” shares + * For user or group shares. + * To obtain combinations, add the desired values together. + * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. */ - public CreateRemoteShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, + public CreateRemoteShareOperation(String remoteFilePath, ShareType shareType, String shareWith, boolean publicUpload, String password, int permissions) { - mPath = path; + mRemoteFilePath = remoteFilePath; mShareType = shareType; mShareWith = shareWith; mPublicUpload = publicUpload; @@ -102,11 +102,11 @@ public class CreateRemoteShareOperation extends RemoteOperation { try { // Post Method - post = new PostMethod(client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); - Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); + post = new PostMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH); + Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHARING_API_PATH); post.setRequestHeader( "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"); // necessary for special characters - post.addParameter(PARAM_PATH, mPath); + post.addParameter(PARAM_PATH, mRemoteFilePath); post.addParameter(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue())); post.addParameter(PARAM_SHARE_WITH, mShareWith); post.addParameter(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)); diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java index 86dc3d33..6b79ac55 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java @@ -58,21 +58,21 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation { private ArrayList mShares; // List of shares for result, one share in this case - private String mPath; + private String mRemoteFilePath; private boolean mReshares; private boolean mSubfiles; /** * Constructor * - * @param path Path to file or folder - * @param reshares If set to ‘false’ (default), only shares from the current user are returned - * If set to ‘true’, all shares from the given file are returned - * @param subfiles If set to ‘false’ (default), lists only the folder being shared - * If set to ‘true’, all shared files within the folder are returned. + * @param remoteFilePath Path to file or folder + * @param reshares If set to ‘false’ (default), only shares from the current user are returned + * If set to ‘true’, all shares from the given file are returned + * @param subfiles If set to ‘false’ (default), lists only the folder being shared + * If set to ‘true’, all shared files within the folder are returned. */ - public GetRemoteSharesForFileOperation(String path, boolean reshares, boolean subfiles) { - mPath = path; + public GetRemoteSharesForFileOperation(String remoteFilePath, boolean reshares, boolean subfiles) { + mRemoteFilePath = remoteFilePath; mReshares = reshares; mSubfiles = subfiles; } @@ -86,12 +86,12 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation { try { // Get Method - get = new GetMethod(client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); - Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); + get = new GetMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH); + Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHARING_API_PATH); // Add Parameters to Get Method get.setQueryString(new NameValuePair[] { - new NameValuePair(PARAM_PATH, mPath), + new NameValuePair(PARAM_PATH, mRemoteFilePath), new NameValuePair(PARAM_RESHARES, String.valueOf(mReshares)), new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles)) }); diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java index 43db4234..f3c69508 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java +++ b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java @@ -66,8 +66,8 @@ public class GetRemoteSharesOperation extends RemoteOperation { // Get the response try{ - get = new GetMethod(client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); - Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHAREAPI_ROUTE); + get = new GetMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH); + Log.d(TAG, "URL ------> " + client.getBaseUri() + ShareUtils.SHARING_API_PATH); status = client.executeMethod(get); if(isSuccess(status)) { Log.d(TAG, "Obtain RESPONSE"); diff --git a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java index c977c908..668a0ccd 100644 --- a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java +++ b/src/com/owncloud/android/lib/resources/shares/ShareUtils.java @@ -34,6 +34,6 @@ package com.owncloud.android.lib.resources.shares; public class ShareUtils { // OCS Route - public static final String SHAREAPI_ROUTE ="/ocs/v1.php/apps/files_sharing/api/v1/shares"; + public static final String SHARING_API_PATH ="/ocs/v1.php/apps/files_sharing/api/v1/shares"; } diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index 2636977f..95d41078 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java @@ -33,7 +33,6 @@ import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; -import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import android.content.Context; import android.net.ConnectivityManager; From e971e5c9e7a4842afa472e0b11acdee555ab0714 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 18 Feb 2014 10:15:03 +0100 Subject: [PATCH 6/7] Update README file and added LICENSE file --- LICENSE.md | 24 +++++++++++++++++++++++ README.md | 56 +++++++++++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..32f729d6 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,24 @@ +### License + +ownCloud Android Library is available under MIT license + +Copyright (C) 2014 ownCloud Inc. +Copyright (C) 2012 Bartek Przybylski + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERSBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index fdc655cc..75db18aa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ownCloud Android Library v1.0 +# ownCloud Android Library ### Introduction Using ownCloud Android library it will be the easiest way to communicate with ownCloud servers. @@ -12,45 +12,45 @@ Get this code and compile it. In the repository it is not only the library proje #### 2.2. Add library to your project There are different ways of adding this library to your code, then it is described one of them -__Step 1.__ Compile the ownCloud Android Library +__Step 1.__ Compile the ownCloud Android Library __Step 2.__ Define a dependency within your project. For that, access to Properties > Android > Library and click on add and select the ownCloud Android library -__Step 2.__ Define a dependency within your project. For that, access to Properties > Android > Library and click on add and select the ownCloud Android library +### Branching strategy +The repository holds two main branches with an infinite lifetime: + +- master +- develop + +Branch __origin/master__ is considered the main branch where the source code of HEAD always reflects a production-ready state. + +Branch __origin/develop__ is considered the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release. + +When the source code in the develop branch reaches a stable point and is ready to be released, all of the changes should be merged back into master somehow and then tagged with a release number. + +Other branches, some supporting branches are used to aid parallel development between team members, ease tracking of features, prepare for production releases and to assist in quickly fixing live production problems. Unlike the main branches, these branches always have a limited life time, since they will be removed eventually. + +The different types of branches we may use are: + +- Branch __perNewFeature__ +- Branch __releaseBranches__ + +Both of them branch off from develop and must merge back into develop branch through a Pull Request in Github. Once the PR is approved and merged, the US branch may be deleted. + +Source: http://nvie.com/posts/a-successful-git-branching-model ### License -ownCloud Android Library is available under MIT license - -Copyright (C) 2014 ownCloud (http://www.owncloud.org/) - -Copyright (C) 2012 Bartek Przybylski - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERSBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - +ownCloud Android Library is available under MIT license. See the file LICENSE.md with the full license text. #### Third part libraries ownCloud Android Library uses Apache JackRabbit, version 2.2.5. Copyright (C) 2004-2010 The Apache Software Foundation. Licensed under Apache License, Version 2.0. + +Apache JackRabbit depends on Commons HTTPClient version 3.1 and SLF4j version 1.7.5; both included also. Copyright (C) 2004-2010 The Apache Software Foundation. Licensed under Apache License, Version 2.0. ### Compatibility -ownCloud Android library from Android 2.2 (android:minSdkVersion="8" android:targetSdkVersion="19") +ownCloud Android Library is valid for Android systems from version Android 2.2 (android:minSdkVersion="8" android:targetSdkVersion="19"). ownCloud Android library supports ownCloud server from version 4.5. - - - - - From b998f8840b807edc321901d7fa17454ef00c7c08 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 18 Feb 2014 10:16:05 +0100 Subject: [PATCH 7/7] Fixed copyright line in comments --- AndroidManifest.xml | 2 +- res/values/empty.xml | 2 +- sample_client/AndroidManifest.xml | 2 +- sample_client/res/layout/file_in_list.xml | 2 +- sample_client/res/layout/main.xml | 2 +- sample_client/res/values-v11/styles.xml | 2 +- sample_client/res/values/dimensions.xml | 2 +- sample_client/res/values/setup.xml | 2 +- sample_client/res/values/strings.xml | 2 +- sample_client/res/values/styles.xml | 2 +- .../owncloud/android/lib/sampleclient/FilesArrayAdapter.java | 2 +- .../com/owncloud/android/lib/sampleclient/MainActivity.java | 2 +- src/com/owncloud/android/lib/common/OwnCloudClient.java | 2 +- src/com/owncloud/android/lib/common/OwnCloudClientFactory.java | 2 +- .../owncloud/android/lib/common/accounts/AccountTypeUtils.java | 3 +-- src/com/owncloud/android/lib/common/accounts/AccountUtils.java | 2 +- .../android/lib/common/network/AdvancedSslSocketFactory.java | 3 +-- .../android/lib/common/network/AdvancedX509TrustManager.java | 2 +- .../owncloud/android/lib/common/network/BearerAuthScheme.java | 2 +- .../owncloud/android/lib/common/network/BearerCredentials.java | 2 +- .../lib/common/network/CertificateCombinedException.java | 2 +- .../lib/common/network/ChunkFromFileChannelRequestEntity.java | 2 +- .../owncloud/android/lib/common/network/FileRequestEntity.java | 2 +- src/com/owncloud/android/lib/common/network/NetworkUtils.java | 2 +- .../lib/common/network/OnDatatransferProgressListener.java | 2 +- .../android/lib/common/network/ProgressiveDataTransferer.java | 2 +- .../android/lib/common/network/ServerNameIndicator.java | 2 +- src/com/owncloud/android/lib/common/network/WebdavEntry.java | 2 +- src/com/owncloud/android/lib/common/network/WebdavUtils.java | 2 +- .../lib/common/operations/OnRemoteOperationListener.java | 3 +-- .../lib/common/operations/OperationCancelledException.java | 3 +-- .../android/lib/common/operations/RemoteOperation.java | 2 +- .../android/lib/common/operations/RemoteOperationResult.java | 3 +-- .../lib/resources/files/ChunkedUploadRemoteFileOperation.java | 3 +-- .../lib/resources/files/CreateRemoteFolderOperation.java | 2 +- .../lib/resources/files/DownloadRemoteFileOperation.java | 2 +- .../lib/resources/files/ExistenceCheckRemoteOperation.java | 2 +- src/com/owncloud/android/lib/resources/files/FileUtils.java | 2 +- .../android/lib/resources/files/ReadRemoteFileOperation.java | 2 +- .../android/lib/resources/files/ReadRemoteFolderOperation.java | 2 +- src/com/owncloud/android/lib/resources/files/RemoteFile.java | 2 +- .../android/lib/resources/files/RemoveRemoteFileOperation.java | 2 +- .../android/lib/resources/files/RenameRemoteFileOperation.java | 2 +- .../android/lib/resources/files/UploadRemoteFileOperation.java | 2 +- .../lib/resources/shares/CreateRemoteShareOperation.java | 2 +- .../lib/resources/shares/GetRemoteSharesForFileOperation.java | 2 +- .../android/lib/resources/shares/GetRemoteSharesOperation.java | 2 +- src/com/owncloud/android/lib/resources/shares/OCShare.java | 2 +- .../lib/resources/shares/RemoveRemoteShareOperation.java | 2 +- src/com/owncloud/android/lib/resources/shares/ShareType.java | 2 +- src/com/owncloud/android/lib/resources/shares/ShareUtils.java | 2 +- .../owncloud/android/lib/resources/shares/ShareXMLParser.java | 2 +- .../android/lib/resources/status/GetRemoteStatusOperation.java | 2 +- .../owncloud/android/lib/resources/status/OwnCloudVersion.java | 2 +- .../lib/resources/users/GetRemoteUserNameOperation.java | 2 +- tests/AndroidManifest.xml | 2 +- tests/res/layout/activity_test.xml | 2 +- tests/res/menu/test.xml | 2 +- tests/res/values-sw600dp/dimens.xml | 2 +- tests/res/values-sw720dp-land/dimens.xml | 2 +- tests/res/values-v11/styles.xml | 2 +- tests/res/values-v14/styles.xml | 2 +- tests/res/values/dimens.xml | 2 +- tests/res/values/setup.xml | 2 +- tests/res/values/strings.xml | 2 +- tests/res/values/styles.xml | 2 +- .../com/owncloud/android/lib/test_project/TestActivity.java | 2 +- tests/test_cases/AndroidManifest.xml | 2 +- tests/test_cases/res/values/strings.xml | 2 +- .../android/lib/test_project/test/CreateFolderTest.java | 2 +- .../android/lib/test_project/test/CreateShareTest.java | 2 +- .../owncloud/android/lib/test_project/test/DeleteFileTest.java | 2 +- .../android/lib/test_project/test/DownloadFileTest.java | 2 +- .../owncloud/android/lib/test_project/test/GetSharesTest.java | 2 +- .../owncloud/android/lib/test_project/test/ReadFileTest.java | 2 +- .../owncloud/android/lib/test_project/test/ReadFolderTest.java | 2 +- .../android/lib/test_project/test/RemoveShareTest.java | 2 +- .../owncloud/android/lib/test_project/test/RenameFileTest.java | 2 +- .../owncloud/android/lib/test_project/test/UploadFileTest.java | 2 +- 79 files changed, 79 insertions(+), 85 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 30dda12f..708f7893 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@