Merge branch 'master' into develop

.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

src/com/owncloud/android/lib/common/utils/Log_OC.java

@@ -175,5 +175,4 @@ public class Log_OC {
     public static String[] getLogFileNames() {
         return mLogFileNames;
     }
-
 }

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;