search

lukeweber / webrtc-jingle-client

Webrtc audio + jingle protocol brought to IOS and Android.
https://groups.google.com/forum/?fromgroups#!forum/webrtc-jingle
BSD 3-Clause "New" or "Revised" License
336 stars 136 forks source link

Updating code to reflect changes in android client. Haven't tested yet changes to C code since can't build yet. #2

Closed jreyes closed 12 years ago

nickflink commented 12 years ago

Hello I've pulled and done the merge in the branch merges.

Unfortunately it's not completely working, and I'm not all together sure why not.

Do you think you can double check my merge and perhaps send us another pull request?

I'm off on vacation for the next couple of weeks, so no rush.

On Wed, Jul 25, 2012 at 5:54 AM, Johann Reyes < reply@reply.github.com

wrote:

You can merge this Pull Request by running:

git pull https://github.com/jreyes/webrtc-jingle-client master

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

https://github.com/lukeweber/webrtc-jingle-client/pull/2

-- Commit Summary --

  • Updating code to new android client
  • working on client
  • Merge remote-tracking branch 'upstream/master'

-- File Changes --

M src/AndroidManifest.xml (2) M src/jni/com_tuenti_voice_VoiceClient.h (52) M src/jni/tuenti/clientsignalingthread.cc (448) M src/jni/tuenti/clientsignalingthread.h (164) M src/jni/tuenti/voiceclient.cc (84) M src/jni/tuenti/voiceclient.h (53) M src/jni/voiceclient_main.cc (118) M src/pom.xml (2) M src/res/layout/main.xml (26) A src/res/raw/outgoing_call_ring.ogg (0) M src/res/values/strings.xml (37) A src/src/com/tuenti/voice/CallState.java (32) M src/src/com/tuenti/voice/VoiceClient.java (58) D src/src/com/tuenti/voice/VoiceClientActivity.java (182) M src/src/com/tuenti/voice/VoiceClientEventCallback.java (4) M src/src/com/tuenti/voice/VoiceClientEventHandler.java (5) A src/src/com/tuenti/voice/XmppError.java (29) A src/src/com/tuenti/voice/XmppState.java (21) A src/src/com/tuenti/voice/ui/VoiceClientActivity.java (329) A src/src/com/tuenti/voice/ui/dialog/IncomingCallDialog.java (48)

-- Patch Links --

https://github.com/lukeweber/webrtc-jingle-client/pull/2.patch https://github.com/lukeweber/webrtc-jingle-client/pull/2.diff

Reply to this email directly or view it on GitHub: https://github.com/lukeweber/webrtc-jingle-client/pull/2

Nick Flink Calle de San Joaquín, 4, 28004 Madrid, Spain +34 911394660 (land line) +34 627256841 (mobile)

jreyes commented 12 years ago

ok going to open another pull request with the new changes.