Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master to fdroid #1632

Merged
merged 22 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fe0c819
[CI] remove macos install hack for colima (#1594)
clangenb Dec 9, 2023
85fd749
[contact_detail_page] prevent red screen in case no community is chos…
clangenb Dec 9, 2023
027a666
Fix switching networks (#1602)
clangenb Dec 9, 2023
56e9ee3
[JS] remove failing gesell genesis hash test, which is going to be ob…
clangenb Dec 14, 2023
d1e37ec
fix reputation count on profile page (#1606)
clangenb Dec 14, 2023
41d42e5
Fix potential `NoReputation` error in faucet. (#1609)
clangenb Dec 14, 2023
f2c2a60
Catch exception during biometrics process and fallback to PIN dialog …
clangenb Dec 18, 2023
3aae0ff
bump flutter to v3.16.4 (#1593)
clangenb Dec 18, 2023
c0076b1
[integration_tests] use correct screenshot function in some cases; fi…
clangenb Dec 19, 2023
232ca8f
Properly define `AccountData` for more ergonomic usage (#1615)
clangenb Dec 22, 2023
c0adbdd
key account management in dart and account encryption refactoring (#1…
clangenb Jan 13, 2024
236f299
Simplify and `getTxPaymentAsset` (#1617)
clangenb Jan 13, 2024
c9db523
Create accounts in dart instead of JS (#1618)
clangenb Jan 16, 2024
a265a15
[ReapVoucher] Minor refactoring and move reap voucher prechecks from …
clangenb Jan 18, 2024
6f848a8
Create and sign proof of attendance in dart (#1620)
clangenb Jan 19, 2024
3762069
bump dependencies for generated files (#1622)
clangenb Jan 19, 2024
1de18c1
Improve PIN handling for creating and importing accounts (#1623)
clangenb Jan 20, 2024
44a8107
Create and sign xts in dart (#1626)
clangenb Jan 29, 2024
1e7af3e
Bump polkadart to get type safety in extrinsic call api (#1629)
clangenb Jan 30, 2024
bccbaa8
Remove webview and JS-related code (#1630)
clangenb Jan 30, 2024
b5a5288
v1.12.0
clangenb Jan 30, 2024
282cb27
Merge branch 'master' into cl/merge-master-to-fdroid
clangenb Jan 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .flutter
Submodule .flutter updated 2245 files
8 changes: 0 additions & 8 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
branches: [master, f-droid]

env:
NODE_VERSION: 18.14.2
JAVA_VERSION: 12.x

jobs:
Expand All @@ -34,18 +33,11 @@ jobs:
- name: Install flutter wrapper
run: ./scripts/install_flutter_wrapper.sh

- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get dependencies (i.e., melos)
run: .flutter/bin/dart pub get

- name: Melos Bootstrap
run: .flutter/bin/dart run melos bootstrap

- name: "Build JS"
run: .flutter/bin/dart run melos yarn-build

- name: "Build apk"
run: .flutter/bin/dart run melos build-apk-fdroid
9 changes: 0 additions & 9 deletions .github/workflows/android_integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
branches: [master, f-droid]

env:
NODE_VERSION: 18.14.2
JAVA_VERSION: 12.x
ARTIFACT_PATH: ./screenshots

Expand Down Expand Up @@ -54,20 +53,12 @@ jobs:
- name: List android images
run: sdkmanager --list | grep system-images

# JS Stuff
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get dependencies (i.e., melos)
run: .flutter/bin/dart pub get

- name: Melos Bootstrap
run: .flutter/bin/dart run melos bootstrap

- name: "Build JS"
run: .flutter/bin/dart run melos yarn-build

- name: Gradle cache
uses: actions/cache@v3
with:
Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/ios_integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
branches: [master, f-droid]

env:
NODE_VERSION: 18.14.2
JAVA_VERSION: 12.x
ARTIFACT_PATH: ./screenshots

Expand Down Expand Up @@ -79,27 +78,18 @@ jobs:
xcrun simctl create "iPhone 8 Plus" "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus" "com.apple.CoreSimulator.SimRuntime.iOS-16-4" || \
xcrun simctl create "iPhone 8 Plus" "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus" "com.apple.CoreSimulator.SimRuntime.iOS-16-2"

# JS Stuff
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get dependencies (i.e., melos)
run: .flutter/bin/dart pub get

- name: Melos Bootstrap
run: .flutter/bin/dart run melos bootstrap

- name: "Build JS"
run: .flutter/bin/dart run melos yarn-build

- name: Start colima a docker runtime for MacOs
# Work around an upstream issue with the runner image:
# https://github.com/actions/runner-images/issues/8500
# The brew install returns exit code 1 for a non-fatal dependency linker error.
# We don't care, the subsequent steps will work still.
run: |
brew upgrade || brew link --overwrite python@3.11
brew install docker
brew install colima
brew install docker || true
brew install colima || true
colima start

- name: Run encointer-node
Expand Down
85 changes: 0 additions & 85 deletions .github/workflows/js_ci.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:
- name: Melos Bootstrap
run: .flutter/bin/dart run melos bootstrap

- name: "Build JS"
run: .flutter/bin/dart run melos yarn-build

- name: "Check fmt"
run: .flutter/bin/dart run melos format-check

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Encointer wallet and client for mobile phones
</p>

### Requirements
- Dart sdk: ">=3.0.1 <3.0.0"
- Flutter: "3.13.8"
- Dart sdk: ">=3.2.0 <3.0.0"
- flutter: "3.16.3"
- Android: minSdkVersion 17
- iOS: --ios-language swift, Xcode version >= 14.3

Expand Down
20 changes: 7 additions & 13 deletions app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ PODS:
- GoogleUtilitiesComponents (1.1.0):
- GoogleUtilities/Logger
- GTMSessionFetcher/Core (2.3.0)
- image_picker_ios (0.0.1):
- Flutter
- local_auth_ios (0.0.1):
- Flutter
- MLImage (1.0.0-beta4)
Expand All @@ -76,7 +74,7 @@ PODS:
- GTMSessionFetcher/Core (< 3.0, >= 1.1)
- MLImage (= 1.0.0-beta4)
- MLKitCommon (~> 9.0)
- mobile_scanner (3.2.0):
- mobile_scanner (3.5.5):
- Flutter
- GoogleMLKit/BarcodeScanning (~> 4.0.0)
- nanopb (2.30909.0):
Expand Down Expand Up @@ -119,7 +117,6 @@ DEPENDENCIES:
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
Expand Down Expand Up @@ -170,8 +167,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
flutter_timezone:
:path: ".symlinks/plugins/flutter_timezone/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
local_auth_ios:
:path: ".symlinks/plugins/local_auth_ios/ios"
mobile_scanner:
Expand All @@ -196,11 +191,11 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/wakelock_plus/ios"

SPEC CHECKSUMS:
add_2_calendar: e9d68636aed37fb18e12f5a3d74c2e0589487af0
add_2_calendar: 5eee66d5a3b99cd5e1487a7e03abd4e3ac4aff11
aes_ecb_pkcs5_flutter: a82e6ecc47654000805ad9d094a8cd29e4bf9667
app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875
connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_inappwebview: 166ed136c90e43c69b451f6d825da379be66c847
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
Expand All @@ -212,25 +207,24 @@ SPEC CHECKSUMS:
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b
MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505
MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390
MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49
mobile_scanner: 47056db0c04027ea5f41a716385542da28574662
mobile_scanner: 202ab6f652e40a9add68b10de4c4fb2a745c4348
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47

PODFILE CHECKSUM: 90aee035b683484f7e14ac9a57b7dc9185377dcb
Expand Down
2 changes: 0 additions & 2 deletions app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@
"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
"${BUILT_PRODUCTS_DIR}/flutter_timezone/flutter_timezone.framework",
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
"${BUILT_PRODUCTS_DIR}/local_auth_ios/local_auth_ios.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
Expand Down Expand Up @@ -275,7 +274,6 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_timezone.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
Expand Down
11 changes: 0 additions & 11 deletions app/js_service_encointer/.browserslistrc

This file was deleted.

7 changes: 0 additions & 7 deletions app/js_service_encointer/.gitignore

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading