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

Commit 490919db authored by Aditi Katragadda's avatar Aditi Katragadda
Browse files

Change MceStateMachine Message filter naming convention 

Currently messageType, indicates the types of messages that are
excluded/filtered out from RequestGetMessagesListing. Related names have
ben changed to reflect implementation and specify that the rquested
message filters are for message types that will be excluded from the
requests.

Tag: #cleanup
Bug: 355241174
Test: atest MapClientStateMachineTest
      atest MessagesFilterTest
Flag: EXEMPT, no change in existing behavior
Change-Id: I328a4a9c98c57b0dcd24f44becddd7b48c3f19c2
parent bc996361

android/app/src/com/android/bluetooth/mapclient/MceStateMachine.java

+9 −7
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ class MceStateMachine extends StateMachine { 
    // URI Scheme for messages with email contact

    private static final String SCHEME_MAILTO = "mailto";



    private static final String FETCH_MESSAGE_TYPE =

            "persist.bluetooth.pts.mapclient.fetchmessagetype";

    private static final String EXCLUDED_MESSAGE_TYPES =

            "persist.bluetooth.pts.mapclient.excludedmessagetypes";

    private static final String SEND_MESSAGE_TYPE =

            "persist.bluetooth.pts.mapclient.sendmessagetype";
@@ -734,12 +734,14 @@ class MceStateMachine extends StateMachine { 
                    // Get the 50 most recent messages from the last week

                    Calendar calendar = Calendar.getInstance();

                    calendar.add(Calendar.DATE, -7);

                    // bit mask - messageType discludes unsupported message types

                    byte messageType =

                    // bit mask - excludedMessageType filters out unsupported message types

                    byte excludedMessageTypes =

                            MessagesFilter.MESSAGE_TYPE_EMAIL | MessagesFilter.MESSAGE_TYPE_IM;

                    if (Utils.isPtsTestMode()) {

                        messageType =

                                (byte) SystemProperties.getInt(FETCH_MESSAGE_TYPE, messageType);

                        excludedMessageTypes =

                                (byte)

                                        SystemProperties.getInt(

                                                EXCLUDED_MESSAGE_TYPES, excludedMessageTypes);

                    }



                    mMasClient.makeRequest(
@@ -748,7 +750,7 @@ class MceStateMachine extends StateMachine { 
                                    0,

                                    new MessagesFilter.Builder()

                                            .setPeriod(calendar.getTime(), null)

                                            .setMessageType(messageType)

                                            .setExcludedMessageTypes(excludedMessageTypes)

                                            .build(),

                                    0,

                                    50,

android/app/src/com/android/bluetooth/mapclient/obex/MessagesFilter.java

+8 −8
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import java.util.Date; 
 */

public final class MessagesFilter {



    public static final byte MESSAGE_TYPE_ALL = 0x00;

    public static final byte MESSAGE_TYPE_NONE = 0x00;

    public static final byte MESSAGE_TYPE_SMS_GSM = 0x01;

    public static final byte MESSAGE_TYPE_SMS_CDMA = 0x02;

    public static final byte MESSAGE_TYPE_EMAIL = 0x04;
@@ -25,7 +25,7 @@ public final class MessagesFilter { 
    public static final byte PRIORITY_HIGH = 0x01;

    public static final byte PRIORITY_NON_HIGH = 0x02;



    public byte messageType = MESSAGE_TYPE_ALL;

    public byte excludedMessageTypes = MESSAGE_TYPE_NONE;



    public String periodBegin = null;
@@ -42,7 +42,7 @@ public final class MessagesFilter { 
    public MessagesFilter() {}



    public MessagesFilter(MessagesFilter filter) {

        this.messageType = filter.messageType;

        this.excludedMessageTypes = filter.excludedMessageTypes;

        this.periodBegin = filter.periodBegin;

        this.periodEnd = filter.periodEnd;

        this.readStatus = filter.readStatus;
@@ -51,8 +51,8 @@ public final class MessagesFilter { 
        this.priority = filter.priority;

    }



    public void setMessageType(byte filter) {

        messageType = filter;

    public void setExcludedMessageTypes(byte filter) {

        excludedMessageTypes = filter;

    }



    public void setPeriod(Date filterBegin, Date filterEnd) {
@@ -96,11 +96,11 @@ public final class MessagesFilter { 
        /**

         * Sets the `Message Type` field of the filter.

         *

         * @param messageType to filter on.

         * @param excludedMessageTypes to filter on.

         * @return This {@link Builder} object.

         */

        public Builder setMessageType(byte messageType) {

            mMessagesFilter.setMessageType(messageType);

        public Builder setExcludedMessageTypes(byte excludedMessageTypes) {

            mMessagesFilter.setExcludedMessageTypes(excludedMessageTypes);

            return this;

        }

android/app/src/com/android/bluetooth/mapclient/obex/RequestGetMessagesListing.java

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ class RequestGetMessagesListing extends Request { 
        ObexAppParameters oap = new ObexAppParameters();



        if (filter != null) {

            if (filter.messageType != MessagesFilter.MESSAGE_TYPE_ALL) {

                oap.add(OAP_TAGID_FILTER_MESSAGE_TYPE, filter.messageType);

            if (filter.excludedMessageTypes != MessagesFilter.MESSAGE_TYPE_NONE) {

                oap.add(OAP_TAGID_FILTER_MESSAGE_TYPE, filter.excludedMessageTypes);

            }



            if (filter.periodBegin != null) {

android/app/tests/unit/src/com/android/bluetooth/mapclient/MessagesFilterTest.java

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class MessagesFilterTest { 
    public void testBuilder() {

        String originator = "test_originator";

        String recipient = "test_recipient";

        byte messageType = MessagesFilter.MESSAGE_TYPE_EMAIL;

        byte excludedMessageTypes = MessagesFilter.MESSAGE_TYPE_EMAIL;

        byte readStatus = MessagesFilter.READ_STATUS_READ;

        byte priority = MessagesFilter.PRIORITY_HIGH;

        Calendar begin = Calendar.getInstance();
@@ -97,7 +97,7 @@ public class MessagesFilterTest { 
                new MessagesFilter.Builder()

                        .setOriginator(originator)

                        .setRecipient(recipient)

                        .setMessageType(messageType)

                        .setExcludedMessageTypes(excludedMessageTypes)

                        .setReadStatus(readStatus)

                        .setPriority(priority)

                        .setPeriod(begin.getTime(), end.getTime())
@@ -105,7 +105,7 @@ public class MessagesFilterTest { 


        assertThat(filter.originator).isEqualTo(originator);

        assertThat(filter.recipient).isEqualTo(recipient);

        assertThat(filter.messageType).isEqualTo(messageType);

        assertThat(filter.excludedMessageTypes).isEqualTo(excludedMessageTypes);

        assertThat(filter.readStatus).isEqualTo(readStatus);

        assertThat(filter.priority).isEqualTo(priority);

        assertThat(filter.periodBegin).isEqualTo((new ObexTime(begin.getTime())).toString());