wip

.containerversion

@@ -1 +1 @@
-27
+28

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 FROM thyrlian/android-sdk:4.0 as android
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -30,6 +30,6 @@ ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
 ADD Makefile /tmp/
 RUN make -C /tmp/ envinit
 
-ENV PATH /opt/qt6/6.2.4/gcc_64/bin:/opt/qt6/6.2.4/gcc_64/libexec:$PATH
+ENV PATH /opt/qt6/6.5.3/gcc_64/bin:/opt/qt6/6.5.3/gcc_64/libexec:$PATH
 
 CMD ["bash"]

Makefile

@@ -85,7 +85,7 @@ clean:
 	cd frontends/android && $(MAKE) clean
 	cd backend/mobileserver && $(MAKE) clean
 dockerinit:
-	./scripts/container.sh build --pull --force-rm -t shiftcrypto/bitbox-wallet-app .
+	./scripts/container.sh build --pull -t shiftcrypto/bitbox-wallet-app .
 dockerdev:
 	./scripts/dockerdev.sh
 locize-push:

frontends/qt/BitBox.pro

@@ -19,7 +19,7 @@ CFORTIFY = -O2 -D_FORTIFY_SOURCE=2
 CSTACK = -fstack-protector-all -fstack-check
 CMISC = -fwrapv
 CASLR = -fPIE -fPIC
-
+CONFIG += debug
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -42,7 +42,7 @@ win32 {
     #QMAKE_LFLAGS += -Wl,--nxcompat
     #QMAKE_LFLAGS += -Wl,--dynamicbase
 } else {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS += -std=c++17
     LIBS += -L$$PWD/server -lserver
     QMAKE_CXXFLAGS += $$CFORTIFY
     QMAKE_CXXFLAGS += $$CSTACK

frontends/qt/Makefile

@@ -24,7 +24,7 @@ linux:
 	$(MAKE) clean
 	cd server && $(MAKE) linux
 	$(MAKE) base
-	qmake -o build/Makefile
+	qmake	 -o build/Makefile
 	cd build && $(MAKE)
 	mkdir build/linux-tmp build/linux
 	mv build/BitBox build/linux-tmp
@@ -36,7 +36,8 @@ linux:
 		# Add Wayland libs so the app can run natively on Wayland too.
 		# The linuxdeployqt maintainer unfortunately refuses to support it automatically: https://github.com/probonopd/linuxdeployqt/issues/189
 		# The list of related plugins was found by: `find $(qmake -query QT_INSTALL_PLUGINS) | grep wayland`
-		-extra-plugins=platforms/libqwayland-generic.so,platforms/libqwayland-egl.so,wayland-graphics-integration-client,wayland-decoration-client,wayland-shell-integration
+		-extra-plugins=platforms/libqwayland-generic.so,platforms/libqwayland-egl.so,wayland-graphics-integration-client,wayland-decoration-client,wayland-shell-integration,*.debug> \
+		-no-strip
 	cp /usr/lib/x86_64-linux-gnu/nss/* build/linux-tmp/lib
 	cp -aR resources/linux build/tmp-deb
 	cp resources/linux/usr/share/applications/bitbox.desktop build/linux-tmp

frontends/qt/main.cpp

@@ -379,11 +379,11 @@ int main(int argc, char *argv[])
         preferredLocale = uiLangs.first();
     }
 
-    QThread workerThread;
+    //QThread workerThread;
     webClass = new WebClass();
     // Run client queries in a separate thread to not block the UI.
-    webClass->moveToThread(&workerThread);
-    workerThread.start();
+    // webClass->moveToThread(&workerThread);
+    // workerThread.start();
 
     serve(
         // cppHeapFree
@@ -480,8 +480,8 @@ int main(int argc, char *argv[])
         delete view;
         view = nullptr;
         webClassMutex.unlock();
-        workerThread.quit();
-        workerThread.wait();
+        // workerThread.quit();
+        // workerThread.wait();
     });
 
 #if defined(_WIN32)

frontends/web/.eslintrc.json

@@ -5,6 +5,7 @@
     "plugin:react/recommended",
     "plugin:react-hooks/recommended"
   ],
+  "ignorePatterns": ["src/utils/qwebchannel.js"],
   "settings": {
     "react": {
       "version": "detect"