From 3896b9ab4f0bfaf480f1f060f08df6f6451aee47 Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Sun, 19 Jun 2022 15:20:44 +0200
Subject: [PATCH] Addressing  #670 - Different sort orders on sitemaps (#672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Addressing  #670 - Different sort orders on sitemaps
* Including localizations

Signed-off-by: Tim Müller-Seydlitz <timbms@gmail.com>
---
 .../Sources/OpenHABCore/Util/Endpoint.swift   |  5 ++
 .../OpenHABCore/Util/Preferences.swift        |  2 +-
 openHAB/Main.storyboard                       | 63 ++++++++++++++-----
 .../OpenHABDrawerTableViewController.swift    |  8 ++-
 openHAB/OpenHABSettingsViewController.swift   | 11 +++-
 openHAB/OpenHABWebViewController.swift        |  1 -
 .../Resources/de.lproj/Localizable.strings    |  2 +
 .../Resources/en.lproj/Localizable.strings    |  1 +
 .../Resources/es.lproj/Localizable.strings    |  1 +
 .../Resources/fi.lproj/Localizable.strings    |  1 +
 .../Resources/fr.lproj/Localizable.strings    |  1 +
 .../Resources/it.lproj/Localizable.strings    |  1 +
 .../Resources/nl.lproj/Localizable.strings    |  1 +
 .../Resources/ru.lproj/Localizable.strings    |  1 +
 openHABTestsSwift/OpenHABEndPoint.swift       | 15 ++---
 15 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
index a61e3fc40..3b62acc90 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
@@ -22,6 +22,11 @@ public enum IconType: Int {
     case svg
 }
 
+public enum SortSitemapsOrder: Int {
+    case label
+    case name
+}
+
 public struct Endpoint {
     let baseURL: String
     let path: String
diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift b/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift
index dec4db81a..a46de6456 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift
@@ -77,7 +77,6 @@ public enum Preferences {
 
     @UserDefaultURL("localUrl", defaultValue: "") public static var localUrl: String
     @UserDefaultURL("remoteUrl", defaultValue: "https://myopenhab.org") public static var remoteUrl: String
-
     @UserDefault("username", defaultValue: "test") public static var username: String
     @UserDefault("password", defaultValue: "test") public static var password: String
     @UserDefault("alwaysSendCreds", defaultValue: false) public static var alwaysSendCreds: Bool
@@ -89,6 +88,7 @@ public enum Preferences {
     @UserDefault("iconType", defaultValue: 0) public static var iconType: Int
     @UserDefault("defaultSitemap", defaultValue: "demo") public static var defaultSitemap: String
     @UserDefault("sendCrashReports", defaultValue: false) public static var sendCrashReports: Bool
+    @UserDefault("sortSitemapsBy", defaultValue: 0) public static var sortSitemapsby: Int
 
     // MARK: - Private
 
diff --git a/openHAB/Main.storyboard b/openHAB/Main.storyboard
index a84ada41b..780ea339b 100644
--- a/openHAB/Main.storyboard
+++ b/openHAB/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ni3-JL-qg0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ni3-JL-qg0">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -53,11 +53,11 @@
                                         <rect key="frame" x="0.0" y="79.666666030883789" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fYY-WZ-Zms" id="GBq-BC-eoa">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="right" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="191" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fxA-Sy-xY6">
-                                                    <rect key="frame" x="322.66666666666669" y="13.666666666666664" width="21.666666666666686" height="17"/>
+                                                    <rect key="frame" x="323.66666666666669" y="13.666666666666664" width="21.666666666666686" height="17"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                                     <nil key="highlightedColor"/>
@@ -310,7 +310,7 @@
                                         <rect key="frame" x="0.0" y="299.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" tableViewCell="OGD-zU-l0C" id="cLy-KN-ufh">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Choice" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hd9-I4-GIr">
@@ -319,7 +319,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="right" verticalHuggingPriority="251" horizontalCompressionResistancePriority="800" text="Selected" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Adh-o9-6Qx">
-                                                    <rect key="frame" x="115.00000000000001" y="13.666666666666664" width="229.33333333333337" height="17"/>
+                                                    <rect key="frame" x="115.00000000000001" y="13.666666666666664" width="230.33333333333337" height="17"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                                     <nil key="highlightedColor"/>
@@ -857,11 +857,11 @@
                                         <rect key="frame" x="0.0" y="398.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="yUI-2s-808" id="jfm-uY-49i">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Client Certificates" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cT1-QE-49w">
-                                                    <rect key="frame" x="27.999999999999993" y="13.666666666666664" width="116.33333333333331" height="17"/>
+                                                    <rect key="frame" x="28" y="13.666666666666664" width="116" height="17"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
@@ -1014,7 +1014,7 @@
                                         <rect key="frame" x="0.0" y="618.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="K1V-oh-QdT" id="Tqr-A3-HHs">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Info" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qfh-lz-UXm">
@@ -1042,7 +1042,7 @@
                                         <rect key="frame" x="0.0" y="662.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kau-YX-5Gn" id="Cya-se-2fH">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Sitemap" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mbw-pH-g4Y">
@@ -1072,7 +1072,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Crash reporting" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ai7-cr-dBg">
-                                                    <rect key="frame" x="27.999999999999993" y="13.666666666666664" width="101.33333333333331" height="17"/>
+                                                    <rect key="frame" x="28" y="13.666666666666664" width="101" height="17"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
@@ -1113,7 +1113,7 @@
                                         <rect key="frame" x="0.0" y="750.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Rk-xB-wOS" id="szB-fb-9zj">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Legal" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8c-Ps-18a">
@@ -1139,7 +1139,7 @@
                                         <rect key="frame" x="0.0" y="794.66666603088379" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gOB-5d-9fY" id="9lh-Vk-icE">
-                                            <rect key="frame" x="0.0" y="0.0" width="349.33333333333331" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="350.33333333333331" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Privacy Policy" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vcs-uN-ETx">
@@ -1158,6 +1158,38 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="CqY-mr-f6U">
+                                        <rect key="frame" x="0.0" y="838.66666603088379" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CqY-mr-f6U" id="fEM-FO-78N">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sort sitemaps by" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DBh-1C-8du">
+                                                    <rect key="frame" x="28" y="13.666666666666664" width="109" height="17"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <nil key="highlightedColor"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="sortSitemapsBy"/>
+                                                    </userDefinedRuntimeAttributes>
+                                                </label>
+                                                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="lJ2-r3-KIv">
+                                                    <rect key="frame" x="240" y="6.6666666666666679" width="109" height="32"/>
+                                                    <segments>
+                                                        <segment title="Label"/>
+                                                        <segment title="Name"/>
+                                                    </segments>
+                                                </segmentedControl>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="DBh-1C-8du" firstAttribute="centerY" secondItem="fEM-FO-78N" secondAttribute="centerY" id="HhF-CB-0w9"/>
+                                                <constraint firstItem="DBh-1C-8du" firstAttribute="leading" secondItem="fEM-FO-78N" secondAttribute="leadingMargin" constant="12" id="Jdj-v0-5sq"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="lJ2-r3-KIv" secondAttribute="trailing" constant="10" id="N5J-9i-shY"/>
+                                                <constraint firstItem="lJ2-r3-KIv" firstAttribute="centerY" secondItem="fEM-FO-78N" secondAttribute="centerY" id="hc4-AC-h3H"/>
+                                                <constraint firstItem="lJ2-r3-KIv" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="DBh-1C-8du" secondAttribute="trailing" constant="8" id="k6A-ie-StE"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                         </sections>
@@ -1180,6 +1212,7 @@
                         <outlet property="sendCrashReportsDummy" destination="Hwl-Ux-Na9" id="lEi-hM-5GB"/>
                         <outlet property="sendCrashReportsSwitch" destination="qS5-yP-H2i" id="ePn-02-tM8"/>
                         <outlet property="settingsTableView" destination="Gpo-Jj-aMP" id="w5C-jq-jO6"/>
+                        <outlet property="sortSitemapsBy" destination="lJ2-r3-KIv" id="c4A-1e-xpx"/>
                         <outlet property="usernameTextField" destination="7GO-er-lvr" id="nLw-7S-7YN"/>
                         <segue destination="VQn-En-nLm" kind="unwind" identifier="unwindToRoot" unwindAction="unwindToRootViewController:" id="Ez7-Nt-ZRa"/>
                     </connections>
@@ -1591,7 +1624,7 @@
             <objects>
                 <tableViewController id="MPp-H6-Zce" customClass="OpenHABDrawerTableViewController" customModule="openHAB" sceneMemberID="viewController">
                     <tableView key="view" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="yaQ-kw-KPl">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="758"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
@@ -1672,7 +1705,7 @@
         </designable>
     </designables>
     <inferredMetricsTieBreakers>
-        <segue reference="t07-wP-hEy"/>
+        <segue reference="z72-H1-TTm"/>
     </inferredMetricsTieBreakers>
     <resources>
         <systemColor name="groupTableViewBackgroundColor">
diff --git a/openHAB/OpenHABDrawerTableViewController.swift b/openHAB/OpenHABDrawerTableViewController.swift
index e25133ddd..ff10f4df0 100644
--- a/openHAB/OpenHABDrawerTableViewController.swift
+++ b/openHAB/OpenHABDrawerTableViewController.swift
@@ -122,8 +122,12 @@ class OpenHABDrawerTableViewController: UITableViewController {
                     self.sitemaps = Array(self.sitemaps.dropLast())
                 }
 
-                // Sort the sitemaps alphabetically.
-                self.sitemaps.sort { $0.label < $1.label }
+                // Sort the sitemaps according to Settings selection.
+                switch SortSitemapsOrder(rawValue: Preferences.sortSitemapsby) ?? .label {
+                case .label: self.sitemaps.sort { $0.label < $1.label }
+                case .name: self.sitemaps.sort { $0.name < $1.name }
+                }
+
                 self.drawerItems.removeAll()
                 if self.drawerTableType == .withStandardMenuEntries {
                     self.setStandardDrawerItems()
diff --git a/openHAB/OpenHABSettingsViewController.swift b/openHAB/OpenHABSettingsViewController.swift
index 5ade10073..670d193a1 100644
--- a/openHAB/OpenHABSettingsViewController.swift
+++ b/openHAB/OpenHABSettingsViewController.swift
@@ -28,6 +28,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
     var settingsIconType: IconType = .png
     var settingsRealTimeSliders = false
     var settingsSendCrashReports = false
+    var settingsSortSitemapsBy: SortSitemapsOrder = .label
 
     var appData: OpenHABDataObject? {
         AppDelegate.appDelegate.appData
@@ -46,6 +47,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
     @IBOutlet private var realTimeSlidersSwitch: UISwitch!
     @IBOutlet private var sendCrashReportsSwitch: UISwitch!
     @IBOutlet private var sendCrashReportsDummy: UIButton!
+    @IBOutlet private var sortSitemapsBy: UISegmentedControl!
 
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -158,7 +160,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
                 ret = 6
             }
         case 1:
-            ret = 11
+            ret = 12
         default:
             ret = 10
         }
@@ -227,6 +229,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
         realTimeSlidersSwitch?.isOn = settingsRealTimeSliders
         sendCrashReportsSwitch?.isOn = settingsSendCrashReports
         iconSegmentedControl?.selectedSegmentIndex = settingsIconType.rawValue
+        sortSitemapsBy?.selectedSegmentIndex = settingsSortSitemapsBy.rawValue
         if settingsDemomode == true {
             disableConnectionSettings()
         } else {
@@ -245,8 +248,8 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
         settingsIdleOff = Preferences.idleOff
         settingsRealTimeSliders = Preferences.realTimeSliders
         settingsSendCrashReports = Preferences.sendCrashReports
-        let rawSettingsIconType = Preferences.iconType
-        settingsIconType = IconType(rawValue: rawSettingsIconType) ?? .png
+        settingsIconType = IconType(rawValue: Preferences.iconType) ?? .png
+        settingsSortSitemapsBy = SortSitemapsOrder(rawValue: Preferences.sortSitemapsby) ?? .label
     }
 
     func updateSettings() {
@@ -262,6 +265,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
         settingsRealTimeSliders = realTimeSlidersSwitch?.isOn ?? false
         settingsSendCrashReports = sendCrashReportsSwitch?.isOn ?? false
         settingsIconType = IconType(rawValue: iconSegmentedControl.selectedSegmentIndex) ?? .png
+        settingsSortSitemapsBy = SortSitemapsOrder(rawValue: sortSitemapsBy.selectedSegmentIndex) ?? .label
     }
 
     func saveSettings() {
@@ -276,6 +280,7 @@ class OpenHABSettingsViewController: UITableViewController, UITextFieldDelegate
         Preferences.realTimeSliders = settingsRealTimeSliders
         Preferences.iconType = settingsIconType.rawValue
         Preferences.sendCrashReports = settingsSendCrashReports
+        Preferences.sortSitemapsby = settingsSortSitemapsBy.rawValue
 
         WatchMessageService.singleton.syncPreferencesToWatch()
     }
diff --git a/openHAB/OpenHABWebViewController.swift b/openHAB/OpenHABWebViewController.swift
index 6e7e5c4bc..b54c3b583 100644
--- a/openHAB/OpenHABWebViewController.swift
+++ b/openHAB/OpenHABWebViewController.swift
@@ -166,7 +166,6 @@ extension OpenHABWebViewController: WKNavigationDelegate {
 
     func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge,
                  completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-
         os_log("Challenge.protectionSpace.authtenticationMethod: %{PUBLIC}@", log: .wkwebview, type: .info, String(describing: challenge.protectionSpace.authenticationMethod))
 
         if let url = modifyUrl(orig: URL(string: openHABRootUrl)), challenge.protectionSpace.host == url.host {
diff --git a/openHAB/Resources/de.lproj/Localizable.strings b/openHAB/Resources/de.lproj/Localizable.strings
index 8ec87cb8b..47e5a480e 100644
--- a/openHAB/Resources/de.lproj/Localizable.strings
+++ b/openHAB/Resources/de.lproj/Localizable.strings
@@ -69,3 +69,5 @@
 "on" = "an";
 "off" = "aus";
 "empty" = "leer";
+"sortSitemapsBy" = "Sortiere Sitemaps nach";
+
diff --git a/openHAB/Resources/en.lproj/Localizable.strings b/openHAB/Resources/en.lproj/Localizable.strings
index b2fbb1cfc..58268beef 100644
--- a/openHAB/Resources/en.lproj/Localizable.strings
+++ b/openHAB/Resources/en.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/es.lproj/Localizable.strings b/openHAB/Resources/es.lproj/Localizable.strings
index b2fbb1cfc..58268beef 100644
--- a/openHAB/Resources/es.lproj/Localizable.strings
+++ b/openHAB/Resources/es.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/fi.lproj/Localizable.strings b/openHAB/Resources/fi.lproj/Localizable.strings
index b2fbb1cfc..58268beef 100644
--- a/openHAB/Resources/fi.lproj/Localizable.strings
+++ b/openHAB/Resources/fi.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/fr.lproj/Localizable.strings b/openHAB/Resources/fr.lproj/Localizable.strings
index 9aab5645c..d6d9234d4 100644
--- a/openHAB/Resources/fr.lproj/Localizable.strings
+++ b/openHAB/Resources/fr.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/it.lproj/Localizable.strings b/openHAB/Resources/it.lproj/Localizable.strings
index b2fbb1cfc..58268beef 100644
--- a/openHAB/Resources/it.lproj/Localizable.strings
+++ b/openHAB/Resources/it.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/nl.lproj/Localizable.strings b/openHAB/Resources/nl.lproj/Localizable.strings
index e4465ab54..49a7f9b1a 100644
--- a/openHAB/Resources/nl.lproj/Localizable.strings
+++ b/openHAB/Resources/nl.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHAB/Resources/ru.lproj/Localizable.strings b/openHAB/Resources/ru.lproj/Localizable.strings
index b2fbb1cfc..58268beef 100644
--- a/openHAB/Resources/ru.lproj/Localizable.strings
+++ b/openHAB/Resources/ru.lproj/Localizable.strings
@@ -69,3 +69,4 @@
 "on" = "on";
 "off" = "off";
 "empty" = "empty";
+"sortSitemapsBy" = "Sort sitemaps by";
diff --git a/openHABTestsSwift/OpenHABEndPoint.swift b/openHABTestsSwift/OpenHABEndPoint.swift
index 7a8ae6149..5899d3920 100644
--- a/openHABTestsSwift/OpenHABEndPoint.swift
+++ b/openHABTestsSwift/OpenHABEndPoint.swift
@@ -1,15 +1,17 @@
+// Copyright (c) 2010-2022 Contributors to the openHAB project
 //
-//  OpenHABEndPoint.swift
-//  openHABTestsSwift
+// See the NOTICE file(s) distributed with this work for additional
+// information.
 //
-//  Created by Tim Müller-Seydlitz on 10.06.22.
-//  Copyright © 2022 openHAB e.V. All rights reserved.
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0
 //
+// SPDX-License-Identifier: EPL-2.0
 
 import XCTest
 
 class OpenHABEndPoint: XCTestCase {
-
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
@@ -28,9 +30,8 @@ class OpenHABEndPoint: XCTestCase {
 
     func testPerformanceExample() throws {
         // This is an example of a performance test case.
-        self.measure {
+        measure {
             // Put the code you want to measure the time of here.
         }
     }
-
 }