Format branch and commit nr

Add copyright notice to statistics.json
Limit to 32 characters in statistics.json

(cherry picked from commit 9ab59dafeb9002a120a0b359660f9ffcac11a470)

Config.xcconfig

@@ -1,7 +1,7 @@
 APP_DISPLAY_NAME = FreeAPS X
 APP_VERSION = 1.0.0
 APP_BUILD_NUMBER = 1
-BRANCH = 
+COPYRIGHT_NOTICE = 
 DEVELOPER_TEAM = ##TEAM_ID##
 BUNDLE_IDENTIFIER = ru.artpancreas.$(DEVELOPMENT_TEAM).FreeAPS
 APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup

FreeAPS.xcodeproj/project.pbxproj

@@ -2178,7 +2178,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/sh\n\ngit_version=$(git log -1 --format=\"%h\")\ngit_branch=$(git symbolic-ref --short -q HEAD)\ngit_tag=$(git describe --tags --exact-match 2>/dev/null)\n\ngit_branch_or_tag=\"${git_branch:-${git_tag}}\"\ngit_branch_or_tag_version=\"${git_branch:-${git_tag}}-${git_version}\"\n\ninfo_plist=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n/usr/libexec/PlistBuddy -c \"Set :BuildBranch '${git_branch_or_tag_version}'\" \"${info_plist}\"\n";
+			shellScript = "#!/bin/sh\n\ngit_version=$(git log -1 --format=\"%h\")\ngit_branch=$(git symbolic-ref --short -q HEAD)\ngit_tag=$(git describe --tags --exact-match 2>/dev/null)\n\ngit_branch_or_tag=\"${git_branch:-${git_tag}}\"\ngit_branch_or_tag_version=\"${git_branch:-${git_tag}} ${git_version}\"\n\ninfo_plist=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n/usr/libexec/PlistBuddy -c \"Set :BuildBranch '${git_branch_or_tag_version}'\" \"${info_plist}\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

FreeAPS/Resources/Info.plist

@@ -70,7 +70,7 @@
 	<key>NSHealthUpdateUsageDescription</key>
 	<string>Health App is used to store blood glucose data</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>$(BRANCH)</string>
+	<string>$(COPYRIGHT_NOTICE)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

FreeAPS/Sources/APS/APSManager.swift

@@ -807,7 +807,9 @@ 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 ?? ""
+        var copyrightNotice_ = Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String ?? ""
+        copyrightNotice_ = String(copyrightNotice_.prefix(32))
         let pump_ = pumpManager?.localizedTitle ?? ""
         let cgm = settingsManager.settings.cgm
         let file = OpenAPS.Monitor.statistics
@@ -1286,7 +1288,8 @@ final class BaseAPSManager: APSManager, Injectable {
             iOS: UIDevice.current.getOSInfo,
             Build_Version: version ?? "",
             Build_Number: build ?? "1",
-            Branch: branch ?? "N/A",
+            Branch: branch,
+            CopyRightNotice: copyrightNotice_,
             Build_Date: buildDate,
             Algorithm: algo_,
             AdjustmentFactor: af,

FreeAPS/Sources/Models/Statistics.swift

@@ -7,6 +7,7 @@ struct Statistics: JSON, Equatable {
     var Build_Version: String
     var Build_Number: String
     var Branch: String
+    var CopyRightNotice: String
     var Build_Date: Date
     var Algorithm: String
     var AdjustmentFactor: Decimal
@@ -25,6 +26,7 @@ struct Statistics: JSON, Equatable {
         Build_Version: String,
         Build_Number: String,
         Branch: String,
+        CopyRightNotice: String,
         Build_Date: Date,
         Algorithm: String,
         AdjustmentFactor: Decimal,
@@ -42,6 +44,7 @@ struct Statistics: JSON, Equatable {
         self.Build_Version = Build_Version
         self.Build_Number = Build_Number
         self.Branch = Branch
+        self.CopyRightNotice = CopyRightNotice
         self.Build_Date = Build_Date
         self.Algorithm = Algorithm
         self.AdjustmentFactor = AdjustmentFactor
@@ -71,6 +74,7 @@ extension Statistics {
         case Build_Version
         case Build_Number
         case Branch
+        case CopyRightNotice
         case Build_Date
         case Algorithm
         case AdjustmentFactor