Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8fdbd319 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by LuK1337
Browse files

Reapply "Settings: Protect sensitive data on the about phone" 



Was reverted here c6eba747.

Co-authored-by: default avatarLuK1337 <priv.luk@gmail.com>
Change-Id: Ib8403ca842a4655d1526b27f1965feeee336c687
parent b549341e

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+25 −4
Original line number Diff line number Diff line
@@ -62,6 +62,27 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
        return AVAILABLE;

    }



    @Override

    public CharSequence getSummary() {

        return mContext.getString(R.string.device_info_protected_single_press);

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        String prefKey = preference.getKey();

        if (prefKey.startsWith(KEY_PHONE_NUMBER)) {

            int simSlotNumber = 0;

            if (!TextUtils.equals(prefKey, KEY_PHONE_NUMBER)) {

                // Get multisim slot number from preference key.

                // Multisim preference key is KEY_PHONE_NUMBER + simSlotNumber

                simSlotNumber = Integer.parseInt(

                        prefKey.replaceAll("[^0-9]", ""));

            }

            setPhoneNumber(simSlotNumber);

        }

        return super.handlePreferenceTreeClick(preference);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);
@@ -78,7 +99,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();

                simSlotNumber++) {

            final Preference multiSimPreference = createNewPreference(screen.getContext());

            multiSimPreference.setSelectable(false);

            multiSimPreference.setSelectable(true);

            multiSimPreference.setCopyingEnabled(true);

            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);

            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
@@ -92,7 +113,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {

            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);

            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));

            setPhoneNumber(simSlotNumber);

            simStatusPreference.setSummary(getSummary());

        }

    }
@@ -133,7 +154,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
    }



    @VisibleForTesting

    protected String getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {

    protected CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {

        final String phoneNumber = SubscriptionUtil.getBidiFormattedPhoneNumber(mContext,

                subscriptionInfo);

        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
@@ -142,6 +163,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 


    @VisibleForTesting

    protected Preference createNewPreference(Context context) {

        return new Preference(context);

        return new PhoneNumberSummaryPreference(context);

    }

}

src/com/android/settings/deviceinfo/imei/ImeiPreference.kt

+5 −2
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ class ImeiPreference( 


    override fun getTitle(context: Context): CharSequence? = formattedTitle



    override fun getSummary(context: Context): CharSequence? = imei

    override fun getSummary(context: Context): CharSequence? =

        context.getString(R.string.device_info_protected_single_press)



    override fun bind(preference: Preference, metadata: PreferenceMetadata) {

        super.bind(preference, metadata)
@@ -68,8 +69,10 @@ class ImeiPreference( 
    }



    override fun onCreate(context: PreferenceLifecycleContext) {

        context.requirePreference<Preference>(key).onPreferenceClickListener =

        val preference = context.requirePreference<Preference>(key)

        preference.onPreferenceClickListener =

            Preference.OnPreferenceClickListener {

                preference.summary = imei

                ImeiInfoDialogFragment.show(context.childFragmentManager, slotIndex, formattedTitle)

                return@OnPreferenceClickListener true

            }

src/com/android/settings/deviceinfo/simstatus/SimEidPreference.kt

+5 −3
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ class SimEidPreference( 


    override fun getTitle(context: Context): CharSequence? = formattedTitle



    override fun getSummary(context: Context): CharSequence? = eidMetadata?.eid

    override fun getSummary(context: Context): CharSequence? =

        context.getString(R.string.device_info_protected_single_press)



    override fun bind(preference: Preference, metadata: PreferenceMetadata) {

        super.bind(preference, metadata)
@@ -71,8 +72,9 @@ class SimEidPreference( 
    }



    override fun onCreate(context: PreferenceLifecycleContext) {

        context.requirePreference<Preference>(key).onPreferenceClickListener =

            Preference.OnPreferenceClickListener {

        val preference = context.requirePreference<Preference>(key)

        preference.onPreferenceClickListener = Preference.OnPreferenceClickListener {

                preference.summary = eidMetadata?.eid

                SimEidDialogFragment.show(

                    context.childFragmentManager, formattedTitle,

                    eidMetadata?.eid ?: ""