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

Sync bugfixes #55

Merged
merged 14 commits into from
Oct 20, 2015
Merged

Sync bugfixes #55

merged 14 commits into from
Oct 20, 2015

Conversation

secondsun
Copy link
Contributor

@wei-lee @danielpassos
This is the sync work so far

…g updates will no longer be overwritten by server side changes
…ead of the Hash value. This is because the hash is the value keyed in the local data cache. If the has has changed since the data was created then when the application restarts these values won't match and phantom data will exist
…r it won't be notified. This usually happens if the server crashes. In this case we will want to verify that we ARE still waiting for an update. If such an update can not be found then we need to clear the delayed flag and continue with running.
…nger the case. I have added checks for this condition as well
updateNewDataFromPending(pData);

boolean hasRecords = false;

if (pData.has("records")) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this can be removed. As well as the resetDataset. It should be removed from the ios and wp sdk too.

@wei-lee
Copy link
Contributor

wei-lee commented Oct 20, 2015

reviewed.

@david-martin
Copy link
Member

@wei-lee @secondsun do we know what version this will be yet? 2.4.1?

@secondsun
Copy link
Contributor Author

@david-martin This hasn't been tested against Gingerbread and testing in Gingerbread has not been a priority . Unless we are planning to test GBread with this PR I would not suggest using the 2.x.x version.

@wei-lee
Copy link
Contributor

wei-lee commented Oct 20, 2015

@secondsun @david-martin I think we will go with 2.4.1, treat it as a bug fixes for the current version. We can have another 3.x release with support for android M.

@wei-lee
Copy link
Contributor

wei-lee commented Oct 20, 2015

@secondsun @david-martin Just had a quick discussion with Dave and Jason and we think 2.5.0 probably is the best option here.

@secondsun
Copy link
Contributor Author

Something I just noticed, master already has android M dependencies. We need to create a branch of the 2.x line and merge this in there and not into master if we are going to be calling this 2.x

@danielpassos danielpassos merged commit d87be21 into feedhenry:master Oct 20, 2015
secondsun added a commit to secondsun/fh-android-sdk that referenced this pull request Oct 20, 2015
@secondsun secondsun deleted the sync-bugfixes branch November 12, 2015 20:53
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