Auto close on upload success after 3sec
This commit is contained in:
@@ -201,6 +201,7 @@ void KOReaderSyncActivity::performUpload() {
|
|||||||
{
|
{
|
||||||
RenderLock lock(*this);
|
RenderLock lock(*this);
|
||||||
state = UPLOAD_COMPLETE;
|
state = UPLOAD_COMPLETE;
|
||||||
|
uploadCompleteTime = millis();
|
||||||
}
|
}
|
||||||
requestUpdate(true);
|
requestUpdate(true);
|
||||||
}
|
}
|
||||||
@@ -350,6 +351,13 @@ void KOReaderSyncActivity::render(RenderLock&&) {
|
|||||||
|
|
||||||
void KOReaderSyncActivity::loop() {
|
void KOReaderSyncActivity::loop() {
|
||||||
if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
|
if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
|
||||||
|
if (state == UPLOAD_COMPLETE && millis() - uploadCompleteTime >= 3000) {
|
||||||
|
ActivityResult result;
|
||||||
|
result.isCancelled = true;
|
||||||
|
setResult(std::move(result));
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
ActivityResult result;
|
ActivityResult result;
|
||||||
result.isCancelled = true;
|
result.isCancelled = true;
|
||||||
|
|||||||
@@ -78,6 +78,9 @@ class KOReaderSyncActivity final : public Activity {
|
|||||||
// Selection in result screen (0=Apply, 1=Upload)
|
// Selection in result screen (0=Apply, 1=Upload)
|
||||||
int selectedOption = 0;
|
int selectedOption = 0;
|
||||||
|
|
||||||
|
// Timestamp when UPLOAD_COMPLETE state was entered (for auto-close)
|
||||||
|
unsigned long uploadCompleteTime = 0;
|
||||||
|
|
||||||
void onWifiSelectionComplete(bool success);
|
void onWifiSelectionComplete(bool success);
|
||||||
void performSync();
|
void performSync();
|
||||||
void performUpload();
|
void performUpload();
|
||||||
|
|||||||
Reference in New Issue
Block a user