From 57cee9364780fb8c7820a3724a3dee429929df6a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 6 Feb 2021 00:31:31 +0100 Subject: [PATCH] trim leading/trailing whitespace from name/summary/video This should make for predictable layouts, since fastlane entries are likely to have a tailing newline, but entries in the metadata YAML will not. --- app/src/main/java/org/fdroid/fdroid/data/App.java | 7 ++++--- .../java/org/fdroid/fdroid/data/LocaleSelectionTest.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 316177284..54e331574 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -520,17 +520,18 @@ public class App extends ValueObject implements Comparable, Parcelable { if (!TextUtils.isEmpty(value)) { whatsNew = value; } + value = getLocalizedEntry(localized, localesToUse, "video"); if (!TextUtils.isEmpty(value)) { - video = value.split("\n", 1)[0]; + video = value.trim(); } value = getLocalizedEntry(localized, localesToUse, "name"); if (!TextUtils.isEmpty(value)) { - name = value; + name = value.trim(); } value = getLocalizedEntry(localized, localesToUse, "summary"); if (!TextUtils.isEmpty(value)) { - summary = value; + summary = value.trim(); } value = getLocalizedEntry(localized, localesToUse, "description"); if (!TextUtils.isEmpty(value)) { diff --git a/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java b/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java index 9aed5e20a..841f6d95d 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/LocaleSelectionTest.java @@ -29,7 +29,7 @@ public class LocaleSelectionTest { private static final String KEY = "summary"; - private static final String EN_US_NAME = "Checkey: info on local apps\n"; + private static final String EN_US_NAME = "Checkey: info on local apps"; private static final String EN_US_FEATURE_GRAPHIC = "en-US/featureGraphic.png"; private static final String EN_US_PHONE_SCREENSHOT = "en-US/phoneScreenshots/First.png"; private static final String EN_US_SEVEN_INCH_SCREENSHOT = "en-US/sevenInchScreenshots/checkey-tablet.png";