From 9cc82672b0d58c36b648636dbcceb655a2894c22 Mon Sep 17 00:00:00 2001 From: maskara Date: Thu, 29 Nov 2018 21:32:01 +0530 Subject: [PATCH 1/2] Fix bookmark crash fix --- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 722d94f318..ad5bf77e13 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 void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { 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; } From d9bc1bbe3477834086c262f716640cfb4617eaa3 Mon Sep 17 00:00:00 2001 From: maskara Date: Sat, 1 Dec 2018 00:56:09 +0530 Subject: [PATCH 2/2] Fix check for bookmark creator --- .../commons/bookmarks/pictures/BookmarkPicturesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cca5867bb1..9bd2613a1f 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 @@ List loadBookmarkedPictures() { 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; }