From 2e29f4f7f92e3f876aa5594c424eb76ae0ce9edc Mon Sep 17 00:00:00 2001 From: Vivek Maskara Date: Sat, 1 Dec 2018 15:50:19 +0530 Subject: [PATCH] Fix bookmark crash fix (#2047) * Fix bookmark crash fix * Fix check for bookmark creator --- .../commons/bookmarks/pictures/BookmarkPicturesController.java | 2 +- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java index cca5867bb..9bd2613a1 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java @@ -36,7 +36,7 @@ public class BookmarkPicturesController { for (Bookmark bookmark : bookmarks) { List tmpMedias = mediaWikiApi.searchImages(bookmark.getMediaName(), 0); for (Media m : tmpMedias) { - if (m.getCreator().equals(bookmark.getMediaCreator())) { + if (m.getCreator().trim().equals(bookmark.getMediaCreator().trim())) { medias.add(m); break; } diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 722d94f31..ad5bf77e1 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -271,7 +271,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple menu.clear(); // see http://stackoverflow.com/a/8495697/17865 inflater.inflate(R.menu.fragment_image_detail, menu); if (pager != null) { - MediaDetailProvider provider = (MediaDetailProvider) getParentFragment(); + MediaDetailProvider provider = getMediaDetailProvider(); if(provider == null) { return; }