Merge pull request #333 from NordicSemiconductor/develop

Version 3.1.0, build 2
NordicSemiconductor · Mar 1, 2021 · 3eff287 · 3eff287
2 parents e72c37a + b2e31f3
commit 3eff287
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Example/nRFMeshProvision.xcodeproj/project.pbxproj b/Example/nRFMeshProvision.xcodeproj/project.pbxproj
@@ -1356,7 +1356,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = nRFMeshProvision/Info.plist;
@@ -1383,7 +1383,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = nRFMeshProvision/Info.plist;

diff --git a/Example/nRFMeshProvision/View Controllers/Settings/EditKeyViewController.swift b/Example/nRFMeshProvision/View Controllers/Settings/EditKeyViewController.swift
@@ -127,7 +127,7 @@ class EditKeyViewController: UITableViewController {
         case IndexPath.keySection where isApplicationKey:
             return 3 // Key, Old Key, Key Index
         case IndexPath.keySection:
-            return 5 // Key, Old Key, Key Index, Phase, Last modified
+            return isNewKey ? 3 : 5 // Key, Old Key, Key Index [, Phase, Last modified ]
         case IndexPath.boundKeySection:
             let network = MeshNetworkManager.instance.meshNetwork!
             return network.networkKeys.count
@@ -191,8 +191,8 @@ class EditKeyViewController: UITableViewController {
         } else if indexPath.isLastModified {
             cell = tableView.dequeueReusableCell(withIdentifier: "detailCell", for: indexPath)
             cell.textLabel?.text = "Last Modified"
-            let timestamp = (key as! NetworkKey).timestamp
-            cell.detailTextLabel?.text = dateFormatter.string(from: timestamp)
+            let timestamp = (key as? NetworkKey)?.timestamp
+            cell.detailTextLabel?.text = timestamp.map { dateFormatter.string(from: $0) } ?? "N/A"
             cell.selectionStyle = .none
         } else {
             let networkKey = network.networkKeys[indexPath.row]