commit b87334b303f63cca464dd6c99ff8d9fb89e1ca28
author maxwelb <maxwelb@google.com> Mon May 14 13:57:32 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue May 15 11:13:24 2018 -0700
tree 9cf6101718eca19beb1ce62c44d5906d65aa7e81
parent 0cd4afc4fd99e6a0003344cdabb510fd60aa6dee

Update DialerCall to use SpamStatus instead of booleans

Test: Tap
PiperOrigin-RevId: 196562314
Change-Id: Ie90a5ad183d4fb65ff512ea158a8687fe1f77963

java/com/android/incallui/call/DialerCall.java

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 431634a..da7c54d 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -52,6 +52,7 @@
 import com.android.contacts.common.compat.CallCompat;
 import com.android.dialer.assisteddialing.ConcreteCreator;
 import com.android.dialer.assisteddialing.TransformationInfo;
+import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
@@ -76,6 +77,7 @@
 import com.android.dialer.preferredsim.PreferredAccountRecorder;
 import com.android.dialer.rtt.RttTranscript;
 import com.android.dialer.rtt.RttTranscriptUtil;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.telecom.TelecomCallUtil;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.theme.R;
@@ -91,6 +93,7 @@
 import com.android.incallui.videotech.empty.EmptyVideoTech;
 import com.android.incallui.videotech.ims.ImsVideoTech;
 import com.android.incallui.videotech.utils.VideoUtils;
+import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.io.IOException;
@@ -165,14 +168,10 @@
   private String callSubject;
   @Nullable private PhoneAccountHandle phoneAccountHandle;
   @CallHistoryStatus private int callHistoryStatus = CALL_HISTORY_STATUS_UNKNOWN;
-  private boolean isSpam;
+
+  @Nullable private SpamStatus spamStatus;
   private boolean isBlocked;
 
-  @Nullable private Boolean isInUserSpamList;
-
-  @Nullable private Boolean isInUserWhiteList;
-
-  @Nullable private Boolean isInGlobalSpamList;
   private boolean didShowCameraPermission;
   private boolean didDismissVideoChargesAlertDialog;
   private PersistableBundle carrierConfig;
@@ -820,6 +819,13 @@
     if (hasProperty(Details.PROPERTY_EMERGENCY_CALLBACK_MODE)) {
       return true;
     }
+
+    // Call.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS is available starting in O
+    if (VERSION.SDK_INT < VERSION_CODES.O) {
+      long timestampMillis = FilteredNumbersUtil.getLastEmergencyCallTimeMillis(context);
+      return isInEmergencyCallbackWindow(timestampMillis);
+    }
+
     // We want to treat any incoming call that arrives a short time after an outgoing emergency call
     // as a potential emergency callback.
     if (getExtras() != null
@@ -1270,39 +1276,28 @@
     didDismissVideoChargesAlertDialog = didDismiss;
   }
 
-  @Nullable
-  public Boolean isInGlobalSpamList() {
-    return isInGlobalSpamList;
+  public void setSpamStatus(@Nullable SpamStatus spamStatus) {
+    this.spamStatus = spamStatus;
   }
 
-  public void setIsInGlobalSpamList(boolean inSpamList) {
-    isInGlobalSpamList = inSpamList;
-  }
-
-  @Nullable
-  public Boolean isInUserSpamList() {
-    return isInUserSpamList;
-  }
-
-  public void setIsInUserSpamList(boolean inSpamList) {
-    isInUserSpamList = inSpamList;
-  }
-
-  @Nullable
-  public Boolean isInUserWhiteList() {
-    return isInUserWhiteList;
-  }
-
-  public void setIsInUserWhiteList(boolean inWhiteList) {
-    isInUserWhiteList = inWhiteList;
+  public Optional<SpamStatus> getSpamStatus() {
+    return Optional.fromNullable(spamStatus);
   }
 
   public boolean isSpam() {
-    return isSpam;
-  }
+    if (spamStatus == null || !spamStatus.isSpam()) {
+      return false;
+    }
 
-  public void setSpam(boolean isSpam) {
-    this.isSpam = isSpam;
+    if (!isIncoming()) {
+      return false;
+    }
+
+    if (isPotentialEmergencyCallback()) {
+      return false;
+    }
+
+    return true;
   }
 
   public boolean isBlocked() {