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; /**