Skip to content

Commit 8949dfa

Browse files
authored
Merge branch 'chore/update-deps' into fix/restore-back-button
2 parents 6a2038e + d70150e commit 8949dfa

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
2121
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
2222
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
23+
<!-- Required for E2E tests connecting to local Electrum server (Android 16+) -->
24+
<uses-permission
25+
android:name="android.permission.NEARBY_WIFI_DEVICES"
26+
android:usesPermissionFlags="neverForLocation"
27+
tools:targetApi="31" />
2328

2429
<application
2530
android:name=".App"
@@ -33,7 +38,7 @@
3338
android:name=".androidServices.LightningNodeService"
3439
android:foregroundServiceType="dataSync"
3540
android:enabled="true"
36-
android:exported="false"/>
41+
android:exported="false" />
3742

3843
<service
3944
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
@@ -59,27 +64,33 @@
5964
<!-- Universal Links -->
6065
<intent-filter android:autoVerify="true">
6166
<action android:name="android.intent.action.VIEW" />
67+
6268
<category android:name="android.intent.category.DEFAULT" />
6369
<category android:name="android.intent.category.BROWSABLE" />
70+
6471
<data
6572
android:scheme="https"
6673
android:host="www.bitkit.to"
6774
android:pathPattern="/treasure-hunt" />
6875
</intent-filter>
6976

70-
<!-- Deeplinks -->
77+
<!-- Deep Links -->
7178
<intent-filter>
7279
<action android:name="android.intent.action.VIEW" />
80+
7381
<category android:name="android.intent.category.DEFAULT" />
7482
<category android:name="android.intent.category.BROWSABLE" />
83+
7584
<data android:scheme="bitkit" />
7685
<data android:scheme="slash" />
7786
<data android:scheme="slashauth" />
7887
<data android:scheme="bitcoin" />
79-
<data android:scheme="BITCOIN"
88+
<data
89+
android:scheme="BITCOIN"
8090
tools:ignore="AppLinkUrlError" />
8191
<data android:scheme="lightning" />
82-
<data android:scheme="LIGHTNING"
92+
<data
93+
android:scheme="LIGHTNING"
8394
tools:ignore="AppLinkUrlError" />
8495
<data android:scheme="lnurl" />
8596
<data android:scheme="lnurlw" />
@@ -90,16 +101,20 @@
90101
<!-- NFC -->
91102
<intent-filter>
92103
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
104+
93105
<category android:name="android.intent.category.DEFAULT" />
94106
<category android:name="android.intent.category.BROWSABLE" />
107+
95108
<data android:scheme="bitkit" />
96109
<data android:scheme="slash" />
97110
<data android:scheme="slashauth" />
98111
<data android:scheme="bitcoin" />
99-
<data android:scheme="BITCOIN"
112+
<data
113+
android:scheme="BITCOIN"
100114
tools:ignore="AppLinkUrlError" />
101115
<data android:scheme="lightning" />
102-
<data android:scheme="LIGHTNING"
116+
<data
117+
android:scheme="LIGHTNING"
103118
tools:ignore="AppLinkUrlError" />
104119
<data android:scheme="lnurl" />
105120
<data android:scheme="lnurlw" />

app/src/main/java/to/bitkit/ext/ByteArray.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ fun ByteArray.toHex(): String = this.toHexString()
1212
fun String.fromHex(): ByteArray = this.hexToByteArray()
1313
// endregion
1414

15-
// region base64
1615
@OptIn(ExperimentalEncodingApi::class)
1716
fun ByteArray.toBase64(): String = Base64.encode(this)
1817

1918
@OptIn(ExperimentalEncodingApi::class)
2019
fun String.fromBase64(): ByteArray = Base64.decode(this)
21-
// endregion
2220

2321
val String.uByteList get() = this.toByteArray().map { it.toUByte() }
2422

0 commit comments

Comments
 (0)