Merge branch 'feature/log-info' into milestone/1.1

Log device, version and locale info #446
owncloud · Jul 10, 2019 · 78d8b03 · 78d8b03
2 parents be14b82 + 09b6e63
commit 78d8b03
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ownCloud/Resources/en.lproj/Localizable.strings b/ownCloud/Resources/en.lproj/Localizable.strings
@@ -166,7 +166,7 @@
 "You need to configure an email account first to be able to send emails." = "You need to configure an email account first to be able to send emails.";
 "Do you want to open the following URL?" = "Do you want to open the following URL?";
 
-"%@ %@ version %@ build %@ (%@)" = "%@ %@ version %@ build %@ (%@)";
+"%@ %@ version %@ build %@ (app: %@, sdk: %@)" = "%@ %@ version %@ build %@ (app: %@, sdk: %@)";
 "beta" = "beta";
 "release" = "release";
 

diff --git a/ownCloud/Settings/MoreSettingsSection.swift b/ownCloud/Settings/MoreSettingsSection.swift
@@ -41,8 +41,8 @@ class MoreSettingsSection: SettingsSection {
 			buildType = "beta".localized
 		}
 
-		let localizedFooter = "%@ %@ version %@ build %@ (%@)".localized
-		let footerTitle = String(format: localizedFooter, OCAppIdentity.shared.appName!, buildType, VendorServices.shared.appVersion, VendorServices.shared.appBuildNumber, VendorServices.shared.lastGitCommit)
+		let localizedFooter = "%@ %@ version %@ build %@ (app: %@, sdk: %@)".localized
+		let footerTitle = String(format: localizedFooter, OCAppIdentity.shared.appName ?? "App", buildType, VendorServices.shared.appVersion, VendorServices.shared.appBuildNumber, VendorServices.shared.lastGitCommit, OCAppIdentity.shared.sdkCommit ?? "unknown")
 
 		self.footerTitle = footerTitle
 

diff --git a/ownCloud/Tools/Log.swift b/ownCloud/Tools/Log.swift
@@ -77,3 +77,13 @@ class Log {
 		return OCLogger.applyPrivacyMask(obj) ?? "(null)"
 	}
 }
+
+extension OCLogger : OCLogIntroFormat {
+	public func logIntroFormat() -> String {
+		return "{{stdIntro}}; Log options: \(Log.logOptionStatus)"
+	}
+
+	public func logHostCommit() -> String? {
+		return LastGitCommit()
+	}
+}