commit c8037f674f3095f490923d903f05790d1e7d5375
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Feb 24 17:05:31 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Feb 24 17:05:31 2014 -0500
tree 4da5260ad0999b2a1c668c973a64d1cb1ad1fe24
parent dbe396d85ed182e8abef9b4abf627993739dacd3

ui: zrtp not supported display red lock

Refs #40232

src/org/sflphone/fragments/CallFragment.java

diff --git a/src/org/sflphone/fragments/CallFragment.java b/src/org/sflphone/fragments/CallFragment.java
index 2843864..2afaf5f 100644
--- a/src/org/sflphone/fragments/CallFragment.java
+++ b/src/org/sflphone/fragments/CallFragment.java
@@ -283,14 +283,14 @@
     public void zrtpNegotiationFailed(Conference c, String securedCallID) {
         mCallbacks.updateDisplayedConference(c);
         SecureSipCall display = (SecureSipCall) getConference().getCallById(securedCallID);
-        display.setZrtpNotSupported(true);
+        enableZRTP(display);
     }
 
     @Override
     public void zrtpNotSupported(Conference c, String securedCallID) {
         mCallbacks.updateDisplayedConference(c);
         SecureSipCall display = (SecureSipCall) getConference().getCallById(securedCallID);
-        display.setZrtpNotSupported(true);
+        enableZRTP(display);
     }
 
     @Override

src/org/sflphone/model/SecureSipCall.java

diff --git a/src/org/sflphone/model/SecureSipCall.java b/src/org/sflphone/model/SecureSipCall.java
index ff59671..086962c 100644
--- a/src/org/sflphone/model/SecureSipCall.java
+++ b/src/org/sflphone/model/SecureSipCall.java
@@ -159,6 +159,7 @@
     }
 
     public void setZrtpNotSupported(boolean zrtpNotSupported) {
+        needSASConfirmation = false;
         this.zrtpNotSupported = zrtpNotSupported;
     }
 

src/org/sflphone/service/CallManagerCallBack.java

diff --git a/src/org/sflphone/service/CallManagerCallBack.java b/src/org/sflphone/service/CallManagerCallBack.java
index 4e83e04..9564f39 100644
--- a/src/org/sflphone/service/CallManagerCallBack.java
+++ b/src/org/sflphone/service/CallManagerCallBack.java
@@ -289,10 +289,7 @@
         Intent intent = new Intent(ZRTP_OFF);
         intent.putExtra("callID", callID);
         intent.putExtra("conference", mService.findConference(callID));
-        mService.sendBroadcast(intent);
-
-
-    }
+        mService.sendBroadcast(intent);    }
 
     @Override
     public void on_show_sas(String callID, String sas, boolean verified) {
@@ -314,6 +311,7 @@
         Log.i(TAG, "on_zrtp_not_supported");
         Intent intent = new Intent(ZRTP_NOT_SUPPORTED);
         SecureSipCall call = (SecureSipCall) mService.getCallById(callID);
+        call.setInitialized();
         call.setZrtpNotSupported(true);
         intent.putExtra("callID", callID);
         intent.putExtra("conference", mService.findConference(callID));
@@ -325,6 +323,7 @@
         Log.i(TAG, "on_zrtp_negociation_failed");
         Intent intent = new Intent(ZRTP_NEGOTIATION_FAILED);
         SecureSipCall call = (SecureSipCall) mService.getCallById(callID);
+        call.setInitialized();
         call.setZrtpNotSupported(true);
         intent.putExtra("callID", callID);
         intent.putExtra("conference", mService.findConference(callID));