From 520f0da98353fce763f0c4e09181c230b07123e0 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 5 Jan 2020 14:22:15 +0100 Subject: [PATCH] Sanitize long and multiline notes --- .../java/protect/card_locker/LoyaltyCardViewActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 5d51e6c6c..9af49cfed 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -191,11 +191,17 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur { LoyaltyCard storeCard = storeCards.get(i); - String loyaltyCardText = storeCard.note; + // Use only first line of note + String loyaltyCardText = storeCard.note.split("\\r?\\n")[0].trim(); if(loyaltyCardText.isEmpty()) { loyaltyCardText = String.valueOf(i + 1); } + else if(loyaltyCardText.length() > 15) + { + // Shorten long notes + loyaltyCardText = loyaltyCardText.substring(0, 15).trim() + "…"; + } tabLayout.addTab(tabLayout.newTab().setText(loyaltyCardText));