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

Jump to bottom

Android: increase core timeout for creating trx from 30 to 180 seconds #37

Merged
merged 3 commits into from
Sep 20, 2021
Merged

Android: increase core timeout for creating trx from 30 to 180 seconds #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430cb84
Android: increase core timeout for creating trx from 30 to 180 seconds
teknex Sep 20, 2021
a397cc4
Fixed build trigger for Android branches
HLXEasy Sep 20, 2021
1b1fe56
Fixed build trigger for Android branches
HLXEasy Sep 20, 2021
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 .github/workflows/build-featurebranch-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- android_*
- android/*

jobs:
# ==========================================================================
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-featurebranch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- 'master'
- 'develop'
- '*android*'
- 'android/*'

jobs:
# ==========================================================================
Expand Down
4 changes: 2 additions & 2 deletions src/qt/spectreclientbridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void SpectreClientBridge::sendCoins(bool fUseCoinControl, QString sChangeAddr)
else
sendResultPendingReply = window->walletModel->sendCoins(0, recipients, coins);

if (!sendResultPendingReply.waitForFinished())
if (!sendResultPendingReply.waitForFinished(180000))
return abortSendCoins(tr("Core not responding."));

sendResult = sendResultPendingReply.returnValue();
Expand All @@ -246,7 +246,7 @@ void SpectreClientBridge::sendCoins(bool fUseCoinControl, QString sChangeAddr)
sendResultPendingReply = window->walletModel->sendCoinsAnon(sendResult.fee(), recipients, coins);
else
sendResultPendingReply = window->walletModel->sendCoins(sendResult.fee(), recipients, coins);
if (!sendResultPendingReply.waitForFinished())
if (!sendResultPendingReply.waitForFinished(180000))
return abortSendCoins(tr("Core not responding."));
sendResult = sendResultPendingReply.returnValue();
sendCoinsStatus = sendResult.status();
Expand Down
Loading