Skip to content

Commit 8b7c21c

Browse files
godenzimgodenzim
committed
Merge branch 'develop' into 'master'
Develop See merge request papers/airgap/airgap-vault!544
2 parents d39151f + 3fd7128 commit 8b7c21c

File tree

13 files changed

+327
-455
lines changed

13 files changed

+327
-455
lines changed

‎android/app/capacitor.build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
implementation project(':capacitor-splash-screen')
1717
implementation project(':capacitor-status-bar')
1818
implementation project(':capawesome-capacitor-file-picker')
19+
implementation project(':capawesome-capacitor-android-edge-to-edge-support')
1920
implementation "androidx.legacy:legacy-support-v4:1.0.0"
2021
implementation "androidx.appcompat:appcompat:1.6.1"
2122
}

‎android/app/src/main/assets/capacitor.plugins.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@
2626
{
2727
"pkg": "@capawesome/capacitor-file-picker",
2828
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
29+
},
30+
{
31+
"pkg": "@capawesome/capacitor-android-edge-to-edge-support",
32+
"classpath": "io.capawesome.capacitorjs.plugins.androidedgetoedgesupport.EdgeToEdgePlugin"
2933
}
3034
]

‎android/capacitor.settings.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
2222

2323
include ':capawesome-capacitor-file-picker'
2424
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
25+
26+
include ':capawesome-capacitor-android-edge-to-edge-support'
27+
project(':capawesome-capacitor-android-edge-to-edge-support').projectDir = new File('../node_modules/@capawesome/capacitor-android-edge-to-edge-support/android')

‎android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
android.enableJetifier=true
1313
android.useAndroidX=true
14-
org.gradle.jvmargs=-Xmx1536m
14+
org.gradle.jvmargs=-Xmx2048m
1515

1616
# When configured, Gradle will run in incubating parallel mode.
1717
# This option should only be used with decoupled projects. More details, visit

‎build/android/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RUN apt-get update -y && apt-get install -y \
66
pkg-config \
77
libjpeg-dev \
88
libcairo2-dev \
9-
openjdk-17-jdk-headless
9+
openjdk-21-jdk-headless
1010

11-
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
11+
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
1212

1313
# create app directory
1414
RUN mkdir /app
@@ -57,4 +57,4 @@ RUN yarn prepare-prod-build \
5757
&& zipalign -p -f -v 4 android-debug.apk android-debug-aligned.apk \
5858
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-debug-aligned.apk \
5959
&& zipalign -p -f -v 4 android-appium.apk android-appium-aligned.apk \
60-
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-appium-aligned.apk \
60+
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-appium-aligned.apk \

‎electron/capacitor.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
"ios": {
1414
"cordovaSwiftVersion": "5.0"
1515
}
16-
}
16+
}

‎package.json‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -37,51 +37,51 @@
3737
"apply-diagnostic-modules": "node apply-diagnostic-modules.js"
3838
},
3939
"resolutions": {
40-
"@airgap/aeternity": "0.13.42",
41-
"@airgap/acurast": "0.13.42",
42-
"@airgap/astar": "0.13.42",
43-
"@airgap/bitcoin": "0.13.42",
44-
"@airgap/coinlib-core": "0.13.42",
45-
"@airgap/coreum": "0.13.42",
46-
"@airgap/cosmos": "0.13.42",
47-
"@airgap/cosmos-core": "0.13.42",
48-
"@airgap/crypto": "0.13.42",
49-
"@airgap/ethereum": "0.13.42",
50-
"@airgap/groestlcoin": "0.13.42",
51-
"@airgap/icp": "0.13.42",
52-
"@airgap/module-kit": "0.13.42",
53-
"@airgap/moonbeam": "0.13.42",
54-
"@airgap/optimism": "0.13.42",
55-
"@airgap/polkadot": "0.13.42",
56-
"@airgap/serializer": "0.13.42",
57-
"@airgap/stellar": "0.13.42",
58-
"@airgap/substrate": "0.13.42",
59-
"@airgap/tezos": "0.13.42"
40+
"@airgap/aeternity": "0.13.43",
41+
"@airgap/acurast": "0.13.43",
42+
"@airgap/astar": "0.13.43",
43+
"@airgap/bitcoin": "0.13.43",
44+
"@airgap/coinlib-core": "0.13.43",
45+
"@airgap/coreum": "0.13.43",
46+
"@airgap/cosmos": "0.13.43",
47+
"@airgap/cosmos-core": "0.13.43",
48+
"@airgap/crypto": "0.13.43",
49+
"@airgap/ethereum": "0.13.43",
50+
"@airgap/groestlcoin": "0.13.43",
51+
"@airgap/icp": "0.13.43",
52+
"@airgap/module-kit": "0.13.43",
53+
"@airgap/moonbeam": "0.13.43",
54+
"@airgap/optimism": "0.13.43",
55+
"@airgap/polkadot": "0.13.43",
56+
"@airgap/serializer": "0.13.43",
57+
"@airgap/stellar": "0.13.43",
58+
"@airgap/substrate": "0.13.43",
59+
"@airgap/tezos": "0.13.43"
6060
},
6161
"dependencies": {
62-
"@airgap/aeternity": "0.13.42",
63-
"@airgap/acurast": "0.13.42",
64-
"@airgap/angular-core": "0.0.58",
65-
"@airgap/angular-ngrx": "0.0.58",
66-
"@airgap/astar": "0.13.42",
67-
"@airgap/bitcoin": "0.13.42",
68-
"@airgap/coinlib-core": "0.13.42",
69-
"@airgap/coreum": "0.13.42",
70-
"@airgap/cosmos": "0.13.42",
71-
"@airgap/cosmos-core": "0.13.42",
72-
"@airgap/crypto": "0.13.42",
73-
"@airgap/ethereum": "0.13.42",
74-
"@airgap/groestlcoin": "0.13.42",
75-
"@airgap/icp": "0.13.42",
76-
"@airgap/module-kit": "0.13.42",
77-
"@airgap/moonbeam": "0.13.42",
78-
"@airgap/optimism": "0.13.42",
79-
"@airgap/polkadot": "0.13.42",
62+
"@airgap/aeternity": "0.13.43",
63+
"@airgap/acurast": "0.13.43",
64+
"@airgap/angular-core": "0.0.59",
65+
"@airgap/angular-ngrx": "0.0.59",
66+
"@airgap/astar": "0.13.43",
67+
"@airgap/bitcoin": "0.13.43",
68+
"@airgap/coinlib-core": "0.13.43",
69+
"@airgap/coreum": "0.13.43",
70+
"@airgap/cosmos": "0.13.43",
71+
"@airgap/cosmos-core": "0.13.43",
72+
"@airgap/crypto": "0.13.43",
73+
"@airgap/ethereum": "0.13.43",
74+
"@airgap/groestlcoin": "0.13.43",
75+
"@airgap/icp": "0.13.43",
76+
"@airgap/module-kit": "0.13.43",
77+
"@airgap/moonbeam": "0.13.43",
78+
"@airgap/optimism": "0.13.43",
79+
"@airgap/polkadot": "0.13.43",
8080
"@airgap/sapling-wasm": "0.0.7",
81-
"@airgap/serializer": "0.13.42",
82-
"@airgap/stellar": "0.13.42",
83-
"@airgap/substrate": "0.13.42",
84-
"@airgap/tezos": "0.13.42",
81+
"@airgap/serializer": "0.13.43",
82+
"@airgap/stellar": "0.13.43",
83+
"@airgap/substrate": "0.13.43",
84+
"@airgap/tezos": "0.13.43",
8585
"@airgap-community/iso-rootstock": "1.0.0",
8686
"@angular/cdk": "^14.2.7",
8787
"@angular/common": "16.1.1",
@@ -100,6 +100,7 @@
100100
"@capacitor/splash-screen": "^6.0.0",
101101
"@capacitor/status-bar": "^6.0.0",
102102
"@capawesome/capacitor-file-picker": "^0.5.8",
103+
"@capawesome/capacitor-android-edge-to-edge-support": "^7.2.3",
103104
"@download/blockies": "1.0.3",
104105
"@ethereumjs/rlp": "^4.0.1",
105106
"@ethereumjs/tx": "^3.4.0",

‎src/app/app.component.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import { SecretsService } from './services/secrets/secrets.service'
4646
import { StartupChecksService } from './services/startup-checks/startup-checks.service'
4747
import { LanguagesType, VaultStorageKey, VaultStorageService } from './services/storage/storage.service'
4848
import { Router } from '@angular/router'
49+
import { EdgeToEdge } from '@capawesome/capacitor-android-edge-to-edge-support'
4950

5051
declare let window: Window & { airGapHasStarted: boolean }
5152

@@ -102,6 +103,10 @@ export class AppComponent implements AfterViewInit {
102103
await this.securityUtils.toggleAutomaticAuthentication({ automatic: true })
103104
}
104105

106+
if (this.platform.is('android')) {
107+
await EdgeToEdge.setBackgroundColor({ color: '#311B58' })
108+
}
109+
105110
this.initChecks()
106111
}
107112

‎src/app/pages/account-address/account-address.page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ export class AccountAddressPage {
145145
this.protocolName = protocolName
146146

147147
switch (protocolIdentifier) {
148+
case MainProtocolSymbols.BTC:
148149
case MainProtocolSymbols.BTC_SEGWIT:
149150
this.syncOptions = [airgapwallet, bluewallet, sparrowwallet, specterwallet, nunchukwallet]
150151
break

‎src/app/pages/secret-edit/secret-edit.page.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ export class SecretEditPage {
6666
}
6767

6868
public async ngOnInit() {
69-
this.lifehashData = await this.lifehashService.generateLifehash(this.secret.fingerprint)
69+
const bytes = this.secret.fingerprint
70+
? new Uint8Array(this.secret.fingerprint.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)))
71+
: new Uint8Array()
72+
73+
this.lifehashData = await this.lifehashService.generateLifehash(bytes)
7074
}
7175

7276
public goToSocialRecoverySetup(): void {

0 commit comments

Comments
 (0)