Merge lp:~xavi-garcia-mena/keeper/stop-inactivity-timer-bug into lp:keeper

[Xavi Garcia]

Simple change to stop the inactivity timer when the helper stops.

Simple change to stop the inactivity timer when the helper stops.

I saw testing on the phone that the inactivity timer never stopped although the helper was not running.

[Charles Kerr (charlesk)]

Good catch.

review: Approve

=== modified file 'src/helper/backup-helper.cpp'
--- src/helper/backup-helper.cpp	2016-07-15 21:46:53 +0000
+++ src/helper/backup-helper.cpp	2016-07-27 13:56:05 +0000
@@ -140,6 +140,7 @@
 
     void on_inactivity_detected()
     {
+        stop_inactivity_timer();
         qWarning() << "Inactivity detected in the helper...stopping it";
         stop();
     }
@@ -203,6 +204,11 @@
         timer_->start(MAX_TIME_WAITING_FOR_DATA);
     }
 
+    void stop_inactivity_timer()
+    {
+        timer_->stop();
+    }
+
     void check_for_done()
     {
         if (n_uploaded_ == q_ptr->expected_size())
@@ -281,6 +287,7 @@
         qDebug() << "HELPER STOPPED +++++++++++++++++++++++++++++++++++++ " << appid;
         auto self = static_cast<BackupHelperPrivate*>(vself);
         self->check_for_done();
+        self->stop_inactivity_timer();
     }
 
     std::vector<ubuntu::app_launch::Helper::URL> get_helper_urls(QString const & /*appId*/)