Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor LongOperationInProgressException #177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor LongOperationInProgressException #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libnitrokey/DeviceCommunicationExceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ class InvalidCRCReceived: public DeviceReceivingFailure {
uint8_t getType() const {return 5;};
};

// LongOperationInProgressException with type 6, see LongOperationInProgressException.h

#endif //LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H
15 changes: 7 additions & 8 deletions libnitrokey/LongOperationInProgressException.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@
#ifndef LIBNITROKEY_LONGOPERATIONINPROGRESSEXCEPTION_H
#define LIBNITROKEY_LONGOPERATIONINPROGRESSEXCEPTION_H

#include "CommandFailedException.h"
#include "DeviceCommunicationExceptions.h"

class LongOperationInProgressException : public CommandFailedException {
class LongOperationInProgressException : public DeviceCommunicationException {

public:
unsigned char progress_bar_value;

LongOperationInProgressException(
unsigned char _command_id, uint8_t last_command_status, unsigned char _progress_bar_value)
: CommandFailedException(_command_id, last_command_status), progress_bar_value(_progress_bar_value){
LongOperationInProgressException(unsigned char _progress_bar_value)
: DeviceCommunicationException("Device returned busy status with long operation in progress"),
progress_bar_value(_progress_bar_value){
LOG(
std::string("LongOperationInProgressException, progress bar status: ")+
std::to_string(progress_bar_value), nitrokey::log::Loglevel::DEBUG);
}
virtual const char *what() const throw() {
return "Device returned busy status with long operation in progress";
}

uint8_t getType() const {return 6;};
};


Expand Down
3 changes: 1 addition & 2 deletions libnitrokey/device_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,7 @@ namespace nitrokey {
== stick20::device_status::busy_progressbar){
dev->m_counters.busy_progressbar++;
LOG(std::string("Throw: Long operation in progress exception"), Loglevel::DEBUG_L1);
throw LongOperationInProgressException(
resp.command_id, resp.device_status, resp.storage_status.progress_bar_value);
throw LongOperationInProgressException(resp.storage_status.progress_bar_value);
}

if (!resp.isValid()) {
Expand Down