Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01785539 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #6 from nextcloud/resumeChunkedUploads 

Resume chunked uploads
parents e6068f87 e7f065cc

.lgtm

+0 −1
Original line number Diff line number Diff line 
pattern = "(?i):shipit:|:\\+1:|LGTM"
 
self_approval_off=true
 
 No newline at end of file

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--  ownCloud Android Library is available under MIT license

<!--  Nextcloud Android Library is available under MIT license

   Copyright (C) 2015 ownCloud Inc.

    

   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +29,7 @@ 
    android:versionName="1.0" >



    <uses-sdk

        android:minSdkVersion="8"

        android:minSdkVersion="11"

        android:targetSdkVersion="23" />



</manifest>

README.md

+1 −1
Original line number Diff line number Diff line
@@ -65,6 +65,6 @@ Licensed under Apache License, Version 2.0. 


## Compatibility



Nextcloud Android library is valid for Android version 2.2 and up (android:minSdkVersion="8" android:targetSdkVersion="23").

Nextcloud Android library is valid for Android version 3.0 and up (android:minSdkVersion="11" android:targetSdkVersion="23").



Nextcloud Android library supports Nextcloud server from version 9.

sample_client/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
      android:versionName="1.0">

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-sdk

        android:minSdkVersion="8"

        android:minSdkVersion="11"

        android:targetSdkVersion="23" />

    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">

        <activity 	android:name="MainActivity"

src/com/owncloud/android/lib/common/network/ChunkFromFileChannelRequestEntity.java

+6 −2
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres 
    }





    public void setmTransferred(long value) {

        mTransferred = value;

    }



    public void writeRequest(final OutputStream out) throws IOException {

        int readCount = 0;

        Iterator<OnDatatransferProgressListener> it = null;