diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-04-22 09:23:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 09:23:51 +0200 |
| commit | c9a2bbc2c9709a0c1f0d20ea8168bd7a7a1b95d5 (patch) | |
| tree | 11987f76d2558356af4b97ba9a7e07cb29f79ae6 /core | |
| parent | 4edaa2e6fc1bc6be9ef1d6bbf5659ed2cc3d55ca (diff) | |
| parent | a8374853636a9b5eca301f70a5da52641e297ed9 (diff) | |
| download | AntennaPod-c9a2bbc2c9709a0c1f0d20ea8168bd7a7a1b95d5.zip | |
Merge pull request #2654 from ydinath/ReplaceDeprecatedLang3Methods
Replace deprecated org.apache.commons.lang3 methods
Diffstat (limited to 'core')
3 files changed, 9 insertions, 3 deletions
diff --git a/core/build.gradle b/core/build.gradle index 9967e99ff..af1ac7ad0 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -50,6 +50,7 @@ dependencies { implementation "com.android.support:support-v4:$supportVersion" implementation "com.android.support:appcompat-v7:$supportVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" + implementation "org.apache.commons:commons-text:$commonstextVersion" implementation ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") { exclude group: "org.json", module: "json" } diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java index ea1b724d4..b512dce3f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java +++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java @@ -1,6 +1,6 @@ package de.danoeh.antennapod.core.syndication.namespace.atom; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import de.danoeh.antennapod.core.syndication.namespace.Namespace; import de.danoeh.antennapod.core.syndication.namespace.SyndElement; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java b/core/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java index a93dd8ee3..e99461806 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java @@ -3,7 +3,8 @@ package de.danoeh.antennapod.core.util; import android.text.TextUtils; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.text.RandomStringGenerator; + /** Generates valid filenames for a given string. */ public class FileNameGenerator { @@ -34,7 +35,11 @@ public class FileNameGenerator { } String filename = buf.toString().trim(); if(TextUtils.isEmpty(filename)) { - return RandomStringUtils.randomAlphanumeric(8); + return new RandomStringGenerator.Builder() + .withinRange('0', 'z') + .filteredBy(Character::isLetterOrDigit) + .build() + .generate(8); } return filename; } |