From 4de5c124e14a1a8f5ab5eee12cfe9a8af4800df4 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 14 Jun 2013 14:34:56 +0000 Subject: [PATCH] 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 --- .../main/java/org/wikimedia/commons/MediaWikiImageView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java index afa95d869..8c17945a6 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 @@ public class MediaWikiImageView extends ImageView { return; } + if(mMedia == null) { + return; + } + final String mUrl; if(tryOriginal) { mUrl = mMedia.getImageUrl(); @@ -172,9 +176,7 @@ public class MediaWikiImageView extends ImageView { @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