Merge branch 'androidrouting'

Author: benma

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, 17, 0)
+	Version = semver.NewSemVer(4, 17, 1)
 )
 
 // UpdateFile is retrieved from the server.

frontends/android/BitBoxApp/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 6
-        versionName "android-4.17.0"
+        versionCode 7
+        versionName "android-4.17.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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.17.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.17.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.17.1 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.17.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/

frontends/qt/resources/MacOS/Info.plist

@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.17.0</string>
+	<string>4.17.1</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.17.0</string>
+	<string>4.17.1</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

frontends/qt/setup.nsi

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.17.0.0
+!define VERSION 4.17.1.0
 !define COMPANY "Shift Cryptosecurity AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"

frontends/web/src/app.tsx

@@ -136,7 +136,7 @@ class App extends Component<Props, State> {
 
     private maybeRoute = () => {
         const currentURL = getCurrentUrl();
-        const isIndex = currentURL === '/' || currentURL === '/index.html';
+        const isIndex = currentURL === '/' || currentURL === '/index.html' || currentURL === '/android_asset/web/index.html';
         const inAccounts = currentURL.startsWith('/account/');
         const accounts = this.props.accounts;
         if (inAccounts && !accounts.some(account => currentURL.startsWith('/account/' + account.code))) {