Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in setting as well as a new DialogFragment, which displays a dialog providing the user with more information before they enable the setting. Bug: 111305845 Test: manual Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
This commit is contained in:
@@ -136,6 +136,8 @@
|
||||
android:theme="@style/Theme.Settings.Home"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter android:priority="1">
|
||||
<!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
|
||||
<action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
|
||||
<action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
|
||||
<action android:name="android.settings.DATA_ROAMING_SETTINGS" />
|
||||
<action android:name="android.settings.MMS_MESSAGE_SETTING" />
|
||||
|
@@ -6990,6 +6990,19 @@
|
||||
<string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
|
||||
<!-- Enhaced 4G LTE Mode summary for 4g calling. [CHAR LIMIT=100] -->
|
||||
<string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice and other communications (recommended)</string>
|
||||
<!-- Title of a preference determining whether or not the user has enabled contact discovery,
|
||||
which is a service that uses the phone numbers in your contacts to determine if your
|
||||
contacts support advanced calling features, such as video calling. [CHAR LIMIT=50]-->
|
||||
<string name="contact_discovery_opt_in_title">Contact discovery</string>
|
||||
<!-- Summary of a preference determining whether or not the user has enabled contact discovery.
|
||||
[CHAR LIMIT=100] -->
|
||||
<string name="contact_discovery_opt_in_summary">Allows your carrier to discover which calling features your contacts support.</string>
|
||||
<!-- Title of the dialog shown when the user tries to enable Contact Discovery.
|
||||
[CHAR LIMIT=50] -->
|
||||
<string name="contact_discovery_opt_in_dialog_title">Enable contact discovery?</string>
|
||||
<!-- Text displayed in the dialog shown when the user tries to enable Contact Discovery.
|
||||
[CHAR LIMIT=NONE]-->
|
||||
<string name="contact_discovery_opt_in_dialog_message">Enabling this feature will allow your carrier access to phone numbers in your contacts in order to discover which calling features they support.</string>
|
||||
<!-- Preferred network type title. [CHAR LIMIT=50] -->
|
||||
<string name="preferred_network_type_title">Preferred network type</string>
|
||||
<!-- Preferred network type summary. [CHAR LIMIT=100] -->
|
||||
|
@@ -52,6 +52,13 @@
|
||||
android:summary="@string/enhanced_4g_lte_mode_summary"
|
||||
settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="contact_discovery_opt_in"
|
||||
android:title="@string/contact_discovery_opt_in_title"
|
||||
android:persistent="false"
|
||||
android:summary="@string/contact_discovery_opt_in_summary"
|
||||
settings:controller="com.android.settings.network.telephony.ContactDiscoveryPreferenceController"/>
|
||||
|
||||
<ListPreference
|
||||
android:key="preferred_network_mode_key"
|
||||
android:title="@string/preferred_network_mode_title"
|
||||
|
@@ -98,6 +98,13 @@
|
||||
android:summary="@string/enhanced_4g_lte_mode_summary"
|
||||
settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="contact_discovery_opt_in"
|
||||
android:title="@string/contact_discovery_opt_in_title"
|
||||
android:persistent="false"
|
||||
android:summary="@string/contact_discovery_opt_in_summary"
|
||||
settings:controller="com.android.settings.network.telephony.ContactDiscoveryPreferenceController"/>
|
||||
|
||||
<ListPreference
|
||||
android:key="preferred_network_mode_key"
|
||||
android:title="@string/preferred_network_mode_title"
|
||||
|
@@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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.settings.network.telephony;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
import android.telephony.ims.ImsManager;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
|
||||
/**
|
||||
* Fragment for the "Contact Discovery" dialog that appears when the user enables
|
||||
* "Contact Discovery" in MobileNetworkSettings or an application starts MobileNetworkSettings with
|
||||
* {@link ImsRcsManager#ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN}.
|
||||
*/
|
||||
public class ContactDiscoveryDialogFragment extends InstrumentedDialogFragment
|
||||
implements DialogInterface.OnClickListener {
|
||||
|
||||
private static final String SUB_ID_KEY = "sub_id_key";
|
||||
private static final String DIALOG_TAG = "discovery_dialog:";
|
||||
|
||||
private int mSubId;
|
||||
private ImsManager mImsManager;
|
||||
|
||||
/**
|
||||
* Create a new Fragment, which will create a new Dialog when
|
||||
* {@link #show(FragmentManager, String)} is called.
|
||||
* @param subId The subscription ID to associate with this Dialog.
|
||||
* @return a new instance of ContactDiscoveryDialogFragment.
|
||||
*/
|
||||
public static ContactDiscoveryDialogFragment newInstance(int subId) {
|
||||
final ContactDiscoveryDialogFragment dialogFragment = new ContactDiscoveryDialogFragment();
|
||||
final Bundle args = new Bundle();
|
||||
args.putInt(SUB_ID_KEY, subId);
|
||||
dialogFragment.setArguments(args);
|
||||
|
||||
return dialogFragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
final Bundle args = getArguments();
|
||||
mSubId = args.getInt(SUB_ID_KEY);
|
||||
mImsManager = getImsManager(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||
final int title = R.string.contact_discovery_opt_in_dialog_title;
|
||||
int message = R.string.contact_discovery_opt_in_dialog_message;
|
||||
builder.setMessage(getResources().getString(message))
|
||||
.setTitle(title)
|
||||
.setIconAttribute(android.R.attr.alertDialogIcon)
|
||||
.setPositiveButton(android.R.string.ok, this)
|
||||
.setNegativeButton(android.R.string.cancel, this);
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
// let the host know that the positive button has been clicked
|
||||
if (which == dialog.BUTTON_POSITIVE) {
|
||||
MobileNetworkUtils.setContactDiscoveryEnabled(mImsManager, mSubId, true /*isEnabled*/);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return METRICS_CATEGORY_UNKNOWN;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public ImsManager getImsManager(Context context) {
|
||||
return context.getSystemService(ImsManager.class);
|
||||
}
|
||||
|
||||
public static String getFragmentTag(int subId) {
|
||||
return DIALOG_TAG + subId;
|
||||
}
|
||||
}
|
@@ -0,0 +1,136 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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.settings.network.telephony;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.ContentObserver;
|
||||
import android.net.Uri;
|
||||
import android.os.PersistableBundle;
|
||||
import android.provider.Telephony;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
import android.telephony.ims.ImsManager;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.lifecycle.LifecycleObserver;
|
||||
import androidx.lifecycle.OnLifecycleEvent;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
|
||||
/**
|
||||
* Controller for the "Contact Discovery" option present in MobileNetworkSettings.
|
||||
*/
|
||||
public class ContactDiscoveryPreferenceController extends TelephonyTogglePreferenceController
|
||||
implements LifecycleObserver {
|
||||
private static final String TAG = "ContactDiscoveryPref";
|
||||
private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI,
|
||||
Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED);
|
||||
|
||||
private ImsManager mImsManager;
|
||||
private CarrierConfigManager mCarrierConfigManager;
|
||||
private ContentObserver mUceSettingObserver;
|
||||
private FragmentManager mFragmentManager;
|
||||
|
||||
@VisibleForTesting
|
||||
public Preference preference;
|
||||
|
||||
public ContactDiscoveryPreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
mImsManager = mContext.getSystemService(ImsManager.class);
|
||||
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
|
||||
}
|
||||
|
||||
public ContactDiscoveryPreferenceController init(FragmentManager fragmentManager, int subId,
|
||||
Lifecycle lifecycle) {
|
||||
mFragmentManager = fragmentManager;
|
||||
mSubId = subId;
|
||||
lifecycle.addObserver(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isChecked() {
|
||||
return MobileNetworkUtils.isContactDiscoveryEnabled(mImsManager, mSubId);
|
||||
}
|
||||
|
||||
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
|
||||
public void onResume() {
|
||||
registerUceObserver();
|
||||
}
|
||||
|
||||
@OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
|
||||
public void onPause() {
|
||||
unregisterUceObserver();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
if (isChecked) {
|
||||
showContentDiscoveryDialog();
|
||||
// launch dialog and wait for activity to return and ContentObserver to fire to update.
|
||||
return false;
|
||||
}
|
||||
MobileNetworkUtils.setContactDiscoveryEnabled(mImsManager, mSubId, false /*isEnabled*/);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus(int subId) {
|
||||
PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId);
|
||||
boolean shouldShowPresence = bundle.getBoolean(
|
||||
CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
|
||||
return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
preference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
private void registerUceObserver() {
|
||||
mUceSettingObserver = new ContentObserver(mContext.getMainThreadHandler()) {
|
||||
@Override
|
||||
public void onChange(boolean selfChange) {
|
||||
onChange(selfChange, null /*uri*/);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChange(boolean selfChange, Uri uri) {
|
||||
Log.d(TAG, "UCE setting changed, re-evaluating.");
|
||||
SwitchPreference switchPref = (SwitchPreference) preference;
|
||||
switchPref.setChecked(isChecked());
|
||||
}
|
||||
};
|
||||
mContext.getContentResolver().registerContentObserver(UCE_URI, true /*notifyForDecendants*/,
|
||||
mUceSettingObserver);
|
||||
}
|
||||
|
||||
private void unregisterUceObserver() {
|
||||
mContext.getContentResolver().unregisterContentObserver(mUceSettingObserver);
|
||||
}
|
||||
|
||||
private void showContentDiscoveryDialog() {
|
||||
ContactDiscoveryDialogFragment dialog = ContactDiscoveryDialogFragment.newInstance(
|
||||
mSubId);
|
||||
dialog.show(mFragmentManager, ContactDiscoveryDialogFragment.getFragmentTag(mSubId));
|
||||
}
|
||||
}
|
@@ -26,6 +26,8 @@ import android.provider.Settings;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
import android.text.TextUtils;
|
||||
import android.view.Menu;
|
||||
import android.view.View;
|
||||
|
||||
@@ -72,7 +74,12 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
public void onSubscriptionsChanged() {
|
||||
if (!Objects.equals(mSubscriptionInfos,
|
||||
mSubscriptionManager.getActiveSubscriptionInfoList(true))) {
|
||||
int oldSubIndex = mCurSubscriptionId;
|
||||
updateSubscriptions(null);
|
||||
// Remove the dialog if the subscription associated with this activity changes.
|
||||
if (mCurSubscriptionId != oldSubIndex) {
|
||||
removeContactDiscoveryDialog(oldSubIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -80,14 +87,33 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
@Override
|
||||
protected void onNewIntent(Intent intent) {
|
||||
super.onNewIntent(intent);
|
||||
validate(intent);
|
||||
setIntent(intent);
|
||||
|
||||
int updateSubscriptionIndex = SUB_ID_NULL;
|
||||
if (intent != null) {
|
||||
updateSubscriptionIndex = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL);
|
||||
}
|
||||
int oldSubId = mCurSubscriptionId;
|
||||
updateSubscriptions(null);
|
||||
|
||||
// If the subscription has changed or the new intent doesnt contain the opt in action,
|
||||
// remove the old discovery dialog. If the activity is being recreated, we will see
|
||||
// onCreate -> onNewIntent, so the dialog will first be recreated for the old subscription
|
||||
// and then removed.
|
||||
if (updateSubscriptionIndex != oldSubId || !doesIntentContainOptInAction(intent)) {
|
||||
removeContactDiscoveryDialog(oldSubId);
|
||||
}
|
||||
// evaluate showing the new discovery dialog if this intent contains an action to show the
|
||||
// opt-in.
|
||||
if (doesIntentContainOptInAction(intent)) {
|
||||
maybeShowContactDiscoveryDialog(updateSubscriptionIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) {
|
||||
setContentView(R.layout.mobile_network_settings_container_v2);
|
||||
} else {
|
||||
@@ -109,6 +135,8 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
});
|
||||
mSubscriptionManager = getSystemService(SubscriptionManager.class);
|
||||
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(true);
|
||||
final Intent startIntent = getIntent();
|
||||
validate(startIntent);
|
||||
mCurSubscriptionId = savedInstanceState != null
|
||||
? savedInstanceState.getInt(Settings.EXTRA_SUB_ID, SUB_ID_NULL)
|
||||
: SUB_ID_NULL;
|
||||
@@ -117,8 +145,8 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
if (actionBar != null) {
|
||||
actionBar.setDisplayHomeAsUpEnabled(true);
|
||||
}
|
||||
|
||||
updateSubscriptions(savedInstanceState);
|
||||
maybeShowContactDiscoveryDialog(mCurSubscriptionId);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -250,6 +278,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
mCurSubscriptionId = subscriptionId;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
private String buildFragmentTag(int subscriptionId) {
|
||||
return MOBILE_SETTINGS_TAG + subscriptionId;
|
||||
}
|
||||
@@ -295,4 +324,60 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
|
||||
mClient.onPhoneChange();
|
||||
}
|
||||
}
|
||||
|
||||
private void removeContactDiscoveryDialog(int subId) {
|
||||
ContactDiscoveryDialogFragment fragment = getContactDiscoveryFragment(subId);
|
||||
if (fragment != null) {
|
||||
fragment.dismiss();
|
||||
}
|
||||
}
|
||||
|
||||
private ContactDiscoveryDialogFragment getContactDiscoveryFragment(int subId) {
|
||||
// In the case that we are rebuilding this activity after it has been destroyed and
|
||||
// recreated, look up the dialog in the fragment manager.
|
||||
return (ContactDiscoveryDialogFragment) getSupportFragmentManager()
|
||||
.findFragmentByTag(ContactDiscoveryDialogFragment.getFragmentTag(subId));
|
||||
}
|
||||
|
||||
private void maybeShowContactDiscoveryDialog(int subId) {
|
||||
// If this activity was launched using ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN, show the
|
||||
// associated dialog only if the opt-in has not been granted yet.
|
||||
boolean showOptInDialog = doesIntentContainOptInAction(getIntent())
|
||||
// has the carrier config enabled capability discovery?
|
||||
&& MobileNetworkUtils.isContactDiscoveryVisible(this, subId)
|
||||
// has the user already enabled this configuration?
|
||||
&& !MobileNetworkUtils.isContactDiscoveryEnabled(this, subId);
|
||||
ContactDiscoveryDialogFragment fragment = getContactDiscoveryFragment(subId);
|
||||
if (showOptInDialog) {
|
||||
if (fragment == null) {
|
||||
fragment = ContactDiscoveryDialogFragment.newInstance(subId);
|
||||
}
|
||||
// Only try to show the dialog if it has not already been added, otherwise we may
|
||||
// accidentally add it multiple times, causing multiple dialogs.
|
||||
if (!fragment.isAdded()) {
|
||||
fragment.show(getSupportFragmentManager(),
|
||||
ContactDiscoveryDialogFragment.getFragmentTag(subId));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean doesIntentContainOptInAction(Intent intent) {
|
||||
String intentAction = (intent != null ? intent.getAction() : null);
|
||||
return TextUtils.equals(intentAction,
|
||||
ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN);
|
||||
}
|
||||
|
||||
private void validate(Intent intent) {
|
||||
// Do not allow ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN without a subscription id specified,
|
||||
// since we do not want the user to accidentally turn on capability polling for the wrong
|
||||
// subscription.
|
||||
if (doesIntentContainOptInAction(intent)) {
|
||||
if (SubscriptionManager.INVALID_SUBSCRIPTION_ID == intent.getIntExtra(
|
||||
Settings.EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID)) {
|
||||
throw new IllegalArgumentException("Intent with action "
|
||||
+ "SHOW_CAPABILITY_DISCOVERY_OPT_IN must also include the extra "
|
||||
+ "Settings#EXTRA_SUB_ID");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -178,6 +178,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
|
||||
Arrays.asList(wifiCallingPreferenceController, videoCallingPreferenceController));
|
||||
use(Enhanced4gLtePreferenceController.class).init(mSubId)
|
||||
.addListener(videoCallingPreferenceController);
|
||||
use(ContactDiscoveryPreferenceController.class).init(getFragmentManager(), mSubId,
|
||||
getLifecycle());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -38,7 +38,9 @@ import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.telephony.euicc.EuiccManager;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
import android.telephony.ims.ProvisioningManager;
|
||||
import android.telephony.ims.RcsUceAdapter;
|
||||
import android.telephony.ims.feature.ImsFeature;
|
||||
import android.telephony.ims.feature.MmTelFeature;
|
||||
import android.telephony.ims.stub.ImsRegistrationImplBase;
|
||||
@@ -155,6 +157,80 @@ public class MobileNetworkUtils {
|
||||
return isWifiCallingEnabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The current user setting for whether or not contact discovery is enabled for the
|
||||
* subscription id specified.
|
||||
* @see RcsUceAdapter#isUceSettingEnabled()
|
||||
*/
|
||||
public static boolean isContactDiscoveryEnabled(Context context, int subId) {
|
||||
android.telephony.ims.ImsManager imsManager =
|
||||
context.getSystemService(android.telephony.ims.ImsManager.class);
|
||||
return isContactDiscoveryEnabled(imsManager, subId);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The current user setting for whether or not contact discovery is enabled for the
|
||||
* subscription id specified.
|
||||
* @see RcsUceAdapter#isUceSettingEnabled()
|
||||
*/
|
||||
public static boolean isContactDiscoveryEnabled(android.telephony.ims.ImsManager imsManager,
|
||||
int subId) {
|
||||
ImsRcsManager manager = getImsRcsManager(imsManager, subId);
|
||||
if (manager == null) return false;
|
||||
RcsUceAdapter adapter = manager.getUceAdapter();
|
||||
try {
|
||||
return adapter.isUceSettingEnabled();
|
||||
} catch (android.telephony.ims.ImsException e) {
|
||||
Log.w(TAG, "UCE service is not available: " + e.getMessage());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the new user setting to enable or disable contact discovery through RCS UCE.
|
||||
* @see RcsUceAdapter#setUceSettingEnabled(boolean)
|
||||
*/
|
||||
public static void setContactDiscoveryEnabled(android.telephony.ims.ImsManager imsManager,
|
||||
int subId, boolean isEnabled) {
|
||||
ImsRcsManager manager = getImsRcsManager(imsManager, subId);
|
||||
if (manager == null) return;
|
||||
RcsUceAdapter adapter = manager.getUceAdapter();
|
||||
try {
|
||||
adapter.setUceSettingEnabled(isEnabled);
|
||||
} catch (android.telephony.ims.ImsException e) {
|
||||
Log.w(TAG, "UCE service is not available: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The ImsRcsManager associated with the subscription specified.
|
||||
*/
|
||||
private static ImsRcsManager getImsRcsManager(android.telephony.ims.ImsManager imsManager,
|
||||
int subId) {
|
||||
if (imsManager == null) return null;
|
||||
try {
|
||||
return imsManager.getImsRcsManager(subId);
|
||||
} catch (Exception e) {
|
||||
Log.w(TAG, "Could not resolve ImsRcsManager: " + e.getMessage());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if contact discovery is available for the subscription specified and the option
|
||||
* should be shown to the user, false if the option should be hidden.
|
||||
*/
|
||||
public static boolean isContactDiscoveryVisible(Context context, int subId) {
|
||||
CarrierConfigManager carrierConfigManager = context.getSystemService(
|
||||
CarrierConfigManager.class);
|
||||
if (carrierConfigManager == null) {
|
||||
Log.w(TAG, "isContactDiscoveryVisible: Could not resolve carrier config");
|
||||
return false;
|
||||
}
|
||||
PersistableBundle bundle = carrierConfigManager.getConfigForSubId(subId);
|
||||
return bundle.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
static Intent buildPhoneAccountConfigureIntent(
|
||||
Context context, PhoneAccountHandle accountHandle) {
|
||||
|
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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.settings.network.telephony;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.telephony.ims.ImsManager;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
import android.telephony.ims.RcsUceAdapter;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ContactDiscoveryDialogFragmentTest {
|
||||
private static final int TEST_SUB_ID = 2;
|
||||
|
||||
@Mock private ImsManager mImsManager;
|
||||
@Mock private ImsRcsManager mImsRcsManager;
|
||||
@Mock private RcsUceAdapter mRcsUceAdapter;
|
||||
|
||||
private ContactDiscoveryDialogFragment mDialogFragmentUT;
|
||||
private FragmentActivity mActivity;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mActivity = Robolectric.buildActivity(FragmentActivity.class).setup().get();
|
||||
mDialogFragmentUT = spy(ContactDiscoveryDialogFragment.newInstance(TEST_SUB_ID));
|
||||
doReturn(mImsManager).when(mDialogFragmentUT).getImsManager(any());
|
||||
doReturn(mImsRcsManager).when(mImsManager).getImsRcsManager(TEST_SUB_ID);
|
||||
doReturn(mRcsUceAdapter).when(mImsRcsManager).getUceAdapter();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCancelDoesNothing() throws Exception {
|
||||
final AlertDialog dialog = startDialog();
|
||||
final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
|
||||
assertThat(negativeButton).isNotNull();
|
||||
negativeButton.performClick();
|
||||
verify(mRcsUceAdapter, never()).setUceSettingEnabled(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOkEnablesDiscovery() throws Exception {
|
||||
final AlertDialog dialog = startDialog();
|
||||
final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
|
||||
assertThat(positiveButton).isNotNull();
|
||||
positiveButton.performClick();
|
||||
verify(mRcsUceAdapter).setUceSettingEnabled(true /*isEnabled*/);
|
||||
}
|
||||
|
||||
private AlertDialog startDialog() {
|
||||
mDialogFragmentUT.show(mActivity.getSupportFragmentManager(), null);
|
||||
return ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
}
|
||||
}
|
@@ -0,0 +1,168 @@
|
||||
/*
|
||||
* Copyright (C) 2020 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.settings.network.telephony;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.database.ContentObserver;
|
||||
import android.net.Uri;
|
||||
import android.os.PersistableBundle;
|
||||
import android.provider.Telephony;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
import android.telephony.ims.ImsManager;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
import android.telephony.ims.RcsUceAdapter;
|
||||
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ContactDiscoveryPreferenceControllerTest {
|
||||
|
||||
private static final int TEST_SUB_ID = 2;
|
||||
private static final Uri UCE_URI = Uri.withAppendedPath(Telephony.SimInfo.CONTENT_URI,
|
||||
Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED);
|
||||
|
||||
@Mock private ImsManager mImsManager;
|
||||
@Mock private ImsRcsManager mImsRcsManager;
|
||||
@Mock private RcsUceAdapter mRcsUceAdapter;
|
||||
@Mock private CarrierConfigManager mCarrierConfigManager;
|
||||
@Mock private ContentResolver mContentResolver;
|
||||
@Mock private FragmentManager mFragmentManager;
|
||||
@Mock private FragmentTransaction mFragmentTransaction;
|
||||
|
||||
private Context mContext;
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private ContactDiscoveryPreferenceController mPreferenceControllerUT;
|
||||
private SwitchPreference mSwitchPreferenceUT;
|
||||
private PersistableBundle mCarrierConfig = new PersistableBundle();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
doReturn(mImsManager).when(mContext).getSystemService(ImsManager.class);
|
||||
doReturn(mImsRcsManager).when(mImsManager).getImsRcsManager(anyInt());
|
||||
doReturn(mRcsUceAdapter).when(mImsRcsManager).getUceAdapter();
|
||||
doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
|
||||
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(eq(TEST_SUB_ID));
|
||||
// Start all tests with presence being disabled.
|
||||
setRcsPresenceConfig(false);
|
||||
doReturn(mContentResolver).when(mContext).getContentResolver();
|
||||
doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
|
||||
|
||||
mPreferenceControllerUT = new ContactDiscoveryPreferenceController(mContext,
|
||||
"ContactDiscovery");
|
||||
mPreferenceControllerUT.init(mFragmentManager, TEST_SUB_ID, mLifecycle);
|
||||
mSwitchPreferenceUT = spy(new SwitchPreference(mContext));
|
||||
mSwitchPreferenceUT.setKey(mPreferenceControllerUT.getPreferenceKey());
|
||||
mPreferenceControllerUT.preference = mSwitchPreferenceUT;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetAvailabilityStatus() {
|
||||
assertEquals("Availability status should not be available.", CONDITIONALLY_UNAVAILABLE,
|
||||
mPreferenceControllerUT.getAvailabilityStatus(TEST_SUB_ID));
|
||||
setRcsPresenceConfig(true);
|
||||
assertEquals("Availability status should available.", AVAILABLE,
|
||||
mPreferenceControllerUT.getAvailabilityStatus(TEST_SUB_ID));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsChecked() throws Exception {
|
||||
doReturn(false).when(mRcsUceAdapter).isUceSettingEnabled();
|
||||
assertFalse(mPreferenceControllerUT.isChecked());
|
||||
|
||||
doReturn(true).when(mRcsUceAdapter).isUceSettingEnabled();
|
||||
assertTrue(mPreferenceControllerUT.isChecked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRegisterObserver() {
|
||||
mLifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
|
||||
verify(mContentResolver).registerContentObserver(eq(UCE_URI), anyBoolean(), any());
|
||||
|
||||
mLifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE);
|
||||
verify(mContentResolver).unregisterContentObserver(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testContentObserverChanged() throws Exception {
|
||||
assertFalse(mSwitchPreferenceUT.isChecked());
|
||||
ContentObserver observer = getUceChangeObserver();
|
||||
assertNotNull(observer);
|
||||
|
||||
doReturn(true).when(mRcsUceAdapter).isUceSettingEnabled();
|
||||
observer.onChange(false, UCE_URI);
|
||||
assertTrue(mSwitchPreferenceUT.isChecked());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetChecked() throws Exception {
|
||||
// Verify a dialog is shown when the switch is enabled (but the switch is not enabled).
|
||||
assertFalse(mPreferenceControllerUT.setChecked(true /*isChecked*/));
|
||||
verify(mFragmentTransaction).add(any(), anyString());
|
||||
// Verify content discovery is disabled when the user disables it.
|
||||
assertTrue(mPreferenceControllerUT.setChecked(false /*isChecked*/));
|
||||
verify(mRcsUceAdapter).setUceSettingEnabled(false);
|
||||
}
|
||||
|
||||
private void setRcsPresenceConfig(boolean isEnabled) {
|
||||
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, isEnabled);
|
||||
}
|
||||
|
||||
private ContentObserver getUceChangeObserver() {
|
||||
ArgumentCaptor<ContentObserver> observerCaptor =
|
||||
ArgumentCaptor.forClass(ContentObserver.class);
|
||||
mLifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
|
||||
verify(mContentResolver).registerContentObserver(eq(UCE_URI), anyBoolean(),
|
||||
observerCaptor.capture());
|
||||
return observerCaptor.getValue();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user