Merge pull request #3587 from ByteHamster/remove-commons-text

Removed commons text library that was just used 2 times

2 files changed, 81 insertions, 74 deletions

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 b512dce3f..714b8d8a7 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,47 +1,51 @@
 package de.danoeh.antennapod.core.syndication.namespace.atom;
 
-import org.apache.commons.text.StringEscapeUtils;
-
+import android.os.Build;
+import android.text.Html;
 import de.danoeh.antennapod.core.syndication.namespace.Namespace;
 import de.danoeh.antennapod.core.syndication.namespace.SyndElement;
 
 /** Represents Atom Element which contains text (content, title, summary). */
 public class AtomText extends SyndElement {
-	public static final String TYPE_TEXT = "text";
-	private static final String TYPE_HTML = "html";
-	private static final String TYPE_XHTML = "xhtml";
-
-	private final String type;
-	private String content;
-
-	public AtomText(String name, Namespace namespace, String type) {
-		super(name, namespace);
-		this.type = type;
-	}
-
-	/** Processes the content according to the type and returns it. */
-	public String getProcessedContent() {
-		if (type == null) {
-			return content;
-		} else if (type.equals(TYPE_HTML)) {
-			return StringEscapeUtils.unescapeHtml4(content);
-		} else if (type.equals(TYPE_XHTML)) {
-			return content;
-		} else { // Handle as text by default
-			return content;
-		}
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getType() {
-		return type;
-	}
+    public static final String TYPE_TEXT = "text";
+    public static final String TYPE_HTML = "html";
+    private static final String TYPE_XHTML = "xhtml";
+
+    private final String type;
+    private String content;
+
+    public AtomText(String name, Namespace namespace, String type) {
+        super(name, namespace);
+        this.type = type;
+    }
+
+    /** Processes the content according to the type and returns it. */
+    public String getProcessedContent() {
+        if (type == null) {
+            return content;
+        } else if (type.equals(TYPE_HTML)) {
+            if (Build.VERSION.SDK_INT >= 24) {
+                return Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY).toString();
+            } else {
+                return Html.fromHtml(content).toString();
+            }
+        } else if (type.equals(TYPE_XHTML)) {
+            return content;
+        } else { // Handle as text by default
+            return content;
+        }
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getType() {
+        return type;
+    }
 
 }
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 e99461806..5579ec27d 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,45 +3,48 @@ package de.danoeh.antennapod.core.util;
 import android.text.TextUtils;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.text.RandomStringGenerator;
 
 
 /** Generates valid filenames for a given string. */
 public class FileNameGenerator {
-	
-	private static final char[] validChars = (
-			"abcdefghijklmnopqrstuvwxyz" +
-			"ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-			"0123456789" +
-			" _-").toCharArray();
-	
-	private FileNameGenerator() {
-	}
-
-	/**
-	 * This method will return a new string that doesn't contain any illegal
-	 * characters of the given string.
-	 */
-	public static String generateFileName(String string) {
-		StringBuilder buf = new StringBuilder();
-		for (int i = 0; i < string.length(); i++) {
-			char c = string.charAt(i);
-			if(Character.isSpaceChar(c) && (buf.length() == 0 || Character.isSpaceChar(buf.charAt(buf.length()-1)))) {
-				continue;
-			}
-			if (ArrayUtils.contains(validChars, c)) {
-				buf.append(c);
-			}
-		}
-		String filename = buf.toString().trim();
-		if(TextUtils.isEmpty(filename)) {
-			return new RandomStringGenerator.Builder()
-					.withinRange('0', 'z')
-					.filteredBy(Character::isLetterOrDigit)
-					.build()
-					.generate(8);
-		}
-		return filename;
-	}
 
+    private static final char[] validChars =
+            ("abcdefghijklmnopqrstuvwxyz"
+            + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            + "0123456789"
+            + " _-").toCharArray();
+
+    private FileNameGenerator() {
+    }
+
+    /**
+     * This method will return a new string that doesn't contain any illegal
+     * characters of the given string.
+     */
+    public static String generateFileName(String string) {
+        StringBuilder buf = new StringBuilder();
+        for (int i = 0; i < string.length(); i++) {
+            char c = string.charAt(i);
+            if (Character.isSpaceChar(c)
+                    && (buf.length() == 0 || Character.isSpaceChar(buf.charAt(buf.length() - 1)))) {
+                continue;
+            }
+            if (ArrayUtils.contains(validChars, c)) {
+                buf.append(c);
+            }
+        }
+        String filename = buf.toString().trim();
+        if (TextUtils.isEmpty(filename)) {
+            return randomString(8);
+        }
+        return filename;
+    }
+
+    private static String randomString(int length) {
+        StringBuilder sb = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            sb.append(validChars[(int) (Math.random() * validChars.length)]);
+        }
+        return sb.toString();
+    }
 }