Remove duplicate code when constructing PhotoInfo proto.

Bug: 79770053
Test: Existing tests
PiperOrigin-RevId: 197192087
Change-Id: I44c60d13c83b3e23dc141fd9e9b88e108687bf96

2 files changed, 60 insertions, 16 deletions

diff --git a/java/com/android/dialer/calllogutils/NumberAttributesConverter.java b/java/com/android/dialer/calllogutils/NumberAttributesBuilder.java
index 8081c4b3f..015d59fd8 100644
--- a/java/com/android/dialer/calllogutils/NumberAttributesConverter.java
+++ b/java/com/android/dialer/calllogutils/NumberAttributesBuilder.java
@@ -18,26 +18,13 @@ package com.android.dialer.calllogutils;
 
 import android.text.TextUtils;
 import com.android.dialer.NumberAttributes;
-import com.android.dialer.glidephotomanager.PhotoInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;
 
-/** Converts {@link NumberAttributes} to {@link PhotoInfo} */
-public final class NumberAttributesConverter {
+/** Builds {@link NumberAttributes} from other data types. */
+public final class NumberAttributesBuilder {
 
-  /** Converts {@link NumberAttributes} to {@link PhotoInfo.Builder} */
-  public static PhotoInfo.Builder toPhotoInfoBuilder(NumberAttributes numberAttributes) {
-    return PhotoInfo.newBuilder()
-        .setName(numberAttributes.getName())
-        .setPhotoUri(numberAttributes.getPhotoUri())
-        .setPhotoId(numberAttributes.getPhotoId())
-        .setLookupUri(numberAttributes.getLookupUri())
-        .setIsBusiness(numberAttributes.getIsBusiness())
-        .setIsSpam(numberAttributes.getIsSpam())
-        .setIsBlocked(numberAttributes.getIsBlocked());
-  }
-
-  /** Converts {@link PhoneLookupInfo} to {@link NumberAttributes.Builder} */
+  /** Returns a {@link NumberAttributes.Builder} with info from {@link PhoneLookupInfo}. */
   public static NumberAttributes.Builder fromPhoneLookupInfo(PhoneLookupInfo phoneLookupInfo) {
     PhoneLookupInfoConsolidator phoneLookupInfoConsolidator =
         new PhoneLookupInfoConsolidator(phoneLookupInfo);
diff --git a/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java b/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java
new file mode 100644
index 000000000..8d193bfd3
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java
@@ -0,0 +1,57 @@
+/*
+ * 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.calllogutils;
+
+import android.provider.CallLog.Calls;
+import android.support.v4.os.BuildCompat;
+import com.android.dialer.NumberAttributes;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.voicemail.model.VoicemailEntry;
+
+/** Builds {@link PhotoInfo} from other data types. */
+public final class PhotoInfoBuilder {
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link CoalescedRow}. */
+  public static PhotoInfo.Builder fromCoalescedRow(CoalescedRow coalescedRow) {
+    return fromNumberAttributes(coalescedRow.getNumberAttributes())
+        .setFormattedNumber(coalescedRow.getFormattedNumber())
+        .setIsVoicemail(coalescedRow.getIsVoicemailCall())
+        .setIsVideo((coalescedRow.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
+        .setIsRtt(
+            BuildCompat.isAtLeastP()
+                && (coalescedRow.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT);
+  }
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link VoicemailEntry}. */
+  public static PhotoInfo.Builder fromVoicemailEntry(VoicemailEntry voicemailEntry) {
+    return fromNumberAttributes(voicemailEntry.getNumberAttributes())
+        .setFormattedNumber(voicemailEntry.getFormattedNumber());
+  }
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link NumberAttributes}. */
+  private static PhotoInfo.Builder fromNumberAttributes(NumberAttributes numberAttributes) {
+    return PhotoInfo.newBuilder()
+        .setName(numberAttributes.getName())
+        .setPhotoUri(numberAttributes.getPhotoUri())
+        .setPhotoId(numberAttributes.getPhotoId())
+        .setLookupUri(numberAttributes.getLookupUri())
+        .setIsBusiness(numberAttributes.getIsBusiness())
+        .setIsBlocked(numberAttributes.getIsBlocked())
+        .setIsSpam(numberAttributes.getIsSpam());
+  }
+}