From 00cdd7b552b3fde4c9cbc1c4e4d0edc1b54df365 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Fri, 18 May 2018 13:32:36 -0700
Subject: Remove duplicate code when constructing PhotoInfo proto.

Bug: 79770053
Test: Existing tests
PiperOrigin-RevId: 197192087
Change-Id: I44c60d13c83b3e23dc141fd9e9b88e108687bf96
---
 .../dialer/voicemail/listui/NewVoicemailViewHolder.java      | 12 +++---------
 .../dialer/voicemail/listui/menu/BottomSheetHeader.java      |  7 ++-----
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'java/com/android/dialer/voicemail')

diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
index c001c0059..ba851ebb9 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
@@ -36,7 +36,7 @@ import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
@@ -147,7 +147,8 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
     menuButton.setOnClickListener(
         NewVoicemailMenu.createOnClickListener(context, voicemailEntryOfViewHolder));
 
-    setPhoto(voicemailEntryOfViewHolder);
+    contactPhotoView.setPhoto(
+        PhotoInfoBuilder.fromVoicemailEntry(voicemailEntryOfViewHolder).build());
 
     // Update the expanded/collapsed state of this view holder
     // Only update the binding of the mediaPlayerView of the expanded view holder
@@ -206,13 +207,6 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
     }
   }
 
-  private void setPhoto(VoicemailEntry voicemailEntry) {
-    contactPhotoView.setPhoto(
-        NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.getNumberAttributes())
-            .setFormattedNumber(voicemailEntry.getFormattedNumber())
-            .build());
-  }
-
   void collapseViewHolder() {
     LogUtil.i(
         "NewVoicemailViewHolder.collapseViewHolder",
diff --git a/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java b/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java
index bf86278b2..deca7bd74 100644
--- a/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java
+++ b/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java
@@ -17,7 +17,7 @@
 package com.android.dialer.voicemail.listui.menu;
 
 import android.text.TextUtils;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
 import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
 import com.android.dialer.voicemail.model.VoicemailEntry;
 
@@ -27,10 +27,7 @@ final class BottomSheetHeader {
   static HistoryItemBottomSheetHeaderInfo fromVoicemailEntry(VoicemailEntry voicemailEntry) {
     return HistoryItemBottomSheetHeaderInfo.newBuilder()
         .setNumber(voicemailEntry.getNumber())
-        .setPhotoInfo(
-            NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.getNumberAttributes())
-                .setFormattedNumber(voicemailEntry.getFormattedNumber())
-                .build())
+        .setPhotoInfo(PhotoInfoBuilder.fromVoicemailEntry(voicemailEntry))
         .setPrimaryText(buildPrimaryVoicemailText(voicemailEntry))
         .setSecondaryText(buildSecondaryVoicemailText(voicemailEntry))
         .build();
-- 
cgit v1.2.3