Added needBackup flag when importing a wallet

js/controllers/import.js

@@ -18,20 +18,21 @@ angular.module('copayApp.controllers').controller('ImportController',
       $scope.$digest();
     }
 
+
     $scope.getFile = function() {
       // If we use onloadend, we need to check the readyState.
       reader.onloadend = function(evt) {
         if (evt.target.readyState == FileReader.DONE) { // DONE == 2
           var encryptedObj = evt.target.result;
           updateStatus('Importing wallet - Procesing backup...');
-        identityService.importWallet(encryptedObj, $scope.password, {}, function(err){
+          identityService.importWallet(encryptedObj, $scope.password, {}, function(err) {
             if (err) {
               $scope.loading = false;
               $scope.error = 'Could not read wallet. Please check your password';
             }
           });
         }
-    };
+      }
     };
 
     $scope.import = function(form) {
@@ -72,11 +73,12 @@ angular.module('copayApp.controllers').controller('ImportController',
         $scope.importOpts.skipFields = skipFields;
 
 
+      << << << < HEAD
       if (backupFile) {
         reader.readAsBinaryString(backupFile);
       } else {
         updateStatus('Importing wallet - Procesing backup...');
-      identityService.importWallet(encryptedObj, $scope.password, $scope.importOpts, function(err){
+        identityService.importWallet(encryptedObj, $scope.password, $scope.importOpts, function(err) {
           if (err) {
             $scope.loading = false;
             $scope.error = 'Could not read wallet. Please check your password';
@@ -85,4 +87,12 @@ angular.module('copayApp.controllers').controller('ImportController',
         });
       }
     };
-});
+  }); === === =
+if (backupFile) {
+  reader.readAsBinaryString(backupFile);
+} else {
+  $scope._doImport(backupText, $scope.password);
+  copay.Compatibility.deleteOldWallet(backupOldWallet);
+}
+};
+}); >>> >>> > Added needBackup flag when importing a wallet

js/models/Identity.js

@@ -278,6 +278,13 @@ Identity.prototype.exportEncryptedWithWalletInfo = function(opts) {
   return crypto.encrypt(this.password, this.exportWithWalletInfo(opts));
 };
 
+Identity.prototype.setBackupNeeded = function() {
+  this.backupNeeded = true;
+  this.store({
+    noWallets: true
+  }, function() {});
+}
+
 Identity.prototype.setBackupDone = function() {
   this.backupNeeded = false;
   this.store({