summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorBurt Wiley Snyder <armorsoft@gmail.com>2019-02-01 09:57:19 -0500
committerH. Lehmann <ByteHamster@users.noreply.github.com>2019-02-01 15:57:19 +0100
commit7f100b3fa60d30fc1cc7efe3a56956b468bda31c (patch)
tree858f7d0cae4307bc8b93ecde6f79b671eadc6b73 /core/src
parent3b67381656731e2aca2dcca4b14d81a9d113628d (diff)
downloadAntennaPod-7f100b3fa60d30fc1cc7efe3a56956b468bda31c.zip
Null handling in OnlineFeedViewActivity (#3004)
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java3
-rw-r--r--core/src/main/res/values/strings.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java b/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
index 40faa1dd2..ffc6a6e28 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
@@ -1,6 +1,7 @@
package de.danoeh.antennapod.core.util;
import android.net.Uri;
+import android.support.annotation.NonNull;
import android.util.Log;
import de.danoeh.antennapod.core.BuildConfig;
@@ -29,7 +30,7 @@ public final class URLChecker {
* @param url The url which is going to be prepared
* @return The prepared url
*/
- public static String prepareURL(String url) {
+ public static String prepareURL(@NonNull String url) {
url = url.trim();
if (url.startsWith("feed://")) {
if (BuildConfig.DEBUG) Log.d(TAG, "Replacing feed:// with http://");
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 21314c80c..e4cd4789e 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -229,6 +229,7 @@
<string name="download_type_media">Media file</string>
<string name="download_type_image">Image</string>
<string name="download_request_error_dialog_message_prefix">An error occurred when trying to download the file:\u0020</string>
+ <string name="null_value_podcast_error">No podcast was provided that could be shown.</string>
<string name="authentication_notification_title">Authentication required</string>
<string name="authentication_notification_msg">The resource you requested requires a username and a password</string>
<string name="confirm_mobile_download_dialog_title">Confirm Mobile Download</string>