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

Commit 158e680f authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Automerger Merge Worker
Browse files

Merge "Don't send MAP new message events if older than one year" into tm-qpr-dev am: d86c8b8c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20786310



Change-Id: Ieefb84c64e3814f8cb0df528c5df8e28346db101
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b03c5fa5 d86c8b8c

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+16 −4
Original line number Diff line number Diff line
@@ -1459,8 +1459,14 @@ public class BluetoothMapContentObserver { 
                            if (mTransmitEvents && // extract contact details only if needed

                                    mMapEventReportVersion

                                            > BluetoothMapUtils.MAP_EVENT_REPORT_V10) {

                                String date = BluetoothMapUtils.getDateTimeString(

                                        c.getLong(c.getColumnIndex(Sms.DATE)));

                                long timestamp = c.getLong(c.getColumnIndex(Sms.DATE));

                                String date = BluetoothMapUtils.getDateTimeString(timestamp);

                                if (BluetoothMapUtils.isDateTimeOlderThanOneYear(timestamp)) {

                                    // Skip sending new message events older than one year

                                    listChanged = false;

                                    msgListSms.remove(id);

                                    continue;

                                }

                                String subject = c.getString(c.getColumnIndex(Sms.BODY));

                                if (subject == null) {

                                    subject = "";
@@ -1631,8 +1637,14 @@ public class BluetoothMapContentObserver { 
                            if (mTransmitEvents && // extract contact details only if needed

                                    mMapEventReportVersion

                                            != BluetoothMapUtils.MAP_EVENT_REPORT_V10) {

                                String date = BluetoothMapUtils.getDateTimeString(

                                        c.getLong(c.getColumnIndex(Mms.DATE)));

                                long timestamp = c.getLong(c.getColumnIndex(Mms.DATE));

                                String date = BluetoothMapUtils.getDateTimeString(timestamp);

                                if (BluetoothMapUtils.isDateTimeOlderThanOneYear(timestamp)) {

                                    // Skip sending new message events older than one year

                                    listChanged = false;

                                    msgListMms.remove(id);

                                    continue;

                                }

                                String subject = c.getString(c.getColumnIndex(Mms.SUBJECT));

                                if (subject == null || subject.length() == 0) {

                                    /* Get subject from mms text body parts - if any exists */

android/app/src/com/android/bluetooth/map/BluetoothMapUtils.java

+15 −0
Original line number Diff line number Diff line
@@ -677,6 +677,21 @@ public class BluetoothMapUtils { 
        return format.format(cal.getTime());

    }



    static boolean isDateTimeOlderThanOneYear(long timestamp) {

        Calendar cal = Calendar.getInstance();

        cal.setTimeInMillis(timestamp);

        Calendar oneYearAgo = Calendar.getInstance();

        oneYearAgo.add(Calendar.YEAR, -1);

        if (cal.compareTo(oneYearAgo) > 0) {

            if (V) {

                Log.v(TAG, "isDateTimeOlderThanOneYear timestamp : " + timestamp

                        + " oneYearAgo: " + oneYearAgo);

            }

            return true;

        }

        return false;

    }



    static void savePeerSupportUtcTimeStamp(int remoteFeatureMask) {

        if ((remoteFeatureMask & MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT)

                == MAP_FEATURE_DEFINED_TIMESTAMP_FORMAT_BIT) {