TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-04 07:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

We don't need jitter stats logging in production anyway

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-11-05 12:52:31 -08:00
parent 8d4f3803df
commit 5b08be8d01
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jni/redphone/WebRtcJitterBuffer.cpp
View File

@ -29,7 +29,7 @@ int WebRtcJitterBuffer::init() {
return -1; return -1;
} }
pthread_create(&stats, NULL, &WebRtcJitterBuffer::collectStats, this); // pthread_create(&stats, NULL, &WebRtcJitterBuffer::collectStats, this);
return 0; return 0;
} }
@ -67,12 +67,12 @@ int WebRtcJitterBuffer::getAudio(short *rawData, int maxRawData) {
} }
void WebRtcJitterBuffer::stop() { void WebRtcJitterBuffer::stop() {
pthread_mutex_lock(&lock); // pthread_mutex_lock(&lock);
running = 0; running = 0;
pthread_cond_signal(&condition); // pthread_cond_signal(&condition);
pthread_mutex_unlock(&lock); // pthread_mutex_unlock(&lock);
pthread_join(stats, NULL); // pthread_join(stats, NULL);
} }
void WebRtcJitterBuffer::collectStats() { void WebRtcJitterBuffer::collectStats() {

BIN
libs/armeabi-v7a/libredphone-audio.so
View File

Binary file not shown.

BIN
libs/armeabi/libredphone-audio.so
View File

Binary file not shown.

BIN
libs/x86/libredphone-audio.so
View File

Binary file not shown.

1
src/org/thoughtcrime/redphone/RedPhone.java
View File

@ -166,6 +166,7 @@ public class RedPhone extends Activity {
Log.w(TAG, "Termination Stack:", new Exception()); Log.w(TAG, "Termination Stack:", new Exception());
callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call)); callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call));
EventBus.getDefault().removeStickyEvent(RedPhoneEvent.class);
delayedFinish(); delayedFinish();
} }

2
src/org/thoughtcrime/redphone/RedPhoneService.java
View File

@ -121,6 +121,7 @@ public class RedPhoneService extends Service implements CallStateListener, CallS
@Override @Override
public void onStart(Intent intent, int startId) { public void onStart(Intent intent, int startId) {
Log.w(TAG, "onStart(): " + intent);
if (intent == null) return; if (intent == null) return;
new Thread(new IntentRunnable(intent)).start(); new Thread(new IntentRunnable(intent)).start();
} }
@ -148,6 +149,7 @@ public class RedPhoneService extends Service implements CallStateListener, CallS
else if (intent.getAction().equals(ACTION_DENY_CALL)) handleDenyCall(intent); else if (intent.getAction().equals(ACTION_DENY_CALL)) handleDenyCall(intent);
else if (intent.getAction().equals(ACTION_HANGUP_CALL)) handleHangupCall(intent); else if (intent.getAction().equals(ACTION_HANGUP_CALL)) handleHangupCall(intent);
else if (intent.getAction().equals(ACTION_SET_MUTE)) handleSetMute(intent); else if (intent.getAction().equals(ACTION_SET_MUTE)) handleSetMute(intent);
else Log.w(TAG, "Unhandled intent: " + intent.getAction() + ", state: " + state);
} }
///// Initializers ///// Initializers