From f80d8afdb0f5ef6d24b8bb76442cab8cef38da8f Mon Sep 17 00:00:00 2001 From: uabdullah Date: Tue, 27 Feb 2018 17:03:45 -0800 Subject: Do not show the voicemail tab if the VM toggle is turned off. Bug: 73123614 Test: N/A PiperOrigin-RevId: 187255950 Change-Id: I9ab50a7a8052f325f1743721bf6432e6c4787a4e --- java/com/android/dialer/main/impl/OldMainActivityPeer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer') diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java index 70ecb8360..a05ef6d16 100644 --- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java +++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java @@ -252,7 +252,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen * Check and return whether the voicemail tab should be shown or not. This includes the following * criteria under which we show the voicemail tab: *
  • The voicemail number exists (e.g we are able to dial into listen to voicemail or press and - * hold 1) + * hold 1) (TODO (uabdullah): Handle this case properly) *
  • Visual voicemail is enabled from the settings tab *
  • Visual voicemail carrier is supported by dialer *
  • There is no voicemail carrier app installed. @@ -265,14 +265,18 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen PhoneAccountHandle defaultUserSelectedAccount = TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_VOICEMAIL); - if (isVoicemailAvailable(context, defaultUserSelectedAccount)) { - return true; + if (!isVoicemailAvailable(context, defaultUserSelectedAccount)) { + LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "Voicemail is not available"); + return false; } + if (VoicemailComponent.get(context) .getVoicemailClient() .isVoicemailEnabled(context, defaultUserSelectedAccount)) { + LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "Voicemail is not enabled"); return true; } + LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "returning false"); return false; } -- cgit v1.2.3