aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-23 01:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

DFU Library 1.10.0

Browse Source
This commit is contained in:
Aleksander Nowakowski
2020-02-12 12:39:26 +01:00
parent 26fc15a040
commit 56747f91da
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@@ -50,7 +50,7 @@ dependencies {
implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3' implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3'
// The DFU Library is imported automatically from jcenter: // The DFU Library is imported automatically from jcenter:
implementation 'no.nordicsemi.android:dfu:1.9.1' implementation 'no.nordicsemi.android:dfu:1.10.0'
// if you desire to build the DFU Library, clone the // if you desire to build the DFU Library, clone the
// https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, // https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder,
// add it as a module into the project structure and uncomment the following line // add it as a module into the project structure and uncomment the following line
@@ -60,7 +60,6 @@ dependencies {
// Gson is needed for DFU to work. The DFU library dependency to Gson is internal and would // Gson is needed for DFU to work. The DFU library dependency to Gson is internal and would
// not be attached to APK. // not be attached to APK.
// See: https://github.com/NordicSemiconductor/Android-nRF-Toolbox/issues/86 // See: https://github.com/NordicSemiconductor/Android-nRF-Toolbox/issues/86
implementation 'com.google.code.gson:gson:2.8.6'
// Import the BLE Common Library. // Import the BLE Common Library.
// The BLE Common Library depends on BLE Library. It is enough to include the first one. // The BLE Common Library depends on BLE Library. It is enough to include the first one.

1
app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
View File

@@ -703,6 +703,7 @@ public class DfuActivity extends AppCompatActivity implements LoaderCallbacks<Cu
.setForceDfu(forceDfu) .setForceDfu(forceDfu)
.setPacketsReceiptNotificationsEnabled(enablePRNs) .setPacketsReceiptNotificationsEnabled(enablePRNs)
.setPacketsReceiptNotificationsValue(numberOfPackets) .setPacketsReceiptNotificationsValue(numberOfPackets)
.setPrepareDataObjectDelay(400)
.setUnsafeExperimentalButtonlessServiceInSecureDfuEnabled(true); .setUnsafeExperimentalButtonlessServiceInSecureDfuEnabled(true);
if (fileType == DfuService.TYPE_AUTO) { if (fileType == DfuService.TYPE_AUTO) {
starter.setZip(fileStreamUri, filePath); starter.setZip(fileStreamUri, filePath);

2
app/src/main/res/values/strings_dfu.xml
View File

@@ -24,7 +24,7 @@
<string name="dfu_feature_title">DFU</string> <string name="dfu_feature_title">DFU</string>
<string name="dfu_service_title">nRF Toolbox DFU Proxy</string> <string name="dfu_service_title">nRF Toolbox DFU Proxy</string>
<string name="dfu_settings_title">DFU Settings</string> <string name="dfu_settings_title">DFU Settings</string>
<string name="dfu_lib_version">DFU Library version 1.9.1</string> <string name="dfu_lib_version">DFU Library version 1.10.0</string>
<string name="dfu_feature_title_long">DEVICE FIRMWARE UPDATE</string> <string name="dfu_feature_title_long">DEVICE FIRMWARE UPDATE</string>
<dimen name="dfu_feature_title_long_margin">-186dp</dimen> <dimen name="dfu_feature_title_long_margin">-186dp</dimen>