From 56e003139f04e7e5454ec6328cbaed798710bcd2 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 12 Dec 2018 20:17:27 +0100 Subject: [PATCH] change to Gradle file structure --- build.gradle | 49 ------------------ owncloudComLib/build.gradle | 26 ++++++++++ .../src/main/AndroidManifest.xml | 4 ++ .../lib/common/DynamicSessionManager.java | 0 .../java}/lib/common/OwnCloudAccount.java | 0 .../main/java}/lib/common/OwnCloudClient.java | 0 .../lib/common/OwnCloudClientFactory.java | 0 .../lib/common/OwnCloudClientManager.java | 0 .../common/OwnCloudClientManagerFactory.java | 0 .../lib/common/SimpleFactoryManager.java | 0 .../lib/common/SingleSessionManager.java | 0 .../lib/common/accounts/AccountTypeUtils.java | 0 .../lib/common/accounts/AccountUtils.java | 0 .../OwnCloudBasicCredentials.java | 0 .../OwnCloudBearerCredentials.java | 0 .../authentication/OwnCloudCredentials.java | 0 .../OwnCloudCredentialsFactory.java | 0 .../OwnCloudSamlSsoCredentials.java | 0 .../oauth/BearerCredentials.java | 0 .../oauth/OAuth2ClientConfiguration.java | 0 .../authentication/oauth/OAuth2Constants.java | 0 .../oauth/OAuth2GetAccessTokenOperation.java | 0 .../authentication/oauth/OAuth2GrantType.java | 0 .../authentication/oauth/OAuth2Provider.java | 0 .../oauth/OAuth2ProvidersRegistry.java | 0 .../oauth/OAuth2QueryParser.java | 0 .../OAuth2RefreshAccessTokenOperation.java | 0 .../oauth/OAuth2RequestBuilder.java | 0 .../oauth/OAuth2ResponseParser.java | 0 .../oauth/OwnCloudOAuth2Provider.java | 0 .../oauth/OwnCloudOAuth2RequestBuilder.java | 0 .../java}/lib/common/http/HttpClient.java | 0 .../java}/lib/common/http/HttpConstants.java | 0 .../http/interceptors/HttpInterceptor.java | 0 .../RequestHeaderInterceptor.java | 0 .../common/http/methods/HttpBaseMethod.java | 0 .../http/methods/nonwebdav/DeleteMethod.java | 0 .../http/methods/nonwebdav/GetMethod.java | 0 .../http/methods/nonwebdav/HttpMethod.java | 0 .../http/methods/nonwebdav/PostMethod.java | 0 .../http/methods/nonwebdav/PutMethod.java | 0 .../http/methods/webdav/CopyMethod.java | 0 .../http/methods/webdav/DavConstants.java | 0 .../common/http/methods/webdav/DavMethod.java | 0 .../common/http/methods/webdav/DavUtils.java | 0 .../http/methods/webdav/MkColMethod.java | 0 .../http/methods/webdav/MoveMethod.java | 0 .../http/methods/webdav/PropfindMethod.java | 0 .../common/http/methods/webdav/PutMethod.java | 0 .../network/AdvancedX509TrustManager.java | 0 .../network/CertificateCombinedException.java | 0 .../network/ChunkFromFileRequestBody.java | 0 .../lib/common/network/FileRequestBody.java | 0 .../lib/common/network/NetworkUtils.java | 0 .../OnDatatransferProgressListener.java | 0 .../network/ProgressiveDataTransferer.java | 0 .../lib/common/network/RedirectionPath.java | 0 .../common/network/ServerNameIndicator.java | 0 .../java}/lib/common/network/WebdavUtils.java | 0 .../common/network/WriteTimeoutEnforcer.java | 0 .../common/operations/ErrorMessageParser.java | 0 .../InvalidCharacterExceptionParser.java | 0 .../operations/OnRemoteOperationListener.java | 0 .../OperationCancelledException.java | 0 .../common/operations/RemoteOperation.java | 0 .../operations/RemoteOperationResult.java | 0 .../main/java}/lib/common/utils/Log_OC.java | 0 .../java}/lib/common/utils/RandomUtils.java | 0 .../files/CopyRemoteFileOperation.java | 0 .../files/CreateRemoteFolderOperation.java | 0 .../files/DownloadRemoteFileOperation.java | 0 .../files/ExistenceCheckRemoteOperation.java | 0 .../java}/lib/resources/files/FileUtils.java | 0 .../files/MoveRemoteFileOperation.java | 0 .../files/ReadRemoteFileOperation.java | 0 .../files/ReadRemoteFolderOperation.java | 0 .../java}/lib/resources/files/RemoteFile.java | 0 .../files/RemoveRemoteFileOperation.java | 0 .../files/RenameRemoteFileOperation.java | 0 .../files/UploadRemoteFileOperation.java | 0 .../ChunkedUploadRemoteFileOperation.java | 0 .../CreateRemoteChunkFolderOperation.java | 0 .../chunks/MoveRemoteChunksFileOperation.java | 0 .../RemoveRemoteChunksFolderOperation.java | 0 .../shares/CreateRemoteShareOperation.java | 0 .../shares/GetRemoteShareOperation.java | 0 .../shares/GetRemoteShareesOperation.java | 0 .../GetRemoteSharesForFileOperation.java | 0 .../shares/GetRemoteSharesOperation.java | 0 .../java}/lib/resources/shares/OCShare.java | 0 .../shares/RemoveRemoteShareOperation.java | 0 .../resources/shares/ShareParserResult.java | 0 .../shares/SharePermissionsBuilder.java | 0 .../ShareToRemoteOperationResultParser.java | 0 .../java}/lib/resources/shares/ShareType.java | 0 .../lib/resources/shares/ShareUtils.java | 0 .../lib/resources/shares/ShareXMLParser.java | 0 .../shares/UpdateRemoteShareOperation.java | 0 .../status/CapabilityBooleanType.java | 0 .../GetRemoteCapabilitiesOperation.java | 0 .../status/GetRemoteStatusOperation.java | 8 +-- .../lib/resources/status/OCCapability.java | 0 .../lib/resources/status/OwnCloudVersion.java | 0 .../users/GetRemoteUserAvatarOperation.java | 0 .../users/GetRemoteUserInfoOperation.java | 0 .../users/GetRemoteUserQuotaOperation.java | 0 sample_client/build.gradle | 35 ++----------- sample_client/{ => src}/assets/oc_sample.png | Bin sample_client/{ => src}/assets/oc_sample.txt | 0 .../{ => src/main}/AndroidManifest.xml | 0 .../lib/sampleclient/FilesArrayAdapter.java | 0 .../lib/sampleclient/MainActivity.java | 0 .../main}/res/drawable-hdpi/ic_launcher.png | Bin .../main}/res/drawable-ldpi/ic_launcher.png | Bin .../main}/res/drawable-mdpi/ic_launcher.png | Bin .../main}/res/layout/file_in_list.xml | 0 .../{ => src/main}/res/layout/main.xml | 0 .../{ => src/main}/res/values-v11/styles.xml | 0 .../{ => src/main}/res/values/dimensions.xml | 0 .../{ => src/main}/res/values/setup.xml | 0 .../{ => src/main}/res/values/strings.xml | 0 .../{ => src/main}/res/values/styles.xml | 0 settings.gradle | 2 +- 123 files changed, 39 insertions(+), 85 deletions(-) create mode 100644 owncloudComLib/build.gradle rename AndroidManifest.xml => owncloudComLib/src/main/AndroidManifest.xml (89%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/DynamicSessionManager.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/OwnCloudAccount.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/OwnCloudClient.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/OwnCloudClientFactory.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/OwnCloudClientManager.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/OwnCloudClientManagerFactory.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/SimpleFactoryManager.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/SingleSessionManager.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/accounts/AccountTypeUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/accounts/AccountUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/OwnCloudBasicCredentials.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/OwnCloudBearerCredentials.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/OwnCloudCredentials.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/OwnCloudCredentialsFactory.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/OwnCloudSamlSsoCredentials.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/BearerCredentials.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2ClientConfiguration.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2Constants.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2GrantType.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2Provider.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2QueryParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2RequestBuilder.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OAuth2ResponseParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/HttpClient.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/HttpConstants.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/interceptors/HttpInterceptor.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/interceptors/RequestHeaderInterceptor.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/HttpBaseMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/nonwebdav/DeleteMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/nonwebdav/GetMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/nonwebdav/HttpMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/nonwebdav/PostMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/nonwebdav/PutMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/CopyMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/DavConstants.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/DavMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/DavUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/MkColMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/MoveMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/PropfindMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/http/methods/webdav/PutMethod.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/AdvancedX509TrustManager.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/CertificateCombinedException.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/ChunkFromFileRequestBody.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/FileRequestBody.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/NetworkUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/OnDatatransferProgressListener.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/ProgressiveDataTransferer.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/RedirectionPath.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/ServerNameIndicator.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/WebdavUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/network/WriteTimeoutEnforcer.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/ErrorMessageParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/InvalidCharacterExceptionParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/OnRemoteOperationListener.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/OperationCancelledException.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/RemoteOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/operations/RemoteOperationResult.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/utils/Log_OC.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/common/utils/RandomUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/CopyRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/CreateRemoteFolderOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/DownloadRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/ExistenceCheckRemoteOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/FileUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/MoveRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/ReadRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/ReadRemoteFolderOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/RemoteFile.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/RemoveRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/RenameRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/UploadRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/CreateRemoteShareOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/GetRemoteShareOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/GetRemoteShareesOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/GetRemoteSharesForFileOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/GetRemoteSharesOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/OCShare.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/RemoveRemoteShareOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/ShareParserResult.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/SharePermissionsBuilder.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/ShareToRemoteOperationResultParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/ShareType.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/ShareUtils.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/ShareXMLParser.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/shares/UpdateRemoteShareOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/status/CapabilityBooleanType.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/status/GetRemoteCapabilitiesOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/status/GetRemoteStatusOperation.java (94%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/status/OCCapability.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/status/OwnCloudVersion.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/users/GetRemoteUserAvatarOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/users/GetRemoteUserInfoOperation.java (100%) rename {src/com/owncloud/android => owncloudComLib/src/main/java}/lib/resources/users/GetRemoteUserQuotaOperation.java (100%) rename sample_client/{ => src}/assets/oc_sample.png (100%) rename sample_client/{ => src}/assets/oc_sample.txt (100%) rename sample_client/{ => src/main}/AndroidManifest.xml (100%) rename sample_client/src/{ => main/java}/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java (100%) rename sample_client/src/{ => main/java}/com/owncloud/android/lib/sampleclient/MainActivity.java (100%) rename sample_client/{ => src/main}/res/drawable-hdpi/ic_launcher.png (100%) rename sample_client/{ => src/main}/res/drawable-ldpi/ic_launcher.png (100%) rename sample_client/{ => src/main}/res/drawable-mdpi/ic_launcher.png (100%) rename sample_client/{ => src/main}/res/layout/file_in_list.xml (100%) rename sample_client/{ => src/main}/res/layout/main.xml (100%) rename sample_client/{ => src/main}/res/values-v11/styles.xml (100%) rename sample_client/{ => src/main}/res/values/dimensions.xml (100%) rename sample_client/{ => src/main}/res/values/setup.xml (100%) rename sample_client/{ => src/main}/res/values/strings.xml (100%) rename sample_client/{ => src/main}/res/values/styles.xml (100%) diff --git a/build.gradle b/build.gradle index 23323227..5cd6b67e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,6 @@ buildscript { } } -apply plugin: 'com.android.library' - allprojects { repositories { google() @@ -18,50 +16,3 @@ allprojects { maven { url 'https://jitpack.io' } } } - -dependencies { - api 'com.squareup.okhttp3:okhttp:3.10.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51" - implementation 'com.gitlab.ownclouders:dav4android:oc_support' -} - -android { - compileSdkVersion 26 - - defaultConfig { - minSdkVersion 14 - targetSdkVersion 26 - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - // Move the tests to tests/java, tests/res, etc... - androidTest.setRoot('tests') - - // Move the build types to build-types/ - // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... - // This moves them out of them default location under src//... which would - // conflict with src/ being used by the main source set. - // Adding new build types or product flavors should be accompanied - // by a similar customization. - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } - - lintOptions { - abortOnError false - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} diff --git a/owncloudComLib/build.gradle b/owncloudComLib/build.gradle new file mode 100644 index 00000000..7415fef9 --- /dev/null +++ b/owncloudComLib/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' + +dependencies { + api 'com.squareup.okhttp3:okhttp:3.12.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11" + implementation 'com.gitlab.ownclouders:dav4android:oc_support' +} + +android { + compileSdkVersion 28 + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 28 + } + + lintOptions { + abortOnError false + ignoreWarnings true + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} diff --git a/AndroidManifest.xml b/owncloudComLib/src/main/AndroidManifest.xml similarity index 89% rename from AndroidManifest.xml rename to owncloudComLib/src/main/AndroidManifest.xml index b8083d23..ffa15c07 100644 --- a/AndroidManifest.xml +++ b/owncloudComLib/src/main/AndroidManifest.xml @@ -30,8 +30,12 @@ + + diff --git a/src/com/owncloud/android/lib/common/DynamicSessionManager.java b/owncloudComLib/src/main/java/lib/common/DynamicSessionManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/DynamicSessionManager.java rename to owncloudComLib/src/main/java/lib/common/DynamicSessionManager.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/owncloudComLib/src/main/java/lib/common/OwnCloudAccount.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudAccount.java rename to owncloudComLib/src/main/java/lib/common/OwnCloudAccount.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLib/src/main/java/lib/common/OwnCloudClient.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClient.java rename to owncloudComLib/src/main/java/lib/common/OwnCloudClient.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/owncloudComLib/src/main/java/lib/common/OwnCloudClientFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientFactory.java rename to owncloudComLib/src/main/java/lib/common/OwnCloudClientFactory.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/owncloudComLib/src/main/java/lib/common/OwnCloudClientManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientManager.java rename to owncloudComLib/src/main/java/lib/common/OwnCloudClientManager.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java b/owncloudComLib/src/main/java/lib/common/OwnCloudClientManagerFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java rename to owncloudComLib/src/main/java/lib/common/OwnCloudClientManagerFactory.java diff --git a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java b/owncloudComLib/src/main/java/lib/common/SimpleFactoryManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/SimpleFactoryManager.java rename to owncloudComLib/src/main/java/lib/common/SimpleFactoryManager.java diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/owncloudComLib/src/main/java/lib/common/SingleSessionManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/SingleSessionManager.java rename to owncloudComLib/src/main/java/lib/common/SingleSessionManager.java diff --git a/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java b/owncloudComLib/src/main/java/lib/common/accounts/AccountTypeUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java rename to owncloudComLib/src/main/java/lib/common/accounts/AccountTypeUtils.java diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/owncloudComLib/src/main/java/lib/common/accounts/AccountUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/accounts/AccountUtils.java rename to owncloudComLib/src/main/java/lib/common/accounts/AccountUtils.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java rename to owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java rename to owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java b/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java rename to owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java b/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java rename to owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java rename to owncloudComLib/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/BearerCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/BearerCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java rename to owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/owncloudComLib/src/main/java/lib/common/http/HttpClient.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/HttpClient.java rename to owncloudComLib/src/main/java/lib/common/http/HttpClient.java diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/owncloudComLib/src/main/java/lib/common/http/HttpConstants.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/HttpConstants.java rename to owncloudComLib/src/main/java/lib/common/http/HttpConstants.java diff --git a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java b/owncloudComLib/src/main/java/lib/common/http/interceptors/HttpInterceptor.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java rename to owncloudComLib/src/main/java/lib/common/http/interceptors/HttpInterceptor.java diff --git a/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java b/owncloudComLib/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java rename to owncloudComLib/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/HttpBaseMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/HttpBaseMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/CopyMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/CopyMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavConstants.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavConstants.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavUtils.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/MkColMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/MkColMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/MoveMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/MoveMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/owncloudComLib/src/main/java/lib/common/http/methods/webdav/PutMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java rename to owncloudComLib/src/main/java/lib/common/http/methods/webdav/PutMethod.java diff --git a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/owncloudComLib/src/main/java/lib/common/network/AdvancedX509TrustManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java rename to owncloudComLib/src/main/java/lib/common/network/AdvancedX509TrustManager.java diff --git a/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java b/owncloudComLib/src/main/java/lib/common/network/CertificateCombinedException.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/CertificateCombinedException.java rename to owncloudComLib/src/main/java/lib/common/network/CertificateCombinedException.java diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java b/owncloudComLib/src/main/java/lib/common/network/ChunkFromFileRequestBody.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java rename to owncloudComLib/src/main/java/lib/common/network/ChunkFromFileRequestBody.java diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/owncloudComLib/src/main/java/lib/common/network/FileRequestBody.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/FileRequestBody.java rename to owncloudComLib/src/main/java/lib/common/network/FileRequestBody.java diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/owncloudComLib/src/main/java/lib/common/network/NetworkUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/NetworkUtils.java rename to owncloudComLib/src/main/java/lib/common/network/NetworkUtils.java diff --git a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java b/owncloudComLib/src/main/java/lib/common/network/OnDatatransferProgressListener.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java rename to owncloudComLib/src/main/java/lib/common/network/OnDatatransferProgressListener.java diff --git a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java b/owncloudComLib/src/main/java/lib/common/network/ProgressiveDataTransferer.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java rename to owncloudComLib/src/main/java/lib/common/network/ProgressiveDataTransferer.java diff --git a/src/com/owncloud/android/lib/common/network/RedirectionPath.java b/owncloudComLib/src/main/java/lib/common/network/RedirectionPath.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/RedirectionPath.java rename to owncloudComLib/src/main/java/lib/common/network/RedirectionPath.java diff --git a/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java b/owncloudComLib/src/main/java/lib/common/network/ServerNameIndicator.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ServerNameIndicator.java rename to owncloudComLib/src/main/java/lib/common/network/ServerNameIndicator.java diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/owncloudComLib/src/main/java/lib/common/network/WebdavUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/WebdavUtils.java rename to owncloudComLib/src/main/java/lib/common/network/WebdavUtils.java diff --git a/src/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java b/owncloudComLib/src/main/java/lib/common/network/WriteTimeoutEnforcer.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java rename to owncloudComLib/src/main/java/lib/common/network/WriteTimeoutEnforcer.java diff --git a/src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java b/owncloudComLib/src/main/java/lib/common/operations/ErrorMessageParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java rename to owncloudComLib/src/main/java/lib/common/operations/ErrorMessageParser.java diff --git a/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java b/owncloudComLib/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java rename to owncloudComLib/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java diff --git a/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java b/owncloudComLib/src/main/java/lib/common/operations/OnRemoteOperationListener.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java rename to owncloudComLib/src/main/java/lib/common/operations/OnRemoteOperationListener.java diff --git a/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java b/owncloudComLib/src/main/java/lib/common/operations/OperationCancelledException.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/OperationCancelledException.java rename to owncloudComLib/src/main/java/lib/common/operations/OperationCancelledException.java diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/owncloudComLib/src/main/java/lib/common/operations/RemoteOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/RemoteOperation.java rename to owncloudComLib/src/main/java/lib/common/operations/RemoteOperation.java diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/owncloudComLib/src/main/java/lib/common/operations/RemoteOperationResult.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java rename to owncloudComLib/src/main/java/lib/common/operations/RemoteOperationResult.java diff --git a/src/com/owncloud/android/lib/common/utils/Log_OC.java b/owncloudComLib/src/main/java/lib/common/utils/Log_OC.java similarity index 100% rename from src/com/owncloud/android/lib/common/utils/Log_OC.java rename to owncloudComLib/src/main/java/lib/common/utils/Log_OC.java diff --git a/src/com/owncloud/android/lib/common/utils/RandomUtils.java b/owncloudComLib/src/main/java/lib/common/utils/RandomUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/utils/RandomUtils.java rename to owncloudComLib/src/main/java/lib/common/utils/RandomUtils.java diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/CopyRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/CopyRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/owncloudComLib/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/owncloudComLib/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/owncloudComLib/src/main/java/lib/resources/files/FileUtils.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/FileUtils.java rename to owncloudComLib/src/main/java/lib/resources/files/FileUtils.java diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/MoveRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/MoveRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/owncloudComLib/src/main/java/lib/resources/files/RemoteFile.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RemoteFile.java rename to owncloudComLib/src/main/java/lib/resources/files/RemoteFile.java diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/RenameRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/RenameRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/UploadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/UploadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java b/owncloudComLib/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java b/owncloudComLib/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java b/owncloudComLib/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java rename to owncloudComLib/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/OCShare.java b/owncloudComLib/src/main/java/lib/resources/shares/OCShare.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/OCShare.java rename to owncloudComLib/src/main/java/lib/resources/shares/OCShare.java diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java b/owncloudComLib/src/main/java/lib/resources/shares/ShareParserResult.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareParserResult.java rename to owncloudComLib/src/main/java/lib/resources/shares/ShareParserResult.java diff --git a/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java b/owncloudComLib/src/main/java/lib/resources/shares/SharePermissionsBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java rename to owncloudComLib/src/main/java/lib/resources/shares/SharePermissionsBuilder.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java b/owncloudComLib/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java rename to owncloudComLib/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareType.java b/owncloudComLib/src/main/java/lib/resources/shares/ShareType.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareType.java rename to owncloudComLib/src/main/java/lib/resources/shares/ShareType.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java b/owncloudComLib/src/main/java/lib/resources/shares/ShareUtils.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareUtils.java rename to owncloudComLib/src/main/java/lib/resources/shares/ShareUtils.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java b/owncloudComLib/src/main/java/lib/resources/shares/ShareXMLParser.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java rename to owncloudComLib/src/main/java/lib/resources/shares/ShareXMLParser.java diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/owncloudComLib/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java rename to owncloudComLib/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java b/owncloudComLib/src/main/java/lib/resources/status/CapabilityBooleanType.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java rename to owncloudComLib/src/main/java/lib/resources/status/CapabilityBooleanType.java diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/owncloudComLib/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java rename to owncloudComLib/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java similarity index 94% rename from src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java rename to owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java index 9896eb44..8ac8480e 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java @@ -52,7 +52,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R * @author David González Verdugo */ -public class GetRemoteStatusOperation extends RemoteOperation { +public class GetRemoteStatusOperation extends RemoteOperation { /** * Maximum time to wait for a response from the server when the connection is being tested, @@ -67,7 +67,7 @@ public class GetRemoteStatusOperation extends RemoteOperation { private static final String HTTPS_PREFIX = "https://"; private static final String HTTP_PREFIX = "http://"; - private RemoteOperationResult mLatestResult; + private RemoteOperationResult mLatestResult; private Context mContext; public GetRemoteStatusOperation(Context context) { @@ -122,7 +122,7 @@ public class GetRemoteStatusOperation extends RemoteOperation { RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED); } else { String version = respJSON.getString(NODE_VERSION); - OwnCloudVersion ocVersion = new OwnCloudVersion(version); + com.owncloud.android.lib.resources.status.OwnCloudVersion ocVersion = new com.owncloud.android.lib.resources.status.OwnCloudVersion(version); /// the version object will be returned even if the version is invalid, no error code; /// every app will decide how to act if (ocVersion.isVersionValid() == false) @@ -175,7 +175,7 @@ public class GetRemoteStatusOperation extends RemoteOperation { } @Override - protected RemoteOperationResult run(OwnCloudClient client) { + protected RemoteOperationResult run(OwnCloudClient client) { if (!isOnline()) { return new RemoteOperationResult<>(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION); } diff --git a/src/com/owncloud/android/lib/resources/status/OCCapability.java b/owncloudComLib/src/main/java/lib/resources/status/OCCapability.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/OCCapability.java rename to owncloudComLib/src/main/java/lib/resources/status/OCCapability.java diff --git a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java b/owncloudComLib/src/main/java/lib/resources/status/OwnCloudVersion.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java rename to owncloudComLib/src/main/java/lib/resources/status/OwnCloudVersion.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java rename to owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java rename to owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java rename to owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java diff --git a/sample_client/build.gradle b/sample_client/build.gradle index c1b01e3f..0b7c8449 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -1,43 +1,15 @@ apply plugin: 'com.android.application' -repositories { - jcenter() -} - dependencies { - implementation project(':') + implementation project(':owncloudComLib') } android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 14 - targetSdkVersion 26 - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - // Move the tests to tests/java, tests/res, etc... - androidTest.setRoot('tests') - - // Move the build types to build-types/ - // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... - // This moves them out of them default location under src//... which would - // conflict with src/ being used by the main source set. - // Adding new build types or product flavors should be accompanied - // by a similar customization. - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') + targetSdkVersion 28 } lintOptions { @@ -47,6 +19,7 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/sample_client/assets/oc_sample.png b/sample_client/src/assets/oc_sample.png similarity index 100% rename from sample_client/assets/oc_sample.png rename to sample_client/src/assets/oc_sample.png diff --git a/sample_client/assets/oc_sample.txt b/sample_client/src/assets/oc_sample.txt similarity index 100% rename from sample_client/assets/oc_sample.txt rename to sample_client/src/assets/oc_sample.txt diff --git a/sample_client/AndroidManifest.xml b/sample_client/src/main/AndroidManifest.xml similarity index 100% rename from sample_client/AndroidManifest.xml rename to sample_client/src/main/AndroidManifest.xml diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java b/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java similarity index 100% rename from sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java rename to sample_client/src/main/java/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java similarity index 100% rename from sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java rename to sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java diff --git a/sample_client/res/drawable-hdpi/ic_launcher.png b/sample_client/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-hdpi/ic_launcher.png rename to sample_client/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/sample_client/res/drawable-ldpi/ic_launcher.png b/sample_client/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-ldpi/ic_launcher.png rename to sample_client/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/sample_client/res/drawable-mdpi/ic_launcher.png b/sample_client/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-mdpi/ic_launcher.png rename to sample_client/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/sample_client/res/layout/file_in_list.xml b/sample_client/src/main/res/layout/file_in_list.xml similarity index 100% rename from sample_client/res/layout/file_in_list.xml rename to sample_client/src/main/res/layout/file_in_list.xml diff --git a/sample_client/res/layout/main.xml b/sample_client/src/main/res/layout/main.xml similarity index 100% rename from sample_client/res/layout/main.xml rename to sample_client/src/main/res/layout/main.xml diff --git a/sample_client/res/values-v11/styles.xml b/sample_client/src/main/res/values-v11/styles.xml similarity index 100% rename from sample_client/res/values-v11/styles.xml rename to sample_client/src/main/res/values-v11/styles.xml diff --git a/sample_client/res/values/dimensions.xml b/sample_client/src/main/res/values/dimensions.xml similarity index 100% rename from sample_client/res/values/dimensions.xml rename to sample_client/src/main/res/values/dimensions.xml diff --git a/sample_client/res/values/setup.xml b/sample_client/src/main/res/values/setup.xml similarity index 100% rename from sample_client/res/values/setup.xml rename to sample_client/src/main/res/values/setup.xml diff --git a/sample_client/res/values/strings.xml b/sample_client/src/main/res/values/strings.xml similarity index 100% rename from sample_client/res/values/strings.xml rename to sample_client/src/main/res/values/strings.xml diff --git a/sample_client/res/values/styles.xml b/sample_client/src/main/res/values/styles.xml similarity index 100% rename from sample_client/res/values/styles.xml rename to sample_client/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index 7cf73a38..17d796c8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':' +include ':owncloudComLib' include ':sample_client' \ No newline at end of file