From 7c76156adf222f686b8a63ef99636924f6b3fdc8 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Thu, 6 Feb 2014 19:19:00 +0100
Subject: [PATCH] finish integrating and end review

---
 package.json               | 2 +-
 src/js/controller/write.js | 6 +++---
 src/js/dao/email-dao.js    | 6 ++----
 src/tpl/write.html         | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index bd25924..1c3c174 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "dependencies": {
         "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master",
         "imap-client": "https://github.com/whiteout-io/imap-client/tarball/dev/attachments",
-        "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/dev/attachments",
+        "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/master",
         "requirejs": "2.1.10"
     },
     "devDependencies": {
diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index 4a5f84b..2ac820a 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -466,9 +466,9 @@ define(function(require) {
                 var reader = new FileReader();
                 reader.onload = function(e) {
                     scope.attachments.push({
-                        fileName: file.name,
-                        contentType: file.type,
-                        uint8Array: new Uint8Array(e.target.result)
+                        filename: file.name,
+                        mimeType: file.type,
+                        content: new Uint8Array(e.target.result)
                     });
                     scope.$apply();
                 };
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 141b239..8e8552b 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -995,14 +995,14 @@ define(function(require) {
 
 
     // PGP Mailer API
-    
+
     /**
      * Login the smtp client
      */
     EmailDAO.prototype._pgpmailerLogin = function() {
         this._pgpMailer.login();
     };
-    
+
 
     // IMAP API
 
@@ -1212,7 +1212,6 @@ define(function(require) {
 
                 // store to local storage
                 self._devicestorage.storeList([email], dbType, callback);
-
             });
         });
     };
@@ -1253,7 +1252,6 @@ define(function(require) {
                     });
                     mail.encrypted = true;
                 });
-
             });
         });
     };
diff --git a/src/tpl/write.html b/src/tpl/write.html
index 8c0270e..d901543 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -36,7 +36,7 @@
           <div class="attachments-box">
             <span ng-repeat="attachment in attachments" class="attachment">
               <span data-icon="&#xe003;"></span>
-              {{attachment.fileName}}
+              {{attachment.filename}}
               <span class="close" data-icon="&#xe000;" ng-click="remove(attachment)"></span>
             </span><!--/.attachment-->
           </div><!--/.attachments-box-->