wrong code revert.

Author: ZahidZafar

src/countly.cpp

@@ -484,24 +484,32 @@ bool Countly::updateSession() {
 	auto duration = std::chrono::duration_cast<std::chrono::seconds>(getSessionDuration());
 	mutex.lock();
 
-	if (!no_events) {
-		std::map<std::string, std::string> data = {
-		{"app_key", session_params["app_key"].get<std::string>()},
-		{"device_id", session_params["device_id"].get<std::string>()},
-		{"events", events.dump()}
-		};
+	if (no_events) {
+		if (duration.count() > COUNTLY_KEEPALIVE_INTERVAL) {
+			std::map<std::string, std::string> data = {
+				{"app_key", session_params["app_key"].get<std::string>()},
+				{"device_id", session_params["device_id"].get<std::string>()},
+				{"session_duration", std::to_string(duration.count())}
+			};
+			if (!sendHTTP("/i", Countly::serializeForm(data)).success) {
+				mutex.unlock();
+				return false;
+			}
 
-		if (!sendHTTP("/i", Countly::serializeForm(data)).success) {
-			mutex.unlock();
-			return false;
+			last_sent += duration;
 		}
+
+		mutex.unlock();
+		return true;
 	}
 
 	std::map<std::string, std::string> data = {
-			{"app_key", session_params["app_key"].get<std::string>()},
-			{"device_id", session_params["device_id"].get<std::string>()},
-			{"session_duration", std::to_string(duration.count())}
+		{"app_key", session_params["app_key"].get<std::string>()},
+		{"device_id", session_params["device_id"].get<std::string>()},
+		{"session_duration", std::to_string(duration.count())},
+		{"events", events.dump()}
 	};
+
 	if (!sendHTTP("/i", Countly::serializeForm(data)).success) {
 		mutex.unlock();
 		return false;
@@ -819,8 +827,9 @@ void Countly::updateLoop() {
 		}
 		size_t last_wait_milliseconds = wait_milliseconds;
 		mutex.unlock();
-		std::this_thread::sleep_for(std::chrono::milliseconds(last_wait_milliseconds));
 		updateSession();
+		std::this_thread::sleep_for(std::chrono::milliseconds(last_wait_milliseconds));
+		
 	}
 	mutex.lock();
 	running = false;