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

Commit 579444c3 authored by James.cf Lin's avatar James.cf Lin Committed by Automerger Merge Worker
Browse files

Fix the subscribe request with the result sip code "404" doesn't map to... 

Fix the subscribe request with the result sip code "404" doesn't map to RcsContactUceCapability with request result = REQUEST_RESULT_NOT_FOUND am: 3b370d5d am: f183b02d am: c0d623bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1683569

Change-Id: Ia35fb923a992683778a9b75d8fb7968168b5586b
parents 9deba41d c0d623bf

src/java/com/android/ims/rcs/uce/presence/pidfparser/PidfParserUtils.java

+11 −0
Original line number Diff line number Diff line
@@ -298,4 +298,15 @@ public class PidfParserUtils { 
                        contact, RcsContactUceCapability.SOURCE_TYPE_NETWORK, requestResult);

        return builder.build();

    }



    /**

     * Get the RcsContactUceCapability instance which the request result is NOT FOUND.

     */

    public static RcsContactUceCapability getNotFoundContactCapabilities(Uri contact) {

        RcsContactUceCapability.PresenceBuilder builder =

                new RcsContactUceCapability.PresenceBuilder(contact,

                        RcsContactUceCapability.SOURCE_TYPE_NETWORK,

                        RcsContactUceCapability.REQUEST_RESULT_NOT_FOUND);

        return builder.build();

    }

}

src/java/com/android/ims/rcs/uce/request/CapabilityRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ public abstract class CapabilityRequest implements UceRequest { 
    }



    /**

     * @return A copy of the RequestResponse instance associated with this request.

     * @return The RequestResponse instance associated with this request.

     */

    public CapabilityRequestResponse getRequestResponse() {

        return mRequestResponse.copy();

        return mRequestResponse;

    }



    /**

src/java/com/android/ims/rcs/uce/request/CapabilityRequestResponse.java

+3 −20
Original line number Diff line number Diff line
@@ -261,26 +261,6 @@ public class CapabilityRequestResponse { 
        return Collections.unmodifiableSet(mRemoteCaps);

    }



    /**

     * Get a copy of the this instance.

     */

    public synchronized CapabilityRequestResponse copy() {

        CapabilityRequestResponse response = new CapabilityRequestResponse();

        response.mRequestInternalError = mRequestInternalError;

        response.mCommandError = mCommandError;

        response.mNetworkRespSipCode = mNetworkRespSipCode;

        response.mReasonPhrase = mReasonPhrase;

        response.mReasonHeaderCause = mReasonHeaderCause;

        response.mReasonHeaderText = mReasonHeaderText;

        response.mTerminatedReason = mTerminatedReason;

        response.mRetryAfterMillis = mRetryAfterMillis;

        response.mTerminatedResource.addAll(mTerminatedResource);

        response.mCachedCapabilityList.addAll(mCachedCapabilityList);

        response.mUpdatedCapabilityList.addAll(mUpdatedCapabilityList);

        response.mRemoteCaps.addAll(mRemoteCaps);

        return response;

    }



    /**

     * Check if the network response is success.

     * @return true if the network response code is OK or Accepted and the Reason header cause
@@ -395,6 +375,9 @@ public class CapabilityRequestResponse { 
                    uceError = RcsUceAdapter.ERROR_FORBIDDEN;

                }

                break;

            case NetworkSipCode.SIP_CODE_NOT_FOUND:              // 404

                uceError = RcsUceAdapter.ERROR_NOT_FOUND;

                break;

            case NetworkSipCode.SIP_CODE_REQUEST_TIMEOUT:        // 408

                uceError = RcsUceAdapter.ERROR_REQUEST_TIMEOUT;

                break;

src/java/com/android/ims/rcs/uce/request/SubscribeRequestCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ public class SubscribeRequestCoordinator extends UceRequestCoordinator { 
        if (response.isNotFound()) {

            List<Uri> uriList = request.getContactUri();

            List<RcsContactUceCapability> capabilityList = uriList.stream().map(uri ->

                    PidfParserUtils.getTerminatedCapability(uri, null))

                    PidfParserUtils.getNotFoundContactCapabilities(uri))

                    .collect(Collectors.toList());

            response.addUpdatedCapabilities(capabilityList);

        }