Yuvipanda has submitted this change and it was merged. Change subject: Do not crash in details view if we try to view local image ......................................................................
Do not crash in details view if we try to view local image Makes sure that if we don't have an image set, we just do nothing rather than crash badly Change-Id: Id1947be4cda1dff1610c69213d7ada986c6a9c67 GitHub: https://github.com/wikimedia/apps-android-commons/pull/9 --- M commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java index afa95d8..8c17945 100644 --- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java +++ b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java @@ -78,6 +78,10 @@ return; } + if(mMedia == null) { + return; + } + final String mUrl; if(tryOriginal) { mUrl = mMedia.getImageUrl(); @@ -172,9 +176,7 @@ @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); - Log.d("Commons", "Called via onLayout"); loadImageIfNecessary(true); - // Called via onLayout } @Override -- To view, visit https://gerrit.wikimedia.org/r/68663 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1947be4cda1dff1610c69213d7ada986c6a9c67 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/commons Gerrit-Branch: master Gerrit-Owner: SuchABot <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
