flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Reordered packages

Browse Source
This commit is contained in:
David A. Velasco 2014-02-14 12:04:41 +01:00
parent 815fbba486
commit 6c4d342610
54 changed files with 208 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java
View File

@ -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<RemoteFile> {

26
sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
View File

@ -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;

116
src/com/owncloud/android/lib/accounts/OwnCloudAccount.java
View File

@ -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<OwnCloudAccount> CREATOR = new Parcelable.Creator<OwnCloudAccount>() {
@Override
public OwnCloudAccount createFromParcel(Parcel source) {
return new OwnCloudAccount(source);
}
@Override
public OwnCloudAccount [] newArray(int size) {
return new OwnCloudAccount[size];
}
};
}

7
src/com/owncloud/android/lib/network/OwnCloudClient.java → src/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -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;

18
src/com/owncloud/android/lib/network/OwnCloudClientFactory.java → src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
View File

@ -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);

2
src/com/owncloud/android/lib/accounts/AccountTypeUtils.java → src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java
View File

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

49
src/com/owncloud/android/lib/accounts/AccountUtils.java → src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -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";
}
}

2
src/com/owncloud/android/lib/network/AdvancedSslSocketFactory.java → src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/AdvancedX509TrustManager.java → src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/BearerAuthScheme.java → src/com/owncloud/android/lib/common/network/BearerAuthScheme.java
View File

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

2
src/com/owncloud/android/lib/network/BearerCredentials.java → src/com/owncloud/android/lib/common/network/BearerCredentials.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/CertificateCombinedException.java → src/com/owncloud/android/lib/common/network/CertificateCombinedException.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/ChunkFromFileChannelRequestEntity.java → src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/FileRequestEntity.java → src/com/owncloud/android/lib/common/network/FileRequestEntity.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/NetworkUtils.java → src/com/owncloud/android/lib/common/network/NetworkUtils.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/OnDatatransferProgressListener.java → src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java
View File

@ -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);

2
src/com/owncloud/android/lib/network/ProgressiveDataTransferer.java → src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java
View File

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

2
src/com/owncloud/android/lib/network/ServerNameIndicator.java → src/com/owncloud/android/lib/common/network/ServerNameIndicator.java
View File

@ -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;

3
src/com/owncloud/android/lib/network/webdav/WebdavEntry.java → src/com/owncloud/android/lib/common/network/WebdavEntry.java
View File

@ -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;

2
src/com/owncloud/android/lib/network/webdav/WebdavUtils.java → src/com/owncloud/android/lib/common/network/WebdavUtils.java
View File

@ -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;

2
src/com/owncloud/android/lib/operations/common/OnRemoteOperationListener.java → src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java
View File

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

2
src/com/owncloud/android/lib/operations/common/OperationCancelledException.java → src/com/owncloud/android/lib/common/operations/OperationCancelledException.java
View File

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

10
src/com/owncloud/android/lib/operations/common/RemoteOperation.java → src/com/owncloud/android/lib/common/operations/RemoteOperation.java
View File

@ -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;

6
src/com/owncloud/android/lib/operations/common/RemoteOperationResult.java → src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View File

@ -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;

10
src/com/owncloud/android/lib/operations/remote/ChunkedUploadRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
View File

@ -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;

13
src/com/owncloud/android/lib/operations/remote/CreateRemoteFolderOperation.java → src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java
View File

@ -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;

14
src/com/owncloud/android/lib/operations/remote/DownloadRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
View File

@ -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.

10
src/com/owncloud/android/lib/operations/remote/ExistenceCheckRemoteOperation.java → src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
View File

@ -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;

2
src/com/owncloud/android/lib/utils/FileUtils.java → src/com/owncloud/android/lib/resources/files/FileUtils.java
View File

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

13
src/com/owncloud/android/lib/operations/remote/ReadRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
View File

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

13
src/com/owncloud/android/lib/operations/remote/ReadRemoteFolderOperation.java → src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
View File

@ -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.

5
src/com/owncloud/android/lib/operations/common/RemoteFile.java → src/com/owncloud/android/lib/resources/files/RemoteFile.java
View File

@ -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

10
src/com/owncloud/android/lib/operations/remote/RemoveRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java
View File

@ -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.

13
src/com/owncloud/android/lib/operations/remote/RenameRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
View File

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

18
src/com/owncloud/android/lib/operations/remote/UploadRemoteFileOperation.java → src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
View File

@ -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.

14
src/com/owncloud/android/lib/operations/remote/CreateShareRemoteOperation.java → src/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java
View File

@ -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.

13
src/com/owncloud/android/lib/operations/remote/GetRemoteSharesOperation.java → src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java
View File

@ -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;

13
src/com/owncloud/android/lib/operations/remote/GetSharesForFileRemoteOperation.java → src/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java
View File

@ -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.

4
src/com/owncloud/android/lib/utils/GetSharesForFileXMLParser.java → src/com/owncloud/android/lib/resources/shares/GetSharesForFileXMLParser.java
View File

@ -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

4
src/com/owncloud/android/lib/operations/common/OCShare.java → src/com/owncloud/android/lib/resources/shares/OCShare.java
View File

@ -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;

2
src/com/owncloud/android/lib/operations/common/ShareType.java → src/com/owncloud/android/lib/resources/shares/ShareType.java
View File

@ -22,7 +22,7 @@
*
*/
package com.owncloud.android.lib.operations.common;
package com.owncloud.android.lib.resources.shares;
/**
* Enum for Share Type, with values:

2
src/com/owncloud/android/lib/utils/ShareUtils.java → src/com/owncloud/android/lib/resources/shares/ShareUtils.java
View File

@ -22,7 +22,7 @@
*
*/
package com.owncloud.android.lib.utils;
package com.owncloud.android.lib.resources.shares;
/**
* Contains Constants for Share Operation

5
src/com/owncloud/android/lib/utils/ShareXMLParser.java → src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
View File

@ -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

12
src/com/owncloud/android/lib/operations/remote/OwnCloudServerCheckOperation.java → src/com/owncloud/android/lib/resources/status/OwnCloudServerCheckOperation.java
View File

@ -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;

2
src/com/owncloud/android/lib/utils/OwnCloudVersion.java → src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
View File

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

8
src/com/owncloud/android/lib/operations/remote/GetUserNameRemoteOperation.java → src/com/owncloud/android/lib/resources/users/GetUserNameRemoteOperation.java
View File

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

22
tests/src/com/owncloud/android/lib/test_project/TestActivity.java
View File

@ -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;

4
tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
View File

@ -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;

4
tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
View File

@ -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;

4
tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
View File

@ -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;

2
tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
View File

@ -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;

2
tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
View File

@ -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;

4
tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
View File

@ -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;

2
tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
View File

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