1 files changed, 55 insertions, 15 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index 317798c..b6f1851 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -1,43 +1,83 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swiften/Base/Log.h>
 
 #include <cstdio>
 
+#if defined(SWIFT_ANDROID_LOGGING) && defined(__ANDROID__)
+#include <android/log.h>
+#endif
+
 
 namespace Swift {
 
 static Log::Severity logLevel = Log::warning;
+std::unique_ptr<FILE, Log::LogFileClose> Log::logfile;
+Log::Callback Log::logCallback;
 
 Log::Log() {
 }
 
 Log::~Log() {
-	// Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
-	fprintf(stderr, "%s", stream.str().c_str());
-	fflush(stderr);
+#if defined(SWIFT_ANDROID_LOGGING) && defined(__ANDROID__)
+    __android_log_print(ANDROID_LOG_VERBOSE, "Swift", stream.str().c_str(), 1);
+#else
+    // Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
+    if (logCallback) {
+        logCallback(severity_, std::move(file_), line_, std::move(function_), stream.str());
+    }
+    else {
+        stream << std::endl;
+        if (logfile) {
+            fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get());
+            fflush(logfile.get());
+        }
+        else {
+            fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), stderr);
+            fflush(stderr);
+        }
+    }
+#endif
 }
 
 std::ostringstream& Log::getStream(
-		Severity /*severity*/, 
-		const std::string& severityString, 
-		const std::string& file, 
-		int line,
-		const std::string& function) {
-	stream << "[" << severityString << "] " << file << ":" << line << " " << function << ": ";
-	return stream;
+        Severity severity,
+        std::string severityString,
+        std::string file,
+        int line,
+        std::string function) {
+    if (logCallback) {
+        severity_ = severity;
+        file_ = std::move(file);
+        line_ = line;
+        function_ = std::move(function);
+    }
+    else {
+        stream << "[" << severityString << "] " << file << ":" << line << " " << function << ": ";
+    }
+    return stream;
 }
 
 Log::Severity Log::getLogLevel() {
-	return logLevel;
+    return logLevel;
 }
 
 void Log::setLogLevel(Severity level) {
-	logLevel = level;
+    logLevel = level;
+}
+
+void Log::setLogFile(const std::string& fileName) {
+    if (!fileName.empty()) {
+        logfile = std::unique_ptr<FILE, Log::LogFileClose>(fopen(fileName.c_str(), "a"));
+    }
+}
+
+void Log::setLogCallback(Callback callback) {
+    Log::logCallback = callback;
 }
 
 }