Merge pull request #30 from iAmiAdam/String-Bash

Hard coded strings replaced in resources

4 files changed, 61 insertions, 33 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java b/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java
index c27bd0d4..6d0e745d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java
@@ -30,7 +30,7 @@ public class GitAsyncTask extends AsyncTask<GitCommand, Integer, String> {
     }
 
     protected void onPreExecute() {
-        this.dialog.setMessage("Running command...");
+        this.dialog.setMessage(activity.getResources().getString(R.string.running_dialog_text));
         this.dialog.setCancelable(false);
         this.dialog.show();
     }
@@ -54,9 +54,9 @@ public class GitAsyncTask extends AsyncTask<GitCommand, Integer, String> {
 
         if (!result.isEmpty()) {
             new AlertDialog.Builder(activity).
-                    setTitle("Internal exception occurred").
-                    setMessage("Message from jgit:\n" + result).
-                    setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                    setTitle(activity.getResources().getString(R.string.jgit_error_dialog_title)).
+                    setMessage(activity.getResources().getString(R.string.jgit_error_dialog_text) + result).
+                    setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
                             if (operation.equals(CloneCommand.class)) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
index 6003cd73..1393d053 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
@@ -113,9 +113,9 @@ public class GitHandler extends ActionBarActivity {
                                 } else {
                                     ((EditText)findViewById(R.id.clone_uri)).setHint("hostname/path");
                                     new AlertDialog.Builder(activity).
-                                            setMessage("You are about to use a read-only repository, you will not be able to push to it").
+                                            setMessage(activity.getResources().getString(R.string.read_only_dialog_text)).
                                             setCancelable(true).
-                                            setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                                            setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                                                 @Override
                                                 public void onClick(DialogInterface dialogInterface, int i) {
 
@@ -444,8 +444,8 @@ public class GitHandler extends ActionBarActivity {
             // did he forget the username?
             if (!hostname.matches("^.+@.+")) {
                 new AlertDialog.Builder(this).
-                        setMessage("Did you forget to specify a username?").
-                        setPositiveButton("Oups...", new DialogInterface.OnClickListener() {
+                        setMessage(activity.getResources().getString(R.string.forget_username_dialog_text)).
+                        setPositiveButton(activity.getResources().getString(R.string.dialog_oops), new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialogInterface, int i) {
 
@@ -530,15 +530,15 @@ public class GitHandler extends ActionBarActivity {
             settings.getString("git_remote_server", "").isEmpty() ||
             settings.getString("git_remote_location", "").isEmpty() )
             new AlertDialog.Builder(this)
-                    .setMessage("You have to set the information about the server before synchronizing with the server")
-                    .setPositiveButton("On my way!", new DialogInterface.OnClickListener() {
+                    .setMessage(activity.getResources().getString(R.string.set_information_dialog_text))
+                    .setPositiveButton(activity.getResources().getString(R.string.dialog_positive), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
                             Intent intent = new Intent(activity, UserPreference.class);
                             startActivityForResult(intent, REQUEST_PULL);
                         }
                     })
-                    .setNegativeButton("Nah... later", new DialogInterface.OnClickListener() {
+                    .setNegativeButton(activity.getResources().getString(R.string.dialog_negative), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
                             // do nothing :(
@@ -643,9 +643,9 @@ public class GitHandler extends ActionBarActivity {
             final File sshKey = new File(getFilesDir() + "/.ssh_key");
             if (!sshKey.exists()) {
                 new AlertDialog.Builder(this)
-                        .setMessage("Please import your SSH key file in the preferences")
-                        .setTitle("No SSH key")
-                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        .setMessage(activity.getResources().getString(R.string.ssh_preferences_dialog_text))
+                        .setTitle(activity.getResources().getString(R.string.ssh_preferences_dialog_title))
+                        .setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int id) {
                                 try {
@@ -657,7 +657,7 @@ public class GitHandler extends ActionBarActivity {
                                     e.printStackTrace();
                                 }
                             }
-                        }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                        }).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
                         // Do nothing...
@@ -670,10 +670,10 @@ public class GitHandler extends ActionBarActivity {
                 passphrase.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
 
                 new AlertDialog.Builder(activity)
-                        .setTitle("Authenticate")
-                        .setMessage("Please provide the passphrase for your SSH key. Leave it empty if there is no passphrase.")
+                        .setTitle(activity.getResources().getString(R.string.passphrase_dialog_title))
+                        .setMessage(activity.getResources().getString(R.string.passphrase_dialog_text))
                         .setView(passphrase)
-                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        .setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int whichButton) {
 
                                 SshSessionFactory.setInstance(new GitConfigSessionFactory());
@@ -693,7 +693,7 @@ public class GitHandler extends ActionBarActivity {
                                 }
 
                             }
-                        }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                        }).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
                         // Do nothing.
                     }
@@ -707,10 +707,10 @@ public class GitHandler extends ActionBarActivity {
                 password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
 
                 new AlertDialog.Builder(activity)
-                        .setTitle("Authenticate")
-                        .setMessage("Please provide the password for this repository")
+                        .setTitle(activity.getResources().getString(R.string.passphrase_dialog_title))
+                        .setMessage(activity.getResources().getString(R.string.password_dialog_text))
                         .setView(password)
-                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        .setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int whichButton) {
 
                                 SshSessionFactory.setInstance(new GitConfigSessionFactory());
@@ -725,7 +725,7 @@ public class GitHandler extends ActionBarActivity {
                                 }
 
                             }
-                        }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                        }).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
                         // Do nothing.
                     }
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 110f71eb..d8b3c1b2 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -89,7 +89,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
         registered = false;
 
         if (TextUtils.isEmpty(providerPackageName)) {
-            Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, this.getResources().getString(R.string.provider_toast_text), Toast.LENGTH_LONG).show();
             Intent intent = new Intent(this, UserPreference.class);
             startActivity(intent);
             // a small hack to avoid eternal loop later, have to be solved via a startactivityforresult()
@@ -145,9 +145,9 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
     public void copyToClipBoard() {
         ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", ((TextView) findViewById(R.id.crypto_password_show)).getText());
         clipboard.setPrimaryClip(clip);
-        showToast("Password copied to clipboard, you have "
+        showToast(this.getResources().getString(R.string.clipboard_beginning_toast_text)
                 + Integer.parseInt(settings.getString("general_show_time", "45"))
-                + " seconds to paste it somewhere.");
+                + this.getResources().getString(R.string.clipboard_ending_toast_text));
     }
 
     public void handleClick(View view) {
@@ -409,7 +409,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
     public void getKeyIds(Intent data) {
         accountName = settings.getString("openpgp_account_name", "");
         if (accountName.isEmpty())
-            showToast("Please set your account name in settings whenever you can");
+            showToast(this.getResources().getString(R.string.name_settings_toast_text));
 
         data.setAction(OpenPgpApi.ACTION_GET_KEY_IDS);
         data.putExtra(OpenPgpApi.EXTRA_USER_IDS, new String[]{accountName.isEmpty() ? "default" : accountName});
@@ -441,9 +441,9 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
 
         if (accountName.isEmpty()) {
             new AlertDialog.Builder(this)
-                    .setMessage("Please set your OpenKeychain account (email) in the preferences")
-                    .setTitle("Account name empty!")
-                    .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                    .setMessage(this.getResources().getString(R.string.account_settings_dialog_text))
+                    .setTitle(this.getResources().getString(R.string.account_settings_dialog_title))
+                    .setPositiveButton(this.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
                             try {
@@ -454,7 +454,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
                                 e.printStackTrace();
                             }
                         }
-                    }).setNegativeButton("No thanks", new DialogInterface.OnClickListener() {
+                    }).setNegativeButton(this.getResources().getString(R.string.dialog_no), new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int id) {
                     // Do nothing...
@@ -471,12 +471,12 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
             String extra = ((EditText) findViewById(R.id.crypto_extra_edit)).getText().toString();
 
             if (name.isEmpty()) {
-                showToast("Please provide a file name");
+                showToast(this.getResources().getString(R.string.file_toast_text));
                 return;
             }
 
             if (pass.isEmpty() && extra.isEmpty()) {
-                showToast("You cannot use an empty password or empty extra content");
+                showToast(this.getResources().getString(R.string.empty_toast_text));
                 return;
             }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fc3cbac..cc4e3e36 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,32 @@
     <string name="add_commit_text">[ANDROID PwdStore] Add </string>
     <string name="remove_commit_text">[ANDROID PwdStore] Remove </string>
     <string name="from_store"> from store.</string>
+
+    <!-- PGPHandler -->
+    <string name="provider_toast_text">No OpenPGP Provider selected!</string>
+    <string name="okc_progress_text">Waiting for OpenKeychain...</string>
+    <string name="clipboard_beginning_toast_text">Password copied to clipboard, you have </string>
+    <string name="clipboard_ending_toast_text"> seconds to paste it somewhere.</string>
+    <string name="name_settings_toast_text">Please set your account name in settings whenever you can</string>
+    <string name="account_settings_dialog_text">Please set your OpenKeychain account (email) in the preferences</string>
+    <string name="account_settings_dialog_title">Account name empty!</string>
+    <string name="file_toast_text">Please provide a file name</string>
+    <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
+
+    <!-- Git Async Task -->
+    <string name="running_dialog_text">Running command...</string>
+    <string name="jgit_error_dialog_title">Internal exception occurred</string>
+    <string name="jgit_error_dialog_text">Message from jgit: /n</string>
+
+    <!-- Git Handler -->
+    <string name="read_only_dialog_text">You are about to use a read-only repository, you will not be able to push to it</string>
+    <string name="forget_username_dialog_text">Did you forget to specify a username?</string>
+    <string name="set_information_dialog_text">You have to set the information about the server before synchronizing with the server</string>
+    <string name="ssh_preferences_dialog_text">Please import your SSH key file in the preferences</string>
+    <string name="ssh_preferences_dialog_title">No SSH key</string>
+    <string name="passphrase_dialog_title">Authenticate</string>
+    <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key. Leave it empty if there is no passphrase.</string>
+    <string name="password_dialog_text">Please provide the password for this repository</string>
     
     <!-- Clone fragment -->
     <string name="clone_fragment_text">Welcome to Password Store\n\n In this screen you can either create a new repository or clone your git repository onto your device.</string>
@@ -63,5 +89,7 @@
     <string name="dialog_no">No</string>
     <string name="dialog_positive">On my way...</string>
     <string name="dialog_negative">Nah... later</string>
+    <string name="dialog_oops">Oops...</string>
+    <string name="dialog_cancel">Cancel</string>
 
 </resources>