diff options
Diffstat (limited to 'java/com/android/voicemail/impl')
3 files changed, 93 insertions, 20 deletions
diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java index 993594eb3..b0881c9a3 100644 --- a/java/com/android/voicemail/impl/VoicemailClientImpl.java +++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java @@ -123,13 +123,28 @@ public class VoicemailClientImpl implements VoicemailClient { } @Override - public boolean isVoicemailTranscriptionAvailable(Context context) { + public boolean isVoicemailTranscriptionAvailable( + Context context, PhoneAccountHandle phoneAccountHandle) { if (!BuildCompat.isAtLeastO()) { LogUtil.i( "VoicemailClientImpl.isVoicemailTranscriptionAvailable", "not running on O or later"); return false; } + if (!isVoicemailEnabled(context, phoneAccountHandle)) { + LogUtil.i( + "VoicemailClientImpl.isVoicemailTranscriptionAvailable", + "visual voicemail is not enabled"); + return false; + } + + if (!isActivated(context, phoneAccountHandle)) { + LogUtil.i( + "VoicemailClientImpl.isVoicemailTranscriptionAvailable", + "visual voicemail is not activated"); + return false; + } + TranscriptionConfigProvider provider = new TranscriptionConfigProvider(context); if (!provider.isVoicemailTranscriptionAvailable()) { LogUtil.i( @@ -141,12 +156,24 @@ public class VoicemailClientImpl implements VoicemailClient { } @Override - public boolean isVoicemailDonationAvailable(Context context) { - if (!isVoicemailTranscriptionAvailable(context)) { + public boolean isVoicemailTranscriptionEnabled(Context context, PhoneAccountHandle account) { + return isVoicemailTranscriptionAvailable(context, account) + && VisualVoicemailSettingsUtil.isVoicemailTranscriptionEnabled(context, account); + } + + @Override + public boolean isVoicemailDonationAvailable( + Context context, PhoneAccountHandle phoneAccountHandle) { + if (!isVoicemailTranscriptionAvailable(context, phoneAccountHandle)) { LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "transcription not available"); return false; } + if (!isVoicemailTranscriptionEnabled(context, phoneAccountHandle)) { + LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "transcription not enabled"); + return false; + } + TranscriptionConfigProvider provider = new TranscriptionConfigProvider(context); if (!provider.isVoicemailDonationAvailable()) { LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "feature disabled by config"); @@ -158,13 +185,34 @@ public class VoicemailClientImpl implements VoicemailClient { @Override public boolean isVoicemailDonationEnabled(Context context, PhoneAccountHandle account) { - return isVoicemailTranscriptionAvailable(context) + return isVoicemailTranscriptionEnabled(context, account) + && isVoicemailDonationAvailable(context, account) && VisualVoicemailSettingsUtil.isVoicemailDonationEnabled(context, account); } @Override + public void setVoicemailTranscriptionEnabled( + Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) { + Assert.checkArgument( + isVoicemailTranscriptionAvailable(context, phoneAccountHandle), + "transcription must be available before enabling/disabling it"); + VisualVoicemailSettingsUtil.setVoicemailTranscriptionEnabled( + context, phoneAccountHandle, enabled); + } + + @Override public void setVoicemailDonationEnabled( Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) { + if (enabled) { + Assert.checkArgument( + isVoicemailTranscriptionAvailable(context, phoneAccountHandle) + && isVoicemailTranscriptionEnabled(context, phoneAccountHandle), + "should not be able to enable donation without transcription " + + "available(value: %b) and enabled (value:%b) for account:%s", + isVoicemailTranscriptionAvailable(context, phoneAccountHandle), + isVoicemailTranscriptionEnabled(context, phoneAccountHandle), + phoneAccountHandle.toString()); + } VisualVoicemailSettingsUtil.setVoicemailDonationEnabled(context, phoneAccountHandle, enabled); } diff --git a/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java b/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java index e42d56938..3e006988e 100644 --- a/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java +++ b/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java @@ -33,6 +33,7 @@ public class VisualVoicemailSettingsUtil { @VisibleForTesting public static final String IS_ENABLED_KEY = "is_enabled"; private static final String ARCHIVE_ENABLED_KEY = "archive_is_enabled"; + private static final String TRANSCRIBE_VOICEMAILS_KEY = "transcribe_voicemails"; private static final String DONATE_VOICEMAILS_KEY = "donate_voicemails"; public static void setEnabled( @@ -59,21 +60,6 @@ public class VisualVoicemailSettingsUtil { } } - private static class VoicemailDeleteWorker implements Worker<Void, Void> { - private final Context context; - - VoicemailDeleteWorker(Context context) { - this.context = context; - } - - @Override - public Void doInBackground(Void unused) { - int deleted = VoicemailDatabaseUtil.deleteAll(context); - VvmLog.i("VisualVoicemailSettingsUtil.doInBackground", "deleted " + deleted + " voicemails"); - return null; - } - } - private static void onSuccess(Void unused) { VvmLog.i("VisualVoicemailSettingsUtil.onSuccess", "delete voicemails"); } @@ -92,12 +78,24 @@ public class VisualVoicemailSettingsUtil { .apply(); } + public static void setVoicemailTranscriptionEnabled( + Context context, PhoneAccountHandle phoneAccount, boolean isEnabled) { + Assert.checkArgument( + VoicemailComponent.get(context) + .getVoicemailClient() + .isVoicemailTranscriptionAvailable(context, phoneAccount)); + new VisualVoicemailPreferences(context, phoneAccount) + .edit() + .putBoolean(TRANSCRIBE_VOICEMAILS_KEY, isEnabled) + .apply(); + } + public static void setVoicemailDonationEnabled( Context context, PhoneAccountHandle phoneAccount, boolean isEnabled) { Assert.checkArgument( VoicemailComponent.get(context) .getVoicemailClient() - .isVoicemailTranscriptionAvailable(context)); + .isVoicemailTranscriptionAvailable(context, phoneAccount)); new VisualVoicemailPreferences(context, phoneAccount) .edit() .putBoolean(DONATE_VOICEMAILS_KEY, isEnabled) @@ -125,6 +123,14 @@ public class VisualVoicemailSettingsUtil { return prefs.getBoolean(ARCHIVE_ENABLED_KEY, false); } + public static boolean isVoicemailTranscriptionEnabled( + Context context, PhoneAccountHandle phoneAccount) { + Assert.isNotNull(phoneAccount); + + VisualVoicemailPreferences prefs = new VisualVoicemailPreferences(context, phoneAccount); + return prefs.getBoolean(TRANSCRIBE_VOICEMAILS_KEY, false); + } + public static boolean isVoicemailDonationEnabled( Context context, PhoneAccountHandle phoneAccount) { Assert.isNotNull(phoneAccount); @@ -146,4 +152,19 @@ public class VisualVoicemailSettingsUtil { VisualVoicemailPreferences prefs = new VisualVoicemailPreferences(context, phoneAccount); return prefs.contains(IS_ENABLED_KEY); } + + private static class VoicemailDeleteWorker implements Worker<Void, Void> { + private final Context context; + + VoicemailDeleteWorker(Context context) { + this.context = context; + } + + @Override + public Void doInBackground(Void unused) { + int deleted = VoicemailDatabaseUtil.deleteAll(context); + VvmLog.i("VisualVoicemailSettingsUtil.doInBackground", "deleted " + deleted + " voicemails"); + return null; + } + } } diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java index c206c0818..781e3477d 100644 --- a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java +++ b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java @@ -98,6 +98,10 @@ public class TranscriptionService extends JobService { return false; } VoicemailClient client = VoicemailComponent.get(context).getVoicemailClient(); + if (!client.isVoicemailTranscriptionEnabled(context, account)) { + LogUtil.i("TranscriptionService.canTranscribeVoicemail", "transcription is not enabled"); + return false; + } if (!client.hasAcceptedTos(context, account)) { LogUtil.i("TranscriptionService.canTranscribeVoicemail", "hasn't accepted TOS"); return false; |