Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2654 from ydinath/ReplaceDeprecatedLang3Methods 

Replace deprecated org.apache.commons.lang3 methods
This commit is contained in:
Martin Fietz 2018-04-22 09:23:51 +02:00 committed by GitHub
parent 4edaa2e6fc a837485363
commit c9a2bbc2c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -45,6 +45,7 @@ project.ext {
supportVersion = "25.3.1" supportVersion = "25.3.1"
commonsioVersion = "2.5" commonsioVersion = "2.5"
commonslangVersion = "3.6" commonslangVersion = "3.6"
commonstextVersion = "1.3"
eventbusVersion = "2.4.0" eventbusVersion = "2.4.0"
flattr4jVersion = "2.14" flattr4jVersion = "2.14"
glideVersion = "3.8.0" glideVersion = "3.8.0"

1
core/build.gradle
View File

@ -50,6 +50,7 @@ dependencies {
implementation "com.android.support:support-v4:$supportVersion" implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:appcompat-v7:$supportVersion" implementation "com.android.support:appcompat-v7:$supportVersion"
implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation "org.apache.commons:commons-text:$commonstextVersion"
implementation ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") { implementation ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
exclude group: "org.json", module: "json" exclude group: "org.json", module: "json"
} }

2
core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/AtomText.java
View File

@ -1,6 +1,6 @@
package de.danoeh.antennapod.core.syndication.namespace.atom; 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.Namespace;
import de.danoeh.antennapod.core.syndication.namespace.SyndElement; import de.danoeh.antennapod.core.syndication.namespace.SyndElement;

9
core/src/main/java/de/danoeh/antennapod/core/util/FileNameGenerator.java
View File

@ -3,7 +3,8 @@ package de.danoeh.antennapod.core.util;
import android.text.TextUtils; import android.text.TextUtils;
import org.apache.commons.lang3.ArrayUtils; 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. */ /** Generates valid filenames for a given string. */
public class FileNameGenerator { public class FileNameGenerator {
@ -34,7 +35,11 @@ public class FileNameGenerator {
} }
String filename = buf.toString().trim(); String filename = buf.toString().trim();
if(TextUtils.isEmpty(filename)) { if(TextUtils.isEmpty(filename)) {
return RandomStringUtils.randomAlphanumeric(8); return new RandomStringGenerator.Builder()
.withinRange('0', 'z')
.filteredBy(Character::isLetterOrDigit)
.build()
.generate(8);
} }
return filename; return filename;
} }