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. Also removes multiple updateSubscriptions() happening when the activity is first created from onStart() and onChanged() callbacks. Bug: 111305845 Test: manual Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
This commit is contained in:
Brad Ebinger
@@ -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.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));
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,8 @@ import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.ims.ImsRcsManager;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.Toolbar;
|
||||
|
||||
@@ -57,15 +59,29 @@ 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;
|
||||
mCurSubscriptionId = updateSubscriptionIndex;
|
||||
updateSubscriptions(getSubscription());
|
||||
|
||||
// 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
|
||||
@@ -91,6 +107,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
|
||||
mProxySubscriptionMgr.addActiveSubscriptionsListener(this);
|
||||
|
||||
final Intent startIntent = getIntent();
|
||||
validate(startIntent);
|
||||
mCurSubscriptionId = savedInstanceState != null
|
||||
? savedInstanceState.getInt(Settings.EXTRA_SUB_ID, SUB_ID_NULL)
|
||||
: ((startIntent != null)
|
||||
@@ -99,20 +116,29 @@ public class MobileNetworkActivity extends SettingsBaseActivity
|
||||
|
||||
final SubscriptionInfo subscription = getSubscription();
|
||||
updateTitleAndNavigation(subscription);
|
||||
maybeShowContactDiscoveryDialog(mCurSubscriptionId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of ProxySubscriptionManager.OnActiveSubscriptionChangedListener
|
||||
*/
|
||||
public void onChanged() {
|
||||
updateSubscriptions(getSubscription());
|
||||
SubscriptionInfo info = getSubscription();
|
||||
int oldSubIndex = mCurSubscriptionId;
|
||||
int subIndex = info.getSubscriptionId();
|
||||
updateSubscriptions(info);
|
||||
// Remove the dialog if the subscription associated with this activity changes.
|
||||
if (subIndex != oldSubIndex) {
|
||||
removeContactDiscoveryDialog(oldSubIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
mProxySubscriptionMgr.setLifecycle(getLifecycle());
|
||||
super.onStart();
|
||||
updateSubscriptions(getSubscription());
|
||||
// updateSubscriptions doesn't need to be called, onChanged will always be called after we
|
||||
// register a listener.
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -193,12 +219,63 @@ public class MobileNetworkActivity extends SettingsBaseActivity
|
||||
fragmentTransaction.commit();
|
||||
}
|
||||
|
||||
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 (SUB_ID_NULL == intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL)) {
|
||||
throw new IllegalArgumentException("Intent with action "
|
||||
+ "SHOW_CAPABILITY_DISCOVERY_OPT_IN must also include the extra "
|
||||
+ "Settings#EXTRA_SUB_ID");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
String buildFragmentTag(int subscriptionId) {
|
||||
return MOBILE_SETTINGS_TAG + subscriptionId;
|
||||
}
|
||||
|
||||
private boolean isSubscriptionChanged(int subscriptionId) {
|
||||
return (subscriptionId == SUB_ID_NULL) || (subscriptionId != mCurSubscriptionId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,6 +177,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
|
||||
.addListener(videoCallingPreferenceController);
|
||||
use(Enhanced4gAdvancedCallingPreferenceController.class).init(mSubId)
|
||||
.addListener(videoCallingPreferenceController);
|
||||
use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId,
|
||||
getLifecycle());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -47,7 +47,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;
|
||||
@@ -163,6 +165,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) {
|
||||
|
||||
Reference in New Issue
Block a user