jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/325932 )
Change subject: Fix subject string for featured image sharing ...................................................................... Fix subject string for featured image sharing Changes the subject string for featured image sharing via image viewing activity. Now sharing featured image from feed and viewing activity displays the same subject in email clients. Updates the featured image checking in viewing activity. Bug: T151023 Change-Id: If38c3d925ea248dde0798f356724fb9bb5fe3f3b --- M app/src/main/java/org/wikipedia/main/MainFragment.java M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java 2 files changed, 19 insertions(+), 11 deletions(-) Approvals: Niedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java b/app/src/main/java/org/wikipedia/main/MainFragment.java index d9ac607..b8b5149 100644 --- a/app/src/main/java/org/wikipedia/main/MainFragment.java +++ b/app/src/main/java/org/wikipedia/main/MainFragment.java @@ -30,6 +30,7 @@ import org.wikipedia.activity.FragmentUtil; import org.wikipedia.analytics.GalleryFunnel; import org.wikipedia.analytics.IntentFunnel; +import org.wikipedia.dataclient.WikiSite; import org.wikipedia.feed.FeedFragment; import org.wikipedia.feed.image.FeaturedImage; import org.wikipedia.feed.image.FeaturedImageCard; @@ -250,8 +251,7 @@ ShareUtil.shareImage(getContext(), bitmap, new File(thumbUrl).getName(), - getString(R.string.feed_featured_image_share_subject) + " | " - + DateUtil.getFeedCardDateString(card.date().baseCalendar()), + featuredImageShareSubject(card), fullSizeUrl); } else { FeedbackUtil.showMessage(MainFragment.this, getString(R.string.gallery_share_error, card.baseImage().title())); @@ -270,8 +270,9 @@ } @Override public void onFeaturedImageSelected(FeaturedImageCard card) { - startActivityForResult(GalleryActivity.newIntent(getActivity(), card.baseImage(), - card.filename(), card.wikiSite(), GalleryFunnel.SOURCE_FEED_FEATURED_IMAGE), + final WikiSite wiki = card.wikiSite(); + startActivityForResult(GalleryActivity.newIntent(getActivity(), new PageTitle(featuredImageShareSubject(card), wiki), + card.filename(), wiki, GalleryFunnel.SOURCE_FEED_FEATURED_IMAGE, card.baseImage()), Constants.ACTIVITY_REQUEST_GALLERY); } @@ -468,6 +469,11 @@ } } + private String featuredImageShareSubject(FeaturedImageCard card) { + return getString(R.string.feed_featured_image_share_subject) + " | " + + DateUtil.getFeedCardDateString(card.date().baseCalendar()); + } + @Nullable private Callback callback() { return FragmentUtil.getCallback(this, Callback.class); } diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java index c7e3ce9..4f48206 100644 --- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java +++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java @@ -68,8 +68,7 @@ public static final String EXTRA_WIKI = "wiki"; public static final String EXTRA_SOURCE = "source"; public static final String EXTRA_FEATURED_IMAGE = "card"; - - private static final String FEED_FEATURED_IMAGE_TITLE = "FeedFeaturedImage"; + public static final String EXTRA_IS_FEATURED_IMAGE = "is_featured"; @NonNull private WikipediaApp app = WikipediaApp.getInstance(); @Nullable private PageTitle pageTitle; @@ -139,10 +138,12 @@ }; @NonNull - public static Intent newIntent(@NonNull Context context, @NonNull FeaturedImage image, - @NonNull String filename, @NonNull WikiSite wiki, int source) { - return newIntent(context, new PageTitle(FEED_FEATURED_IMAGE_TITLE, wiki), filename, wiki, - source).putExtra(EXTRA_FEATURED_IMAGE, GsonMarshaller.marshal(image)); + public static Intent newIntent(@NonNull Context context, @NonNull PageTitle pageTitle, + @NonNull String filename, @NonNull WikiSite wiki, int source, + @NonNull FeaturedImage image) { + return newIntent(context, pageTitle, filename, wiki, source) + .putExtra(EXTRA_FEATURED_IMAGE, GsonMarshaller.marshal(image)) + .putExtra(EXTRA_IS_FEATURED_IMAGE, true); } @NonNull @@ -228,7 +229,8 @@ if (pageTitle == null) { throw new IllegalStateException("pageTitle should not be null"); - } else if (FEED_FEATURED_IMAGE_TITLE.equals(pageTitle.getText())) { + } else if (getIntent().hasExtra(EXTRA_IS_FEATURED_IMAGE) + && getIntent().getBooleanExtra(EXTRA_IS_FEATURED_IMAGE, false)) { FeaturedImage featuredImage = GsonUnmarshaller.unmarshal(FeaturedImage.class, getIntent().getStringExtra(EXTRA_FEATURED_IMAGE)); if (featuredImage != null) { -- To view, visit https://gerrit.wikimedia.org/r/325932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If38c3d925ea248dde0798f356724fb9bb5fe3f3b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Hlakhara <himanshulakhara1...@gmail.com> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits