Skip to content

Commit

Permalink
Application version 1.14.2.
Browse files Browse the repository at this point in the history 
Disconnecting event added.
Aligning with DFU lib changes.
Graddle version 1.2.3.
  • Loading branch information
@philips77
philips77 committed Jul 22, 2015
1 parent 4d4771c commit 57bb546
Show file tree
Hide file tree
Showing 11 changed files with 133 additions and 150 deletions.
8 changes: 5 additions & 3 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
Expand All @@ -89,10 +91,10 @@
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="design-22.2.0" level="project" />
<orderEntry type="library" exported="" name="nrf-logger-v2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
<orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
<orderEntry type="module" module-name="dfu" exported="" />
</component>
</module>
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "no.nordicsemi.android.nrftoolbox"
minSdkVersion 18
targetSdkVersion 22
versionCode 34
versionName "1.14.1"
versionCode 35
versionName "1.14.2"
}
buildTypes {
release {
Expand All @@ -20,7 +20,7 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.0'
compile project(':dfu')
compile files('libs/achartengine-1.1.0.jar')
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="no.nordicsemi.android.nrftoolbox"
android:installLocation="auto"
android:versionCode="34"
android:versionName="1.14.1" >
android:versionCode="35"
android:versionName="1.14.2" >

<uses-sdk
android:minSdkVersion="18"
Expand Down
226 changes: 103 additions & 123 deletions app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.CursorLoader;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.Loader;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
Expand Down Expand Up @@ -64,7 +62,10 @@
import java.io.IOException;
import java.io.InputStream;

import no.nordicsemi.android.error.GattError;
import no.nordicsemi.android.dfu.DfuProgressListener;
import no.nordicsemi.android.dfu.DfuProgressListenerAdapter;
import no.nordicsemi.android.dfu.DfuServiceListenerHelper;
import no.nordicsemi.android.dfu.DfuServiceInitiator;
import no.nordicsemi.android.nrftoolbox.AppHelpFragment;
import no.nordicsemi.android.nrftoolbox.R;
import no.nordicsemi.android.nrftoolbox.dfu.adapter.FileBrowserAppsAdapter;
Expand Down Expand Up @@ -127,32 +128,93 @@ public class DfuActivity extends AppCompatActivity implements LoaderCallbacks<Cu
private int mFileTypeTmp; // This value is being used when user is selecting a file not to overwrite the old value (in case he/she will cancel selecting file)
private boolean mStatusOk;

private final BroadcastReceiver mDfuUpdateReceiver = new BroadcastReceiver() {
private final DfuProgressListener mDfuProgressListener = new DfuProgressListenerAdapter() {
@Override
public void onReceive(final Context context, final Intent intent) {
// DFU is in progress or an error occurred
final String action = intent.getAction();

if (DfuService.BROADCAST_PROGRESS.equals(action)) {
final int progress = intent.getIntExtra(DfuService.EXTRA_DATA, 0);
final int currentPart = intent.getIntExtra(DfuService.EXTRA_PART_CURRENT, 1);
final int totalParts = intent.getIntExtra(DfuService.EXTRA_PARTS_TOTAL, 1);
updateProgressBar(progress, currentPart, totalParts, false, false);
} else if (DfuService.BROADCAST_ERROR.equals(action)) {
final int error = intent.getIntExtra(DfuService.EXTRA_DATA, 0);
final boolean connectionStateError = intent.getIntExtra(DfuService.EXTRA_ERROR_TYPE, DfuService.ERROR_TYPE_OTHER) == DfuService.ERROR_TYPE_COMMUNICATION_STATE;
updateProgressBar(error, 0, 0, true, connectionStateError);

// We have to wait a bit before canceling notification. This is called before DfuService creates the last notification.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
}
public void onDeviceConnecting(final String deviceAddress) {
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_connecting);
}

@Override
public void onDfuProcessStarting(final String deviceAddress) {
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_starting);
}

@Override
public void onEnablingDfuMode(final String deviceAddress) {
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_switching_to_dfu);
}

@Override
public void onFirmwareValidating(final String deviceAddress) {
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_validating);
}

@Override
public void onDeviceDisconnecting(final String deviceAddress) {
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_disconnecting);
}

@Override
public void onDfuCompleted(final String deviceAddress) {
mTextPercentage.setText(R.string.dfu_status_completed);
// let's wait a bit until we cancel the notification. When canceled immediately it will be recreated by service again.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
onTransferCompleted();

// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
}

@Override
public void onDfuAborted(final String deviceAddress) {
mTextPercentage.setText(R.string.dfu_status_aborted);
// let's wait a bit until we cancel the notification. When canceled immediately it will be recreated by service again.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
onUploadCanceled();

// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
}

@Override
public void onProgressChanged(final String deviceAddress, final int percent, final float speed, final float avgSpeed, final int currentPart, final int partsTotal) {
mProgressBar.setIndeterminate(false);
mProgressBar.setProgress(percent);
mTextPercentage.setText(getString(R.string.progress, percent));
if (partsTotal > 1)
mTextUploading.setText(getString(R.string.dfu_status_uploading_part, currentPart, partsTotal));
else
mTextUploading.setText(R.string.dfu_status_uploading);
}

@Override
public void onError(final String deviceAddress, final int error, final int errorType, final String message) {
showErrorMessage(message);

// We have to wait a bit before canceling notification. This is called before DfuService creates the last notification.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
}
};

Expand Down Expand Up @@ -231,25 +293,14 @@ private void setGUI() {
protected void onResume() {
super.onResume();

// We are using LocalBroadcastReceiver instead of normal BroadcastReceiver for optimization purposes
final LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(this);
broadcastManager.registerReceiver(mDfuUpdateReceiver, makeDfuUpdateIntentFilter());
DfuServiceListenerHelper.registerProgressListener(this, mDfuProgressListener);
}

@Override
protected void onPause() {
super.onPause();

final LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(this);
broadcastManager.unregisterReceiver(mDfuUpdateReceiver);
}

private static IntentFilter makeDfuUpdateIntentFilter() {
final IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(DfuService.BROADCAST_PROGRESS);
intentFilter.addAction(DfuService.BROADCAST_ERROR);
intentFilter.addAction(DfuService.BROADCAST_LOG);
return intentFilter;
DfuServiceListenerHelper.unregisterProgressListener(this, mDfuProgressListener);
}

private void isBLESupported() {
Expand Down Expand Up @@ -743,17 +794,15 @@ public void onUploadClicked(final View view) {

final boolean keepBond = preferences.getBoolean(SettingsFragment.SETTINGS_KEEP_BOND, false);

final Intent service = new Intent(this, DfuService.class);
service.putExtra(DfuService.EXTRA_DEVICE_ADDRESS, mSelectedDevice.getAddress());
service.putExtra(DfuService.EXTRA_DEVICE_NAME, mSelectedDevice.getName());
service.putExtra(DfuService.EXTRA_FILE_MIME_TYPE, mFileType == DfuService.TYPE_AUTO ? DfuService.MIME_TYPE_ZIP : DfuService.MIME_TYPE_OCTET_STREAM);
service.putExtra(DfuService.EXTRA_FILE_TYPE, mFileType);
service.putExtra(DfuService.EXTRA_FILE_PATH, mFilePath);
service.putExtra(DfuService.EXTRA_FILE_URI, mFileStreamUri);
service.putExtra(DfuService.EXTRA_INIT_FILE_PATH, mInitFilePath);
service.putExtra(DfuService.EXTRA_INIT_FILE_URI, mInitFileStreamUri);
service.putExtra(DfuService.EXTRA_KEEP_BOND, keepBond);
startService(service);
final DfuServiceInitiator starter = new DfuServiceInitiator(mSelectedDevice.getAddress())
.setDeviceName(mSelectedDevice.getName())
.setKeepBond(keepBond);
if (mFileType == DfuService.TYPE_AUTO)
starter.setZip(mFileStreamUri, mFilePath);
else {
starter.setBinOrHex(mFileType, mFileStreamUri, mFilePath).setInitFile(mInitFileStreamUri, mInitFilePath);
}
starter.start(this, DfuService.class);
}

private void showUploadCancelDialog() {
Expand Down Expand Up @@ -789,72 +838,6 @@ public void onDialogCanceled() {
// do nothing
}

private void updateProgressBar(final int progress, final int part, final int total, final boolean error, final boolean connectionError) {
switch (progress) {
case DfuService.PROGRESS_CONNECTING:
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_connecting);
break;
case DfuService.PROGRESS_STARTING:
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_starting);
break;
case DfuService.PROGRESS_ENABLING_DFU_MODE:
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_switching_to_dfu);
break;
case DfuService.PROGRESS_VALIDATING:
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_validating);
break;
case DfuService.PROGRESS_DISCONNECTING:
mProgressBar.setIndeterminate(true);
mTextPercentage.setText(R.string.dfu_status_disconnecting);
break;
case DfuService.PROGRESS_COMPLETED:
mTextPercentage.setText(R.string.dfu_status_completed);
// let's wait a bit until we cancel the notification. When canceled immediately it will be recreated by service again.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
onTransferCompleted();

// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
break;
case DfuService.PROGRESS_ABORTED:
mTextPercentage.setText(R.string.dfu_status_aborted);
// let's wait a bit until we cancel the notification. When canceled immediately it will be recreated by service again.
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
onUploadCanceled();

// if this activity is still open and upload process was completed, cancel the notification
final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(DfuService.NOTIFICATION_ID);
}
}, 200);
break;
default:
mProgressBar.setIndeterminate(false);
if (error) {
showErrorMessage(progress, connectionError);
} else {
mProgressBar.setProgress(progress);
mTextPercentage.setText(getString(R.string.progress, progress));
if (total > 1)
mTextUploading.setText(getString(R.string.dfu_status_uploading_part, part, total));
else
mTextUploading.setText(R.string.dfu_status_uploading);
}
break;
}
}

private void showProgressBar() {
mProgressBar.setVisibility(View.VISIBLE);
mTextPercentage.setVisibility(View.VISIBLE);
Expand Down Expand Up @@ -884,12 +867,9 @@ public void onCancelUpload() {
mTextPercentage.setText(null);
}

private void showErrorMessage(final int code, final boolean connectionError) {
private void showErrorMessage(final String message) {
clearUI(false);
if (connectionError)
showToast("Upload failed: " + GattError.parseConnectionError(code));
else
showToast("Upload failed: " + GattError.parse(code));
showToast("Upload failed: " + message);
}

private void clearUI(final boolean clearDevice) {
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,19 @@ public void connect(final BluetoothDevice device) {

/**
* Disconnects from the device. Does nothing if not connected.
* @return true if device is to be disconnected. False if it was already disconnected.
*/
public void disconnect() {
public boolean disconnect() {
mUserDisconnected = true;

if (mConnected && mBluetoothGatt != null) {
Logger.v(mLogSession, "Disconnecting...");
mCallbacks.onDeviceDisconnecting();
Logger.d(mLogSession, "gatt.disconnect()");
mBluetoothGatt.disconnect();
return true;
}
return false;
}

/**
Expand Down Expand Up @@ -618,7 +622,7 @@ private void onError(final String message, final int errorCode) {

@Override
public final void onConnectionStateChange(final BluetoothGatt gatt, final int status, final int newState) {
Logger.v(mLogSession, "[Callback] Connection state changed with status: " + status + " and new state: " + newState + " (" + stateToString(newState) + ")");
Logger.d(mLogSession, "[Callback] Connection state changed with status: " + status + " and new state: " + newState + " (" + stateToString(newState) + ")");

if (status == BluetoothGatt.GATT_SUCCESS && newState == BluetoothProfile.STATE_CONNECTED) {
// Notify the parent activity/service
Expand Down
Loading

0 comments on commit 57bb546

Please sign in to comment.