Skip to content

Merge 2.9 release with master #2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 19, 2018
Merged

Merge 2.9 release with master #2174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2d271a
Fix memory leak due to wikidata edit listener (#2048)
maskaravivek Nov 30, 2018
2e29f4f
Fix bookmark crash fix (#2047)
maskaravivek Dec 1, 2018
568f807
Bug fix #2042 (#2056)
ashishkumar468 Dec 1, 2018
2bc9492
Bugfix/duplicate categories (#2080)
ashishkumar468 Dec 4, 2018
36e077f
Fix crash because of inactive fragment UI (#2046)
maskaravivek Dec 5, 2018
615c0be
Add information icon action Fiixes #2055 2.9.0: the 'i' icon in nearb…
neslihanturan Dec 17, 2018
189898b
Merge branch 'master' into 2.9-release
maskaravivek Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix bookmark crash fix (#2047) 
* Fix bookmark crash fix

* Fix check for bookmark creator
  • Loading branch information
@maskaravivek @neslihanturan
maskaravivek authored and neslihanturan committed Dec 1, 2018
commit 2e29f4f7f92e3f876aa5594c424eb76ae0ce9edc
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ List<Media> loadBookmarkedPictures() {
for (Bookmark bookmark : bookmarks) {
List<Media> 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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down