diff options
Diffstat (limited to 'src/com')
6 files changed, 174 insertions, 12 deletions
diff --git a/src/com/android/dialer/DialerApplication.java b/src/com/android/dialer/DialerApplication.java index 189c68221..1a0497bb9 100644 --- a/src/com/android/dialer/DialerApplication.java +++ b/src/com/android/dialer/DialerApplication.java @@ -19,11 +19,13 @@ package com.android.dialer; import android.app.Application; import android.content.Context; import android.os.Trace; +import android.preference.PreferenceManager; import android.support.annotation.Nullable; import com.android.contacts.common.extensions.ExtensionsFactory; import com.android.contacts.common.testing.NeededForTesting; -import com.android.dialer.compat.FilteredNumberCompat; +import com.android.dialer.database.FilteredNumberAsyncQueryHandler; +import com.android.dialer.filterednumber.BlockedNumbersAutoMigrator; public class DialerApplication extends Application { @@ -39,6 +41,8 @@ public class DialerApplication extends Application { Trace.beginSection(TAG + " ExtensionsFactory initialization"); ExtensionsFactory.init(getApplicationContext()); Trace.endSection(); + new BlockedNumbersAutoMigrator(PreferenceManager.getDefaultSharedPreferences(this), + new FilteredNumberAsyncQueryHandler(getContentResolver())).autoMigrate(); Trace.endSection(); } diff --git a/src/com/android/dialer/compat/FilteredNumberCompat.java b/src/com/android/dialer/compat/FilteredNumberCompat.java index 91563dc0d..008782d86 100644 --- a/src/com/android/dialer/compat/FilteredNumberCompat.java +++ b/src/com/android/dialer/compat/FilteredNumberCompat.java @@ -16,6 +16,7 @@ package com.android.dialer.compat; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import android.app.FragmentManager; @@ -67,6 +68,8 @@ public class FilteredNumberCompat { private static Boolean isEnabledForTest; + private static Context contextForTest; + /** * @return The column name for ID in the filtered number database. */ @@ -154,7 +157,8 @@ public class FilteredNumberCompat { */ @NeededForTesting public static void setHasMigratedToNewBlocking(boolean hasMigrated) { - PreferenceManager.getDefaultSharedPreferences(DialerApplication.getContext()).edit() + PreferenceManager.getDefaultSharedPreferences( + MoreObjects.firstNonNull(contextForTest, DialerApplication.getContext())).edit() .putBoolean(HAS_MIGRATED_TO_NEW_BLOCKING_KEY, hasMigrated).apply(); } @@ -163,6 +167,11 @@ public class FilteredNumberCompat { isEnabledForTest = isEnabled; } + @NeededForTesting + public static void setContextForTest(Context context) { + contextForTest = context; + } + /** * Gets the content {@link Uri} for number filtering. * diff --git a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java index 52ef49ac0..68a2e85d5 100644 --- a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java +++ b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java @@ -125,7 +125,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { null, null, null); } - public final void hasBlockedNumbers(final OnHasBlockedNumbersListener listener) { + public void hasBlockedNumbers(final OnHasBlockedNumbersListener listener) { startQuery(NO_TOKEN, new Listener() { @Override diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersAutoMigrator.java b/src/com/android/dialer/filterednumber/BlockedNumbersAutoMigrator.java new file mode 100644 index 000000000..ed0faabbe --- /dev/null +++ b/src/com/android/dialer/filterednumber/BlockedNumbersAutoMigrator.java @@ -0,0 +1,101 @@ +/* + * 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.filterednumber; + +import com.google.common.base.Preconditions; + +import android.content.SharedPreferences; +import android.util.Log; + +import com.android.dialer.compat.FilteredNumberCompat; +import com.android.dialer.database.FilteredNumberAsyncQueryHandler; +import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnHasBlockedNumbersListener; + +/** + * Class responsible for checking if the user can be auto-migrated to {@link + * android.provider.BlockedNumberContract} blocking. In order for this to happen, the user cannot + * have any numbers that are blocked in the Dialer solution. + */ +public class BlockedNumbersAutoMigrator { + + private static final String TAG = "BlockedNumbersAuto"; + + private static final String HAS_CHECKED_AUTO_MIGRATE_KEY = "checkedAutoMigrate"; + + private final SharedPreferences sharedPreferences; + private final FilteredNumberAsyncQueryHandler queryHandler; + + /** + * Constructs the BlockedNumbersAutoMigrator with the given {@link SharedPreferences} and {@link + * FilteredNumberAsyncQueryHandler}. + * + * @param sharedPreferences The SharedPreferences used to persist information. + * @param queryHandler The FilteredNumberAsyncQueryHandler used to determine if there are + * blocked numbers. + * @throws NullPointerException if sharedPreferences or queryHandler are null. + */ + public BlockedNumbersAutoMigrator(SharedPreferences sharedPreferences, + FilteredNumberAsyncQueryHandler queryHandler) { + this.sharedPreferences = Preconditions.checkNotNull(sharedPreferences); + this.queryHandler = Preconditions.checkNotNull(queryHandler); + } + + /** + * Attempts to perform the auto-migration. Auto-migration will only be attempted once and can be + * performed only when the user has no blocked numbers. As a result of this method, the user + * will be migrated to the framework blocking solution, as determined by {@link + * FilteredNumberCompat#hasMigratedToNewBlocking()}. + */ + public void autoMigrate() { + if (!shouldAttemptAutoMigrate()) { + return; + } + + Log.i(TAG, "Attempting to auto-migrate."); + queryHandler.hasBlockedNumbers(new OnHasBlockedNumbersListener() { + @Override + public void onHasBlockedNumbers(boolean hasBlockedNumbers) { + if (hasBlockedNumbers) { + Log.i(TAG, "Not auto-migrating: blocked numbers exist."); + return; + } + Log.i(TAG, "Auto-migrating: no blocked numbers."); + FilteredNumberCompat.setHasMigratedToNewBlocking(true); + } + }); + } + + private boolean shouldAttemptAutoMigrate() { + if (sharedPreferences.contains(HAS_CHECKED_AUTO_MIGRATE_KEY)) { + Log.d(TAG, "Not attempting auto-migrate: already checked once."); + return false; + } + Log.i(TAG, "Updating state as already checked for auto-migrate."); + sharedPreferences.edit().putBoolean(HAS_CHECKED_AUTO_MIGRATE_KEY, true).apply(); + + if (!FilteredNumberCompat.canUseNewFiltering()) { + Log.i(TAG, "Not attempting auto-migrate: not available."); + return false; + } + + if (FilteredNumberCompat.hasMigratedToNewBlocking()) { + Log.i(TAG, "Not attempting auto-migrate: already migrated."); + return false; + } + return true; + } +} diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java index 87ba8bef6..b64f18691 100644 --- a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java +++ b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java @@ -15,6 +15,8 @@ */ package com.android.dialer.filterednumber; +import com.google.common.base.MoreObjects; + import android.app.ListFragment; import android.app.LoaderManager; import android.content.Context; @@ -32,11 +34,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.android.contacts.common.compat.CompatUtils; import com.android.contacts.common.lettertiles.LetterTileDrawable; +import com.android.contacts.common.testing.NeededForTesting; import com.android.dialer.R; import com.android.dialer.compat.FilteredNumberCompat; import com.android.dialer.database.FilteredNumberContract; +import com.android.dialer.filterednumber.BlockedNumbersMigrator.Listener; import com.android.dialer.filterednumber.FilteredNumbersUtil.CheckForSendToVoicemailContactListener; import com.android.dialer.filterednumber.FilteredNumbersUtil.ImportSendToVoicemailContactsListener; import com.android.dialer.voicemail.VisualVoicemailEnabledChecker; @@ -46,9 +49,12 @@ public class BlockedNumbersFragment extends ListFragment VisualVoicemailEnabledChecker.Callback { private static final char ADD_BLOCKED_NUMBER_ICON_LETTER = '+'; + private BlockedNumbersMigrator blockedNumbersMigratorForTest; + protected View migratePromoView; + private TextView blockedNumbersText; + private TextView footerText; private BlockedNumbersAdapter mAdapter; private VisualVoicemailEnabledChecker mVoicemailEnabledChecker; - private View mImportSettings; private View mBlockedNumbersDisabledForEmergency; private View mBlockedNumberListDivider; @@ -81,6 +87,9 @@ public class BlockedNumbersFragment extends ListFragment } setListAdapter(mAdapter); + blockedNumbersText = (TextView) getListView().findViewById(R.id.blocked_number_text_view); + migratePromoView = getListView().findViewById(R.id.migrate_promo); + getListView().findViewById(R.id.migrate_promo_allow_button).setOnClickListener(this); mImportSettings = getListView().findViewById(R.id.import_settings); mBlockedNumbersDisabledForEmergency = getListView().findViewById(R.id.blocked_numbers_disabled_for_emergency); @@ -89,6 +98,8 @@ public class BlockedNumbersFragment extends ListFragment getListView().findViewById(R.id.view_numbers_button).setOnClickListener(this); getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(this); + footerText = (TextView) getActivity().findViewById( + R.id.blocked_number_footer_textview); mVoicemailEnabledChecker = new VisualVoicemailEnabledChecker(getContext(),this); mVoicemailEnabledChecker.asyncUpdate(); updateActiveVoicemailProvider(); @@ -124,13 +135,16 @@ public class BlockedNumbersFragment extends ListFragment // new blocked numbers from the Blocked Management UI. They will be shown a promo card // asking them to migrate to new blocking instead. if (FilteredNumberCompat.canUseNewFiltering()) { + migratePromoView.setVisibility(View.VISIBLE); + blockedNumbersText.setVisibility(View.GONE); getListView().findViewById(R.id.add_number_linear_layout).setVisibility(View.GONE); getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(null); - mBlockedNumberListDivider.setVisibility(View.INVISIBLE); - - mImportSettings.setSystemUiVisibility(View.GONE); + mBlockedNumberListDivider.setVisibility(View.GONE); + mImportSettings.setVisibility(View.GONE); getListView().findViewById(R.id.import_button).setOnClickListener(null); getListView().findViewById(R.id.view_numbers_button).setOnClickListener(null); + mBlockedNumbersDisabledForEmergency.setVisibility(View.GONE); + footerText.setVisibility(View.GONE); } else { FilteredNumbersUtil.checkForSendToVoicemailContact( getActivity(), new CheckForSendToVoicemailContactListener() { @@ -143,7 +157,9 @@ public class BlockedNumbersFragment extends ListFragment }); } - if (FilteredNumbersUtil.hasRecentEmergencyCall(getContext())) { + // All views except migrate and the block list are hidden when new filtering is available + if (!FilteredNumberCompat.canUseNewFiltering() + && FilteredNumbersUtil.hasRecentEmergencyCall(getContext())) { mBlockedNumbersDisabledForEmergency.setVisibility(View.VISIBLE); } else { mBlockedNumbersDisabledForEmergency.setVisibility(View.GONE); @@ -190,7 +206,8 @@ public class BlockedNumbersFragment extends ListFragment @Override public void onClick(final View view) { - BlockedNumbersSettingsActivity activity = (BlockedNumbersSettingsActivity) getActivity(); + final BlockedNumbersSettingsActivity activity = + (BlockedNumbersSettingsActivity) getActivity(); if (activity == null) { return; } @@ -208,8 +225,22 @@ public class BlockedNumbersFragment extends ListFragment mImportSettings.setVisibility(View.GONE); } }); + } else if (resId == R.id.migrate_promo_allow_button) { + view.setEnabled(false); + MoreObjects.firstNonNull(blockedNumbersMigratorForTest, + new BlockedNumbersMigrator(getContext().getContentResolver())) + .migrate(new Listener() { + @Override + public void onComplete() { + getContext().startActivity( + FilteredNumberCompat.createManageBlockedNumbersIntent(getContext())); + // Remove this activity from the backstack + activity.finish(); + } + }); } } + @Override public void onVisualVoicemailEnabledStatusChanged(boolean newStatus){ updateActiveVoicemailProvider(); @@ -219,12 +250,15 @@ public class BlockedNumbersFragment extends ListFragment if (getActivity() == null || getActivity().isFinishing()) { return; } - TextView footerText = (TextView) getActivity().findViewById( - R.id.blocked_number_footer_textview); if (mVoicemailEnabledChecker.isVisualVoicemailEnabled()) { footerText.setText(R.string.block_number_footer_message_vvm); } else { footerText.setText(R.string.block_number_footer_message_no_vvm); } } + + @NeededForTesting + void setBlockedNumbersMigratorForTest(BlockedNumbersMigrator blockedNumbersMigrator) { + blockedNumbersMigratorForTest = blockedNumbersMigrator; + } } diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index fc689d037..9db3e0564 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -38,6 +38,7 @@ import java.util.List; public class DialerSettingsActivity extends AppCompatPreferenceActivity { protected SharedPreferences mPreferences; + private boolean migrationStatusOnBuildHeaders; @Override protected void onCreate(Bundle savedInstanceState) { @@ -46,6 +47,18 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { } @Override + protected void onResume() { + super.onResume(); + /* + * The headers need to be recreated if the migration status changed between when the headers + * were created and now. + */ + if (migrationStatusOnBuildHeaders != FilteredNumberCompat.hasMigratedToNewBlocking()) { + invalidateHeaders(); + } + } + + @Override public void onBuildHeaders(List<Header> target) { Header displayOptionsHeader = new Header(); displayOptionsHeader.titleRes = R.string.display_options_title; @@ -99,6 +112,7 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { blockedCallsHeader.titleRes = R.string.manage_blocked_numbers_label; blockedCallsHeader.intent = FilteredNumberCompat.createManageBlockedNumbersIntent(this); target.add(blockedCallsHeader); + migrationStatusOnBuildHeaders = FilteredNumberCompat.hasMigratedToNewBlocking(); } if (isPrimaryUser && (TelephonyManagerCompat.isTtyModeSupported(telephonyManager) |