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

Commit f57fcc82 authored by Rahul Arya's avatar Rahul Arya Committed by Android Build Coastguard Worker
Browse files

Revert "Don't send MAP new message events if older than one year" 

This reverts commit c2adf575.

Reason for revert: b/265636454

Test: QA verified offending CL was cause of feature breakage

Change-Id: I7cdd940e9b9f9216116dd1b7cff89735c05f13ef
(cherry picked from commit d345e086)
Merged-In: I7cdd940e9b9f9216116dd1b7cff89735c05f13ef
parent 627513c5

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

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

                                    mMapEventReportVersion

                                            > BluetoothMapUtils.MAP_EVENT_REPORT_V10) {

                                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 date = BluetoothMapUtils.getDateTimeString(

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

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

                                if (subject == null) {

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

                                    mMapEventReportVersion

                                            != BluetoothMapUtils.MAP_EVENT_REPORT_V10) {

                                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 date = BluetoothMapUtils.getDateTimeString(

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

                                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

+0 −15
Original line number Diff line number Diff line
@@ -677,21 +677,6 @@ 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) {