From ea7890cd5e829ed3f0b5f726561c569690af2030 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Mon, 19 Jun 2017 12:40:59 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/159428781. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/158012278 (6/05/2017) to cl/159428781 (6/19/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030 Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484 --- .../error/VoicemailTosMessageCreator.java | 301 +++++++++++++++++++++ 1 file changed, 301 insertions(+) create mode 100644 java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java (limited to 'java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java') diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java new file mode 100644 index 000000000..3f0ed1f58 --- /dev/null +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -0,0 +1,301 @@ +/* + * Copyright (C) 2017 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.app.voicemail.error; + +import android.app.AlertDialog; +import android.content.ComponentName; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.support.annotation.Nullable; +import android.telecom.PhoneAccountHandle; +import android.telephony.TelephonyManager; +import android.view.View; +import android.view.View.OnClickListener; +import com.android.contacts.common.compat.TelephonyManagerCompat; +import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action; +import com.android.dialer.buildtype.BuildType; +import com.android.dialer.common.LogUtil; +import com.android.dialer.logging.DialerImpression; +import com.android.dialer.logging.Logger; +import com.android.voicemail.VisualVoicemailTypeExtensions; +import com.android.voicemail.VoicemailClient; +import com.android.voicemail.VoicemailComponent; +import java.util.Locale; + +/** + * Create error message from {@link VoicemailStatus} for voicemail. This is will show different + * terms of service for Verizon and for other carriers. + */ +public class VoicemailTosMessageCreator { + // Flag to check which version of the Verizon ToS that the user has accepted. + public static final String VVM3_TOS_VERSION_ACCEPTED_KEY = "vvm3_tos_version_accepted"; + + // Flag to check which version of the Google Dialer ToS that the user has accepted. + public static final String DIALER_TOS_VERSION_ACCEPTED_KEY = "dialer_tos_version_accepted"; + + public static final int CURRENT_VVM3_TOS_VERSION = 2; + public static final int CURRENT_DIALER_TOS_VERSION = 1; + + private static final String ISO639_SPANISH = "es"; + + private final Context context; + private final VoicemailStatus status; + private final VoicemailStatusReader statusReader; + private final SharedPreferences preferences; + + VoicemailTosMessageCreator( + final Context context, + final VoicemailStatus status, + final VoicemailStatusReader statusReader) { + this.context = context; + this.status = status; + this.statusReader = statusReader; + this.preferences = PreferenceManager.getDefaultSharedPreferences(context); + } + + @Nullable + VoicemailErrorMessage maybeCreateTosMessage() { + // TODO: add filtering based on carrier + if (hasAcceptedTos()) { + return null; + } + // TODO: temporarily skip the terms of service for dogfood builds + if (BuildType.get() == BuildType.DOGFOOD) { + LogUtil.i( + "VoicemailTosMessageCreator.maybeCreateTosMessage", + "Skipping voicemail ToS for dogfood build"); + return null; + } + logTosCreatedImpression(); + + return new VoicemailTosMessage( + getTosTitle(), + getTosMessage(), + new Action( + getDeclineText(), + new OnClickListener() { + @Override + public void onClick(View v) { + LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "decline clicked"); + PhoneAccountHandle handle = + new PhoneAccountHandle( + ComponentName.unflattenFromString(status.phoneAccountComponentName), + status.phoneAccountId); + logTosDeclinedImpression(); + showDeclineTosDialog(handle); + } + }), + new Action( + getAcceptText(), + new OnClickListener() { + @Override + public void onClick(View v) { + LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "accept clicked"); + recordTosAcceptance(); + logTosAcceptedImpression(); + statusReader.refresh(); + } + }, + true /* raised */)) + .setModal(true); + } + + private void showDeclineTosDialog(final PhoneAccountHandle handle) { + if (isVvm3() && Vvm3VoicemailMessageCreator.PIN_NOT_SET == status.configurationState) { + LogUtil.i( + "VoicemailTosMessageCreator.showDeclineTosDialog", "PIN_NOT_SET, showing set PIN dialog"); + showSetPinBeforeDeclineDialog(); + return; + } + LogUtil.i( + "VoicemailTosMessageCreator.showDeclineVerizonTosDialog", + "showing decline ToS dialog, status=" + status); + final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setMessage(getTosDeclinedDialogMessageId()); + builder.setPositiveButton( + getTosDeclinedDialogDowngradeId(), + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINED); + VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient(); + if (voicemailClient.isVoicemailModuleEnabled()) { + voicemailClient.setVoicemailEnabled(context, status.getPhoneAccountHandle(), false); + } else { + TelephonyManagerCompat.setVisualVoicemailEnabled(telephonyManager, handle, false); + } + } + }); + + builder.setNegativeButton( + android.R.string.cancel, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }); + + builder.setCancelable(true); + builder.show(); + } + + private void showSetPinBeforeDeclineDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setMessage(R.string.verizon_terms_and_conditions_decline_set_pin_dialog_message); + builder.setPositiveButton( + R.string.verizon_terms_and_conditions_decline_set_pin_dialog_set_pin, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Logger.get(context) + .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN); + Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); + context.startActivity(intent); + } + }); + + builder.setNegativeButton( + android.R.string.cancel, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }); + + builder.setCancelable(true); + builder.show(); + } + + private boolean isVvm3() { + return VisualVoicemailTypeExtensions.VVM_TYPE_VVM3.equals(status.type); + } + + private boolean useSpanish() { + return Locale.getDefault().getLanguage().equals(new Locale(ISO639_SPANISH).getLanguage()); + } + + private boolean hasAcceptedTos() { + if (isVvm3()) { + return preferences.getInt(VVM3_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_VVM3_TOS_VERSION; + } else { + return preferences.getInt(DIALER_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_DIALER_TOS_VERSION; + } + } + + private void recordTosAcceptance() { + if (isVvm3()) { + preferences.edit().putInt(VVM3_TOS_VERSION_ACCEPTED_KEY, CURRENT_VVM3_TOS_VERSION).apply(); + } else { + preferences + .edit() + .putInt(DIALER_TOS_VERSION_ACCEPTED_KEY, CURRENT_DIALER_TOS_VERSION) + .apply(); + } + } + + private void logTosCreatedImpression() { + if (isVvm3()) { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_CREATED); + } else { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_CREATED); + } + } + + private void logTosDeclinedImpression() { + if (isVvm3()) { + Logger.get(context) + .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_DECLINE_CLICKED); + } else { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_DECLINE_CLICKED); + } + } + + private void logTosAcceptedImpression() { + if (isVvm3()) { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_ACCEPTED); + } else { + Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_ACCEPTED); + } + } + + private CharSequence getVvm3Tos() { + return useSpanish() + ? context.getString(R.string.verizon_terms_and_conditions_1_1_spanish) + : context.getString(R.string.verizon_terms_and_conditions_1_1_english); + } + + private CharSequence getDialerTos() { + return useSpanish() + ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish) + : context.getString(R.string.dialer_terms_and_conditions_1_0_english); + } + + private CharSequence getAcceptText() { + if (isVvm3()) { + return useSpanish() + ? context.getString(R.string.verizon_terms_and_conditions_accept_spanish) + : context.getString(R.string.verizon_terms_and_conditions_accept_english); + } else { + return useSpanish() + ? context.getString(R.string.dialer_terms_and_conditions_accept_spanish) + : context.getString(R.string.dialer_terms_and_conditions_accept_english); + } + } + + private CharSequence getDeclineText() { + if (isVvm3()) { + return useSpanish() + ? context.getString(R.string.verizon_terms_and_conditions_decline_spanish) + : context.getString(R.string.verizon_terms_and_conditions_decline_english); + } else { + return useSpanish() + ? context.getString(R.string.dialer_terms_and_conditions_decline_spanish) + : context.getString(R.string.dialer_terms_and_conditions_decline_english); + } + } + + private String getTosTitle() { + return isVvm3() + ? context.getString(R.string.verizon_terms_and_conditions_title) + : context.getString(R.string.dialer_terms_and_conditions_title); + } + + private String getTosMessage() { + return isVvm3() + ? context.getString( + R.string.verizon_terms_and_conditions_message, getDialerTos(), getVvm3Tos()) + : context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); + } + + private int getTosDeclinedDialogMessageId() { + return isVvm3() + ? R.string.verizon_terms_and_conditions_decline_dialog_message + : R.string.dialer_terms_and_conditions_decline_dialog_message; + } + + private int getTosDeclinedDialogDowngradeId() { + return isVvm3() + ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade + : R.string.dialer_terms_and_conditions_decline_dialog_downgrade; + } +} -- cgit v1.2.3