Skip to content

Commit

Permalink
post review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
VitorVieiraZ committed Nov 8, 2024
1 parent 1994114 commit 216a6b9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/test/testmerginapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2982,7 +2982,7 @@ void TestMerginApi::testDownloadWithNetworkError()
QVERIFY( retrySpy.count() > 0 );
QCOMPARE( finishSpy.count(), 1 );

// Verify that 5 (MAX_RETRY_COUNT) retry attempts were made
// Verify that transaction.MAX_RETRY_COUNT retry attempts were made
int maxRetries = TransactionStatus::MAX_RETRY_COUNT;
QCOMPARE( retrySpy.count(), maxRetries );

Expand Down
7 changes: 4 additions & 3 deletions core/merginapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,8 @@ void MerginApi::downloadItemReplyFinished( DownloadQueueItem item )
transaction.retryCount++;
transaction.downloadQueue.append( item );

CoreUtils::log( "pull " + projectFullName, QStringLiteral( "Retrying download (attempt %1 of 5)" ).arg( transaction.retryCount ) );
CoreUtils::log( "pull " + projectFullName, QStringLiteral( "Retrying download (attempt %1 of %2)" ).arg( transaction.retryCount )
.arg( transaction.MAX_RETRY_COUNT ) );

downloadNextItem( projectFullName );

Expand Down Expand Up @@ -3228,8 +3229,8 @@ ProjectDiff MerginApi::compareProjectFiles(
/*
for ( MerginFile file : oldServerFilesMap )
{
// R-D/L-D
// TODO: need to do anything?
// R-D/L-D
// TODO: need to do anything?
}
*/

Expand Down
1 change: 0 additions & 1 deletion core/merginapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ class MerginApi: public QObject

/**
* Sets the network manager to be used for Mergin API requests
* \param QNetworkAccessManager
*/
void setNetworkManager( QNetworkAccessManager *manager );

Expand Down

1 comment on commit 216a6b9

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 24.11.693211 just submitted!

Please sign in to comment.