Public in calls option

Change-Id: Ic54daeeb89df2cb2c315520801656e5637a29be6

jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceRegistrationResponse.java

@@ -41,8 +41,7 @@ public class DeviceRegistrationResponse {
     private String receiptSignature;
     private String userPhoto;
     //Backward compatibility fix so all the fields are included here.
-    private Boolean allowCertFromHistory;
-    private Boolean allowCertFromTrusted;
+    private Boolean publicInCalls;
     private Boolean proxyEnabled;
     private String  dhtProxyListUrl;
     private String  proxyServer;
@@ -53,7 +52,6 @@ public class DeviceRegistrationResponse {
     private String  turnServerPassword;
     private Boolean videoEnabled;
     private Boolean turnEnabled;
-    private Boolean allowCertFromContact;
     private Boolean accountDiscovery;
     private Boolean peerDiscovery;
     private Boolean upnpEnabled;
@@ -71,8 +69,7 @@ public class DeviceRegistrationResponse {
 
     public void setPolicyData(String policyData){
         PolicyData policy = JsonIterator.deserialize(policyData,PolicyData.class);
-        this.allowCertFromHistory = policy.getAllowCertFromHistory();
-        this.allowCertFromTrusted = policy.getAllowCertFromTrusted();
+        this.publicInCalls = policy.getPublicInCalls();
         this.proxyEnabled = policy.getProxyEnabled();
         this.dhtProxyListUrl = policy.getDhtProxyListUrl();
         this.proxyServer = policy.getProxyServer();
@@ -83,7 +80,6 @@ public class DeviceRegistrationResponse {
         this.turnServerPassword = policy.getTurnServerPassword();
         this.videoEnabled = policy.getVideoEnabled();
         this.turnEnabled = policy.getTurnEnabled();
-        this.allowCertFromContact = policy.getAllowCertFromContact();
         this.accountDiscovery = policy.getAccountDiscovery();
         this.peerDiscovery = policy.getPeerDiscovery();
         this.upnpEnabled = policy.getUpnpEnabled();

jams-common/src/main/java/net/jami/jams/common/objects/user/PolicyData.java

@@ -7,8 +7,7 @@ import lombok.Setter;
 @Setter
 public class PolicyData {
 
-    private Boolean allowCertFromHistory;
-    private Boolean allowCertFromTrusted;
+    private Boolean publicInCalls;
     private Boolean proxyEnabled;
     private String  dhtProxyListUrl;
     private String proxyServer;
@@ -19,7 +18,6 @@ public class PolicyData {
     private String turnServerPassword;
     private Boolean videoEnabled;
     private Boolean turnEnabled;
-    private Boolean allowCertFromContact;
     private Boolean accountDiscovery;
     private Boolean peerDiscovery;
     private Boolean upnpEnabled;

jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js

@@ -171,7 +171,7 @@ export default function EditBlueprintConfiguration(props) {
   const history = useHistory();
 
   const [videoEnabled, setVideoEnabled] = React.useState(true);
-  const [allowCertFromContact, setAllowCertFromContact] = React.useState(true);
+  const [publicInCalls, setPublicInCalls] = React.useState(true);
   const [autoAnswer, setAutoAnswer] = React.useState(false);
   const [peerDiscovery, setPeerDiscovery] = React.useState(true);
   const [rendezVous, setRendezVous] = React.useState(false);
@@ -209,7 +209,7 @@ export default function EditBlueprintConfiguration(props) {
       .then((response) => {
         let policyData = JSON.parse(response.data.policyData);
         setVideoEnabled(policyData["videoEnabled"]);
-        setAllowCertFromContact(policyData["allowCertFromContact"]);
+        setPublicInCalls(policyData["publicInCalls"]);
         setAutoAnswer(policyData["autoAnswer"]);
         setPeerDiscovery(policyData["peerDiscovery"]);
         setRendezVous(policyData["rendezVous"]);
@@ -252,9 +252,7 @@ export default function EditBlueprintConfiguration(props) {
   const handleUpdateConfiguration = (field, value, selectedOptions = []) => {
     let data = {
       videoEnabled: videoEnabled,
-      allowCertFromContact: allowCertFromContact,
-      allowCertFromHistory: allowCertFromContact,
-      allowCertFromTrusted: allowCertFromContact,
+      publicInCalls: publicInCalls,
       autoAnswer: autoAnswer,
       peerDiscovery: peerDiscovery,
       accountDiscovery: peerDiscovery,

jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js

@@ -94,7 +94,7 @@ export default function EditBlueprintPermissions(props) {
   const history = useHistory();
 
   const [videoEnabled, setVideoEnabled] = React.useState(true);
-  const [allowCertFromContact, setAllowCertFromContact] = React.useState(true);
+  const [publicInCalls, setPublicInCalls] = React.useState(true);
   const [autoAnswer, setAutoAnswer] = React.useState(false);
   const [peerDiscovery, setPeerDiscovery] = React.useState(true);
   const [rendezVous, setRendezVous] = React.useState(false);
@@ -124,7 +124,7 @@ export default function EditBlueprintPermissions(props) {
       .then((response) => {
         let policyData = JSON.parse(response.data.policyData);
         setVideoEnabled(policyData["videoEnabled"]);
-        setAllowCertFromContact(policyData["allowCertFromContact"]);
+        setPublicInCalls(policyData["publicInCalls"]);
         setAutoAnswer(policyData["autoAnswer"]);
         setPeerDiscovery(policyData["peerDiscovery"]);
         setRendezVous(policyData["rendezVous"]);
@@ -151,9 +151,7 @@ export default function EditBlueprintPermissions(props) {
   const handleUpdatePermissions = (field, value) => {
     let data = {
       videoEnabled: videoEnabled,
-      allowCertFromContact: allowCertFromContact,
-      allowCertFromHistory: allowCertFromContact,
-      allowCertFromTrusted: allowCertFromContact,
+      publicInCalls: publicInCalls,
       autoAnswer: autoAnswer,
       peerDiscovery: peerDiscovery,
       accountDiscovery: peerDiscovery,
@@ -169,11 +167,7 @@ export default function EditBlueprintPermissions(props) {
       dhtProxyListUrl: dhtProxyListUrl,
     };
 
-    if (field === "allowCertFromContact") {
-      data.allowCertFromContact = value;
-      data.allowCertFromHistory = value;
-      data.allowCertFromTrusted = value;
-    } else if (field === "peerDiscovery") {
+    if (field === "peerDiscovery") {
       data.peerDiscovery = value;
       data.accountDiscovery = value;
       data.accountPublish = value;
@@ -270,19 +264,19 @@ export default function EditBlueprintPermissions(props) {
                       <FormControlLabel
                         control={
                           <Checkbox
-                            checked={allowCertFromContact}
+                            checked={publicInCalls}
                             color="primary"
                             onChange={(e) => {
-                              setAllowCertFromContact(e.target.checked);
+                              setPublicInCalls(e.target.checked);
                               handleUpdatePermissions(
-                                "allowCertFromContact",
+                                "publicInCalls",
                                 e.target.checked
                               );
                             }}
-                            name="allowCertFromContact"
+                            name="publicInCalls"
                           />
                         }
-                        label="Allow incomming calls from unknown contacts"
+                        label="Allow incoming calls from unknown contacts"
                       />
                     </FormGroup>
                     <FormGroup row>

jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java

@@ -130,17 +130,9 @@ public class DeviceServlet extends HttpServlet {
                 obj.remove("videoEnabled");
             }
 
-            if (obj.get("allowCertFromContact") != null) {
-                obj.add("Account.allowCertFromContact", obj.get("allowCertFromContact"));
-                obj.remove("allowCertFromContact");
-            }
-            if (obj.get("allowCertFromHistory") != null) {
-                obj.add("Account.allowCertFromHistory", obj.get("allowCertFromHistory"));
-                obj.remove("allowCertFromHistory");
-            }
-            if (obj.get("allowCertFromTrusted") != null) {
-                obj.add("Account.allowCertFromTrusted", obj.get("allowCertFromTrusted"));
-                obj.remove("allowCertFromTrusted");
+            if (obj.get("publicInCalls") != null) {
+                obj.add("DHT.PublicInCalls", obj.get("publicInCalls"));
+                obj.remove("publicInCalls");
             }
 
             if (obj.get("autoAnswer") != null) {