Merge branch 'develop' into htmlpatch

2 files changed, 5 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index a4e661f62..f6bf11e66 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -146,7 +146,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
                 || TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
             feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND))
                     ? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString();
-            getSupportActionBar().setTitle(R.string.add_new_feed_label);
+            getSupportActionBar().setTitle(R.string.add_feed_label);
         } else {
             throw new IllegalArgumentException("Activity must be started with feedurl argument!");
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
index 4c94e2b76..557510808 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
@@ -24,7 +24,10 @@ public class OpmlImportFromIntentActivity extends OpmlImportBaseActivity {
         if (uri != null && uri.toString().startsWith("/")) {
             uri = Uri.parse("file://" + uri.toString());
         } else {
-            uri = Uri.parse(getIntent().getStringExtra(Intent.EXTRA_TEXT));
+            String extraText = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+            if(extraText != null) {
+                uri = Uri.parse(extraText);
+            }
         }
         importUri(uri);
     }