1 files changed, 21 insertions, 24 deletions
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
index 1f857840e..d42c255eb 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
@@ -45,7 +45,6 @@ import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.dialer.glidephotomanager.GlidePhotoManager;
-import com.android.dialer.glidephotomanager.PhotoInfo;
 import com.android.dialer.time.Clock;
 import com.android.dialer.voicemail.listui.menu.NewVoicemailMenu;
 import com.android.dialer.voicemail.model.VoicemailEntry;
@@ -64,7 +63,7 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
   private final ImageView menuButton;
   private final Clock clock;
   private boolean isViewHolderExpanded;
-  private int viewHolderId;
+  private long viewHolderId;
   private VoicemailEntry voicemailEntryOfViewHolder;
   @NonNull private Uri viewHolderVoicemailUri;
   private final NewVoicemailViewHolderListener voicemailViewHolderListener;
@@ -117,7 +116,7 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
       FragmentManager fragmentManager,
       NewVoicemailMediaPlayer mediaPlayer,
       int position,
-      int currentlyExpandedViewHolderId) {
+      long currentlyExpandedViewHolderId) {
 
     LogUtil.i(
         "NewVoicemailViewHolder.bindViewHolderValuesFromAdapter",
@@ -128,16 +127,16 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
         cursor.getCount());
 
     voicemailEntryOfViewHolder = VoicemailCursorLoader.toVoicemailEntry(cursor);
-    viewHolderId = voicemailEntryOfViewHolder.id();
+    viewHolderId = voicemailEntryOfViewHolder.getId();
     LogUtil.i(
         "NewVoicemailViewHolder.bindViewHolderValuesFromAdapter", "viewholderId:%d", viewHolderId);
-    viewHolderVoicemailUri = Uri.parse(voicemailEntryOfViewHolder.voicemailUri());
+    viewHolderVoicemailUri = Uri.parse(voicemailEntryOfViewHolder.getVoicemailUri());
     primaryTextView.setText(
         VoicemailEntryText.buildPrimaryVoicemailText(context, voicemailEntryOfViewHolder));
     secondaryTextView.setText(
         VoicemailEntryText.buildSecondaryVoicemailText(context, clock, voicemailEntryOfViewHolder));
 
-    String voicemailTranscription = voicemailEntryOfViewHolder.transcription();
+    String voicemailTranscription = voicemailEntryOfViewHolder.getTranscription();
 
     if (TextUtils.isEmpty(voicemailTranscription)) {
       transcriptionTextView.setVisibility(GONE);
@@ -204,10 +203,10 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
     LogUtil.v(
         "NewVoicemailViewHolder.boldViewHolderIfUnread",
         "id:%d, isRead:%d",
-        voicemailEntryOfViewHolder.id(),
-        voicemailEntryOfViewHolder.isRead());
+        voicemailEntryOfViewHolder.getId(),
+        voicemailEntryOfViewHolder.getIsRead());
 
-    if (voicemailEntryOfViewHolder.isRead() == 0) {
+    if (voicemailEntryOfViewHolder.getIsRead() == 0) {
       primaryTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
       secondaryTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
       transcriptionTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
@@ -215,13 +214,11 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
   }
 
   private void setPhoto(VoicemailEntry voicemailEntry) {
-    PhotoInfo.Builder photoInfoBuilder =
-        NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes());
-    if (!TextUtils.isEmpty(voicemailEntry.formattedNumber())) {
-      photoInfoBuilder.setFormattedNumber(voicemailEntry.formattedNumber());
-    }
-
-    glidePhotoManager.loadQuickContactBadge(quickContactBadge, photoInfoBuilder.build());
+    glidePhotoManager.loadQuickContactBadge(
+        quickContactBadge,
+        NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.getNumberAttributes())
+            .setFormattedNumber(voicemailEntry.getFormattedNumber())
+            .build());
   }
 
   void collapseViewHolder() {
@@ -293,9 +290,9 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
 
     Assert.isNotNull(voicemailViewHolderListener);
     Assert.checkArgument(
-        voicemailEntry.id() == viewHolderId, "ensure that the adapter binding has taken place");
+        voicemailEntry.getId() == viewHolderId, "ensure that the adapter binding has taken place");
     Assert.checkArgument(
-        Uri.parse(voicemailEntry.voicemailUri()).equals(viewHolderVoicemailUri),
+        Uri.parse(voicemailEntry.getVoicemailUri()).equals(viewHolderVoicemailUri),
         "ensure that the adapter binding has taken place");
     LogUtil.i(
         "NewVoicemailViewHolder.expandAndBindViewHolderAndMediaPlayerViewWithAdapterValues",
@@ -305,15 +302,15 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
         isViewHolderExpanded,
         String.valueOf(viewHolderVoicemailUri),
         String.valueOf(mediaPlayerView.getVoicemailUri()),
-        voicemailEntry.isRead());
+        voicemailEntry.getIsRead());
 
-    if (voicemailEntry.isRead() == 0) {
+    if (voicemailEntry.getIsRead() == 0) {
       // update as read.
       primaryTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
       secondaryTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
       transcriptionTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
 
-      Uri uri = Uri.parse(voicemailEntry.voicemailUri());
+      Uri uri = Uri.parse(voicemailEntry.getVoicemailUri());
 
       Worker<Pair<Context, Uri>, Integer> markVoicemailRead = this::markVoicemailAsRead;
       SuccessListener<Integer> markedAsReadVoicemailCallBack = this::onVoicemailMarkedAsRead;
@@ -344,8 +341,8 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
   }
 
   private void updateBrandingText(VoicemailEntry voicemailEntry) {
-    if (voicemailEntry.transcriptionState() == VoicemailCompat.TRANSCRIPTION_AVAILABLE
-        && !TextUtils.isEmpty(voicemailEntry.transcription())) {
+    if (voicemailEntry.getTranscriptionState() == VoicemailCompat.TRANSCRIPTION_AVAILABLE
+        && !TextUtils.isEmpty(voicemailEntry.getTranscription())) {
       transcriptionBrandingTextView.setVisibility(VISIBLE);
     } else {
       transcriptionBrandingTextView.setVisibility(GONE);
@@ -435,7 +432,7 @@ final class NewVoicemailViewHolder extends RecyclerView.ViewHolder implements On
     return isViewHolderExpanded;
   }
 
-  public int getViewHolderId() {
+  public long getViewHolderId() {
     return viewHolderId;
   }