From b6896289752aa13076028058b37f734b429d8f38 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Thu, 21 Dec 2017 07:58:50 +0100
Subject: [PATCH] fix some strings and remove debugging code (#160)

---
 app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java | 8 ++++----
 .../main/java/com/m2049r/xmrwallet/SecureActivity.java    | 3 +--
 .../fragment/send/SendBtcConfirmWizardFragment.java       | 4 ++--
 .../fragment/send/SendConfirmWizardFragment.java          | 4 ++--
 app/src/main/res/values-es/strings.xml                    | 5 ++---
 app/src/main/res/values/strings.xml                       | 5 ++---
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
index 4ddb93b9..77cc83e8 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -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);
diff --git a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
index dc9ac1ac..ee749989 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
@@ -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);
         }
     }
diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
index 3f1bd5e5..9288870c 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
@@ -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);
diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
index 73e3d91b..fe8395f6 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java
@@ -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);
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 55d381ca..833b74d6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 278a6cf2..a0025cfb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>