Remove four parameter interface for some functions being passed an identity.

addon/content/dialogs/options.js

@@ -224,7 +224,8 @@ var pEpOptions = {
   resetIdentity(item) {
     let name = item.getAttribute("fullName");
     let email = item.getAttribute("email");
-    pEpController.key_reset_identity(name, email, null);
+    let id = new pEp.Identity(email, "pEp_own_userId", name, "");
+    pEpController.key_reset_identity(id);
   },
 
   resetAll() {

addon/content/modules/handshake.js

@@ -77,7 +77,7 @@ class Handshake {
   }
 
   updateAllIdentities(identitiesArray) {
-    return Promise.all(identitiesArray.map((identity) => this.controller.update_identity(identity, "mockId")));
+    return Promise.all(identitiesArray.map((identity) => this.controller.update_identity(identity)));
   }
 
   identityRatings(identitiesArray) {

addon/content/modules/pEp.js

@@ -139,8 +139,8 @@ class pEp {
     return Promise.resolve(myselfPopulated);
   }
 
-  async identity_rating(email, id, name, fp) {
-    const identity = new pEp.Identity(email, id, name, fp);
+  async identity_rating(identity) {
+    this.log.info("pEp: identity_rating()", identity);
     return this.adapter.identity_rating(identity).then((rating) => {
       identity.rating = rating;
       return identity;
@@ -155,36 +155,30 @@ class pEp {
       if (!this.languageList.has(language)) language = "en";
     }
     this.log.info("pEp: get_trustwords()", identity1, identity2);
-    const user1 = new pEp.Identity(identity1.address, identity1.user_id, identity1.username, identity1.fpr);
-    const user2 = new pEp.Identity(identity2.address, identity2.user_id, identity2.username, identity2.fpr);
-    return this.adapter.get_trustwords(user1, user2, language, full);
+    return this.adapter.get_trustwords(identity1, identity2, language, full);
   }
 
   async get_languagelist() {
     return this.adapter.get_languagelist();
   }
 
-  async update_identity(address, id, name, fingerprint) {
-    this.log.info("pEp: update_identity()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async update_identity(identity) {
+    this.log.info("pEp: update_identity()", identity);
     return this.adapter.update_identity(identity);
   }
 
-  async key_reset_trust(address, id, name, fingerprint) {
-    this.log.info("pEp: key_reset_trust()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async key_reset_trust(identity) {
+    this.log.info("pEp: key_reset_trust()", identity);
     return this.adapter.key_reset_trust(identity);
   }
 
-  async key_reset_user(address, id, name, fingerprint) {
-    this.log.info("pEp: key_reset_user()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async key_reset_user(identity) {
+    this.log.info("pEp: key_reset_user()", identity);
     return this.adapter.key_reset_user(identity);
   }
 
-  async key_reset_identity(address, name, fingerprint) {
-    this.log.info("pEp: key_reset_identity()");
-    const identity = new pEp.Identity(address, "pEp_own_userId", name, fingerprint);
+  async key_reset_identity(identity) {
+    this.log.info("pEp: key_reset_identity()", identity);
     return this.adapter.key_reset_identity(identity);
   }
 
@@ -193,21 +187,18 @@ class pEp {
     return this.adapter.key_reset_all_own_keys();
   }
 
-  async trust_personal_key(address, id, name, fingerprint) {
-    this.log.info("pEp: trust_personal_key()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async trust_personal_key(identity) {
+    this.log.info("pEp: trust_personal_key()", identity);
     return this.adapter.trust_personal_key(identity);
   }
 
-  async key_mistrusted(address, id, name, fingerprint) {
-    this.log.info("pEp: key_mistrusted()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async key_mistrusted(identity) {
+    this.log.info("pEp: key_mistrusted()", identity);
     return this.adapter.key_mistrusted(identity);
   }
 
-  async is_pEp_user(address, id, name, fingerprint) {
-    this.log.info("pEp: is_pEp_user()");
-    const identity = new pEp.Identity(address, id, name, fingerprint);
+  async is_pEp_user(identity) {
+    this.log.info("pEp: is_pEp_user()", identity);
     return this.adapter.is_pEp_user(identity).then((is_pEp) => {
       identity.is_pEp = is_pEp;
       return identity;

addon/content/pepmsghdrview.js

@@ -518,7 +518,8 @@ var pEpHdrView = {
     } else {
       // Maybe this was sent to me being part of a mailing list.
       for (let addr of allAdresses) {
-        let id = pEpController.synchronise(pEpController.update_identity(addr.email, "", addr.name, ""));
+        let id = new pEp.Identity(addr.email, "", addr.name, "");
+        id = pEpController.synchronise(pEpController.update_identity(id));
         if (id.me) {
           id.username = addr.name;  // Engine invents some name if it was empty.
           pEpMyself = id;