From 07d6d00a5cc6c1aeb1befaccc1e832b3d5b398d8 Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Fri, 23 Mar 2018 21:10:59 -0700 Subject: Move spam setting related methods out of spam interface into a separate spam setting interface. Test: All the existing tests PiperOrigin-RevId: 190314880 Change-Id: I030acbd70120f508c5a4616757d89113524110fa --- java/com/android/incallui/call/CallList.java | 2 +- java/com/android/incallui/spam/SpamCallListListener.java | 11 ++++++----- java/com/android/incallui/spam/SpamNotificationActivity.java | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 9a0902639..f639e5bdb 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -144,7 +144,7 @@ public class CallList implements DialerCallDelegate { Trace.beginSection("checkSpam"); call.addListener(new DialerCallListenerImpl(call)); LogUtil.d("CallList.onCallAdded", "callState=" + call.getState()); - if (SpamComponent.get(context).spam().isSpamEnabled()) { + if (SpamComponent.get(context).spamSettings().isSpamEnabled()) { String number = TelecomCallUtil.getNumber(telecomCall); SpamComponent.get(context) .spam() diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index 9ef65d877..e852f3d2c 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -205,7 +205,7 @@ public class SpamCallListListener implements CallList.Listener { /** Determines if the after call notification should be shown for the specified call. */ private boolean shouldShowAfterCallNotification(DialerCall call) { - if (!SpamComponent.get(context).spam().isSpamNotificationEnabled()) { + if (!SpamComponent.get(context).spamSettings().isSpamNotificationEnabled()) { return false; } @@ -305,7 +305,8 @@ public class SpamCallListListener implements CallList.Listener { private boolean shouldThrottleSpamNotification() { int randomNumber = random.nextInt(100); - int thresholdForShowing = SpamComponent.get(context).spam().percentOfSpamNotificationsToShow(); + int thresholdForShowing = + SpamComponent.get(context).spamSettings().percentOfSpamNotificationsToShow(); if (thresholdForShowing == 0) { LogUtil.d( "SpamCallListListener.shouldThrottleSpamNotification", @@ -329,7 +330,7 @@ public class SpamCallListListener implements CallList.Listener { private boolean shouldThrottleNonSpamNotification() { int randomNumber = random.nextInt(100); int thresholdForShowing = - SpamComponent.get(context).spam().percentOfNonSpamNotificationsToShow(); + SpamComponent.get(context).spamSettings().percentOfNonSpamNotificationsToShow(); if (thresholdForShowing == 0) { LogUtil.d( "SpamCallListListener.shouldThrottleNonSpamNotification", @@ -418,7 +419,7 @@ public class SpamCallListListener implements CallList.Listener { */ private PendingIntent createBlockReportSpamPendingIntent(DialerCall call) { String action = SpamNotificationActivity.ACTION_MARK_NUMBER_AS_SPAM; - return SpamComponent.get(context).spam().isDialogEnabledForSpamNotification() + return SpamComponent.get(context).spamSettings().isDialogEnabledForSpamNotification() ? createActivityPendingIntent(call, action) : createServicePendingIntent(call, action); } @@ -429,7 +430,7 @@ public class SpamCallListListener implements CallList.Listener { */ private PendingIntent createNotSpamPendingIntent(DialerCall call) { String action = SpamNotificationActivity.ACTION_MARK_NUMBER_AS_NOT_SPAM; - return SpamComponent.get(context).spam().isDialogEnabledForSpamNotification() + return SpamComponent.get(context).spamSettings().isDialogEnabledForSpamNotification() ? createActivityPendingIntent(call, action) : createServicePendingIntent(call, action); } diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java index 61d04a0d6..cb5f8e514 100644 --- a/java/com/android/incallui/spam/SpamNotificationActivity.java +++ b/java/com/android/incallui/spam/SpamNotificationActivity.java @@ -197,7 +197,7 @@ public class SpamNotificationActivity extends FragmentActivity { /** Creates and displays the dialog for whitelisting a number. */ private void maybeShowNotSpamDialog( final String number, final ContactLookupResult.Type contactLookupResultType) { - if (SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) { + if (SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) { DialogFragmentForReportingNotSpam.newInstance( getFormattedNumber(number, this), new BlockReportSpamDialogs.OnConfirmListener() { @@ -216,7 +216,7 @@ public class SpamNotificationActivity extends FragmentActivity { /** Creates and displays the dialog for blocking/reporting a number as spam. */ private void maybeShowBlockReportSpamDialog( final String number, final ContactLookupResult.Type contactLookupResultType) { - if (SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) { + if (SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) { String displayNumber = getFormattedNumber(number, this); maybeShowBlockNumberMigrationDialog( new BlockedNumbersMigrator.Listener() { @@ -225,7 +225,7 @@ public class SpamNotificationActivity extends FragmentActivity { DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam.newInstance( displayNumber, SpamComponent.get(SpamNotificationActivity.this) - .spam() + .spamSettings() .isDialogReportSpamCheckedByDefault(), new BlockReportSpamDialogs.OnSpamDialogClickListener() { @Override @@ -319,7 +319,7 @@ public class SpamNotificationActivity extends FragmentActivity { } private void assertDialogsEnabled() { - if (!SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) { + if (!SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) { throw new IllegalStateException( "Cannot start this activity with given action because dialogs are not enabled."); } -- cgit v1.2.3