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

Commit 0b309d6e authored by Jackson Fan's avatar Jackson Fan Committed by Nick Pelly
Browse files

Improve Obex compatibility 

Handle headers with excessive whilespace
Send correct reponse code when client abort onPut
parent a4433af5

obex/javax/obex/ObexHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -897,6 +897,11 @@ public final class ObexHelper { 
            if (lower < 0) {

                lower += 256;

            }

            // If upper and lower both equal 0, it should be the end of string.

            // Ignore left bytes from array to avoid potential issues

            if (upper == 0 && lower == 0) {

                return new String(c, 0, i);

            }



            c[i] = (char)((upper << 8) | lower);

        }

obex/javax/obex/ServerSession.java

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ public final class ServerSession extends ObexSession implements Runnable { 
            } else {

                response = validateResponseCode(mListener.onPut(op));

            }

            if (response != ResponseCodes.OBEX_HTTP_OK) {

            if (response != ResponseCodes.OBEX_HTTP_OK && !op.isAborted) {

                op.sendReply(response);

            } else if (!op.isAborted) {

                // wait for the final bit