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

Fix regression in manual barcode selector

Browse Source
This commit is contained in:
Sylvia van Os
2020-12-16 18:56:01 +01:00
parent cf20d03fb3
commit afa76d8f54
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/protect/card_locker/ScanActivity.java
View File

@@ -127,6 +127,24 @@ public class ScanActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent intent)
{
super.onActivityResult(requestCode, resultCode, intent);
BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
if (!barcodeValues.isEmpty()) {
Intent manualResult = new Intent();
Bundle manualResultBundle = new Bundle();
manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
manualResult.putExtras(manualResultBundle);
ScanActivity.this.setResult(RESULT_OK, manualResult);
finish();
}
}
public void addManually(View view) {
Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
if (cardId != null) {