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

added settings for watchdogtimer / complete rewrite of remote marker downloads #367

Merged
merged 3 commits into from
Jan 29, 2015
Merged

Conversation

hirbod
Copy link
Contributor

@hirbod hirbod commented Jan 24, 2015

Please mention this function in WIKI

avoid Exceptions and memory leaks, much faster download and user
experience trough async image request.
@hirbod hirbod changed the title added settings for watchdogtimer added settings for watchdogtimer / complete rewrite of remote marker downloads Jan 25, 2015
@hirbod
Copy link
Contributor Author

hirbod commented Jan 25, 2015

Hi Masashi, since you changed my code a bit, you can't merge it. Would you incoporate my watchdog method manually? This would be nice! Then I could install the test version in my app

@wf9a5m75
Copy link
Member

Your code is already in the test branch.

@hirbod
Copy link
Contributor Author

hirbod commented Jan 25, 2015

Watchdog not. I had to incoporate it myself after I've installed the test branch

@hirbod
Copy link
Contributor Author

hirbod commented Jan 25, 2015

@hirbod
Copy link
Contributor Author

hirbod commented Jan 27, 2015

?

cause it’s annyoing
@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

@wf9a5m75 you ignore me? :(

@wf9a5m75
Copy link
Member

No, it's really busy.

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

Want to pull app into the store in 3-4 days.. thanks why I'm pushing so much.. sorry

@wf9a5m75 wf9a5m75 merged commit 52890d0 into mapsplugin:test Jan 29, 2015
wf9a5m75 added a commit that referenced this pull request Jan 29, 2015
Thank you for your help @hirbod
@wf9a5m75
Copy link
Member

Thank you for your help @hirbod

@wf9a5m75 wf9a5m75 added this to the v1.2.5 milestone Jan 29, 2015
@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

damn... now you did overwrite your marker edits.. there was old code in my PR
@wf9a5m75

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

Revert please and only take the code-part for WatchDog

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

#337

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

@wf9a5m75 da4ca94

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

and i really don't understand your organizing. masashi_dev, master and test. All the PRs and fixes are mixed or missing or invalid now?!

wf9a5m75 added a commit that referenced this pull request Jan 29, 2015
Remove the merged code from Marker.m at once.
@wf9a5m75
Copy link
Member

Removed your code from Marker.m at once.

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

I don't really understand. And where is your improved version of my code?

@wf9a5m75
Copy link
Member

masashi_dev's code for me , which includes cordova files.
master is master.
test is the beta test version.

Because of many people ask me many things, such as test, new feature, bug fix ... (you may know), I need to do coding in parallel.
That's why branches are increasing.

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

Allright. Cause usally "test" was your branch for "nearly" final. And now I can't use it anymore. Need to wait till you incorporate all the fixes and new things. Hope you realease 1.2.5 today which has all the new improvements

@wf9a5m75
Copy link
Member

So is this your final code, isn't it?
#337 (comment)

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

Yeah, everything allright. But you improved the code because of marker. But I see you've merged the correct code to masashi_dev

@hirbod
Copy link
Contributor Author

hirbod commented Jan 29, 2015

https://github.com/wf9a5m75/phonegap-googlemaps-plugin/blob/masashi_dev/src/ios/GoogleMaps/Marker.m#L480-L528

This one is correct. And of course the .h file and die generic download function

wf9a5m75 added a commit that referenced this pull request Mar 1, 2015
Thank you for your help @hirbod
wf9a5m75 added a commit that referenced this pull request Mar 1, 2015
Remove the merged code from Marker.m at once.
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.

2 participants