From 3d8162d6d71a5d0972cef508f9be9ca8459997c2 Mon Sep 17 00:00:00 2001 From: jabarros Date: Wed, 1 Oct 2014 12:44:02 +0200 Subject: [PATCH 1/4] Increase SYN_READ_TIMEOUT in ReadRemoteFileOperation until 40000 milliseconds --- .../android/lib/resources/files/ReadRemoteFileOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java index 50a62596..3fb695a4 100644 --- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java +++ b/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java @@ -48,7 +48,7 @@ import com.owncloud.android.lib.common.utils.Log_OC; public class ReadRemoteFileOperation extends RemoteOperation { private static final String TAG = ReadRemoteFileOperation.class.getSimpleName(); - private static final int SYNC_READ_TIMEOUT = 10000; + private static final int SYNC_READ_TIMEOUT = 40000; private static final int SYNC_CONNECTION_TIMEOUT = 5000; private String mRemotePath; From 70bcb55f271e4cafbad5a097c9d03cc6c9046baf Mon Sep 17 00:00:00 2001 From: LukeOwncloud Date: Sun, 12 Oct 2014 21:30:39 +0200 Subject: [PATCH 2/4] Update pom.xml update android sdk 19 to revision 4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bf1e612..4690784f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 1.5.1-SNAPSHOT 1.6 - 4.4.2_r3 + 4.4.2_r4 19 From 67c41d8ec3bdad77e65280bee9498413b53c8d5f Mon Sep 17 00:00:00 2001 From: jabarros Date: Mon, 20 Oct 2014 10:42:26 +0200 Subject: [PATCH 3/4] Check Travis update --- src/com/owncloud/android/lib/common/utils/Log_OC.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/owncloud/android/lib/common/utils/Log_OC.java b/src/com/owncloud/android/lib/common/utils/Log_OC.java index ed2fe6ee..8ed8c52c 100644 --- a/src/com/owncloud/android/lib/common/utils/Log_OC.java +++ b/src/com/owncloud/android/lib/common/utils/Log_OC.java @@ -175,5 +175,4 @@ public class Log_OC { public static String[] getLogFileNames() { return mLogFileNames; } - } From 8764ac8f63323b8739a645a701ed75fdc62339c3 Mon Sep 17 00:00:00 2001 From: jabarros Date: Mon, 20 Oct 2014 11:24:12 +0200 Subject: [PATCH 4/4] Update travis.yml file for building with new Android support in Travis --- .travis.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2920d050..3619bd9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,16 @@ -language: java +language: android +android: + components: + - build-tools-20.0.0 + - android-19 + - android-17 + - android-14 + - extra-android-support + licenses: + - 'android-sdk-license-5be876d5' + - 'android-sdk-license-598b93a6' jdk: oraclejdk7 before_install: -- sudo apt-get update -qq -- sudo apt-get install -qq libstdc++6:i386 lib32z1 expect -- export LICENSES="android-sdk-license-5be876d5|android-sdk-license-598b93a6" -- curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer - | bash /dev/stdin --install=$COMPONENTS --accept=$LICENSES -- source ~/.android-sdk-installer/env - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M - emulator -avd test -no-skin -no-audio -no-window & - rm pom.xml @@ -25,4 +29,4 @@ env: - secure: aF4U20Xlu/rfrbxCmoJAiGh1doYTAZ10UEDmajuinT+ZGSJLivuqD7DDY/00sI6IXWg+J1vL+7jJm4JSYusHPg38UHZ4q92k6RmZycW2ATUzZnGT54O5FRnY67MfVwgVpIMK9UOL/6NEciBHEjlIOL0wbKQiJB++1YtBZOQLGL4= - secure: N+ECSwNg8v2GsAFJ2y/tCiffauHDpN76zuFI2pDqf0fjmCtJZHu4BH5ArXBHjyHKmgn20a/8eZXcwJaH1HsJ80bo7vDJ2miShjGIQ90hPcdmUiB2XVJcew4f04CtvMDH5o7DRt4ykWArlbPL2rhVag0jotlSidolHBwRFnbDhDY= matrix: - - COMPONENTS=build-tools-20.0.0,android-19,sys-img-armeabi-v7a-android-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a