Merge remote-tracking branch 'benma/update'

benma · benma · commit ca3859b63a11 · 2020-01-18T17:49:13.000+01:00
diff --git a/backend/backend.go b/backend/backend.go
@@ -763,11 +763,6 @@ func (backend *Backend) Start() <-chan interface{} {
 	return backend.events
 }
 
-// Events returns the push notifications channel.
-func (backend *Backend) Events() <-chan interface{} {
-	return backend.events
-}
-
 // TryMakeNewBase calls TryMakeNewBase() in the manager with the given ip
 func (backend *Backend) TryMakeNewBase(ip string) (bool, error) {
 	return backend.baseManager.TryMakeNewBase(ip)
@@ -927,10 +922,6 @@ func (backend *Backend) Register(theDevice device.Interface) error {
 		return err
 	}
 
-	backend.Notify(observable.Event{
-		Subject: "devices/registered",
-		Action:  action.Reload,
-	})
 	// Old-school
 	select {
 	case backend.events <- backendEvent{
diff --git a/backend/bridgecommon/bridgecommon.go b/backend/bridgecommon/bridgecommon.go
@@ -172,7 +172,11 @@ func Serve(
 
 	token = hex.EncodeToString(random.BytesOrPanic(16))
 
-	events := backend.Events()
+	// the port is unused, as we bridge directly without a server.
+	handlers = backendHandlers.NewHandlers(backend,
+		backendHandlers.NewConnectionData(-1, token))
+
+	events := handlers.Events()
 	go func() {
 		for {
 			select {
@@ -189,10 +193,6 @@ func Serve(
 		}
 	}()
 
-	// the port is unused, as we bridge directly without a server.
-	handlers = backendHandlers.NewHandlers(backend,
-		backendHandlers.NewConnectionData(-1, token))
-
 }
 
 // Shutdown is cleaning up after Serve. It is called when the application is closed or goes to
diff --git a/backend/devices/bitbox/assets.go b/backend/devices/bitbox/assets.go
diff --git a/backend/devices/bitbox/assets/firmware.deterministic.7.0.4.signed.bin b/backend/devices/bitbox/assets/firmware.deterministic.7.0.4.signed.bin
diff --git a/backend/devices/bitbox/device.go b/backend/devices/bitbox/device.go
@@ -46,7 +46,7 @@ import (
 )
 
 var (
-	lowestSupportedFirmwareVersion    = semver.NewSemVer(7, 0, 3)
+	lowestSupportedFirmwareVersion    = semver.NewSemVer(7, 0, 4)
 	lowestNonSupportedFirmwareVersion = semver.NewSemVer(8, 0, 0)
 
 	pinPolicyProd              = NewPasswordPolicy("^[[:print:]]{4,}$")
diff --git a/backend/devices/bitbox/firmware.go b/backend/devices/bitbox/firmware.go
@@ -22,7 +22,7 @@ import (
 
 //go:generate go-bindata -pkg $GOPACKAGE -o assets.go assets
 
-var bundledFirmwareVersion = semver.NewSemVer(7, 0, 3)
+var bundledFirmwareVersion = semver.NewSemVer(7, 0, 4)
 
 // BundledFirmwareVersion returns the version of the bundled firmware.
 func BundledFirmwareVersion() *semver.SemVer {
diff --git a/backend/handlers/handlers.go b/backend/handlers/handlers.go
@@ -313,6 +313,11 @@ func NewHandlers(
 	return handlers
 }
 
+// Events returns the push notifications channel.
+func (handlers *Handlers) Events() <-chan interface{} {
+	return handlers.backendEvents
+}
+
 func writeJSON(w io.Writer, value interface{}) {
 	if err := json.NewEncoder(w).Encode(value); err != nil {
 		panic(err)
diff --git a/backend/update.go b/backend/update.go
@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
 
 var (
 	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 16, 0)
+	Version = semver.NewSemVer(4, 16, 1)
 )
 
 // UpdateFile is retrieved from the server.
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -35,8 +35,8 @@ linux:
 	cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
 	mkdir build/tmp-deb/opt/
 	cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.16.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.16.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.16.1 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.16.1 -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && /opt/linuxdeployqt-6-x86_64.AppImage BitBox -appimage
 	mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/
diff --git a/frontends/qt/resources/MacOS/Info.plist b/frontends/qt/resources/MacOS/Info.plist
@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.16.0</string>
+	<string>4.16.1</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.16.0</string>
+	<string>4.16.1</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>
diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.16.0.0
+!define VERSION 4.16.1.0
 !define COMPANY "Shift Cryptosecurity AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"
diff --git a/frontends/web/src/app.tsx b/frontends/web/src/app.tsx
@@ -136,20 +136,21 @@ class App extends Component<Props, State> {
 
     private maybeRoute = () => {
         const currentURL = getCurrentUrl();
+        const isIndex = currentURL === '/' || currentURL === '/index.html';
         const inAccounts = currentURL.startsWith('/account/');
         const accounts = this.props.accounts;
         if (inAccounts && !accounts.some(account => currentURL.startsWith('/account/' + account.code))) {
             route('/', true);
             return;
         }
-        if (currentURL === '/' || currentURL === '/account') {
+        if (isIndex || currentURL === '/account') {
             if (accounts && accounts.length) {
                 route(`/account/${accounts[0].code}`, true);
                 return;
             }
         }
         const deviceIDs: string[] = Object.keys(this.props.devices);
-        if (currentURL === '/' && deviceIDs.length > 0) {
+        if (isIndex && deviceIDs.length > 0) {
             route(`/device/${deviceIDs[0]}`, true);
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import (`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`var (`
`49`		`- lowestSupportedFirmwareVersion = semver.NewSemVer(7, 0, 3)`
	`49`	`+ lowestSupportedFirmwareVersion = semver.NewSemVer(7, 0, 4)`
`50`	`50`	`lowestNonSupportedFirmwareVersion = semver.NewSemVer(8, 0, 0)`
`51`	`51`
`52`	`52`	`pinPolicyProd = NewPasswordPolicy("^[[:print:]]{4,}$")`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`// Version of the backend as displayed to the user.`
`30`		`- Version = semver.NewSemVer(4, 16, 0)`
	`30`	`+ Version = semver.NewSemVer(4, 16, 1)`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// UpdateFile is retrieved from the server.`