From 7d0a017b568ac0ca4133206872b503d4965e796e Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Wed, 11 Nov 2015 16:36:16 -0800 Subject: Blocking number suppresses voicemails in the same minute ~ Modified FilteredNumbersUtil to check if a voicemail needs to be blocked by checking if the voicemail date matches the block date to the minute, rather than millisecond ~ Modified FilteredNumbersUtil#shouldBlockVoicemail to improve readability + Added tests to verify FilteredNumbersUtil#shouldBlockVoicemail Bug: 25346075 Change-Id: I9851a574f0d13b7f09c99438810454770c88aa8b --- .../dialer/filterednumber/FilteredNumbersUtil.java | 29 +++---- .../filterednumber/FilteredNumbersUtilTest.java | 92 ++++++++++++++++++++++ 2 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java diff --git a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java index 4cc8e7594..76d391357 100644 --- a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java +++ b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java @@ -35,6 +35,7 @@ import android.widget.Toast; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.TimeUnit; import com.android.contacts.common.testing.NeededForTesting; import com.android.dialer.R; @@ -247,21 +248,21 @@ public class FilteredNumbersUtil { FilteredNumberColumns.NORMALIZED_NUMBER + "=?", new String[] { normalizedNumber }, null); - - boolean shouldBlock = false; - if (cursor != null) { - try { - if (cursor.moveToFirst()) { - // Block if number is found and it was added before this voicemail was received. - final long numberBlockedTimeMs = cursor.getLong(0); - shouldBlock = cursor.getCount() > 0 && voicemailDateMs > numberBlockedTimeMs; - } - } finally { - cursor.close(); - } + if (cursor == null) { + return false; + } + try { + /* + * Block if number is found and it was added before this voicemail was received. + * The VVM's date is reported with precision to the minute, even though its + * magnitude is in milliseconds, so we perform the comparison in minutes. + */ + return cursor.moveToFirst() && + TimeUnit.MINUTES.convert(voicemailDateMs, TimeUnit.MILLISECONDS) >= + TimeUnit.MINUTES.convert(cursor.getLong(0), TimeUnit.MILLISECONDS); + } finally { + cursor.close(); } - - return shouldBlock; } public static boolean hasRecentEmergencyCall(Context context) { diff --git a/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java b/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java new file mode 100644 index 000000000..180295cba --- /dev/null +++ b/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dialer.filterednumber; + +import android.test.AndroidTestCase; + +import com.android.contacts.common.test.mocks.ContactsMockContext; +import com.android.contacts.common.test.mocks.MockContentProvider.Query; +import com.android.dialer.database.FilteredNumberContract; +import com.android.dialer.database.FilteredNumberContract.FilteredNumber; +import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns; + +public class FilteredNumbersUtilTest extends AndroidTestCase { + + private static final String COUNTRY_ISO = "US"; + + // Wed Nov 11 2015 15:00:00 + private static final long EARLIER_TIME = 1447282800000l; + + // Wed Nov 11 2015 15:01:40 + private static final long LATER_TIME = 1447282900000l; + + private static final String[] FILTERED_NUMBER_PROJECTION = new String[] { + FilteredNumberColumns.CREATION_TIME }; + + private static final String NORMALIZED_NUMBER = "+16503903411"; + + private static final long NULL_CREATION_TIME = -1; + + private ContactsMockContext mContext; + + @Override + public void setUp() throws Exception { + super.setUp(); + mContext = new ContactsMockContext(getContext(), FilteredNumberContract.AUTHORITY); + } + + public void testShouldBlockVoicemail_NotBlocked() { + setupShouldBlockVoicemailQuery(NULL_CREATION_TIME); + assertFalse(FilteredNumbersUtil.shouldBlockVoicemail(mContext, NORMALIZED_NUMBER, + COUNTRY_ISO, EARLIER_TIME)); + } + + public void testShouldBlockVoicemail_BlockedBeforeVoicemail() { + setupShouldBlockVoicemailQuery(EARLIER_TIME); + assertTrue(FilteredNumbersUtil.shouldBlockVoicemail(mContext, NORMALIZED_NUMBER, + COUNTRY_ISO, LATER_TIME)); + } + + public void testShouldBlockVoicemail_BlockedAfterVoicemail() { + setupShouldBlockVoicemailQuery(LATER_TIME); + assertFalse(FilteredNumbersUtil.shouldBlockVoicemail(mContext, NORMALIZED_NUMBER, + COUNTRY_ISO, EARLIER_TIME)); + } + + public void testShouldBlockVoicemail_BlockedSameTimeAsVoicemail() { + setupShouldBlockVoicemailQuery(EARLIER_TIME); + assertTrue(FilteredNumbersUtil.shouldBlockVoicemail(mContext, NORMALIZED_NUMBER, + COUNTRY_ISO, EARLIER_TIME)); + } + + public void testShouldBlockVoicemail_BlockedInSameMinuteAsVoicemail() { + setupShouldBlockVoicemailQuery(EARLIER_TIME); + assertTrue(FilteredNumbersUtil.shouldBlockVoicemail(mContext, NORMALIZED_NUMBER, + COUNTRY_ISO, EARLIER_TIME + 30000)); + } + + private void setupShouldBlockVoicemailQuery(long creationTimeMs) { + Query query = mContext.getContactsProvider().expectQuery(FilteredNumber.CONTENT_URI) + .withProjection(FILTERED_NUMBER_PROJECTION) + .withAnySelection() + .withAnySortOrder(); + if (creationTimeMs == NULL_CREATION_TIME) { + query.returnEmptyCursor(); + return; + } + query.returnRow(creationTimeMs); + } +} -- cgit v1.2.3