summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Smith <adam.smith18@ntlworld.com>2014-10-30 22:11:31 +0000
committerAdam Smith <adam.smith18@ntlworld.com>2014-10-30 22:11:31 +0000
commitaf2c0ab0e1e8f45e821e4fc37752eee4bc6ab1bc (patch)
treece767c55ce0a766b166c91dff7bdc7c4baaddaaa
parent9f9f99dc244d255f1dfbda8cc546413929edf51f (diff)
Check that the string resources work
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/PasswordStore.java8
-rw-r--r--app/src/main/res/values/strings.xml10
2 files changed, 13 insertions, 5 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 62bf3d4f..18cee1f2 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -53,7 +53,7 @@ public class PasswordStore extends ActionBarActivity {
super.onResume();
// create the repository static variable in PasswordRepository
- PasswordRepository.getRepository(new File(getFilesDir() + "/store/.git"));
+ PasswordRepository.getRepository(new File(getFilesDir() + this.getResources().getString(R.string.git_store)));
// re-check that there was no change with the repository state
checkLocalRepository();
@@ -111,8 +111,8 @@ public class PasswordStore extends ActionBarActivity {
Log.d("PASS", "Menu item " + id + " pressed");
AlertDialog.Builder initBefore = new AlertDialog.Builder(this)
- .setMessage("Please clone or create a new repository below before trying to add a password or any synchronization operation.")
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ .setMessage(this.getResources().getString(R.string.creation_alert_text));
+ .setPositiveButton(this.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
}
@@ -205,7 +205,7 @@ public class PasswordStore extends ActionBarActivity {
GitAsyncTask tasks = new GitAsyncTask(this, false, false, CommitCommand.class);
tasks.execute(
git.add().addFilepattern("."),
- git.commit().setMessage("[ANDROID PwdStore] Initialized store with keyID: " + keyId)
+ git.commit().setMessage(R.string.initialization_commit_text + keyId)
);
} catch (Exception e) {
e.printStackTrace();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07c6b3fd..0c44511c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,12 @@
<string name="dialog_delete">Delete directory</string>
<string name="dialog_do_not_delete">Cancel</string>
<string name="title_activity_git_clone">Clone repository</string>
-
+
+ <!-- Password Store -->
+ <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</strng>
+ <string name="initialization_commit_text">[ANDROID PwdStore] Initialized store with keyID: </string>
+ <string name="store_git">/store/.git</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>
<string name="clone">Clone existing</string>
@@ -43,6 +48,9 @@
<!-- DECRYPT Layout -->
<string name="crypto_category">Category</string>
<string name="action_search">Search</string>
+
+ <!-- Misc -->
+ <string name="ok">OK</string>
</resources>