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-25220] Android: Fix FileProxy compatibility with TiDrawableReference #9392

Merged
merged 1 commit into from
Sep 5, 2017
Merged

[TIMOB-25220] Android: Fix FileProxy compatibility with TiDrawableReference #9392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions android/titanium/src/java/org/appcelerator/titanium/view/TiDrawableReference.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.TiApplication;
import org.appcelerator.titanium.TiBlob;
import org.appcelerator.titanium.TiDimension;
import org.appcelerator.titanium.TiFileProxy;
import org.appcelerator.titanium.io.TiBaseFile;
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.util.TiDownloadListener;
Expand Down Expand Up @@ -238,6 +239,8 @@ public static TiDrawableReference fromObject(Activity activity, Object object)
return fromBlob(activity, TiConvert.toBlob(object));
} else if (object instanceof Number) {
return fromResourceId(activity, ((Number)object).intValue());
} else if (object instanceof TiFileProxy) {
return fromFile(activity, ((TiFileProxy)object).getBaseFile());
} else {
Log.w(TAG, "Unknown image resource type: " + object.getClass().getSimpleName()
+ ". Returning null drawable reference");
Expand Down