From 607570a5e1ab91d9c2c2ff0208ca67494bb10114 Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Fri, 9 May 2014 09:52:02 -0300
Subject: [PATCH] removed dropbox backup options

---
 index.html               | 10 ++--------
 js/controllers/backup.js | 25 ++++++-------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/index.html b/index.html
index 154a19ac0..6fcd89c61 100644
--- a/index.html
+++ b/index.html
@@ -557,19 +557,13 @@
       <div class="backup" data-ng-controller="BackupController">
         <h3>{{title}}</h3>
         <div class="row text-center">
-          <div class="large-4 medium-4 columns">
+          <div class="large-3 medium-3 columns">
             <a class="panel box-backup" ng-click="download()">
               <i class="fi-download size-72"></i>
               <p> Download File </p>
             </a>
           </div>
-          <div class="large-4 medium-4 columns">
-            <a class="panel box-backup" ng-click="dropbox()">
-              <i class="fi-social-dropbox size-72"></i>
-              <p> Backup to Dropbox </p>
-            </a>
-          </div>
-          <div class="large-4 medium-4 columns">
+          <div class="large-3 medium-3 columns">
             <a class="panel box-backup" ng-click="email()">
               <i class="fi-mail size-72"></i>
               <p> Backup to email </p>
diff --git a/js/controllers/backup.js b/js/controllers/backup.js
index 5ea246b3a..7919879f6 100644
--- a/js/controllers/backup.js
+++ b/js/controllers/backup.js
@@ -4,33 +4,20 @@ angular.module('copay.backup').controller('BackupController',
   function($scope, $rootScope, $location, $window, $timeout) {
     $scope.title = 'Backup';
 
-    var filename = $rootScope.wallet.id + '.json.aes';
-
-    // TODO: get the real encrypted wallet.
     var _getEncryptedWallet = function() {
       var wallet = $rootScope.wallet.toEncryptedObj();
       return wallet;
     };
 
-    var _getWalletBlob = function() {
+    $scope.download = function() {
+      var timestamp = +(new Date);
+      var walletName = ($rootScope.wallet.name ? $rootScope.wallet.name : '') + '-' + $rootScope.wallet.id ;
+      var filename = walletName + '-' + timestamp + '.json.aes';
       var wallet = _getEncryptedWallet();
       var blob = new Blob([wallet], {type: 'text/plain;charset=utf-8'});
-
-      return blob;
-    };
-
-    $scope.download = function() {
-      var blob = _getWalletBlob();
       saveAs(blob, filename);
     };
 
-    $scope.dropbox = function() { 
-      var blob = _getWalletBlob();
-      var url = $window.URL.createObjectURL(blob);
-
-      // TODO: send the blob to Dropbox, (if we can...)
-    };
-
     $scope.email = function() {
       var email = prompt('Please enter your email addres.');
       var mailformat = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
@@ -40,9 +27,9 @@ angular.module('copay.backup').controller('BackupController',
       } else {
         if (email && email !== '') {
           var body = _getEncryptedWallet();
-          var subject = 'Copay Backup'; 
+          var subject = ($rootScope.wallet.name ? $rootScope.wallet.name + ' - ' : '') + $rootScope.wallet.id; 
           var href = 'mailto:' + email + '?'
-           + 'subject=' + subject + '&'
+           + 'subject=[Copay Backup] ' + subject + '&'
            + 'body=' + body;
 
           var newWin = $window.open(href, '_blank', 'scrollbars=yes,resizable=yes,width=10,height=10');