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

fix(android): don't copy Ti.Buffer properties not set during #clone() #10670

Merged
merged 2 commits into from
Mar 15, 2019
Merged

fix(android): don't copy Ti.Buffer properties not set during #clone() #10670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88c429
fix(android): don't copy Ti.Buffer properties not set during #clone()
sgtcoolguy Feb 1, 2019
86271ed
Merge branch '8_0_X' into TIMOB-26789
sgtcoolguy Feb 12, 2019
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
6 changes: 4 additions & 2 deletions android/titanium/src/java/ti/modules/titanium/BufferProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,12 @@ public BufferProxy clone(Object[] args)
BufferProxy clone = new BufferProxy(copyOfRange(buffer, offset, offset + length));
// Copy over byteOrder and type properties
clone.setProperty(TiC.PROPERTY_BYTE_ORDER, this.getProperty(TiC.PROPERTY_BYTE_ORDER));
clone.setProperty(TiC.PROPERTY_TYPE, this.getProperty(TiC.PROPERTY_TYPE));
if (this.hasProperty(TiC.PROPERTY_TYPE)) {
clone.setProperty(TiC.PROPERTY_TYPE, this.getProperty(TiC.PROPERTY_TYPE));
}
// Copy value if cloning with no args
// TODO How would we handle this with a partial clone?
if (args.length == 0) {
if (args.length == 0 && this.hasProperty(TiC.PROPERTY_VALUE)) {
clone.setProperty(TiC.PROPERTY_VALUE, this.getProperty(TiC.PROPERTY_VALUE));
}
return clone;
Expand Down