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

Commit e80534ff authored by Tao Liejun's avatar Tao Liejun Committed by Nick Pelly
Browse files

Fix connection ID issue in Obex lib 

ConnectionID should be consistent in one Obex session.
parent 82dbf678

obex/javax/obex/ServerOperation.java

+3 −3
Original line number Diff line number Diff line
@@ -169,10 +169,10 @@ public final class ServerOperation implements Operation, BaseStream { 
                mHasBody = true;

            }



            if (requestHeader.mConnectionID != null) {

            if (mListener.getConnectionId() != -1 && requestHeader.mConnectionID != null) {

                mListener.setConnectionId(ObexHelper.convertToLong(requestHeader.mConnectionID));

            } else {

                mListener.setConnectionId(0);

                mListener.setConnectionId(1);

            }



            if (requestHeader.mAuthResp != null) {
@@ -438,7 +438,7 @@ public final class ServerOperation implements Operation, BaseStream { 
                    if (body != null) {

                        mHasBody = true;

                    }

                    if (requestHeader.mConnectionID != null) {

                    if (mListener.getConnectionId() != -1 && requestHeader.mConnectionID != null) {

                        mListener.setConnectionId(ObexHelper

                                .convertToLong(requestHeader.mConnectionID));

                    } else {

obex/javax/obex/ServerSession.java

+4 −4
Original line number Diff line number Diff line
@@ -283,10 +283,10 @@ public final class ServerSession extends ObexSession implements Runnable { 


                ObexHelper.updateHeaderSet(request, headers);



                if (request.mConnectionID != null) {

                if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {

                    mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));

                } else {

                    mListener.setConnectionId(-1);

                    mListener.setConnectionId(1);

                }

                // the Auth chan is initiated by the server, client sent back the authResp .

                if (request.mAuthResp != null) {
@@ -405,7 +405,7 @@ public final class ServerSession extends ObexSession implements Runnable { 
                ObexHelper.updateHeaderSet(request, headers);

            }



            if (request.mConnectionID != null) {

            if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {

                mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));

            } else {

                mListener.setConnectionId(1);
@@ -527,7 +527,7 @@ public final class ServerSession extends ObexSession implements Runnable { 
                ObexHelper.updateHeaderSet(request, headers);

            }



            if (request.mConnectionID != null) {

            if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {

                mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));

            } else {

                mListener.setConnectionId(1);