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

Commit b87d33d8 authored by Ashwini Munigala's avatar Ashwini Munigala Committed by Steve Kondik
Browse files

OBEX: Include NameHeader in final PUT Server Response 

Check and include NameHeader for Server Response set
from obex upper layer in FINAL packet instead of
first CONTINUE packet.

Change-Id: Ida9546d5b7664df8be708cba48eb7ddd86e5c94e
CRs-fixed: 765163
parent 0bdaefa7

btobex/javax/btobex/ServerSession.java

+11 −0
Original line number Diff line number Diff line
@@ -285,11 +285,22 @@ public final class ServerSession extends ObexSession implements Runnable { 
                if (VERBOSE) Log.v(TAG, "handlePutRequest pre != HTTP_OK sendReply");

                op.sendReply(response, false, false);

            } else if (!op.isAborted) {

                String nameHeader = (String)op.replyHeader.getHeader(HeaderSet.NAME);

                if (!op.finalBitSet && nameHeader != null) {

                    if (VERBOSE) Log.v(TAG, "handlePutRequest Saved: "+nameHeader);

                    //Donot Include NameHeader in CONTINUE

                    op.replyHeader.setHeader(HeaderSet.NAME, null);

                }

                // wait for the final bit

                while (!op.finalBitSet) {

                    if (VERBOSE) Log.v(TAG, "handlePutRequest pre looped sendReply");

                    op.sendReply(ResponseCodes.OBEX_HTTP_CONTINUE, op.mSingleResponseActive, false);

                }

                if (nameHeader != null) {

                    if (VERBOSE) Log.v(TAG, "handlePutRequest SETHeader: "+nameHeader);

                    //PUT NameHeader in Final Packet

                    op.replyHeader.setHeader(HeaderSet.NAME, nameHeader);

                }

                op.sendReply(response, false,false);

            }

        } catch (Exception e) {