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
6 changed files with 13 additions and 16 deletions
@@ -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);
@@ -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);
}
}
@@ -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);
@@ -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);