* #40232: Display SAS when call starts
diff --git a/src/org/sflphone/fragments/CallableWrapperFragment.java b/src/org/sflphone/fragments/CallableWrapperFragment.java
index fc6b732..e85f94f 100644
--- a/src/org/sflphone/fragments/CallableWrapperFragment.java
+++ b/src/org/sflphone/fragments/CallableWrapperFragment.java
@@ -7,9 +7,6 @@
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
import org.sflphone.interfaces.CallInterface;
import org.sflphone.service.CallManagerCallBack;
@@ -30,7 +27,8 @@
@Override
public void onResume() {
- super.onResume();IntentFilter intentFilter = new IntentFilter();
+ super.onResume();
+ IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(CallManagerCallBack.INCOMING_CALL);
intentFilter.addAction(CallManagerCallBack.INCOMING_TEXT);
intentFilter.addAction(CallManagerCallBack.CALL_STATE_CHANGED);
@@ -52,47 +50,47 @@
}
@Override
- public void callStateChanged(Intent callState) {
+ public void callStateChanged(String callID, String state) {
}
@Override
- public void incomingText(Intent msg) {
+ public void incomingText(String ID, String from, String msg) {
}
@Override
- public void confCreated(Intent intent) {
+ public void confCreated(String id) {
}
@Override
- public void confRemoved(Intent intent) {
+ public void confRemoved(String id) {
}
@Override
- public void confChanged(Intent intent) {
+ public void confChanged(String id, String state) {
}
@Override
- public void recordingChanged(Intent intent) {
+ public void recordingChanged(String callID, String filename) {
}
@Override
- public void secureZrtpOn(Intent intent) {
+ public void secureZrtpOn(String id) {
}
@Override
- public void secureZrtpOff(Intent intent) {
+ public void secureZrtpOff(String id) {
}
@Override
- public void displaySAS(Intent intent) {
+ public void displaySAS(String callID, String SAS, boolean verified) {
}
@@ -103,23 +101,23 @@
@Override
public void onReceive(Context context, Intent intent) {
if (intent.getAction().contentEquals(CallManagerCallBack.INCOMING_TEXT)) {
- incomingText(intent);
+ incomingText(intent.getStringExtra("CallID"), intent.getStringExtra("From"), intent.getStringExtra("Msg"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.CALL_STATE_CHANGED)) {
- callStateChanged(intent);
+ callStateChanged(intent.getStringExtra("CallID"), intent.getStringExtra("State"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.CONF_CREATED)) {
- confCreated(intent);
+ confCreated(intent.getStringExtra("confID"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.CONF_REMOVED)) {
- confRemoved(intent);
+ confRemoved(intent.getStringExtra("confID"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.CONF_CHANGED)) {
- confChanged(intent);
+ confChanged(intent.getStringExtra("confID"), intent.getStringExtra("state"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.RECORD_STATE_CHANGED)) {
- recordingChanged(intent);
+ recordingChanged(intent.getStringExtra("callID"), intent.getStringExtra("file"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.ZRTP_OFF)) {
- secureZrtpOff(intent);
+ secureZrtpOff(intent.getStringExtra("callID"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.ZRTP_ON)) {
- secureZrtpOn(intent);
+ secureZrtpOn(intent.getStringExtra("callID"));
} else if (intent.getAction().contentEquals(CallManagerCallBack.DISPLAY_SAS)) {
- displaySAS(intent);
+ displaySAS(intent.getStringExtra("callID"), intent.getStringExtra("SAS"), intent.getBooleanExtra("verified", false));
} else {
Log.e(TAG, "Unknown action: " + intent.getAction());
}