rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes

This commit is contained in:
Aleksander Nowakowski 2014-11-28 16:37:36 +01:00
parent 06f7ab8f4b
commit 295e43c7e9
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/no/nordicsemi/android/dfu/DfuBaseService.java
View File

@ -145,8 +145,6 @@ public abstract class DfuBaseService extends IntentService {
* </ol> * </ol>
*/ */
public static final String EXTRA_FILE_TYPE = "no.nordicsemi.android.dfu.extra.EXTRA_FILE_TYPE"; public static final String EXTRA_FILE_TYPE = "no.nordicsemi.android.dfu.extra.EXTRA_FILE_TYPE";
/** This extra field is used when DFU service launched from script. */
public static final String EXTRA_FILE_TYPE_AS_STRING = "no.nordicsemi.android.dfu.extra.EXTRA_FILE_TYPE_AS_STRING";
/** /**
* <p> * <p>
* The file contains a new version of Soft Device. * The file contains a new version of Soft Device.
@ -882,15 +880,7 @@ public abstract class DfuBaseService extends IntentService {
final String initFilePath = intent.getStringExtra(EXTRA_INIT_FILE_PATH); final String initFilePath = intent.getStringExtra(EXTRA_INIT_FILE_PATH);
final Uri initFileUri = intent.getParcelableExtra(EXTRA_INIT_FILE_URI); final Uri initFileUri = intent.getParcelableExtra(EXTRA_INIT_FILE_URI);
final Uri logUri = intent.getParcelableExtra(EXTRA_LOG_URI); final Uri logUri = intent.getParcelableExtra(EXTRA_LOG_URI);
final String fileTypeAsString = intent.getStringExtra(EXTRA_FILE_TYPE_AS_STRING);
int fileType = intent.getIntExtra(EXTRA_FILE_TYPE, TYPE_AUTO); int fileType = intent.getIntExtra(EXTRA_FILE_TYPE, TYPE_AUTO);
if (fileTypeAsString != null) {
try {
fileType = Integer.parseInt(fileTypeAsString);
} catch (final Exception e) {
fileType = TYPE_AUTO;
}
}
if (filePath != null && fileType == TYPE_AUTO) if (filePath != null && fileType == TYPE_AUTO)
fileType = filePath.toLowerCase(Locale.US).endsWith("zip") ? TYPE_AUTO : TYPE_APPLICATION; fileType = filePath.toLowerCase(Locale.US).endsWith("zip") ? TYPE_AUTO : TYPE_APPLICATION;
String mimeType = intent.getStringExtra(EXTRA_FILE_MIME_TYPE); String mimeType = intent.getStringExtra(EXTRA_FILE_MIME_TYPE);
@ -1402,6 +1392,7 @@ public abstract class DfuBaseService extends IntentService {
final long startTime = mLastProgressTime = mStartTime = SystemClock.elapsedRealtime(); final long startTime = mLastProgressTime = mStartTime = SystemClock.elapsedRealtime();
updateProgressNotification(); updateProgressNotification();
try { try {
logi("Starting upload...");
sendLogBroadcast(Level.APPLICATION, "Starting upload..."); sendLogBroadcast(Level.APPLICATION, "Starting upload...");
response = uploadFirmwareImage(gatt, packetCharacteristic, is); response = uploadFirmwareImage(gatt, packetCharacteristic, is);
} catch (final DeviceDisconnectedException e) { } catch (final DeviceDisconnectedException e) {
@ -2387,7 +2378,7 @@ public abstract class DfuBaseService extends IntentService {
builder.setColor(Color.GRAY); builder.setColor(Color.GRAY);
// Add Abort action to the notification // Add Abort action to the notification
if (progress != PROGRESS_ABORTED && progress != PROGRESS_COMPLETED) { if (progress != PROGRESS_ABORTED && progress != PROGRESS_COMPLETED && progress < ERROR_MASK) {
final Intent abortIntent = new Intent(BROADCAST_ACTION); final Intent abortIntent = new Intent(BROADCAST_ACTION);
abortIntent.putExtra(EXTRA_ACTION, ACTION_ABORT); abortIntent.putExtra(EXTRA_ACTION, ACTION_ABORT);
final PendingIntent pendingAbortIntent = PendingIntent.getBroadcast(this, 1, abortIntent, PendingIntent.FLAG_UPDATE_CURRENT); final PendingIntent pendingAbortIntent = PendingIntent.getBroadcast(this, 1, abortIntent, PendingIntent.FLAG_UPDATE_CURRENT);