AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: restore Send/ScanDialog for desktop/dev, keeping qr scan Activity for android only.

Browse Source 
Also use stable R package, regardless of APP_PACKAGE_DOMAIN used in build.
This commit is contained in:
Sander van Grieken
2023-10-26 11:17:22 +02:00
parent 5c3e14d8de
commit 32c1915de4
7 changed files with 210 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/android/Dockerfile
View File

@@ -198,7 +198,7 @@ RUN cd /opt \
&& git fetch --all \
# commit: from branch accumulator/qt6-wip (note: careful with force-pushing! see #8162) \
#
&& git checkout "f2741f0b7b6a4ac52fc6cb0dc9ac706e2287be02^{commit}" \
&& git checkout "eb4a3522373e0b4e2749b8a8bc965ff51355ea35^{commit}" \
&& /opt/venv/bin/python3 -m pip install --no-build-isolation --no-dependencies -e .
# build env vars

2
contrib/android/make_apk.sh
View File

@@ -45,7 +45,7 @@ info "apk building phase starts."
# FIXME: changing "APP_PACKAGE_NAME" seems to require a clean rebuild of ".buildozer/",
# to avoid that, maybe change "APP_PACKAGE_DOMAIN" instead.
# So, in particular, to build a testnet apk, simply uncomment:
export APP_PACKAGE_DOMAIN=org.electrum.testnet
#export APP_PACKAGE_DOMAIN=org.electrum.testnet
if [ $CI ]; then
# override log level specified in buildozer.spec to "debug":