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.

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

[TIMOB-15623] tiapp.xml secured and encrypted properties #4900

Merged
merged 5 commits into from
Nov 5, 2013

Conversation

pec1985
Copy link
Contributor

@pec1985 pec1985 commented Nov 1, 2013

No description provided.

Also added these properties to "listProperties" and "hasProperties". A debug log letting the developer know that these properties cannot be removed on "removeProperty" has also been added
@pec1985
Copy link
Contributor Author

pec1985 commented Nov 1, 2013

IMPORTANT
Please wait for #4898 to be merged before merging this one.

@ayeung
Copy link
Contributor

ayeung commented Nov 2, 2013

This probably needs to be merged with master to get the changes from #4898

jsonData = [NSData dataWithContentsOfFile:tiAppPropertiesPath];
}
NSError *error = nil;
props = [[NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error] retain];
Copy link
Contributor

Choose a reason for hiding this comment

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

Should check for error value in case anything wrong happens.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should also ensure that the return object type isKindOfClass NSDictionary

@srahim
Copy link
Contributor

srahim commented Nov 3, 2013

There couple of other issues.
** "ti.ui.defaultunit" is checked from the NSUserDefaults for Layout system to get the default unit . Those need to be replaced.
** Should remove the dead code for the old method. Remove ApplicationDefaults and [load defaults] function from boot process

NSError *error = nil;
props = [[NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error] retain];
if(error != nil) {
DebugLog(@"[WARN] Could not load tiapp.xml properties, error was %@", [error localizedDescription]);
Copy link
Contributor

Choose a reason for hiding this comment

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

[ERROR]

@vishalduggal
Copy link
Contributor

Minor Comments. Starting FR

@vishalduggal
Copy link
Contributor

FR Passed. Merging.

vishalduggal added a commit that referenced this pull request Nov 5, 2013
[TIMOB-15623] tiapp.xml secured and encrypted properties
@vishalduggal vishalduggal merged commit f7fe1e0 into tidev:master Nov 5, 2013
@pec1985 pec1985 deleted the timob-15623 branch March 11, 2014 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants