diff --git a/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java b/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java index 6cecd2180..1aecfb8db 100644 --- a/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java +++ b/app/src/androidTest/java/de/test/antennapod/dialogs/ShareDialogTest.java @@ -4,8 +4,10 @@ import android.content.Context; import android.content.Intent; import android.view.View; +import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.Matchers; +import org.hamcrest.TypeSafeMatcher; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -83,13 +85,6 @@ public class ShareDialogTest { onView(allOf(isDisplayed(), withText(R.string.share_label))); } - @Test - public void testShareDialogShareButton() throws InterruptedException { - onView(withText(R.string.share_label)).perform(scrollTo()).perform(click()); - onView(allOf(isDisplayed(), withText(R.string.share_label))); - onView(withText(R.string.share_episode_positive_label_button)).perform(scrollTo()).perform(click()); - } - @Test public void testShareDialogCancelButton() { onView(withText(R.string.share_label)).perform(scrollTo()).perform(click()); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java index 7e3fe91d0..af602fbf2 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java @@ -59,7 +59,7 @@ public class ShareDialog extends DialogFragment { setupOptions(); builder - .setPositiveButton(R.string.share_episode_positive_label_button, new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.share_label, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { if (radioEpisodeWebsite.isChecked()) { diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index a06a8aa8c..060e02c25 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -136,12 +136,12 @@ Podcast settings Rename podcast Remove podcast - Share… + Share Share Episode URL Share Episode URL with Position Share File - Share Website URL - Share Podcast URL + Website address + Podcast feed URL Share Media File URL Share Media File URL with Position Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes). @@ -766,11 +766,10 @@ Sure, let\'s do this! - Share Include: Playback position Media file URL - Episode website + Episode webpage Audio controls