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

Commit 383e95e2 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Code Review
Browse files

Merge "DropBox: Read until the end of stream has been reached"

parents db65907a e9f18815
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -150,7 +150,12 @@ public class DropBoxManager {
            try {
                is = getInputStream();
                byte[] buf = new byte[maxBytes];
                return new String(buf, 0, Math.max(0, is.read(buf)));
                int readBytes = 0;
                int n = 0;
                while (n >= 0 && (readBytes += n) < maxBytes) {
                    n = is.read(buf, readBytes, maxBytes - readBytes);
                }
                return new String(buf, 0, readBytes);
            } catch (IOException e) {
                return null;
            } finally {