From ac6cd58c8642d22e47a6d4b30295137a61177e85 Mon Sep 17 00:00:00 2001
From: Brandon Maxwell <maxwelb@google.com>
Date: Mon, 21 Mar 2016 14:37:47 -0700
Subject: Checking for blocked number after migrating

+ There's an edge case crash in the Dialer when initiating the
migration workflow. If the user has blocked a number in the framework
prior to migrating the Dialer and then attempts to block that number
again in the Dialer, the migration workflow starts, completes, and
then the app crashes. This is because prior to migrating, the Dialer
doesn't know that the number is blocked in the framework, allowing it
to block the same number twice.

+ Since this case is specific to the situation where an already
blocked number initiates migration, this CL fixes the problem by
checking if the number is blocked in the framework, prior to blocking
it after the migration.

Change-Id: I31c8978afb871f364e63cab5cc6da3e5fd106b29
Fixes: 27720157
---
 .../FilteredNumberCompatInstrumentationTest.java   | 92 ++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 tests/src/com/android/dialer/compat/FilteredNumberCompatInstrumentationTest.java

(limited to 'tests')

diff --git a/tests/src/com/android/dialer/compat/FilteredNumberCompatInstrumentationTest.java b/tests/src/com/android/dialer/compat/FilteredNumberCompatInstrumentationTest.java
new file mode 100644
index 000000000..8ceb25046
--- /dev/null
+++ b/tests/src/com/android/dialer/compat/FilteredNumberCompatInstrumentationTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.dialer.compat;
+
+import android.app.AlertDialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.DialogInterface;
+import android.provider.BlockedNumberContract.BlockedNumbers;
+import android.test.ActivityInstrumentationTestCase2;
+
+import com.android.contacts.common.compat.CompatUtils;
+import com.android.dialer.DialtactsActivity;
+import com.android.dialer.R;
+
+/**
+ * UI tests for FilteredNumberCompat
+ */
+public class FilteredNumberCompatInstrumentationTest extends
+        ActivityInstrumentationTestCase2<DialtactsActivity> {
+
+    private static final String E164_NUMBER = "+16502530000";
+    private static final String NUMBER = "6502530000";
+    private static final String COUNTRY_ISO = "US";
+
+    private ContentResolver mContentResolver;
+    private FragmentManager mFragmentManager;
+
+    public FilteredNumberCompatInstrumentationTest() {
+        super(DialtactsActivity.class);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mContentResolver = getActivity().getContentResolver();
+        mFragmentManager = getActivity().getFragmentManager();
+        mContentResolver.delete(BlockedNumbersSdkCompat.CONTENT_URI,
+                BlockedNumbers.COLUMN_ORIGINAL_NUMBER + " = ?", new String[]{NUMBER});
+    }
+
+    public void testShowBlockNumberDialogFlow_AlreadyBlocked() throws InterruptedException {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+
+        ContentValues values = new ContentValues();
+        values.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, NUMBER);
+        mContentResolver.insert(BlockedNumbers.CONTENT_URI, values);
+
+        FilteredNumberCompat.setHasMigratedToNewBlocking(false);
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                FilteredNumberCompat
+                        .showBlockNumberDialogFlow(mContentResolver, null, NUMBER, COUNTRY_ISO,
+                                E164_NUMBER, R.id.floating_action_button_container,
+                                mFragmentManager, null);
+            }
+        });
+        getInstrumentation().waitForIdleSync();
+
+        final DialogFragment migrateDialogFragment = (DialogFragment) mFragmentManager
+                .findFragmentByTag("MigrateBlockedNumbers");
+        assertTrue(migrateDialogFragment.getDialog().isShowing());
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                ((AlertDialog) migrateDialogFragment.getDialog())
+                        .getButton(DialogInterface.BUTTON_POSITIVE).performClick();
+            }
+        });
+        getInstrumentation().waitForIdleSync();
+        assertNull(mFragmentManager.findFragmentByTag("BlockNumberDialog"));
+    }
+}
-- 
cgit v1.2.3