mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-11 01:23:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ScanActivity result code (use ParseResult)

Browse Source
This commit is contained in:
Sylvia van Os
2024-10-01 17:33:45 +02:00
parent ea456c6d80
commit 8eeff0058b
12 changed files with 197 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -693,27 +693,21 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
mCardIdAndBarCodeEditorLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
if (result.getResultCode() == RESULT_OK) {
Intent intent = result.getData();
if (intent == null) {
Log.d("barcode card id editor", "barcode and card id editor picker returned without an intent");
Intent resultIntent = result.getData();
if (resultIntent == null) {
Log.d(TAG, "barcode and card id editor picker returned without an intent");
return;
}
List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, getApplicationContext());
Bundle resultIntentBundle = resultIntent.getExtras();
if (resultIntentBundle == null) {
Log.d(TAG, "barcode and card id editor picker returned without a bundle");
return;
}
Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
@Override
public void onUserChoseBarcode(BarcodeValues barcodeValues) {
setLoyaltyCardCardId(barcodeValues.content());
setLoyaltyCardBarcodeType(barcodeValues.format());
setLoyaltyCardBarcodeId("");
}
@Override
public void onUserDismissedSelector() {
}
});
tempLoyaltyCard.updateFromBundle(resultIntentBundle, false);
generateBarcode();
hasChanged = true;
}
});