1
0
Commit Graph

139 Commits

Author SHA1 Message Date
SomberNight
adb1db57ff android readme: update commands in "reproducibility fail" section
I think file was renamed in upstream p4a
2023-12-13 19:41:38 +00:00
xiaolou86
00c584d557 contrib: fix typos 2023-12-04 14:15:38 +08:00
Sander van Grieken
05758432d6 android: exclude more unnecessary directories 2023-12-01 16:01:46 +01:00
SomberNight
f14e99139c android build: we always want apks, as we want to use our own privkey
ThomasV reported contrib/release.sh generating .aab artifacts.
aabs are shady business... best to avoid handing privkeys to big G (or any 3rd party!).

This must be a consequence of the recent p4a rebase,
e.g. 04bb63bbf0
2023-11-23 03:58:35 +00:00
SomberNight
d49e1bb32c contrib/android/Readme.md: update "how to run qml gui on linux" section 2023-11-09 16:40:45 +00:00
Sander van Grieken
58ff76adcf android: correctly describe buildozer branch used 2023-11-07 10:32:09 +01:00
Sander van Grieken
55c01bda9b android: set target_sdk_version to 33 2023-11-07 10:32:06 +01:00
Sander van Grieken
32c1915de4 qml: restore Send/ScanDialog for desktop/dev, keeping qr scan Activity for android only.
Also use stable R package, regardless of APP_PACKAGE_DOMAIN used in build.
2023-11-07 10:17:10 +01:00
SomberNight
5c3e14d8de qml: replace Send/ScanDialog with java bases zxing qr scan activity. 2023-11-07 10:17:10 +01:00
Sander van Grieken
b9ab0f63ef qt6: update buildozer ref to ce4f2257249fdf4ff1f4cb8983fd7ac44174a274 2023-11-07 10:17:10 +01:00
Sander van Grieken
a77ff9943a qml: refactor qr scan to qt6
As the method of capturing frames is totally different, the animation when
a QR is found has been removed.
2023-11-07 10:17:10 +01:00
Sander van Grieken
0441cb0ad5 qml: exclude payserver plugin for qml 2023-11-07 10:09:51 +01:00
Sander van Grieken
bf6163b4f8 android: update p4a ref to 3b3733dbf5f461e197ba83887ac0d3b6d0f1c396
buildozer ref to 698b48136c55b2495128207c5e98dccc128bb6c2
2023-11-07 10:09:51 +01:00
Sander van Grieken
770a32cf6a qt6: update recipe pins, NDK, SDK, Ant, use venv for buildozer/p4a, add tomli recipe 2023-11-07 10:09:51 +01:00
Sander van Grieken
16d3db95ab qt6: update android build container to bookworm 2023-11-07 10:09:51 +01:00
SomberNight
e346d36851 bump libsecp256k1 version 2023-09-25 13:11:03 +00:00
SomberNight
b45c84f24f remove the kivy gui
We now use the qml gui on Android, and haven't been maintaining
the kivy GUI for a while.
2023-08-30 16:47:37 +00:00
SomberNight
c3f16615ca android build: exclude kivy classes from qml apk
taken from https://github.com/spesmilo/electrum/pull/8545
22bfd4eca6

note: com.android.support is used in our p4a fork's PythonActivity.java
(com.android.support was previously pulled in by me.dm7.barcodescanner)
052b9f7945/pythonforandroid/bootstraps/qt5/build/src/main/java/org/kivy/android/PythonActivity.java (L43)
2023-08-30 14:10:56 +00:00
SomberNight
1ff4130804 contrib/docker_notes.md: add notes re debian apt mirror, and envvars
related https://github.com/spesmilo/electrum/issues/8496
2023-06-22 15:45:30 +00:00
SomberNight
9b1fb0e5fe android build: bump python, openssl 2023-06-02 17:17:43 +00:00
SomberNight
c049b461bb bump libsecp256k1 version 2023-05-26 13:22:35 +00:00
Sander van Grieken
0672ea20ab qml: implement toggle for android SECURE_FLAG and add marker to wizard pages
that should be secured.
2023-05-02 15:16:51 +02:00
SomberNight
155258f208 release.sh: check we have each binary (RM case)
~duplicated from the non-RM case
2023-04-27 17:36:09 +00:00
Sander van Grieken
2fc9ee5c51 p4a: fix for Qt5 accessibility bug
see 087fc3c583
2023-04-24 11:29:26 +02:00
SomberNight
2a2b683d23 bump libsecp256k1 version 2023-04-21 14:13:32 +00:00
SomberNight
16fcfe34a7 build: rm "contrib" from debian apt sources lists 2023-04-18 16:09:50 +00:00
SomberNight
e77b0560bf android: fix notifications by fixing "plyer" dependency
upstreamed patch at https://github.com/kivy/plyer/pull/756
2023-04-06 18:00:45 +00:00
SomberNight
40cfa62c2d android readme: update "access datadir on Android from desktop"
Added a section re pushing wallet to device.
It is surprisingly tricky, but using specifically the "/data/local/tmp"
folder as an intermediary, it works.
2023-04-06 16:56:14 +00:00
Sander van Grieken
b40794014d android: exclude more unneeded files in qml resource bundle generation 2023-04-06 11:42:06 +02:00
SomberNight
0e5464ca13 android build: enable asserts, and add sanity-check for it
Note that 0f541be6f1 added a warning log if asserts are disabled.
It is intentional that these two things are in separate files:
We always want to log that warning, even if someone is using electrum as a library.
However, in that latter case, I think it's fine not to sys.exit(), but leave the decision up to the library user.

Similar thinking when running from source: let's log the warning but don't sys.exit().
2023-03-31 16:24:14 +00:00
SomberNight
f25e384654 build: fail if not inside git clone
related: https://github.com/spesmilo/electrum/issues/8284
2023-03-28 22:35:19 +00:00
SomberNight
965e1ac9a3 android: update readme, list required apt packages for qml on desktop 2023-03-24 14:03:38 +00:00
Sander van Grieken
f9f57b58b4 Revert "android build: rm x86_64 target from "all" alias, since it is broken"
This reverts commit b2372f2d53.

x86_64 build should work now
2023-03-23 17:01:09 +01:00
Sander van Grieken
aaff7502db android: update P4A to 3c2750795ba93aa1a3e513a13c2ea2ac5bddba17
remove qt5 patch to disable avx/avx2 for x86_64 arch
2023-03-23 17:00:08 +01:00
SomberNight
b2372f2d53 android build: rm x86_64 target from "all" alias, since it is broken
(and release.sh uses the "all" target)

see https://github.com/spesmilo/electrum/issues/8278
2023-03-23 14:38:19 +00:00
SomberNight
2231057d1e android build: allow specifying "x86_64" as target in build.sh 2023-03-23 14:12:39 +00:00
Sander van Grieken
17bb1ad5c5 qml: enable Qt virtual keyboard and add Electrum keyboard style, modified from Qt 'default' style 2023-03-23 10:30:40 +01:00
ghost43
27bc0bb552 Merge pull request #8267 from SomberNight/202303_build_userid1000
build: docker scripts to work even if host user id != 1000
2023-03-21 17:54:29 +00:00
SomberNight
98304662ca android build: default to log_level=2
It is nice to see debug logs for local builds,
and also extremely useful to have them on the CI.

follow-up 6b9d294a86
2023-03-21 16:34:39 +00:00
Sander van Grieken
bac889c593 android: fix ply depends assert 2023-03-21 17:12:49 +01:00
Sander van Grieken
6b9d294a86 android: log_level 2 when running in CI 2023-03-21 14:13:57 +01:00
Sander van Grieken
1176552132 android: upgrade to Qt 5.15.7, PyQt5 5.15.9 2023-03-21 12:41:20 +01:00
SomberNight
c9b6a6c01e build: fix repro builds where host userid != 1000
- repro builds to use fixed uid=1000 inside the container
  - in case the file permissions leak into the binaries, they are still reproducible
  - chown 1000:1000 fresh_clone
- repro builds to create fresh_clone dir outside git clone
  - otherwise the local dev build would still interact with the fresh_clone dir
    - due to e.g. recursive "find -exec touch",
    - and even the "docker build" cmd itself would try to stat/read it
      - see https://github.com/docker/for-linux/issues/380
  - and "rm -rf fresh_clone" needs sudo if the host uid is not 1000
  - this way the local dev build does not need sudo

to recap:
- local dev builds use the host userid inside the container, directly operate on the project dir
  - does not need sudo
- repro builds create a fresh git clone, chown it to 1000, and use userid=1000 inside the container
  - if the host userid is 1000, does not need sudo
  - otherwise, needs sudo

closes https://github.com/spesmilo/electrum/issues/8261
2023-03-20 23:32:59 +00:00
Sander van Grieken
c9df290301 android: update P4A to 8589243afb48fdb116d791dc5b3973382e83273f
include Qt Virtual Keyboard libraries and associated QtQuick components
2023-03-20 13:15:03 +01:00
SomberNight
6e472efd5f build: follow-up prev: only use host userid for local dev builds
reproducibility probably needs a hardcoded userid

Also, move the UID arg later in the dockerfiles, for better caching.
(if local dev build and repro build set different UIDs, the build caches
will diverge at that step)
2023-03-20 02:06:54 +00:00
Sander van Grieken
ab073827cf build: use uid of user building the build containers 2023-03-20 02:06:50 +00:00
SomberNight
d8abab34d8 build: rm "non-free" from debian apt sources lists
was not needed, and better to avoid :)
2023-03-18 06:22:38 +00:00
SomberNight
adca13a86c android readme: update "access datadir on Android from desktop"
was getting `cp: /sdcard/some_path/my_wallet: Operation not permitted`
adb no longer has permissions to write to the sdcard

New command allows dumping the file directly to local pc via usb.

related:
https://stackoverflow.com/q/72714568
https://stackoverflow.com/q/18471780
2023-03-17 19:21:01 +00:00
Sander van Grieken
a5485e5f68 android: use material dark style for splashscreen action bar 2023-03-06 12:03:25 +01:00
Sander van Grieken
d2883e19ac android: qt5 activity inhibit screenshots 2023-03-06 11:11:08 +01:00