Merge pull request bitpay#4744 from matiu/bug/chrome-storage-detection

better nw / chrome storage detection

Author: cmgustavo

cordova/config.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.bitpay.copay"
-  version="2.6.0"
-  android-versionCode="116"
-  ios-CFBundleVersion="2.6.0">
+  version="2.7.0"
+  android-versionCode="117"
+  ios-CFBundleVersion="2.7.0">
     <name>Copay</name>
     <description>
       A secure bitcoin wallet for friends and companies.

cordova/wp/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="2.6.0.0" />
+  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="2.7.0.0" />
   <mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
   <Properties>
     <DisplayName>Copay Bitcoin Wallet</DisplayName>

cordova/wp/Properties/WMAppManifest.xml

@@ -11,7 +11,7 @@
     <Language code="pl" />
     <Language code="cs" />
   </Languages>
-  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="2.6.0.0" xmlns="" NotificationService="MPN">
+  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="2.7.0.0" xmlns="" NotificationService="MPN">
     <IconPath IsRelative="true" IsResource="false">Assets\[email protected]</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />

package.json

@@ -2,8 +2,8 @@
   "name": "copay",
   "description": "A multisignature bitcoin wallet",
   "author": "BitPay",
-  "version": "2.6.0",
-  "androidVersionCode": "116",
+  "version": "2.7.0",
+  "androidVersionCode": "117",
   "keywords": [
     "wallet",
     "copay",

src/js/services/localStorage.js

@@ -67,33 +67,35 @@ angular.module('copayApp.services')
 
 
     if (isNW) {
-      $log.info('Overwritting localstorage with chrome storage for NW.JS');
+      $log.info('Using chrome storage for NW.JS');
 
       var ts = ls.getItem('migrationToChromeStorage');
       var p = ls.getItem('profile');
 
-      // Need migration?
-      if (!ts && p) {
-        $log.info('### MIGRATING DATA! TO CHROME STORAGE');
-
-        var j = 0;
-        for (var i = 0; i < localStorage.length; i++) {
-          var k = ls.key(i);
-          var v = ls.getItem(k);
-
-          $log.debug('   Key: ' + k);
-          root.set(k, v, function() {
-            j++;
-            if (j == localStorage.length) {
-              $log.info('### MIGRATION DONE');
-              ls.setItem('migrationToChromeStorage', Date.now())
-              ls = chrome.storage.local;
-            }
-          })
+      root.get('profile', function(err, newP){
+        // Need migration?
+        if (!ts && !newP && p) {
+          $log.info('### MIGRATING DATA! TO CHROME STORAGE');
+
+          var j = 0;
+          for (var i = 0; i < localStorage.length; i++) {
+            var k = ls.key(i);
+            var v = ls.getItem(k);
+
+            $log.debug('   Key: ' + k);
+            root.set(k, v, function() {
+              j++;
+              if (j == localStorage.length) {
+                $log.info('### MIGRATION DONE');
+                ls.setItem('migrationToChromeStorage', Date.now())
+                ls = chrome.storage.local;
+              }
+            })
+          }
+        } else if (p) {
+          $log.info('# Data already migrated to Chrome storage.' + (ts||''));
         }
-      } else if (p) {
-        $log.info('# Data already migrated to Chrome storage on ' + ts);
-      }
+      });
     }
 
 

webkitbuilds/.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=2.6.0
+Version=2.7.0
 Name=Copay
 Comment=A multisignature wallet
 Exec=copay

webkitbuilds/setup-win.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Copay"
-#define MyAppVersion "2.6.0"
+#define MyAppVersion "2.7.0"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://copay.io"
 #define MyAppExeName "Copay.exe"