Skip to content

Commit fc5106c

Browse files
authored
Merge pull request #1603 from SatoshiPortal/develop
6.4.0+131
2 parents b7fd952 + 2e15fdd commit fc5106c

420 files changed

Lines changed: 26549 additions & 12772 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
KEY_SERVER= # http://o7rwmpnfkzdcay2gotla6sbrviu27wcgck7nsjrq77nqhtwbjvwcraad.onion
21
GOOGLE_DRIVE_CLIENT_ID= # <YOUR_GOOGLE_DRIVE_CLIENT_ID>.apps.googleusercontent.com
32
GOOGLE_DRIVE_URL_SCHEME= # com.googleusercontent.apps.<YOUR_GOOGLE_DRIVE_CLIENT_ID>
43
BB_AUTH_URL= # accounts0x.bullbitcoin.dev

README.md

Lines changed: 13 additions & 13 deletions

android/app/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,14 @@ android {
7171

7272
buildTypes {
7373
debug {
74+
minifyEnabled false
75+
shrinkResources false
7476
signingConfig signingConfigs.debug
7577
}
76-
release {
77-
signingConfig signingConfigs.release
78+
release {
79+
minifyEnabled false
80+
shrinkResources false
81+
signingConfig signingConfigs.release
7882
}
7983
}
8084

android/app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
44
<!-- <uses-permission android:name="android.permission.NFC"/> -->
55
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
6-
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
7-
6+
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
87
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
98
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
109
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
1110
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
11+
12+
<!-- Background tasks -->
13+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
14+
15+
<uses-feature android:name="android.hardware.usb.host" android:required="false" />
16+
<uses-permission android:name="android.hardware.usb.host" />
1217
<queries>
1318
<intent>
1419
<action android:name="android.intent.action.VIEW"/>
@@ -45,6 +50,12 @@
4550
<category android:name="android.intent.category.BROWSABLE"/>
4651
<data android:scheme="bitcoin"/>
4752
</intent-filter>
53+
<!-- USB device attached intent filter for BitBox02 -->
54+
<intent-filter>
55+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
56+
</intent-filter>
57+
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
58+
android:resource="@xml/device_filter" />
4859
</activity>
4960
<!-- Don't delete the meta-data below.
5061
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
20.4 KB
15.8 KB
11.3 KB
8.41 KB
29.8 KB
23.6 KB

0 commit comments

Comments
 (0)