From 8b91c71d6fb501e922c6c62eed74729f84e44ab1 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 12 Feb 2016 14:04:58 +0100 Subject: [PATCH 1/3] Updated build target to Android APIv23 --- .travis.yml | 9 ++++++--- AndroidManifest.xml | 2 +- build.gradle | 6 +++--- project.properties | 2 +- sample_client/AndroidManifest.xml | 2 +- sample_client/build.gradle | 4 ++-- sample_client/gradle/wrapper/gradle-wrapper.properties | 2 +- sample_client/project.properties | 2 +- src/com/owncloud/android/lib/common/OwnCloudClient.java | 6 +++--- .../android/lib/common/network/RedirectionPath.java | 3 +-- .../lib/resources/files/DownloadRemoteFileOperation.java | 2 +- .../lib/resources/files/ReadRemoteFileOperation.java | 2 +- .../lib/resources/files/ReadRemoteFolderOperation.java | 2 +- .../lib/resources/files/UploadRemoteFileOperation.java | 2 +- .../lib/resources/shares/CreateRemoteShareOperation.java | 2 +- .../lib/resources/shares/GetRemoteShareOperation.java | 2 +- .../lib/resources/shares/GetRemoteShareesOperation.java | 2 +- .../shares/GetRemoteSharesForFileOperation.java | 2 +- .../lib/resources/shares/GetRemoteSharesOperation.java | 2 +- .../lib/resources/shares/UpdateRemoteShareOperation.java | 2 +- .../resources/status/GetRemoteCapabilitiesOperation.java | 2 +- .../lib/resources/users/GetRemoteUserNameOperation.java | 2 +- test_client/AndroidManifest.xml | 2 +- test_client/build.gradle | 4 ++-- test_client/gradle/wrapper/gradle-wrapper.properties | 2 +- test_client/project.properties | 2 +- test_client/tests/build.gradle | 4 ++-- test_client/tests/project.properties | 2 +- .../lib/test_project/test/OwnCloudClientTest.java | 2 +- 29 files changed, 41 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2598e3e7..030fa16d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,11 @@ sudo: false language: android android: components: - - build-tools-22.0.1 - - android-19 + - platform-tools + - tools + - build-tools-23.0.2 + - android-23 + - sys-img-armeabi-v7a-android-23 branches: only: - master @@ -33,7 +36,7 @@ env: - secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8= - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro= matrix: - - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a addons: coverity_scan: project: diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 98463b39..bd1b0f78 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -30,7 +30,7 @@ + android:targetSdkVersion="23" /> diff --git a/build.gradle b/build.gradle index 2fc53f41..6483cddb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.5.0' } } @@ -18,8 +18,8 @@ dependencies { } android { - compileSdkVersion 19 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion "23.0.2" sourceSets { main { diff --git a/project.properties b/project.properties index 91d2b024..b2ef7dcc 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-19 +target=android-23 android.library=true diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml index 0dcaaa73..27c13660 100644 --- a/sample_client/AndroidManifest.xml +++ b/sample_client/AndroidManifest.xml @@ -30,7 +30,7 @@ + android:targetSdkVersion="23" /> + android:targetSdkVersion="23" /> Date: Tue, 16 Feb 2016 12:45:16 +0100 Subject: [PATCH 2/3] Moved target folder for download test to private storage, to fix problems with runtime check of permissions in Android 6 --- .../android/lib/test_project/TestActivity.java | 4 ++-- .../lib/test_project/test/DownloadFileTest.java | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java index c399bb49..c9fd712a 100644 --- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java +++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java @@ -227,8 +227,8 @@ public class TestActivity extends Activity { public RemoteOperationResult downloadFile(RemoteFile remoteFile, String temporalFolder) { // Create folder String path = "/owncloud/tmp/" + temporalFolder; - File sdCard = Environment.getExternalStorageDirectory(); - File folder = new File(sdCard.getAbsolutePath() + "/" + path); + File privateFolder = getFilesDir(); + File folder = new File(privateFolder.getAbsolutePath() + "/" + path); folder.mkdirs(); DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile.getRemotePath(), folder.getAbsolutePath()); diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java index ed04d443..04f36090 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java @@ -94,9 +94,8 @@ public class DownloadFileTest extends RemoteTest { */ public void testDownloadFile() { RemoteOperationResult result = mActivity.downloadFile( - new RemoteFile(mFullPath2Image), - mActivity.getFilesDir().getAbsolutePath() - ); + new RemoteFile(mFullPath2Image), "" + ); mDownloadedFilePath = mFullPath2Image; assertTrue(result.isSuccess()); // TODO some checks involving the local file @@ -107,9 +106,8 @@ public class DownloadFileTest extends RemoteTest { */ public void testDownloadFileSpecialChars() { RemoteOperationResult result = mActivity.downloadFile( - new RemoteFile(mFullPath2ImageWitSpecialChars), - mActivity.getFilesDir().getAbsolutePath() - ); + new RemoteFile(mFullPath2ImageWitSpecialChars), "" + ); mDownloadedFilePath = mFullPath2ImageWitSpecialChars; assertTrue(result.isSuccess()); // TODO some checks involving the local file @@ -120,9 +118,8 @@ public class DownloadFileTest extends RemoteTest { */ public void testDownloadFileNotFound() { RemoteOperationResult result = mActivity.downloadFile( - new RemoteFile(mFullPath2ImageNotFound), - mActivity.getFilesDir().getAbsolutePath() - ); + new RemoteFile(mFullPath2ImageNotFound), "" + ); assertFalse(result.isSuccess()); } From 27237576efd9f93ec93eb8bc1d5f123b2caba69a Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 16 Feb 2016 13:31:55 +0100 Subject: [PATCH 3/3] Fixed wrong test case for shares, and warnings in test cases --- .../com/owncloud/android/lib/test_project/TestActivity.java | 1 - .../owncloud/android/lib/test_project/test/CopyFileTest.java | 2 -- .../android/lib/test_project/test/OwnCloudClientTest.java | 1 - .../lib/test_project/test/UpdatePrivateShareTest.java | 5 ++--- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java index c9fd712a..6d0134f5 100644 --- a/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java +++ b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java @@ -37,7 +37,6 @@ import android.app.Activity; import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.os.Environment; import android.util.Log; import android.view.Menu; diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java index 468d2de1..1c350f83 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java @@ -109,8 +109,6 @@ public class CopyFileTest extends ActivityInstrumentationTestCase2 private static final String SRC_PATH_TO_FILE_6 = SRC_BASE_FOLDER + FILE6; - private static final String SRC_PATH_TO_FILE_7 = SRC_BASE_FOLDER + FILE7; - private static final String SRC_PATH_TO_NON_EXISTENT_FILE = SRC_BASE_FOLDER + NO_FILE; private static final String SRC_PATH_TO_EMPTY_FOLDER = SRC_BASE_FOLDER + EMPTY; diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java index 81030e44..0e8eca0a 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java @@ -30,7 +30,6 @@ import java.security.GeneralSecurityException; import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.HeadMethod; -import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.commons.httpclient.HttpStatus; diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java index d839530b..128b0641 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java @@ -28,7 +28,6 @@ package com.owncloud.android.lib.test_project.test; import java.io.File; import java.security.GeneralSecurityException; -import java.util.Calendar; import junit.framework.AssertionFailedError; @@ -207,8 +206,8 @@ public class UpdatePrivateShareTest extends RemoteTest { UpdateRemoteShareOperation updateNoShare = new UpdateRemoteShareOperation( mFileShare.getRemoteId() ); - updateShare.setPermissions(OCShare.READ_PERMISSION_FLAG); // minimum permissions - result = updateShare.execute(mClient); + updateNoShare.setPermissions(OCShare.READ_PERMISSION_FLAG); // minimum permissions + result = updateNoShare.execute(mClient); assertFalse(result.isSuccess()); }