From c4c1bbc23624b850469c289b07ae2c67a8473653 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 4 Feb 2016 11:54:09 +0100
Subject: Move hardcoded string to string resources.
---
main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 4 ++--
main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java | 2 +-
main/src/main/res/values/strings.xml | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'main/src')
diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 1a037824..152755a5 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -131,8 +131,8 @@ public class LaunchVPN extends Activity {
entry.setTransformationMethod(new PasswordTransformationMethod());
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
- dialog.setTitle("Need " + getString(type));
- dialog.setMessage("Enter the password for profile " + mSelectedProfile.mName);
+ dialog.setTitle(getString(R.string.pw_request_dialog_title, getString(type)));
+ dialog.setMessage(getString(R.string.pw_request_dialog_prompt, mSelectedProfile.mName));
if (type == R.string.password) {
((EditText)userpwlayout.findViewById(R.id.username)).setText(mSelectedProfile.mUsername);
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
index 798f432d..efba038f 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
@@ -53,7 +53,7 @@ public class InlineFileTab extends Fragment
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- menu.add(0, MENU_SAVE, 0, "Use inline data")
+ menu.add(0, MENU_SAVE, 0, R.string.menu_use_inline_data)
.setIcon(android.R.drawable.ic_menu_save)
.setAlphabeticShortcut('u')
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 1ad2fe87..f88fbb8f 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -396,5 +396,7 @@
<string name="permission_revoked">VPN permission revoked by OS (e.g. other VPN program started), stopping VPN</string>
<string name="pushpeerinfo">Push Peer info</string>
<string name="pushpeerinfosummary">Send extra information to the server, e.g. SSL version and Android version</string>
-
+ <string name="pw_request_dialog_title">Need %1$s</string>
+ <string name="pw_request_dialog_prompt">Please enter the password for profile %1$s</string>
+ <string name="menu_use_inline_data">Use inline data</string>
</resources>
--
cgit v1.2.3