From 281d2407619efeeb95e96a12291fa2b3cec61c1f Mon Sep 17 00:00:00 2001 From: erfanian Date: Mon, 31 Jul 2017 14:52:48 -0700 Subject: Add full phone permission groups checks. Move to the new ExecutorFactory classes. Bug: 63711921 Test: unit test PiperOrigin-RevId: 163752136 Change-Id: I33bc1e415bd3c48d593be753939d9ba42d8ba156 --- java/com/android/incallui/InCallPresenter.java | 3 +- .../incallui/spam/NumberInCallHistoryTask.java | 107 --------------------- .../incallui/spam/SpamCallListListener.java | 100 ++++++++++++++++--- 3 files changed, 89 insertions(+), 121 deletions(-) delete mode 100644 java/com/android/incallui/spam/NumberInCallHistoryTask.java (limited to 'java/com') diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index c46c99ed0..3a4862233 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -42,6 +42,7 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnCheckBlocke import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.DefaultDialerExecutorFactory; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.InteractionEvent; @@ -363,7 +364,7 @@ public class InCallPresenter implements CallList.Listener { mCallList.addListener(this); // Create spam call list listener and add it to the list of listeners - mSpamCallListListener = new SpamCallListListener(context); + mSpamCallListListener = new SpamCallListListener(context, new DefaultDialerExecutorFactory()); mCallList.addListener(mSpamCallListListener); VideoPauseController.getInstance().setUp(this); diff --git a/java/com/android/incallui/spam/NumberInCallHistoryTask.java b/java/com/android/incallui/spam/NumberInCallHistoryTask.java deleted file mode 100644 index 886933fb5..000000000 --- a/java/com/android/incallui/spam/NumberInCallHistoryTask.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2016 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.incallui.spam; - -import android.annotation.TargetApi; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteException; -import android.os.AsyncTask; -import android.os.Build.VERSION_CODES; -import android.provider.CallLog; -import android.provider.CallLog.Calls; -import android.support.annotation.NonNull; -import android.telephony.PhoneNumberUtils; -import android.text.TextUtils; -import com.android.dialer.common.LogUtil; -import com.android.dialer.common.concurrent.AsyncTaskExecutor; -import com.android.dialer.common.concurrent.AsyncTaskExecutors; -import com.android.dialer.telecom.TelecomUtil; -import com.android.dialer.util.PermissionsUtil; -import com.android.incallui.call.DialerCall; -import com.android.incallui.call.DialerCall.CallHistoryStatus; -import java.util.Objects; - -/** Checks if the number is in the call history. */ -@TargetApi(VERSION_CODES.M) -public class NumberInCallHistoryTask extends AsyncTask { - - public static final String TASK_ID = "number_in_call_history_status"; - - private final Context context; - private final Listener listener; - private final String number; - private final String countryIso; - - public NumberInCallHistoryTask( - @NonNull Context context, @NonNull Listener listener, String number, String countryIso) { - this.context = Objects.requireNonNull(context); - this.listener = Objects.requireNonNull(listener); - this.number = number; - this.countryIso = countryIso; - } - - public void submitTask() { - if (!PermissionsUtil.hasPhonePermissions(context)) { - return; - } - AsyncTaskExecutor asyncTaskExecutor = AsyncTaskExecutors.createThreadPoolExecutor(); - asyncTaskExecutor.submit(TASK_ID, this); - } - - @Override - @CallHistoryStatus - public Integer doInBackground(Void... params) { - String numberToQuery = number; - String fieldToQuery = Calls.NUMBER; - String normalizedNumber = PhoneNumberUtils.formatNumberToE164(number, countryIso); - - // If we can normalize the number successfully, look in "normalized_number" - // field instead. Otherwise, look for number in "number" field. - if (!TextUtils.isEmpty(normalizedNumber)) { - numberToQuery = normalizedNumber; - fieldToQuery = Calls.CACHED_NORMALIZED_NUMBER; - } - try (Cursor cursor = - context - .getContentResolver() - .query( - TelecomUtil.getCallLogUri(context), - new String[] {CallLog.Calls._ID}, - fieldToQuery + " = ?", - new String[] {numberToQuery}, - null)) { - return cursor != null && cursor.getCount() > 0 - ? DialerCall.CALL_HISTORY_STATUS_PRESENT - : DialerCall.CALL_HISTORY_STATUS_NOT_PRESENT; - } catch (SQLiteException e) { - LogUtil.e("NumberInCallHistoryTask.doInBackground", "query call log error", e); - return DialerCall.CALL_HISTORY_STATUS_UNKNOWN; - } - } - - @Override - public void onPostExecute(@CallHistoryStatus Integer callHistoryStatus) { - listener.onComplete(callHistoryStatus); - } - - /** Callback for the async task. */ - public interface Listener { - - void onComplete(@CallHistoryStatus int callHistoryStatus); - } -} diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index 56ae55823..27e58a775 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -16,14 +16,21 @@ package com.android.incallui.spam; +import android.annotation.TargetApi; import android.app.Notification; import android.app.Notification.Builder; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.database.Cursor; +import android.database.sqlite.SQLiteException; import android.graphics.drawable.Icon; +import android.os.Build.VERSION_CODES; +import android.provider.CallLog; +import android.provider.CallLog.Calls; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v4.os.BuildCompat; import android.telecom.DisconnectCause; import android.telephony.PhoneNumberUtils; @@ -31,17 +38,23 @@ import android.text.TextUtils; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.blocking.FilteredNumbersUtil; +import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.DialerExecutor.Worker; +import com.android.dialer.common.concurrent.DialerExecutorFactory; import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.ContactLookupResult; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.notification.NotificationChannelId; import com.android.dialer.spam.Spam; +import com.android.dialer.telecom.TelecomUtil; +import com.android.dialer.util.PermissionsUtil; import com.android.incallui.R; import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.CallHistoryStatus; +import java.util.Arrays; import java.util.Random; /** @@ -53,15 +66,67 @@ public class SpamCallListListener implements CallList.Listener { private final Context context; private final Random random; + private final DialerExecutorFactory dialerExecutorFactory; - public SpamCallListListener(Context context) { - this.context = context; - this.random = new Random(); + public SpamCallListListener(Context context, @NonNull DialerExecutorFactory factory) { + this(context, new Random(), factory); } - public SpamCallListListener(Context context, Random rand) { + public SpamCallListListener( + Context context, Random rand, @NonNull DialerExecutorFactory factory) { this.context = context; this.random = rand; + Assert.isNotNull(factory); + this.dialerExecutorFactory = factory; + } + + /** Checks if the number is in the call history. */ + @TargetApi(VERSION_CODES.M) + static final class NumberInCallHistoryWorker implements Worker { + + private final Context appContext; + private final String number; + private final String countryIso; + + public NumberInCallHistoryWorker( + @NonNull Context appContext, String number, String countryIso) { + this.appContext = Assert.isNotNull(appContext); + this.number = number; + this.countryIso = countryIso; + } + + @Override + @NonNull + @CallHistoryStatus + public Integer doInBackground(@Nullable Void input) throws Throwable { + String numberToQuery = number; + String fieldToQuery = Calls.NUMBER; + String normalizedNumber = PhoneNumberUtils.formatNumberToE164(number, countryIso); + + // If we can normalize the number successfully, look in "normalized_number" + // field instead. Otherwise, look for number in "number" field. + if (!TextUtils.isEmpty(normalizedNumber)) { + numberToQuery = normalizedNumber; + fieldToQuery = Calls.CACHED_NORMALIZED_NUMBER; + } + + try (Cursor cursor = + appContext + .getContentResolver() + .query( + TelecomUtil.getCallLogUri(appContext), + new String[] {CallLog.Calls._ID}, + fieldToQuery + " = ?", + new String[] {numberToQuery}, + null)) { + return cursor != null && cursor.getCount() > 0 + ? DialerCall.CALL_HISTORY_STATUS_PRESENT + : DialerCall.CALL_HISTORY_STATUS_NOT_PRESENT; + } catch (SQLiteException e) { + LogUtil.e("NumberInCallHistoryWorker.doInBackground", "query call log error", e); + return DialerCall.CALL_HISTORY_STATUS_UNKNOWN; + } + } } @Override @@ -70,15 +135,24 @@ public class SpamCallListListener implements CallList.Listener { if (TextUtils.isEmpty(number)) { return; } - NumberInCallHistoryTask.Listener listener = - new NumberInCallHistoryTask.Listener() { - @Override - public void onComplete(@CallHistoryStatus int callHistoryStatus) { - call.setCallHistoryStatus(callHistoryStatus); - } - }; - new NumberInCallHistoryTask(context, listener, number, GeoUtil.getCurrentCountryIso(context)) - .submitTask(); + + String[] deniedPhonePermissions = + PermissionsUtil.getPermissionsCurrentlyDenied( + context, PermissionsUtil.allPhoneGroupPermissionsUsedInDialer); + if (deniedPhonePermissions.length > 0) { + LogUtil.i( + "NumberInCallHistoryWorker.submitTask", + "Need phone permissions: " + Arrays.toString(deniedPhonePermissions)); + return; + } + + NumberInCallHistoryWorker historyTask = + new NumberInCallHistoryWorker(context, number, GeoUtil.getCurrentCountryIso(context)); + dialerExecutorFactory + .createNonUiTaskBuilder(historyTask) + .onSuccess((result) -> call.setCallHistoryStatus(result)) + .build() + .executeParallel(null); } @Override -- cgit v1.2.3