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

Version 2.2.0

Browse Source
This commit is contained in:
Aleksander Nowakowski
2016-11-29 13:05:55 +01:00
parent 10c1c275f6
commit 5d3a3d8fa6
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion '24.0.2'
buildToolsVersion '25.0.1'
defaultConfig {
applicationId "no.nordicsemi.android.nrftoolbox"
minSdkVersion 18
targetSdkVersion 25
versionCode 54
versionName "2.1.1"
versionCode 55
versionName "2.2.0"
}
buildTypes {
release {
@@ -32,9 +32,9 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.gms:play-services-wearable:9.2.0'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0'
compile 'no.nordicsemi.android.support.v18:scanner:0.2.0'
compile 'com.android.support:appcompat-v7:25.0.1'
compile 'com.android.support:design:25.0.1'
compile 'no.nordicsemi.android.support.v18:scanner:1.0.0'
compile 'no.nordicsemi.android:log:2.0.0'
compile('org.simpleframework:simple-xml:2.7.1') {
exclude group: 'stax', module: 'stax-api'
@@ -45,7 +45,7 @@ dependencies {
wearApp project(':wear')
// The DFU Library is imported automatically from jcenter.
compile 'no.nordicsemi.android:dfu:1.0.4'
compile 'no.nordicsemi.android:dfu:1.1.0'
// If you want to make some changes in the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder,
// add it as a module in Project Structure and uncomment the following line:

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

@@ -689,7 +689,8 @@ public class DfuActivity extends AppCompatActivity implements LoaderCallbacks<Cu
.setKeepBond(keepBond)
.setForceDfu(forceDfu)
.setPacketsReceiptNotificationsEnabled(enablePRNs)
.setPacketsReceiptNotificationsValue(numberOfPackets);
.setPacketsReceiptNotificationsValue(numberOfPackets)
.setUnsafeExperimentalButtonlessServiceInSecureDfuEnabled(true);
if (mFileType == DfuService.TYPE_AUTO)
starter.setZip(mFileStreamUri, mFilePath);
else {

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

@@ -71,6 +71,7 @@ public class DfuInitiatorActivity extends AppCompatActivity implements ScannerFr
if (intent.hasExtra(DfuService.EXTRA_INIT_FILE_PATH))
service.putExtra(DfuService.EXTRA_INIT_FILE_PATH, initPath);
service.putExtra(DfuService.EXTRA_KEEP_BOND, keepBond);
service.putExtra(DfuService.EXTRA_UNSAFE_EXPERIMENTAL_BUTTONLESS_DFU, true);
startService(service);
finish();
}

8
common/build.gradle
View File

@@ -23,12 +23,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 24
buildToolsVersion "24.0.2"
compileSdkVersion 25
buildToolsVersion "25.0.1"
defaultConfig {
minSdkVersion 18
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
@@ -42,5 +42,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:support-v4:25.0.1'
}

4
wear/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "24.0.2"
buildToolsVersion "25.0.1"
defaultConfig {
applicationId "no.nordicsemi.android.nrftoolbox"
@@ -23,6 +23,6 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.support:wearable:1.4.0'
compile 'com.google.android.gms:play-services-wearable:9.2.0'
compile 'no.nordicsemi.android.support.v18:scanner:0.2.0'
compile 'no.nordicsemi.android.support.v18:scanner:1.0.0'
compile project(':common')
}