Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-02-07 15:38:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2441 from ByteHamster/duplicate-label

Browse Source 
Merged add_feed_label and add_new_feed_label
This commit is contained in:
Martin Fietz 2017-10-15 15:57:25 +02:00 committed by GitHub
commit 6df85d02e1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
View File

@ -146,7 +146,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
|| TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) { || TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND)) feedUrl = (TextUtils.equals(getIntent().getAction(), Intent.ACTION_SEND))
? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString(); ? getIntent().getStringExtra(Intent.EXTRA_TEXT) : getIntent().getDataString();
getSupportActionBar().setTitle(R.string.add_new_feed_label); getSupportActionBar().setTitle(R.string.add_feed_label);
} else { } else {
throw new IllegalArgumentException("Activity must be started with feedurl argument!"); throw new IllegalArgumentException("Activity must be started with feedurl argument!");
} }

1
core/src/main/res/values/strings.xml
View File

@ -13,7 +13,6 @@
<string name="favorite_episodes_label">Favorites</string> <string name="favorite_episodes_label">Favorites</string>
<string name="new_label">New</string> <string name="new_label">New</string>
<string name="settings_label">Settings</string> <string name="settings_label">Settings</string>
<string name="add_new_feed_label">Add Podcast</string>
<string name="downloads_label">Downloads</string> <string name="downloads_label">Downloads</string>
<string name="downloads_running_label">Running</string> <string name="downloads_running_label">Running</string>
<string name="downloads_completed_label">Completed</string> <string name="downloads_completed_label">Completed</string>