aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/PasswordStore.java22
-rw-r--r--app/src/main/res/menu/pwdstore.xml4
-rw-r--r--app/src/main/res/values/strings.xml19
3 files changed, 28 insertions, 17 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 18cee1f2..603eb305 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() + this.getResources().getString(R.string.git_store)));
+ PasswordRepository.getRepository(new File(getFilesDir() + this.getResources().getString(R.string.store_git)));
// 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(this.getResources().getString(R.string.creation_alert_text));
- .setPositiveButton(this.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ .setMessage(this.getResources().getString(R.string.creation_dialog_text))
+ .setPositiveButton(this.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
}
@@ -220,15 +220,15 @@ public class PasswordStore extends ActionBarActivity {
if (keyId.isEmpty())
new AlertDialog.Builder(this)
- .setMessage("You have to select your \"PGP-Key ID\" before initializing the repository")
- .setPositiveButton("On my way!", new DialogInterface.OnClickListener() {
+ .setMessage(this.getResources().getString(R.string.key_dialog_text))
+ .setPositiveButton(this.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, GitHandler.REQUEST_INIT);
}
})
- .setNegativeButton("Nah... later", new DialogInterface.OnClickListener() {
+ .setNegativeButton(this.getResources().getString(R.string.dialog_negative), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
// do nothing :(
@@ -238,7 +238,7 @@ public class PasswordStore extends ActionBarActivity {
else {
new AlertDialog.Builder(this)
- .setMessage("Which connection method do you prefer?")
+ .setMessage(this.getResources().getString(R.string.connection_dialog_text))
.setPositiveButton("ssh-key", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
@@ -370,9 +370,9 @@ public class PasswordStore extends ActionBarActivity {
public void deletePassword(final PasswordRecyclerAdapter adapter, final int position) {
final PasswordItem item = adapter.getValues().get(position);
new AlertDialog.Builder(this).
- setMessage("Are you sure you want to delete the password \"" +
+ setMessage(this.getResources().getString(R.string.delete_dialog_text) +
item + "\"")
- .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+ .setPositiveButton(this.getResources().getString(R.string.dialog_yes), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
String path = item.getFile().getAbsolutePath();
@@ -389,7 +389,7 @@ public class PasswordStore extends ActionBarActivity {
);
}
})
- .setNegativeButton("NO", new DialogInterface.OnClickListener() {
+ .setNegativeButton(this.getResources().getString(R.string.dialog_no), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
@@ -444,7 +444,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] Add " + data.getExtras().getString("NAME") + " from store.")
+ git.commit().setMessage(this.getResources().getString(R.string.add_commit_text) + data.getExtras().getString("NAME") + this.getResources().getString(R.string.from_store))
);
updateListAdapter();
break;
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index bfb3ad0c..220bd49b 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -24,8 +24,8 @@
<item android:id="@+id/refresh"
android:title="Refresh list"
- android:showAsAction="never"
- android:icon="@drawable/ico_sync"/>
+ pwstore:showAsAction="never"
+ android:icon="@drawable/ic_action_refresh"/>
<item android:id="@+id/user_pref"
android:title="Settings"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c44511c..7fc3cbac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,9 +15,17 @@
<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="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
<string name="store_git">/store/.git</string>
+ <string name="key_dialog_text">You have to select your "PGP-Key ID" before initializing the repository</string>
+ <string name="connection_dialog_text">Which connection method do you prefer?</string>
+ <string name="delete_dialog_text">Are you sure you want to delete the password /"</string>
+
+ <!-- git commits -->
+ <string name="initialization_commit_text">[ANDROID PwdStore] Initialized store with keyID: </string>
+ <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>
<!-- 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>
@@ -50,7 +58,10 @@
<string name="action_search">Search</string>
<!-- Misc -->
- <string name="ok">OK</string>
-
+ <string name="dialog_ok">OK</string>
+ <string name="dialog_yes">Yes</string>
+ <string name="dialog_no">No</string>
+ <string name="dialog_positive">On my way...</string>
+ <string name="dialog_negative">Nah... later</string>
</resources>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-24 00:39:41 +0000