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

Commit eed32008 authored by AnubhavGupta's avatar AnubhavGupta Committed by Andre Eisenbach
Browse files

Bluetooth: Send GET request as single packet 

- If obex based profile explicitly sets GET with final flag, then
  GET should always be sent as single packet request with final flag
  set.

Change-Id: I82ff8295a239c4dbbfb4b3abfd358021820283cc
parent e8909dc0

obex/javax/obex/ClientOperation.java

+34 −15
Original line number Diff line number Diff line
@@ -632,8 +632,10 @@ public final class ClientOperation implements Operation, BaseStream { 


        if (mGetOperation) {

            if (!mOperationDone) {

                if (!mGetFinalFlag) {

                    mReplyHeader.responseCode = ResponseCodes.OBEX_HTTP_CONTINUE;

                while ((more) && (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) {

                    while ((more) && (mReplyHeader.responseCode ==

                            ResponseCodes.OBEX_HTTP_CONTINUE)) {

                        more = sendRequest(ObexHelper.OBEX_OPCODE_GET);

                    }

                    // For GET we need to loop until all headers have been sent,
@@ -648,6 +650,15 @@ public final class ClientOperation implements Operation, BaseStream { 
                    } else {

                        checkForSrm();

                    }

                } else {

                    more = sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);



                    if (more) {

                        throw new IOException("FINAL_GET forced, data didn't fit into one packet");

                    }



                    mOperationDone = true;

                }

            }

        } else {

            // PUT operation
@@ -705,7 +716,15 @@ public final class ClientOperation implements Operation, BaseStream { 
                if (mPrivateInput == null) {

                    mPrivateInput = new PrivateInputStream(this);

                }



                if (!mGetFinalFlag) {

                    sendRequest(ObexHelper.OBEX_OPCODE_GET);

                } else {

                    sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);

                }

                if (mReplyHeader.responseCode != ResponseCodes.OBEX_HTTP_CONTINUE) {

                    mOperationDone = true;

                }

                return true;



            } else if (mOperationDone) {