Skip to content
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

Jump to bottom

TIMOB-9983-Use TiDrawableReference.fromUrl #3943

Merged
merged 2 commits into from
Mar 18, 2013
Merged

TIMOB-9983-Use TiDrawableReference.fromUrl #3943

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a451d
TIMOB-9983-Use TiDrawableReference.fromUrl
salachi Mar 8, 2013
3c1146b
TIMOB-9983-incorporated review comments about null check
salachi Mar 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions android/modules/map/src/java/ti/modules/titanium/map/TiMapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.util.TiUIHelper;
import org.appcelerator.titanium.view.TiDrawableReference;
import org.appcelerator.titanium.view.TiUIView;

import ti.modules.titanium.map.MapRoute.RouteOverlay;
Expand Down Expand Up @@ -1114,15 +1115,11 @@ private Drawable makeMarker(int c)
private Drawable makeMarker(String pinImage)
{
if (pinImage != null) {
String url = proxy.resolveUrl(null, pinImage);
TiBaseFile file = TiFileFactory.createTitaniumFile(new String[] { url }, false);
try {
Drawable d = new BitmapDrawable(mapWindow.getContext().getResources(), TiUIHelper.createBitmap(file
.getInputStream()));
TiDrawableReference drawableRef = TiDrawableReference.fromUrl(proxy, pinImage);
if (drawableRef != null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drawableRef cannot be null at this point. We don't need this check here.

Drawable d = drawableRef.getDrawable();
d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d may be null. So we need a null check before calling d.setBounds(). And if d==null, it should log an error, something like "Unable to create drawable from path: xxxxx" .

return d;
} catch (IOException e) {
Log.e(TAG, "Error creating drawable from path: " + pinImage.toString(), e);
}
}
return null;
Expand Down