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

Fix as reviewed and add test

Browse Source
This commit is contained in:
Sylvia van Os
2020-01-02 21:15:06 +01:00
parent cc99af13e4
commit ce81d3afd4
4 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
private static final String TAG = "CardLocker";
protected static final String NO_BARCODE = "_NO_BARCODE_";
private static final int SELECT_BARCODE_REQUEST = 1;
protected static final int SELECT_BARCODE_REQUEST = 1;
EditText storeFieldEdit;
EditText noteFieldEdit;
@@ -499,7 +499,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
}
if(contents != null && contents.isEmpty() == false &&
format != null && format.isEmpty() == false)
format != null)
{
Log.i(TAG, "Read barcode id: " + contents);
Log.i(TAG, "Read format: " + format);
@@ -508,7 +508,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
cardIdView.setText(contents);
final TextView barcodeTypeField = findViewById(R.id.barcodeType);
barcodeTypeField.setText(format);
// Set special NO_BARCODE value to prevent onResume from overwriting it
barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
onResume();
}
}