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

Merge pull request #1404 from joserebelo/import-trailing-slash

Browse Source 
Fix parse of import URI with trailing slash
This commit is contained in:
Sylvia van Os
2023-07-07 18:35:25 +02:00
committed by GitHub
parent 8e0a40ee3f c8b6328cc6
commit f2b7a63a02
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/protect/card_locker/ImportURIHelper.java
View File

@@ -46,8 +46,11 @@ public class ImportURIHelper {
}
private boolean isImportUri(Uri uri) {
// Remove trailing slash added by some browsers (if it exists)
final String uriPath = uri.getPath().replaceAll("/$", "");
for (int i = 0; i < hosts.length; i++) {
if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
if (uri.getHost().equals(hosts[i]) && uriPath.equals(paths[i])) {
return true;
}
}

31
app/src/test/java/protect/card_locker/ImportURITest.java
View File

@@ -97,6 +97,37 @@ public class ImportURITest {
assertEquals(0, parsedCard.archiveStatus);
}
@Test
public void parseWithTrailingSlash() throws InvalidObjectException, UnsupportedEncodingException {
// Generate card
DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
// Get card
LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
// Card to URI, with a trailing slash
Uri cardUri = importURIHelper.toUri(card).buildUpon().path("/share/").build();
assertEquals("/share/", cardUri.getPath());
// Parse URI
LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
// Compare everything
assertEquals(card.store, parsedCard.store);
assertEquals(card.note, parsedCard.note);
assertEquals(card.validFrom, parsedCard.validFrom);
assertEquals(card.expiry, parsedCard.expiry);
assertEquals(card.balance, parsedCard.balance);
assertEquals(card.balanceType, parsedCard.balanceType);
assertEquals(card.cardId, parsedCard.cardId);
assertEquals(card.barcodeId, parsedCard.barcodeId);
assertEquals(card.barcodeType.format(), parsedCard.barcodeType.format());
assertNull(parsedCard.headerColor);
// No export of starStatus for export URL foreseen therefore 0 will be imported
assertEquals(0, parsedCard.starStatus);
assertEquals(0, parsedCard.archiveStatus);
}
@Test
public void failToParseInvalidUri() {
try {