Skip to content

update#2

Merged
koush merged 16 commits into
CyanogenMod:cm-10.1from
koush:master
Jul 23, 2013
Merged

update#2
koush merged 16 commits into
CyanogenMod:cm-10.1from
koush:master

Conversation

@koush

@koush koush commented Jul 23, 2013

Copy link
Copy Markdown

No description provided.

Corey Downing and Rick Kawala and others added 16 commits July 16, 2013 16:50
Use Uri's raw path for creating GET string to avoid removing URL encoding
fix readString on ByteBufferList.

Change-Id: I07993c7354432d32b25de1e7b9c097c16ac99a4a
Change-Id: I4ea3f10d261b3422ec98400359be3a2a7b3a4ab5
Change-Id: I2bf941202892439a12c21eb7f8ad08a81e73f1d9
Change-Id: Ibf3ba8e1e35b6a2926ec55c6781debda949c29ae
Change-Id: Ic2d6fedabef76d57d454239dd6e4be3c9a788721
Give the sample app the name "AndroidAsync Sample" in Android launcher,
instead of the generic name "MainActivity"-
Provide non-generic name for sample app
Change-Id: Ia8787cddebbc0a4da6910762f344544edb664d6b
The default HTTP charset is ISO-8859-1 so we need to specify UTF-8,
which is what is being sent to the client.
Specify UTF-8 charset in Content-Type
koush added a commit that referenced this pull request Jul 23, 2013
@koush koush merged commit e4cd210 into CyanogenMod:cm-10.1 Jul 23, 2013
@cm-gerrit

Copy link
Copy Markdown

Hi there;

This is an automated reply, to let you know CyanogenMod doesn't merge pull
requests submitted directly to our github.com repositories.

You can submit your change requests through our public review system,
located at http://review.cyanogenmod.org/

That review system is an installation of Google's Gerrit code review.
If you've never interacted with Gerrit before, we also suggest you take
a look at http://wiki.cyanogenmod.org/wiki/Howto:_Gerrit

Thanks!

On Tue, 23 Jul 2013 10:32:58 -0700 you wrote:

You can merge this Pull Request by running:

git pull https://github.com/koush/AndroidAsync master

Or you can view, comment on it, or merge it online at:

#2

-- Commit Summary --

-- File Changes --

M AndroidAsync/AndroidManifest.xml (4)
M AndroidAsync/src/com/koushikdutta/async/AsyncDatagramSocket.java (3)
M AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java (5)
M AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java (16)
M AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java (1)
M AndroidAsync/src/com/koushikdutta/async/ChannelWrapper.java (1)
M AndroidAsync/src/com/koushikdutta/async/DatagramChannelWrapper.java (8)
M AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java (5)
M AndroidAsync/src/com/koushikdutta/async/SocketChannelWrapper.java (5)
M AndroidAsync/src/com/koushikdutta/async/Util.java (9)
M AndroidAsync/src/com/koushikdutta/async/future/Future.java (1)
M AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java (7)
M AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java (2)
M AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java (2)
M AndroidAsync/src/com/koushikdutta/async/http/ResponseCacheMiddleware.java (58)
M AndroidAsync/src/com/koushikdutta/async/http/libcore/DiskLruCache.java (207)
M AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java (6)
M AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java (4)
M AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java (109)
M AndroidAsyncSample/res/values/strings.xml (2)
M AndroidAsyncTest/src/com/koushikdutta/async/test/CacheTests.java (27)
M AndroidAsyncTest/src/com/koushikdutta/async/test/HttpClientTests.java (12)
M AndroidAsyncTest/src/com/koushikdutta/async/test/SocketIOTests.java (83)

-- Patch Links --

https://github.com/CyanogenMod/AndroidAsync/pull/2.patch
https://github.com/CyanogenMod/AndroidAsync/pull/2.diff

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.

4 participants