Display SAS based on zrtp account preferences
Refs #40232
diff --git a/src/org/sflphone/fragments/CallFragment.java b/src/org/sflphone/fragments/CallFragment.java
index b1dce9d..027fb4a 100644
--- a/src/org/sflphone/fragments/CallFragment.java
+++ b/src/org/sflphone/fragments/CallFragment.java
@@ -429,6 +429,8 @@
}
}
});
+ } else {
+
}
}
}
diff --git a/src/org/sflphone/model/SecureSipCall.java b/src/org/sflphone/model/SecureSipCall.java
index 1a44bd0..b809002 100644
--- a/src/org/sflphone/model/SecureSipCall.java
+++ b/src/org/sflphone/model/SecureSipCall.java
@@ -97,7 +97,7 @@
}
public boolean isConfirmedSAS() {
- return false;
+ return confirmedSAS;
}
public void setConfirmedSAS(boolean confirmedSAS) {
@@ -135,4 +135,7 @@
}
};
+ public void sasConfirmedByZrtpLayer(boolean verified) {
+
+ }
}
diff --git a/src/org/sflphone/service/CallManagerCallBack.java b/src/org/sflphone/service/CallManagerCallBack.java
index 45d709f..c8249de 100644
--- a/src/org/sflphone/service/CallManagerCallBack.java
+++ b/src/org/sflphone/service/CallManagerCallBack.java
@@ -318,18 +318,24 @@
@Override
public void on_show_sas(String callID, String sas, boolean verified) {
Log.i(TAG, "on_show_sas:" + sas);
- Log.i(TAG, "SAS Verified:" + verified);
+ Log.i(TAG, "SAS Verified by zrtp layer:" + verified);
+ Log.i(TAG, "SAS Verified by zrtp layer:" + verified);
Intent intent = new Intent(DISPLAY_SAS);
intent.putExtra("callID", callID);
intent.putExtra("SAS", sas);
intent.putExtra("verified", verified);
SecureSipCall call = (SecureSipCall) mService.getCallById(callID);
- intent.putExtra("conference", findConference(callID));
-
call.setSAS(sas);
- call.setConfirmedSAS(verified);
+ call.sasConfirmedByZrtpLayer(verified);
+ Log.i(TAG, "SAS needs to be displayed:" + call.getAccount().getSrtpDetails().getDetailBoolean(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS));
+ if(call.getAccount().getSrtpDetails().getDetailBoolean(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS))
+ call.setConfirmedSAS(false);
+ else
+ call.setConfirmedSAS(true);
+
+ intent.putExtra("conference", findConference(callID));
mService.sendBroadcast(intent);
}
diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index 258564b..deb8568 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -1190,6 +1190,8 @@
@Override
protected void doRun() throws SameThreadException, RemoteException {
Log.i(TAG, "SipService.confirmSAS() thread running...");
+ SecureSipCall call = (SecureSipCall) getCallById(callID);
+ call.setConfirmedSAS(true);
callManagerJNI.setSASVerified(callID);
}
});
diff --git a/src/org/sflphone/utils/CallProximityManager.java b/src/org/sflphone/utils/CallProximityManager.java
index a5431e9..8236d6d 100644
--- a/src/org/sflphone/utils/CallProximityManager.java
+++ b/src/org/sflphone/utils/CallProximityManager.java
@@ -122,7 +122,7 @@
}
if (supportProximity) {
Log.d(THIS_FILE, "We can use native screen locker !!");
- proximityWakeLock = powerManager.newWakeLock(proximityScreenOffWakeLock, "com.csipsimple.CallProximity");
+ proximityWakeLock = powerManager.newWakeLock(proximityScreenOffWakeLock, "org.sflphone.CallProximity");
proximityWakeLock.setReferenceCounted(false);
}
@@ -275,7 +275,7 @@
activeRegardingCalls = mDirector.shouldActivateProximity();
}
- Log.d(THIS_FILE, "Horizontal : " + horizontal + " and activate for calls " + activeRegardingCalls);
+ //Log.d(THIS_FILE, "Horizontal : " + horizontal + " and activate for calls " + activeRegardingCalls);
if (activeRegardingCalls && !horizontal) {
// Phone is in use! Arrange for the screen to turn off
// automatically when the sensor detects a close object.