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

Commit 4770d017 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Populate ipsecSecret field in VpnProfile" am: 4c533480 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499



Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d93cea1 4c533480

src/com/android/settings/vpn2/ConfigDialog.java

+5 −1
Original line number Diff line number Diff line
@@ -653,10 +653,14 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
                profile.ipsecSecret = mIpsecSecret.getText().toString();

                break;



            case VpnProfile.TYPE_IKEV2_IPSEC_RSA:

                if (mIpsecUserCert.getSelectedItemPosition() != 0) {

                    profile.ipsecSecret = (String) mIpsecUserCert.getSelectedItem();

                }

                // fall through

            case VpnProfile.TYPE_L2TP_IPSEC_RSA:

                profile.l2tpSecret = mL2tpSecret.getText().toString();

                // fall through

            case VpnProfile.TYPE_IKEV2_IPSEC_RSA: // fall through

            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:

                if (mIpsecUserCert.getSelectedItemPosition() != 0) {

                    profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();