From 540385d1fb39df3e5cbf6553e988089739ef92d1 Mon Sep 17 00:00:00 2001
From: uabdullah <uabdullah@google.com>
Date: Tue, 27 Mar 2018 15:12:22 -0700
Subject: Turn off transcription when user declines tos (existing dialer user)

When an existing dialer user is shown the ToS and they declines it, the transcription setting must be turned off, to respect the users wishes.

We also no longer take the user to the settings page.

Bug: 74033229,77147114
Test: Unit test
PiperOrigin-RevId: 190682249
Change-Id: I8c0abf9f3cbb15ded12a760abe540c557fd2e7d3
---
 .../listui/error/VoicemailTosMessageCreator.java     | 20 +++++++-------------
 .../voicemail/listui/error/res/values/strings.xml    |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

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

diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
index ec1a95a1a..ba9e35012 100644
--- a/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
@@ -22,7 +22,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
@@ -40,11 +39,9 @@ import android.view.View.OnClickListener;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage.Action;
-import com.android.dialer.voicemail.settings.VoicemailSettingsFragment;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
@@ -129,19 +126,16 @@ public class VoicemailTosMessageCreator {
             getExistingUserTosTitle(),
             getExistingUserTosMessageText(),
             new Action(
-                context.getString(R.string.dialer_terms_and_conditions_existing_user_setings),
+                context.getString(R.string.dialer_terms_and_conditions_existing_user_decline),
                 new OnClickListener() {
                   @Override
                   public void onClick(View v) {
-                    LogUtil.i("VoicemailTosMessageCreator.getPromoMessage", "open settings");
-                    Intent intent =
-                        new Intent(Intent.ACTION_VIEW)
-                            .setComponent(
-                                new ComponentName(context, Constants.get().getSettingsActivity()))
-                            .setData(
-                                Uri.fromParts(
-                                    "header", VoicemailSettingsFragment.class.getName(), null));
-                    context.startActivity(intent);
+                    LogUtil.i(
+                        "VoicemailTosMessageCreator.getPromoMessage", "declined transcription");
+                    VoicemailClient voicemailClient =
+                        VoicemailComponent.get(context).getVoicemailClient();
+                    voicemailClient.setVoicemailTranscriptionEnabled(
+                        context, status.getPhoneAccountHandle(), false);
                   }
                 }),
             new Action(
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
index b222d9c01..4306063d9 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
@@ -199,7 +199,7 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual
   <string name="dialer_terms_and_conditions_decline_spanish" translatable="false">Rechazar</string>
 
   <string name="dialer_terms_and_conditions_existing_user_ack">Ok, got it</string>
-  <string name="dialer_terms_and_conditions_existing_user_setings">Settings</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No Thanks</string>
 
   <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string>
 
-- 
cgit v1.2.3