From 12061c870e823f4de4e217540fa686a2040df9f1 Mon Sep 17 00:00:00 2001 From: maxwelb Date: Fri, 4 May 2018 12:22:12 -0700 Subject: Add SimpleSpamStatus and use it in FakeSpam and SpamStub Test: Tap PiperOrigin-RevId: 195453152 Change-Id: Ida07f465a832e3541d4c9f6abad97b633c38ac13 --- java/com/android/dialer/spam/SimpleSpamStatus.java | 36 ++++++++++++++++++++++ java/com/android/dialer/spam/SpamStub.java | 15 +-------- 2 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 java/com/android/dialer/spam/SimpleSpamStatus.java (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/SimpleSpamStatus.java b/java/com/android/dialer/spam/SimpleSpamStatus.java new file mode 100644 index 000000000..b49241cf8 --- /dev/null +++ b/java/com/android/dialer/spam/SimpleSpamStatus.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2018 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.spam; + +import android.support.annotation.Nullable; +import com.google.auto.value.AutoValue; +import com.google.common.base.Optional; + +/** Holds a boolean and long to represent spam status. */ +@AutoValue +public abstract class SimpleSpamStatus implements SpamStatus { + + /** Returns a SimpleSpamStatus with the given boolean and timestamp. */ + public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) { + return new AutoValue_SimpleSpamStatus(isSpam, Optional.fromNullable(timestampMillis)); + } + + /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */ + public static SimpleSpamStatus notSpam() { + return create(false, null); + } +} diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java index 8851fd09e..cbeb3b9b6 100644 --- a/java/com/android/dialer/spam/SpamStub.java +++ b/java/com/android/dialer/spam/SpamStub.java @@ -21,7 +21,6 @@ import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; import com.android.dialer.logging.ContactLookupResult; import com.android.dialer.logging.ContactSource; import com.android.dialer.logging.ReportingLocation; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; @@ -47,19 +46,7 @@ public class SpamStub implements Spam { ImmutableMap.Builder resultBuilder = new ImmutableMap.Builder<>(); for (DialerPhoneNumber dialerPhoneNumber : dialerPhoneNumbers) { - resultBuilder.put( - dialerPhoneNumber, - new SpamStatus() { - @Override - public boolean isSpam() { - return false; - } - - @Override - public Optional getTimestampMillis() { - return Optional.absent(); - } - }); + resultBuilder.put(dialerPhoneNumber, SimpleSpamStatus.notSpam()); } return resultBuilder.build(); }); -- cgit v1.2.3 From 4bd39ec1d5644a0c84bc9272cd6e637664862a09 Mon Sep 17 00:00:00 2001 From: maxwelb Date: Fri, 4 May 2018 14:29:39 -0700 Subject: Add ListenableFuture based APIs for checkSpamStatus Bug: 79171382 Test: Tap, manually verified incoming spam call PiperOrigin-RevId: 195472160 Change-Id: I0cda8f36b350a9fc03e098667e8bd83ad8b1d161 --- java/com/android/dialer/spam/Spam.java | 37 ++++++++++++++++++++++-------- java/com/android/dialer/spam/SpamStub.java | 18 ++++++++++++--- 2 files changed, 43 insertions(+), 12 deletions(-) (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java index 21d770ed3..9d0f2a796 100644 --- a/java/com/android/dialer/spam/Spam.java +++ b/java/com/android/dialer/spam/Spam.java @@ -40,6 +40,34 @@ public interface Spam { ListenableFuture> batchCheckSpamStatus( ImmutableSet dialerPhoneNumbers); + /** + * Checks if the given number is suspected of being spam. + * + * @param dialerPhoneNumber the phone number. + * @return the {@link SpamStatus} for the given number. + */ + ListenableFuture checkSpamStatus(DialerPhoneNumber dialerPhoneNumber); + + /** + * Checks if the given number is suspected of being spam. + * + *

See {@link #checkSpamStatus(DialerPhoneNumber)}. + * + * @param number the phone number. + * @param defaultCountryIso the default country to use if it's not part of the number. + * @return the {@link SpamStatus} for the given number. + */ + ListenableFuture checkSpamStatus(String number, @Nullable String defaultCountryIso); + + /** + * Checks if the given number is suspected of being a spam. + * + * @param number The phone number of the call. + * @param countryIso The country ISO of the call. + * @param listener The callback to be invoked after {@code Info} is fetched. + */ + void checkSpamStatus(String number, String countryIso, Listener listener); + /** * Called as an indication that the Spam implementation should check whether downloading a spam * list needs to occur or not. @@ -54,15 +82,6 @@ public interface Spam { */ ListenableFuture updateSpamListDownload(boolean isEnabledByUser); - /** - * Checks if the given number is suspected of being a spam. - * - * @param number The phone number of the call. - * @param countryIso The country ISO of the call. - * @param listener The callback to be invoked after {@code Info} is fetched. - */ - void checkSpamStatus(String number, String countryIso, Listener listener); - /** * @param number The number to check if the number is in the user's white list (non spam list) * @param countryIso The country ISO of the call. diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java index cbeb3b9b6..cf5693c9f 100644 --- a/java/com/android/dialer/spam/SpamStub.java +++ b/java/com/android/dialer/spam/SpamStub.java @@ -16,6 +16,7 @@ package com.android.dialer.spam; +import android.support.annotation.Nullable; import com.android.dialer.DialerPhoneNumber; import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; import com.android.dialer.logging.ContactLookupResult; @@ -53,9 +54,14 @@ public class SpamStub implements Spam { } @Override - public ListenableFuture updateSpamListDownload(boolean isEnabledByUser) { - // no-op - return Futures.immediateFuture(null); + public ListenableFuture checkSpamStatus(DialerPhoneNumber dialerPhoneNumber) { + return Futures.immediateFuture(SimpleSpamStatus.notSpam()); + } + + @Override + public ListenableFuture checkSpamStatus( + String number, @Nullable String defaultCountryIso) { + return Futures.immediateFuture(SimpleSpamStatus.notSpam()); } @Override @@ -63,6 +69,12 @@ public class SpamStub implements Spam { listener.onComplete(false); } + @Override + public ListenableFuture updateSpamListDownload(boolean isEnabledByUser) { + // no-op + return Futures.immediateFuture(null); + } + @Override public void checkUserMarkedNonSpamStatus(String number, String countryIso, Listener listener) { listener.onComplete(false); -- cgit v1.2.3 From dcff9e63f54d995ab706f63b8b563b077007741c Mon Sep 17 00:00:00 2001 From: maxwelb Date: Fri, 4 May 2018 15:54:56 -0700 Subject: Delete obsolete checkSpamStatus(Listener) API Bug: 79171382 Test: Build PiperOrigin-RevId: 195485088 Change-Id: I306c1ab0fdd629baf1feb0a689debe72eb08b450 --- java/com/android/dialer/spam/Spam.java | 9 --------- java/com/android/dialer/spam/SpamStub.java | 5 ----- 2 files changed, 14 deletions(-) (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java index 9d0f2a796..6aa69af4a 100644 --- a/java/com/android/dialer/spam/Spam.java +++ b/java/com/android/dialer/spam/Spam.java @@ -59,15 +59,6 @@ public interface Spam { */ ListenableFuture checkSpamStatus(String number, @Nullable String defaultCountryIso); - /** - * Checks if the given number is suspected of being a spam. - * - * @param number The phone number of the call. - * @param countryIso The country ISO of the call. - * @param listener The callback to be invoked after {@code Info} is fetched. - */ - void checkSpamStatus(String number, String countryIso, Listener listener); - /** * Called as an indication that the Spam implementation should check whether downloading a spam * list needs to occur or not. diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java index cf5693c9f..a2e7258ee 100644 --- a/java/com/android/dialer/spam/SpamStub.java +++ b/java/com/android/dialer/spam/SpamStub.java @@ -64,11 +64,6 @@ public class SpamStub implements Spam { return Futures.immediateFuture(SimpleSpamStatus.notSpam()); } - @Override - public void checkSpamStatus(String number, String countryIso, Listener listener) { - listener.onComplete(false); - } - @Override public ListenableFuture updateSpamListDownload(boolean isEnabledByUser) { // no-op -- cgit v1.2.3 From 80e3892b5bc6c6f5294f9bf0bd2aada06677de1d Mon Sep 17 00:00:00 2001 From: maxwelb Date: Fri, 4 May 2018 17:32:56 -0700 Subject: Move SpamStatus classes into subpackage Test: Build PiperOrigin-RevId: 195498557 Change-Id: I28525d0475f847b2ff5a128580256e2688ed47d5 --- java/com/android/dialer/spam/SimpleSpamStatus.java | 36 ------------------- java/com/android/dialer/spam/Spam.java | 1 + java/com/android/dialer/spam/SpamStatus.java | 40 ---------------------- java/com/android/dialer/spam/SpamStub.java | 2 ++ .../dialer/spam/status/SimpleSpamStatus.java | 36 +++++++++++++++++++ .../com/android/dialer/spam/status/SpamStatus.java | 40 ++++++++++++++++++++++ 6 files changed, 79 insertions(+), 76 deletions(-) delete mode 100644 java/com/android/dialer/spam/SimpleSpamStatus.java delete mode 100644 java/com/android/dialer/spam/SpamStatus.java create mode 100644 java/com/android/dialer/spam/status/SimpleSpamStatus.java create mode 100644 java/com/android/dialer/spam/status/SpamStatus.java (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/SimpleSpamStatus.java b/java/com/android/dialer/spam/SimpleSpamStatus.java deleted file mode 100644 index b49241cf8..000000000 --- a/java/com/android/dialer/spam/SimpleSpamStatus.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2018 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.spam; - -import android.support.annotation.Nullable; -import com.google.auto.value.AutoValue; -import com.google.common.base.Optional; - -/** Holds a boolean and long to represent spam status. */ -@AutoValue -public abstract class SimpleSpamStatus implements SpamStatus { - - /** Returns a SimpleSpamStatus with the given boolean and timestamp. */ - public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) { - return new AutoValue_SimpleSpamStatus(isSpam, Optional.fromNullable(timestampMillis)); - } - - /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */ - public static SimpleSpamStatus notSpam() { - return create(false, null); - } -} diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java index 6aa69af4a..181a55dea 100644 --- a/java/com/android/dialer/spam/Spam.java +++ b/java/com/android/dialer/spam/Spam.java @@ -24,6 +24,7 @@ import com.android.dialer.DialerPhoneNumber; import com.android.dialer.logging.ContactLookupResult; import com.android.dialer.logging.ContactSource; import com.android.dialer.logging.ReportingLocation; +import com.android.dialer.spam.status.SpamStatus; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ListenableFuture; diff --git a/java/com/android/dialer/spam/SpamStatus.java b/java/com/android/dialer/spam/SpamStatus.java deleted file mode 100644 index 0b859d1c7..000000000 --- a/java/com/android/dialer/spam/SpamStatus.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2018 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.spam; - -import com.google.common.base.Optional; - -/** An interface representing a number's spam status. */ -@SuppressWarnings("Guava") -public interface SpamStatus { - - /** Returns true if the number is spam. */ - boolean isSpam(); - - /** - * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the - * underlying data source. - * - *

{@code Optional.absent()} is returned if - * - *

    - *
  • the number's spam status doesn't exist in the underlying data source, or - *
  • the underlying data source can't provide a timestamp. - *
- */ - Optional getTimestampMillis(); -} diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java index a2e7258ee..2789c01e7 100644 --- a/java/com/android/dialer/spam/SpamStub.java +++ b/java/com/android/dialer/spam/SpamStub.java @@ -22,6 +22,8 @@ import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; import com.android.dialer.logging.ContactLookupResult; import com.android.dialer.logging.ContactSource; import com.android.dialer.logging.ReportingLocation; +import com.android.dialer.spam.status.SimpleSpamStatus; +import com.android.dialer.spam.status.SpamStatus; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; diff --git a/java/com/android/dialer/spam/status/SimpleSpamStatus.java b/java/com/android/dialer/spam/status/SimpleSpamStatus.java new file mode 100644 index 000000000..ec28b9dce --- /dev/null +++ b/java/com/android/dialer/spam/status/SimpleSpamStatus.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2018 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.spam.status; + +import android.support.annotation.Nullable; +import com.google.auto.value.AutoValue; +import com.google.common.base.Optional; + +/** Holds a boolean and long to represent spam status. */ +@AutoValue +public abstract class SimpleSpamStatus implements SpamStatus { + + /** Returns a SimpleSpamStatus with the given boolean and timestamp. */ + public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) { + return new AutoValue_SimpleSpamStatus(isSpam, Optional.fromNullable(timestampMillis)); + } + + /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */ + public static SimpleSpamStatus notSpam() { + return create(false, null); + } +} diff --git a/java/com/android/dialer/spam/status/SpamStatus.java b/java/com/android/dialer/spam/status/SpamStatus.java new file mode 100644 index 000000000..8186ac5cc --- /dev/null +++ b/java/com/android/dialer/spam/status/SpamStatus.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2018 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.spam.status; + +import com.google.common.base.Optional; + +/** An interface representing a number's spam status. */ +@SuppressWarnings("Guava") +public interface SpamStatus { + + /** Returns true if the number is spam. */ + boolean isSpam(); + + /** + * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the + * underlying data source. + * + *

{@code Optional.absent()} is returned if + * + *

    + *
  • the number's spam status doesn't exist in the underlying data source, or + *
  • the underlying data source can't provide a timestamp. + *
+ */ + Optional getTimestampMillis(); +} -- cgit v1.2.3 From cf0905f01e94fced893fff8de114719e4bf77de2 Mon Sep 17 00:00:00 2001 From: maxwelb Date: Fri, 4 May 2018 18:20:04 -0700 Subject: Add GlobalSpamListStatus and UserSpamListStatus Test: Build PiperOrigin-RevId: 195502147 Change-Id: I5f88fb91e52f36da73725e392dee8dfef2666be0 --- .../dialer/spam/status/GlobalSpamListStatus.java | 52 +++++++++++++++++++ .../dialer/spam/status/UserSpamListStatus.java | 58 ++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 java/com/android/dialer/spam/status/GlobalSpamListStatus.java create mode 100644 java/com/android/dialer/spam/status/UserSpamListStatus.java (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/status/GlobalSpamListStatus.java b/java/com/android/dialer/spam/status/GlobalSpamListStatus.java new file mode 100644 index 000000000..741d6e869 --- /dev/null +++ b/java/com/android/dialer/spam/status/GlobalSpamListStatus.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2018 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.spam.status; + +import android.support.annotation.IntDef; +import com.google.auto.value.AutoValue; +import com.google.common.base.Optional; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** A value class representing a number's spam status in the global spam list. */ +@AutoValue +public abstract class GlobalSpamListStatus { + + /** Integers representing the spam status in the global spam list. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({Status.NOT_ON_LIST, Status.ON_LIST}) + public @interface Status { + int NOT_ON_LIST = 1; + int ON_LIST = 2; + } + + public abstract @Status int getStatus(); + + /** + * Returns the timestamp (in milliseconds) representing when a number's spam status was put on the + * list, or {@code Optional.absent()} if the number is not on the list. + */ + public abstract Optional getTimestampMillis(); + + public static GlobalSpamListStatus notOnList() { + return new AutoValue_GlobalSpamListStatus(Status.NOT_ON_LIST, Optional.absent()); + } + + public static GlobalSpamListStatus onList(long timestampMillis) { + return new AutoValue_GlobalSpamListStatus(Status.ON_LIST, Optional.of(timestampMillis)); + } +} diff --git a/java/com/android/dialer/spam/status/UserSpamListStatus.java b/java/com/android/dialer/spam/status/UserSpamListStatus.java new file mode 100644 index 000000000..01f99872b --- /dev/null +++ b/java/com/android/dialer/spam/status/UserSpamListStatus.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2018 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.spam.status; + +import android.support.annotation.IntDef; +import com.google.auto.value.AutoValue; +import com.google.common.base.Optional; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** A value class representing a number's spam status in the user spam list. */ +@AutoValue +@SuppressWarnings("Guava") +public abstract class UserSpamListStatus { + + /** Integers representing the spam status in the user spam list. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({Status.NOT_ON_LIST, Status.WHITELISTED, Status.BLACKLISTED}) + public @interface Status { + int NOT_ON_LIST = 1; + int WHITELISTED = 2; + int BLACKLISTED = 3; + } + + public abstract @Status int getStatus(); + + /** + * Returns the timestamp (in milliseconds) representing when a number's spam status was put on the + * list, or {@code Optional.absent()} if the number is not on the list. + */ + public abstract Optional getTimestampMillis(); + + public static UserSpamListStatus notOnList() { + return new AutoValue_UserSpamListStatus(Status.NOT_ON_LIST, Optional.absent()); + } + + public static UserSpamListStatus whitelisted(long timestampMillis) { + return new AutoValue_UserSpamListStatus(Status.WHITELISTED, Optional.of(timestampMillis)); + } + + public static UserSpamListStatus blacklisted(long timestampMillis) { + return new AutoValue_UserSpamListStatus(Status.BLACKLISTED, Optional.of(timestampMillis)); + } +} -- cgit v1.2.3 From ebaf6303bab244e8eb930d19f0e61a2660861812 Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Wed, 9 May 2018 10:58:42 -0700 Subject: Hide new after call spam blocking promo behind an additional flag. Test: N/A PiperOrigin-RevId: 195995975 Change-Id: I0311770eecdf36f275d81ba481098259344cbf5b --- java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java index a117e1908..42fb39f38 100644 --- a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java +++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java @@ -42,6 +42,8 @@ public class SpamBlockingPromoHelper { static final String SPAM_BLOCKING_PROMO_PERIOD_MILLIS = "spam_blocking_promo_period_millis"; static final String SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS = "spam_blocking_promo_last_show_millis"; public static final String ENABLE_SPAM_BLOCKING_PROMO = "enable_spam_blocking_promo"; + public static final String ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO = + "enable_after_call_spam_blocking_promo"; private final Context context; private final SpamSettings spamSettings; @@ -77,6 +79,13 @@ public class SpamBlockingPromoHelper { return lastShowMillis == 0 || System.currentTimeMillis() - lastShowMillis > showPeriodMillis; } + /* Returns true if we should show a spam blocking promo in after call notification scenario. */ + public boolean shouldShowAfterCallSpamBlockingPromo() { + return shouldShowSpamBlockingPromo() + && ConfigProviderBindings.get(context) + .getBoolean(ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO, false); + } + /** * Shows a spam blocking promo dialog. * -- cgit v1.2.3 From 2f4a0075e9f546514359eda60a24ac9cd49ea80a Mon Sep 17 00:00:00 2001 From: weijiaxu Date: Wed, 9 May 2018 16:28:04 -0700 Subject: Add some annotations that won't influence aosp. Test: blaze test. PiperOrigin-RevId: 196047666 Change-Id: Ia54e342113f9dbc9fe884b9a85d0f4db33f94cf5 --- java/com/android/dialer/spam/SpamComponent.java | 2 ++ java/com/android/dialer/spam/StubSpamModule.java | 3 +++ 2 files changed, 5 insertions(+) (limited to 'java/com/android/dialer/spam') diff --git a/java/com/android/dialer/spam/SpamComponent.java b/java/com/android/dialer/spam/SpamComponent.java index 2b70b6fe1..a0ffcce1f 100644 --- a/java/com/android/dialer/spam/SpamComponent.java +++ b/java/com/android/dialer/spam/SpamComponent.java @@ -18,6 +18,7 @@ package com.android.dialer.spam; import android.content.Context; import com.android.dialer.inject.HasRootComponent; +import com.android.dialer.inject.IncludeInDialerRoot; import dagger.Subcomponent; /** Dagger component to get Spam. */ @@ -35,6 +36,7 @@ public abstract class SpamComponent { } /** Used to refer to the root application component. */ + @IncludeInDialerRoot public interface HasComponent { SpamComponent spamComponent(); } diff --git a/java/com/android/dialer/spam/StubSpamModule.java b/java/com/android/dialer/spam/StubSpamModule.java index 5540408ad..b60967475 100644 --- a/java/com/android/dialer/spam/StubSpamModule.java +++ b/java/com/android/dialer/spam/StubSpamModule.java @@ -16,10 +16,13 @@ package com.android.dialer.spam; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import dagger.Binds; import dagger.Module; /** Module which binds {@link SpamStub}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class StubSpamModule { -- cgit v1.2.3