Skip to content

Response headers #170

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

Merged
merged 8 commits into from
Mar 28, 2013
Merged

Response headers #170

merged 8 commits into from
Mar 28, 2013

Conversation

p-m-j
Copy link
Contributor

@p-m-j p-m-j commented Jan 26, 2013

Cleanup of old pull request #160.

Added response headers to onSuccess (in a backwards compatible fashion) for those that need them.

# Project target.
target=android-3
target=android-10
Copy link

Choose a reason for hiding this comment

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

I suggest these project properties (and ~/.gitignore) should probably not be changed in this pull request.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there a way to remove them from the request? or is this more of a note for anyone potentially merging it in?

Copy link

Choose a reason for hiding this comment

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

You can change them back to what master has and push another commit. It should automatically be reflected here.
e.g.

git checkout response-headers
git checkout master -- project.properties .gitignore
git commit -m "Revert changes to project.properties and .gitignore"
git push

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done (but in a slightly less elegant manner)

p-m-j and others added 3 commits January 27, 2013 00:57
reverted to how it was in master
reverted to how it was in master
@danpe
Copy link

danpe commented Mar 28, 2013

Waiting for this to be merged :)

@loopj
Copy link
Collaborator

loopj commented Mar 28, 2013

I'm considering merging this in, @rustybox could you please merge in master?

Thanks

@p-m-j
Copy link
Contributor Author

p-m-j commented Mar 28, 2013

Can you dumb that down for me? I'm still pretty new to git and dvcs lingo.

@loopj
Copy link
Collaborator

loopj commented Mar 28, 2013

Try this:

git remote add upstream git://github.com/loopj/android-async-http.git
git merge upstream/master
git push origin response-headers

@krschultz
Copy link
Contributor

@rustybox If I remember correctly there is a merge conflict, I have a branch that includes the merge fix if you want it, https://github.com/krschultz/android-async-http/tree/feature/response-headers

p-m-j added 2 commits March 28, 2013 21:44
…tz/android-async-http into response-headers

Conflicts:
	src/com/loopj/android/http/AsyncHttpResponseHandler.java
	src/com/loopj/android/http/JsonHttpResponseHandler.java
Conflicts:
	src/com/loopj/android/http/AsyncHttpResponseHandler.java
@p-m-j
Copy link
Contributor Author

p-m-j commented Mar 28, 2013

Cheers @krschultz, right i believe that is resolved @loopj.

loopj added a commit that referenced this pull request Mar 28, 2013
@loopj loopj merged commit 0ad045f into android-async-http:master Mar 28, 2013
@loopj
Copy link
Collaborator

loopj commented Mar 28, 2013

Thanks guys!

@p-m-j
Copy link
Contributor Author

p-m-j commented Mar 28, 2013

Thank you for the great lib, it really came in amazingly handy on a recent project :)

@loopj
Copy link
Collaborator

loopj commented Mar 28, 2013

Sure no problem, thanks for your contribution.

@danpe
Copy link

danpe commented Mar 28, 2013

Thanks guys ! 👍

@lucamac
Copy link
Contributor

lucamac commented Mar 29, 2013

cheers guys

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.

6 participants