mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 13:57:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hard coded strings replaced for resources in GitHandler

Browse Source
This commit is contained in:
Adam Smith
2014-10-31 14:28:09 +00:00
parent 7219fedf45
commit 58183ee900
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/zeapo/pwdstore/GitHandler.java
View File

@@ -113,9 +113,9 @@ public class GitHandler extends ActionBarActivity {
} else { } else {
((EditText)findViewById(R.id.clone_uri)).setHint("hostname/path"); ((EditText)findViewById(R.id.clone_uri)).setHint("hostname/path");
new AlertDialog.Builder(activity). 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). setCancelable(true).
setPositiveButton("OK", new DialogInterface.OnClickListener() { setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
@@ -444,8 +444,8 @@ public class GitHandler extends ActionBarActivity {
// did he forget the username? // did he forget the username?
if (!hostname.matches("^.+@.+")) { if (!hostname.matches("^.+@.+")) {
new AlertDialog.Builder(this). new AlertDialog.Builder(this).
setMessage("Did you forget to specify a username?"). setMessage(activity.getResources().getString(R.string.forget_username_dialog_text)).
setPositiveButton("Oups...", new DialogInterface.OnClickListener() { setPositiveButton(activity.getResources().getString(R.string.dialog_oops), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { 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_server", "").isEmpty() ||
settings.getString("git_remote_location", "").isEmpty() ) settings.getString("git_remote_location", "").isEmpty() )
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage("You have to set the information about the server before synchronizing with the server") .setMessage(activity.getResources().getString(R.string.set_information_dialog_text))
.setPositiveButton("On my way!", new DialogInterface.OnClickListener() { .setPositiveButton(activity.getResources().getString(R.string.dialog_positive), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
Intent intent = new Intent(activity, UserPreference.class); Intent intent = new Intent(activity, UserPreference.class);
startActivityForResult(intent, REQUEST_PULL); startActivityForResult(intent, REQUEST_PULL);
} }
}) })
.setNegativeButton("Nah... later", new DialogInterface.OnClickListener() { .setNegativeButton(activity.getResources().getString(R.string.dialog_negative), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
// do nothing :( // do nothing :(
@@ -643,9 +643,9 @@ public class GitHandler extends ActionBarActivity {
final File sshKey = new File(getFilesDir() + "/.ssh_key"); final File sshKey = new File(getFilesDir() + "/.ssh_key");
if (!sshKey.exists()) { if (!sshKey.exists()) {
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage("Please import your SSH key file in the preferences") .setMessage(activity.getResources().getString(R.string.ssh_preferences_dialog_text))
.setTitle("No SSH key") .setTitle(activity.getResources().getString(R.string.ssh_preferences_dialog_title))
.setPositiveButton("OK", new DialogInterface.OnClickListener() { .setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
try { try {
@@ -657,7 +657,7 @@ public class GitHandler extends ActionBarActivity {
e.printStackTrace(); e.printStackTrace();
} }
} }
}).setNegativeButton("Cancel", new DialogInterface.OnClickListener() { }).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
// Do nothing... // Do nothing...
@@ -670,10 +670,10 @@ public class GitHandler extends ActionBarActivity {
passphrase.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); passphrase.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle("Authenticate") .setTitle(activity.getResources().getString(R.string.passphrase_dialog_title))
.setMessage("Please provide the passphrase for your SSH key. Leave it empty if there is no passphrase.") .setMessage(activity.getResources().getString(R.string.passphrase_dialog_text))
.setView(passphrase) .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) { public void onClick(DialogInterface dialog, int whichButton) {
SshSessionFactory.setInstance(new GitConfigSessionFactory()); 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) { public void onClick(DialogInterface dialog, int whichButton) {
// Do nothing. // Do nothing.
} }
@@ -707,10 +707,10 @@ public class GitHandler extends ActionBarActivity {
password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle("Authenticate") .setTitle(activity.getResources().getString(R.string.passphrase_dialog_title))
.setMessage("Please provide the password for this repository") .setMessage(activity.getResources().getString(R.string.password_dialog_text))
.setView(password) .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) { public void onClick(DialogInterface dialog, int whichButton) {
SshSessionFactory.setInstance(new GitConfigSessionFactory()); 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) { public void onClick(DialogInterface dialog, int whichButton) {
// Do nothing. // Do nothing.
} }

12
app/src/main/res/values/strings.xml
View File

@@ -42,6 +42,16 @@
<string name="running_dialog_text">Running command...</string> <string name="running_dialog_text">Running command...</string>
<string name="jgit_error_dialog_title">Internal exception occurred</string> <string name="jgit_error_dialog_title">Internal exception occurred</string>
<string name="jgit_error_dialog_text">Message from jgit: /n</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 --> <!-- 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_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>
@@ -79,5 +89,7 @@
<string name="dialog_no">No</string> <string name="dialog_no">No</string>
<string name="dialog_positive">On my way...</string> <string name="dialog_positive">On my way...</string>
<string name="dialog_negative">Nah... later</string> <string name="dialog_negative">Nah... later</string>
<string name="dialog_oops">Oops...</string>
<string name="dialog_cancel">Cancel</string>
</resources> </resources>