From 89c9ff500a3af31740e5cf082e30b79c9cc8451e Mon Sep 17 00:00:00 2001 From: twyen Date: Thu, 14 Dec 2017 17:26:58 -0800 Subject: Add PreCall step to check permission If CALL_PHONE is missing PreCall will abort immediately and show a toast. Bug: 70565989,70566029 Test: PermissionCheckActionTest PiperOrigin-RevId: 179123070 Change-Id: I0d43c6acd44e77562752c871bed0223b2f787dde --- .../dialer/precall/impl/PermissionCheckAction.java | 54 ++++++++++++++++++++++ .../android/dialer/precall/impl/PreCallImpl.java | 3 +- .../dialer/precall/impl/res/values/strings.xml | 3 ++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 java/com/android/dialer/precall/impl/PermissionCheckAction.java (limited to 'java/com/android/dialer/precall') diff --git a/java/com/android/dialer/precall/impl/PermissionCheckAction.java b/java/com/android/dialer/precall/impl/PermissionCheckAction.java new file mode 100644 index 000000000..b57b37a6f --- /dev/null +++ b/java/com/android/dialer/precall/impl/PermissionCheckAction.java @@ -0,0 +1,54 @@ +/* + * 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.precall.impl; + +import android.content.Context; +import android.widget.Toast; +import com.android.dialer.callintent.CallIntentBuilder; +import com.android.dialer.precall.PreCallAction; +import com.android.dialer.precall.PreCallCoordinator; +import com.android.dialer.util.PermissionsUtil; + +/** Aborts call and show a toast if phone permissions are missing. */ +public class PermissionCheckAction implements PreCallAction { + + @Override + public boolean requiresUi(Context context, CallIntentBuilder builder) { + return !PermissionsUtil.hasPhonePermissions(context); + } + + @Override + public void runWithoutUi(Context context, CallIntentBuilder builder) {} + + @Override + public void runWithUi(PreCallCoordinator coordinator) { + if (!requiresUi(coordinator.getActivity(), coordinator.getBuilder())) { + return; + } + Toast.makeText( + coordinator.getActivity(), + coordinator + .getActivity() + .getString(R.string.pre_call_permission_check_no_phone_permission), + Toast.LENGTH_LONG) + .show(); + coordinator.abortCall(); + } + + @Override + public void onDiscard() {} +} diff --git a/java/com/android/dialer/precall/impl/PreCallImpl.java b/java/com/android/dialer/precall/impl/PreCallImpl.java index b9c9d8873..f75c8d9ec 100644 --- a/java/com/android/dialer/precall/impl/PreCallImpl.java +++ b/java/com/android/dialer/precall/impl/PreCallImpl.java @@ -38,7 +38,8 @@ public class PreCallImpl implements PreCall { @Override public ImmutableList getActions() { - return ImmutableList.of(new CallingAccountSelector(), new AssistedDialAction()); + return ImmutableList.of( + new PermissionCheckAction(), new CallingAccountSelector(), new AssistedDialAction()); } @NonNull diff --git a/java/com/android/dialer/precall/impl/res/values/strings.xml b/java/com/android/dialer/precall/impl/res/values/strings.xml index 2560e4999..0b59607b6 100644 --- a/java/com/android/dialer/precall/impl/res/values/strings.xml +++ b/java/com/android/dialer/precall/impl/res/values/strings.xml @@ -15,6 +15,9 @@ ~ limitations under the License --> + + Cannot make call without phone permission + Choose SIM for this call -- cgit v1.2.3