Просмотр исходного кода

Show both branch and copyright notice in statistics

Jon Mårtensson 3 лет назад
Родитель
Сommit
a659b61150
2 измененных файлов с 7 добавлено и 3 удалено
  1. 1 1
      Config.xcconfig
  2. 6 2
      FreeAPS/Sources/APS/APSManager.swift

+ 1 - 1
Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = FreeAPS X
-APP_VERSION = 1.0.0
+APP_VERSION = 1.0.1
 APP_BUILD_NUMBER = 1
 BRANCH = 
 DEVELOPER_TEAM = ##TEAM_ID##

+ 6 - 2
FreeAPS/Sources/APS/APSManager.swift

@@ -807,7 +807,11 @@ final class BaseAPSManager: APSManager, Injectable {
         let buildDate = Bundle.main.buildDate
         let version = Bundle.main.releaseVersionNumber
         let build = Bundle.main.buildVersionNumber
-        let branch = Bundle.main.infoDictionary?["BuildBranch"] as? String
+
+        let branch_ = Bundle.main.infoDictionary?["BuildBranch"] as? String ?? ""
+        let copyrightNotice_ = Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String ?? ""
+        let branch = branch_ + " " + copyrightNotice_
+
         let pump_ = pumpManager?.localizedTitle ?? ""
         let cgm = settingsManager.settings.cgm
         let file = OpenAPS.Monitor.statistics
@@ -1286,7 +1290,7 @@ final class BaseAPSManager: APSManager, Injectable {
             iOS: UIDevice.current.getOSInfo,
             Build_Version: version ?? "",
             Build_Number: build ?? "1",
-            Branch: branch ?? "N/A",
+            Branch: branch,
             Build_Date: buildDate,
             Algorithm: algo_,
             AdjustmentFactor: af,