From 71f4a20aa1bcf2edb5ec4ef4086815425f20ee39 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 6 Jun 2018 16:38:26 +0200 Subject: [PATCH] android: Show profile ID at bottom of advanced settings Can be selected and copied to the clipboard to use in automation software that doesn't support the shortcut. --- .../android/ui/VpnProfileDetailActivity.java | 12 +++++++++++ .../main/res/layout/profile_detail_view.xml | 21 +++++++++++++++++++ .../app/src/main/res/values-de/strings.xml | 3 ++- .../app/src/main/res/values-pl/strings.xml | 1 + .../app/src/main/res/values-ru/strings.xml | 1 + .../app/src/main/res/values-ua/strings.xml | 1 + .../src/main/res/values-zh-rCN/strings.xml | 1 + .../src/main/res/values-zh-rTW/strings.xml | 1 + .../app/src/main/res/values/strings.xml | 3 ++- 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java index 37c5b3357f..a811244e27 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java @@ -132,6 +132,8 @@ public class VpnProfileDetailActivity extends AppCompatActivity private EditText mIkeProposal; private TextInputLayoutHelper mEspProposalWrap; private EditText mEspProposal; + private TextView mProfileIdLabel; + private TextView mProfileId; @Override public void onCreate(Bundle savedInstanceState) @@ -194,6 +196,9 @@ public class VpnProfileDetailActivity extends AppCompatActivity /* make the link clickable */ ((TextView)findViewById(R.id.proposal_intro)).setMovementMethod(LinkMovementMethod.getInstance()); + mProfileIdLabel = (TextView)findViewById(R.id.profile_id_label); + mProfileId = (TextView)findViewById(R.id.profile_id); + final SpaceTokenizer spaceTokenizer = new SpaceTokenizer(); mName.setTokenizer(spaceTokenizer); mRemoteId.setTokenizer(spaceTokenizer); @@ -564,6 +569,12 @@ public class VpnProfileDetailActivity extends AppCompatActivity } mShowAdvanced.setVisibility(!show ? View.VISIBLE : View.GONE); mAdvancedSettings.setVisibility(show ? View.VISIBLE : View.GONE); + + if (show && mProfile == null) + { + mProfileIdLabel.setVisibility(View.GONE); + mProfileId.setVisibility(View.GONE); + } } /** @@ -749,6 +760,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity mSelectedApps = mProfile.getSelectedAppsSet(); mIkeProposal.setText(mProfile.getIkeProposal()); mEspProposal.setText(mProfile.getEspProposal()); + mProfileId.setText(mProfile.getUUID().toString()); flags = mProfile.getFlags(); useralias = mProfile.getUserCertificateAlias(); local_id = mProfile.getLocalId(); diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml index d4d88314d0..cf7609c445 100644 --- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml +++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml @@ -414,6 +414,27 @@ + + + + diff --git a/src/frontends/android/app/src/main/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml index ec4c80fe86..896e53608f 100644 --- a/src/frontends/android/app/src/main/res/values-de/strings.xml +++ b/src/frontends/android/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ Ein Wert wird benötigt, um die Verbindung aufbauen zu können Bitte geben Sie Ihren Benutzernamen ein diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml index 3bf24a4191..ce1dc6741b 100644 --- a/src/frontends/android/app/src/main/res/values-pl/strings.xml +++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml @@ -113,6 +113,7 @@ This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" + Profile ID A value is required to initiate the connection Wprowadź swoją nazwę użytkownika diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml index f4e5967585..756473b564 100644 --- a/src/frontends/android/app/src/main/res/values-ru/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml @@ -110,6 +110,7 @@ This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" + Profile ID A value is required to initiate the connection Пожалуйста введите имя пользователя diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml index 931c09a6fb..8c165734a3 100644 --- a/src/frontends/android/app/src/main/res/values-ua/strings.xml +++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml @@ -111,6 +111,7 @@ This VPN profile already exists, its current settings will be replaced. Import certificate from VPN profile Certificate for \"%1$s\" + Profile ID A value is required to initiate the connection Введіть ім\'я користувача diff --git a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml index 7291ccb6c6..2d195f6384 100644 --- a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml @@ -110,6 +110,7 @@ 此VPN配置已经存在，当前设定将被覆盖。 从VPN配置导入证书 \"%1$s\" 所对应的证书 + Profile ID 必填信息以初始化连接 请输入您的用户名 diff --git a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml index 5283d368a0..650cd6940d 100644 --- a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml @@ -110,6 +110,7 @@ 這個VPN設定檔已經存在，當前設定檔會被覆蓋。 從VPN設定檔匯入憑證 \"%1$s\" 對應的憑證 + Profile ID 請填寫必要訊息才能初始化連線 請輸入您的用戶名稱 diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml index 5c88e43ea0..e6cb9dc4cd 100644 --- a/src/frontends/android/app/src/main/res/values/strings.xml +++ b/src/frontends/android/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ A value is required to initiate the connection Please enter your username -- 2.39.2