[Merge] lp:~renatofilho/sync-monitor/sync-by-acount into lp:sync-monitor

[Michael Sheldon]

Review: Needs Fixing

There's a bit of indentation that's out of line (marked with a diff comment), other than that this looks good

Diff comments:

> 
> === modified file 'src/sync-daemon.cpp'
> --- src/sync-daemon.cpp	2015-07-10 23:00:40 +0000
> +++ src/sync-daemon.cpp	2015-10-15 15:10:56 +0000
> @@ -139,10 +139,14 @@
>      } else if (state == SyncNetwork::NetworkOffline) {
>          qDebug() << "Device is offline cancel active syncs. There is a sync in progress?" << (m_currentAccount ? "Yes" : "No");
>          if (m_currentAccount) {
> -            m_offlineQueue->push(m_currentAccount, m_currentServiceName, false);
> +            if (m_currentAccount->retrySync()) {
> +                qDebug() << "Push sync to later sync";
> +                m_offlineQueue->push(m_currentAccount, m_currentServiceName, false);
> +            } else {
> +                 qDebug() << "Do not try re-sync the account";
> +            }
>              m_currentAccount->cancel(m_currentServiceName);
> -            qDebug() << "Current account pushed to late sync with sevice" << m_currentServiceName;
> -        }
> +       }

Indentation is out of line here

>          if (m_timeout->isActive()) {
>              m_timeout->stop();
>          }


-- 
https://code.launchpad.net/~renatofilho/sync-monitor/sync-by-acount/+merge/273917
Your team Ubuntu Phablet Team is subscribed to branch lp:sync-monitor.