Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not warn that all files are deleted when removing a local feed

Browse Source
This commit is contained in:
Herbert Reiter 2020-07-21 09:50:20 +02:00 committed by GitHub
parent 9cd1c94906
commit 9d76676421
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

4
app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
View File

@ -279,9 +279,11 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null); ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null);
} }
}; };
int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
: R.string.feed_delete_confirmation_msg;
ConfirmationDialog conDialog = new ConfirmationDialog(getActivity(), ConfirmationDialog conDialog = new ConfirmationDialog(getActivity(),
R.string.remove_feed_label, R.string.remove_feed_label,
getString(R.string.feed_delete_confirmation_msg, feed.getTitle())) { getString(messageId, feed.getTitle())) {
@Override @Override
public void onConfirmButtonPressed( public void onConfirmButtonPressed(

4
app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
View File

@ -199,9 +199,11 @@ public class NavDrawerFragment extends Fragment implements AdapterView.OnItemCli
} }
} }
}; };
int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
: R.string.feed_delete_confirmation_msg;
ConfirmationDialog conDialog = new ConfirmationDialog(getContext(), ConfirmationDialog conDialog = new ConfirmationDialog(getContext(),
R.string.remove_feed_label, R.string.remove_feed_label,
getString(R.string.feed_delete_confirmation_msg, feed.getTitle())) { getString(messageId, feed.getTitle())) {
@Override @Override
public void onConfirmButtonPressed(DialogInterface dialog) { public void onConfirmButtonPressed(DialogInterface dialog) {
dialog.dismiss(); dialog.dismiss();

4
app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
View File

@ -270,7 +270,9 @@ public class SubscriptionFragment extends Fragment {
} }
}; };
String message = getString(R.string.feed_delete_confirmation_msg, feed.getTitle()); int messageId = feed.isLocalFeed() ? R.string.feed_delete_confirmation_local_msg
: R.string.feed_delete_confirmation_msg;
String message = getString(messageId, feed.getTitle());
ConfirmationDialog dialog = new ConfirmationDialog(getContext(), R.string.remove_feed_label, message) { ConfirmationDialog dialog = new ConfirmationDialog(getContext(), R.string.remove_feed_label, message) {
@Override @Override
public void onConfirmButtonPressed(DialogInterface clickedDialog) { public void onConfirmButtonPressed(DialogInterface clickedDialog) {

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

@ -145,6 +145,7 @@
<string name="share_item_url_label">Share Media File URL</string> <string name="share_item_url_label">Share Media File URL</string>
<string name="share_item_url_with_position_label">Share Media File URL with Position</string> <string name="share_item_url_with_position_label">Share Media File URL with Position</string>
<string name="feed_delete_confirmation_msg">Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes).</string> <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes).</string>
<string name="feed_delete_confirmation_local_msg">Please confirm that you want to remove the podcast \"%1$s\". The files in the local source folder will not be deleted.</string>
<string name="feed_remover_msg">Removing podcast</string> <string name="feed_remover_msg">Removing podcast</string>
<string name="load_complete_feed">Refresh complete podcast</string> <string name="load_complete_feed">Refresh complete podcast</string>
<string name="multi_select">Multi select</string> <string name="multi_select">Multi select</string>