Extract spam information from encoded lookup-uri

Change-Id: Ibd4ca9b0cc340a59de09c14082b0b74eae180224
Issue-Id: OPO-736

3 files changed, 23 insertions, 2 deletions

diff --git a/src/com/android/contacts/common/model/Contact.java b/src/com/android/contacts/common/model/Contact.java
index 83b6f422..8539b346 100644
--- a/src/com/android/contacts/common/model/Contact.java
+++ b/src/com/android/contacts/common/model/Contact.java
@@ -101,6 +101,7 @@ public class Contact {
 
     private String mProviderName;
     private int mSpamCount = 0;
+    private boolean mIsSpam;
 
     /**
      * Constructor for special results, namely "no contact found" and "error".
@@ -511,6 +512,14 @@ public class Contact {
         return mProviderName;
     }
 
+    public void setIsSpam(boolean isSpam) {
+        mIsSpam = isSpam;
+    }
+
+    public boolean isSpam() {
+        return mIsSpam;
+    }
+
     public void setProviderName(String providerName) {
         mProviderName = providerName;
     }
diff --git a/src/com/android/contacts/common/model/ContactBuilder.java b/src/com/android/contacts/common/model/ContactBuilder.java
index 9056ff03..29011aa8 100644
--- a/src/com/android/contacts/common/model/ContactBuilder.java
+++ b/src/com/android/contacts/common/model/ContactBuilder.java
@@ -80,6 +80,7 @@ public class ContactBuilder {
     private boolean mIsBusiness;
 
     private int mSpamCount;
+    private boolean mIsSpam;
     private String mInfoProviderName;
     private String mSuccinctLocation;
 
@@ -154,7 +155,7 @@ public class ContactBuilder {
                     String number = mPhoneNumbers.get(0).number;
                     mLookupKey = PhoneNumberUtils.normalizeNumber(number);
                 }
-
+                mIsSpam = contact.optBoolean(CallerMetaData.IS_SPAM, false);
                 mSpamCount = contact.optInt(CallerMetaData.SPAM_COUNT, 0);
                 mInfoProviderName = contact.optString(CallerMetaData.INFO_PROVIDER, null);
                 mSuccinctLocation = contact.optString(CallerMetaData.SUCCINCT_LOCATION, null);
@@ -176,6 +177,14 @@ public class ContactBuilder {
         return mSpamCount;
     }
 
+    public boolean isSpam() {
+        return mIsSpam;
+    }
+
+    public void setIsSpam(boolean isSpam) {
+        mIsSpam = isSpam;
+    }
+
     public void setInfoProviderName(String infoProviderName) {
         mInfoProviderName = infoProviderName;
     }
@@ -355,6 +364,7 @@ public class ContactBuilder {
             }
 
             // add spam count and attribution
+            contact.put(CallerMetaData.IS_SPAM, isSpam());
             contact.put(CallerMetaData.SPAM_COUNT, getSpamCount());
             contact.put(CallerMetaData.INFO_PROVIDER, getInfoProviderName());
             contact.put(CallerMetaData.SUCCINCT_LOCATION, getSuccinctLocation());
@@ -439,6 +449,7 @@ public class ContactBuilder {
                     .build());
 
             contactToReturn.setSpamCount(getSpamCount());
+            contactToReturn.setIsSpam(isSpam());
             contactToReturn.setProviderName(getInfoProviderName());
 
             return contactToReturn;
diff --git a/src/com/android/contacts/common/util/CallerMetaData.java b/src/com/android/contacts/common/util/CallerMetaData.java
index 55b58480..6f46110f 100644
--- a/src/com/android/contacts/common/util/CallerMetaData.java
+++ b/src/com/android/contacts/common/util/CallerMetaData.java
@@ -10,8 +10,9 @@ public class CallerMetaData {
     public static final String SUCCINCT_LOCATION = "CALLER_META_DATA_SUCCINCT_LOCATION";
     public static final String INFO_PROVIDER = "CALLER_META_DATA_INFO_PROVIDER";
     public static final String PHOTO_URL = "CALLER_META_DATA_PHOTO_URL";
+    public static final String IS_SPAM = "CALLER_META_DATA_IS_SPAM";
 
     // mimetype for the name of service that helped identify the caller
     public static final String MIMETYPE_SERVICE_IDENTIFIER =
-            "com.cyanogen/callerinfoservice/identifier";
+            "com.cyanogen.ambient/callerinfoservice/identifier";
 }