mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-05 20:52:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't show update barcode dialog if value is the same as card ID

Browse Source
This commit is contained in:
Sylvia van Os
2021-06-10 16:49:52 +02:00
parent da445255ec
commit ce65163377
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -707,6 +707,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
}
private void askBarcodeChange(Runnable callback) {
if (tempStoredOldBarcodeValue.equals(cardIdFieldView.getText().toString())) {
// They are the same, don't ask
barcodeIdField.setText(R.string.sameAsCardId);
tempStoredOldBarcodeValue = null;
if (callback != null) {
callback.run();
}
return;
}
new AlertDialog.Builder(this)
.setTitle(R.string.updateBarcodeQuestionTitle)
.setMessage(R.string.updateBarcodeQuestionText)
@@ -726,6 +738,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
callback.run();
}
})
.setOnDismissListener(dialogInterface -> {
barcodeIdField.setText(tempStoredOldBarcodeValue);
tempStoredOldBarcodeValue = null;
if (callback != null) {
callback.run();
}
})
.show();
}