Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some strings and remove debugging code (#160)

This commit is contained in:
m2049r 2017-12-21 07:58:50 +01:00 committed by GitHub
parent f8e701aa07
commit b689628975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
View File

@ -278,7 +278,7 @@ public class LoginActivity extends SecureActivity
// set dialog message
alertDialogBuilder
.setCancelable(false)
.setPositiveButton("OK",
.setPositiveButton(getString(R.string.label_ok),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Helper.hideKeyboardAlways(LoginActivity.this);
@ -286,7 +286,7 @@ public class LoginActivity extends SecureActivity
new AsyncRename().execute(walletName, newName);
}
})
.setNegativeButton("Cancel",
.setNegativeButton(getString(R.string.label_cancel),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Helper.hideKeyboardAlways(LoginActivity.this);
@ -482,8 +482,8 @@ public class LoginActivity extends SecureActivity
// set dialog message
alertDialogBuilder
.setCancelable(false)
.setPositiveButton("OK", null)
.setNegativeButton("Cancel",
.setPositiveButton(getString(R.string.label_ok), null)
.setNegativeButton(getString(R.string.label_cancel),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Helper.hideKeyboardAlways(LoginActivity.this);

3
app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
View File

@ -31,9 +31,8 @@ public abstract class SecureActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
File f = new File(Helper.getStorageRoot(this), "screenshot");
// set FLAG_SECURE to prevent screenshots in Release Mode
if ((!BuildConfig.DEBUG) && (!f.exists())) {
if (!BuildConfig.DEBUG) {
getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
}
}

4
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
View File

@ -374,7 +374,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
alertDialogBuilder
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
.setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
String pass = etPassword.getEditText().getText().toString();
if (getActivityCallback().verifyWalletPassword(pass)) {
@ -386,7 +386,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
}
}
})
.setNegativeButton("Cancel",
.setNegativeButton(getString(R.string.label_cancel),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Helper.hideKeyboardAlways(activity);

4
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
View File

@ -250,7 +250,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
alertDialogBuilder
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
.setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
String pass = etPassword.getEditText().getText().toString();
if (getActivityCallback().verifyWalletPassword(pass)) {
@ -262,7 +262,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
}
}
})
.setNegativeButton("Cancel",
.setNegativeButton(getString(R.string.label_cancel),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Helper.hideKeyboardAlways(activity);

5
app/src/main/res/values-es/strings.xml
View File

@ -15,8 +15,9 @@
<string name="label_login_wallets">Carteras</string>
<string name="label_donate">Donar</string>
<string name="label_close">Cerrar</string>
<string name="label_ok">OK</string>
<string name="label_cancel">Cancelar</string>
<string name="label_close">Cerrar</string>
<string name="label_wallet_advanced_details">Toca para información más detallada</string>
<string name="label_send_success">¡Éxito!</string>
@ -134,8 +135,6 @@
<string name="generate_button_export">Exportar Claves</string>
<string name="generate_button_delete">BORRAR</string>
<string name="generate_wallet_watchonly">&lt;Cartera De Sólo Vista&gt;</string>
<string name="generate_wallet_name">¡Dame un nombre!</string>
<string name="generate_wallet_exists">¡La cartera ya existe!</string>
<string name="generate_wallet_dot">No puede empezar con .</string>

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

@ -17,8 +17,9 @@
<string name="label_login_wallets">Wallets</string>
<string name="label_donate">Donate</string>
<string name="label_close">Close</string>
<string name="label_ok">OK</string>
<string name="label_cancel">Cancel</string>
<string name="label_close">Close</string>
<string name="label_wallet_advanced_details">Touch for detailed information</string>
<string name="label_send_success">Successfully sent</string>
@ -201,8 +202,6 @@
<string name="generate_button_export">Export Keys</string>
<string name="generate_button_delete">DELETE</string>
<string name="generate_wallet_watchonly">&lt;Watch Only Wallet&gt;</string>
<string name="generate_wallet_name">Give me a name!</string>
<string name="generate_wallet_exists">Wallet exists!</string>
<string name="generate_wallet_dot">Cannot begin with .</string>