Implement new blocking

Old blocking is deprecated.

Bug: 70989544
Test: TAP
PiperOrigin-RevId: 191086875
Change-Id: Icde4963fce603fc4e16e486b78c070bd439e26e4

9 files changed, 125 insertions, 0 deletions

diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
index 621287f6c..de974cbec 100644
--- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
+++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
@@ -41,6 +41,7 @@ import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
  * Fragment for confirming and enacting blocking/unblocking a number. Also invokes snackbar
  * providing undo functionality.
  */
+@Deprecated
 public class BlockNumberDialogFragment extends DialogFragment {
 
   private static final String BLOCK_DIALOG_FRAGMENT = "BlockNumberDialog";
diff --git a/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java b/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
index 6e9fe1315..8a57f29e7 100644
--- a/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
+++ b/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
@@ -33,6 +33,7 @@ import com.android.dialer.common.concurrent.DialerExecutorFactory;
  * android.provider.BlockedNumberContract} blocking. In order for this to happen, the user cannot
  * have any numbers that are blocked in the Dialer solution.
  */
+@Deprecated
 public class BlockedNumbersAutoMigrator {
 
   static final String HAS_CHECKED_AUTO_MIGRATE_KEY = "checkedAutoMigrate";
diff --git a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
index 61ebf2f56..101a04b2f 100644
--- a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
+++ b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
@@ -36,6 +36,7 @@ import java.util.Objects;
  * {@link android.provider.BlockedNumberContract} blocking.
  */
 @TargetApi(VERSION_CODES.N)
+@Deprecated
 public class BlockedNumbersMigrator {
 
   private final Context context;
diff --git a/java/com/android/dialer/blocking/Blocking.java b/java/com/android/dialer/blocking/Blocking.java
new file mode 100644
index 000000000..e86d0a6ac
--- /dev/null
+++ b/java/com/android/dialer/blocking/Blocking.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2018 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.blocking;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.BlockedNumberContract.BlockedNumbers;
+import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
+import com.android.dialer.common.database.Selection;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+
+/** Blocks and unblocks number. */
+public final class Blocking {
+
+  private Blocking() {}
+
+  /**
+   * Thrown when blocking cannot be performed because dialer is not the default dialer, or the
+   * current user is not a primary user.
+   *
+   * <p>Blocking is only allowed on the primary user (the first user added). Primary user cannot be
+   * easily checked because {@link
+   * android.provider.BlockedNumberContract#canCurrentUserBlockNumbers(Context)} is a slow IPC, and
+   * UserManager.isPrimaryUser() is a system API. Since secondary users are rare cases this class
+   * choose to ignore the check and let callers handle the failure later.
+   */
+  public static final class BlockingFailedException extends Exception {
+    BlockingFailedException(Throwable cause) {
+      super(cause);
+    }
+  }
+
+  /**
+   * Block a number.
+   *
+   * @param countryIso the current location used to guess the country code of the number if not
+   *     available. If {@code null} and {@code number} does not have a country code, only the
+   *     original number will be blocked.
+   * @throws BlockingFailedException in the returned future if the operation failed.
+   */
+  public static ListenableFuture<Void> block(
+      Context context,
+      ListeningExecutorService executorService,
+      String number,
+      @Nullable String countryIso) {
+    return executorService.submit(
+        () -> {
+          ContentValues values = new ContentValues();
+          values.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number);
+          String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+          if (e164Number != null) {
+            values.put(BlockedNumbers.COLUMN_E164_NUMBER, e164Number);
+          }
+          try {
+            context.getContentResolver().insert(BlockedNumbers.CONTENT_URI, values);
+          } catch (SecurityException e) {
+            throw new BlockingFailedException(e);
+          }
+          return null;
+        });
+  }
+
+  /**
+   * Unblock a number.
+   *
+   * @param countryIso the current location used to guess the country code of the number if not
+   *     available. If {@code null} and {@code number} does not have a country code, only the
+   *     original number will be unblocked.
+   * @throws BlockingFailedException in the returned future if the operation failed.
+   */
+  public static ListenableFuture<Void> unblock(
+      Context context,
+      ListeningExecutorService executorService,
+      String number,
+      @Nullable String countryIso) {
+    return executorService.submit(
+        () -> {
+          Selection selection =
+              Selection.column(BlockedNumbers.COLUMN_ORIGINAL_NUMBER).is("=", number);
+          String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+          if (e164Number != null) {
+            selection =
+                selection
+                    .buildUpon()
+                    .or(Selection.column(BlockedNumbers.COLUMN_E164_NUMBER).is("=", e164Number))
+                    .build();
+          }
+          try {
+            context
+                .getContentResolver()
+                .delete(
+                    BlockedNumbers.CONTENT_URI,
+                    selection.getSelection(),
+                    selection.getSelectionArgs());
+          } catch (SecurityException e) {
+            throw new BlockingFailedException(e);
+          }
+          return null;
+        });
+  }
+}
diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
index 8be479c99..b41759259 100644
--- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
+++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
@@ -38,6 +38,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /** TODO(calderwoodra): documentation */
+@Deprecated
 public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler {
 
   public static final int INVALID_ID = -1;
diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java
index b0af45c97..d263d212c 100644
--- a/java/com/android/dialer/blocking/FilteredNumberCompat.java
+++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java
@@ -48,6 +48,7 @@ import java.util.Objects;
  * referencing columns from either contract class in situations where both blocking solutions may be
  * used.
  */
+@Deprecated
 public class FilteredNumberCompat {
 
   private static Boolean canAttemptBlockOperationsForTest;
diff --git a/java/com/android/dialer/blocking/FilteredNumberProvider.java b/java/com/android/dialer/blocking/FilteredNumberProvider.java
index 3fad4e24f..547892b41 100644
--- a/java/com/android/dialer/blocking/FilteredNumberProvider.java
+++ b/java/com/android/dialer/blocking/FilteredNumberProvider.java
@@ -34,6 +34,7 @@ import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
 import com.android.dialer.location.GeoUtil;
 
 /** Filtered number content provider. */
+@Deprecated
 public class FilteredNumberProvider extends ContentProvider {
 
   private static final int FILTERED_NUMBERS_TABLE = 1;
diff --git a/java/com/android/dialer/blocking/FilteredNumbersUtil.java b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
index 6433355fd..d839ef5da 100644
--- a/java/com/android/dialer/blocking/FilteredNumbersUtil.java
+++ b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
@@ -42,6 +42,7 @@ import com.android.dialer.util.PermissionsUtil;
 import java.util.concurrent.TimeUnit;
 
 /** Utility to help with tasks related to filtered numbers. */
+@Deprecated
 public class FilteredNumbersUtil {
 
   public static final String CALL_BLOCKING_NOTIFICATION_TAG = "call_blocking";
diff --git a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
index 9b416ff5e..9a3b647d2 100644
--- a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
+++ b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
@@ -30,6 +30,7 @@ import java.util.Objects;
  * Dialog fragment shown to users when they need to migrate to use {@link
  * android.provider.BlockedNumberContract} for blocking.
  */
+@Deprecated
 public class MigrateBlockedNumbersDialogFragment extends DialogFragment {
 
   private BlockedNumbersMigrator blockedNumbersMigrator;