diff --git a/Befund.xcodeproj/project.pbxproj b/Befund.xcodeproj/project.pbxproj index d9668a9..fc8e4ee 100644 --- a/Befund.xcodeproj/project.pbxproj +++ b/Befund.xcodeproj/project.pbxproj @@ -921,9 +921,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Befund/Befund.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; - DEVELOPMENT_TEAM = 9239XBB72R; + CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W86CN3N7WD; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Befund/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Patienten Befundapp"; @@ -936,14 +939,16 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = "de.labor-stein.Befund"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "App Store Connect Profile"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store Connect Profile"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/$(PROJECT_NAME)-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -957,9 +962,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Befund/Befund.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; - DEVELOPMENT_TEAM = 9239XBB72R; + CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = W86CN3N7WD; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Befund/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Patienten Befundapp"; @@ -972,14 +980,16 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = "de.labor-stein.Befund"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "App Store Connect Profile"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store Connect Profile"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/$(PROJECT_NAME)-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/Befund/Controllers/SettingsController.swift b/Befund/Controllers/SettingsController.swift index f6ec065..c7486c5 100644 --- a/Befund/Controllers/SettingsController.swift +++ b/Befund/Controllers/SettingsController.swift @@ -555,7 +555,7 @@ class SettingsController: UIViewController, UITextFieldDelegate, UpdatingParentC } else { - let tmp_decrypted_key = Core.Security.AES.Decrypt(value: SettingsController.Settings?.hashed_private_key ?? "", password: String( decoding:Core.Security.AES.GetKey(password: old_password), as: UTF8.self)) + let tmp_decrypted_key = Core.Security.AES.Decrypt(value: Settings?.hashed_private_key ?? "", password: String( decoding:Core.Security.AES.GetKey(password: old_password), as: UTF8.self)) if(tmp_decrypted_key != nil) { @@ -584,17 +584,17 @@ class SettingsController: UIViewController, UITextFieldDelegate, UpdatingParentC self.popupChangePWD_Status.text = "" let newPassAESkey = Core.Security.AES.GetKey(password: newPass) - let decrypted_private_key = Core.Security.AES.Decrypt(value: SettingsController.Settings?.hashed_private_key ?? "", password: String( decoding:Core.Security.AES.GetKey(password: old_password), as: UTF8.self)) + let decrypted_private_key = Core.Security.AES.Decrypt(value: Settings?.hashed_private_key ?? "", password: String( decoding:Core.Security.AES.GetKey(password: old_password), as: UTF8.self)) var requestKeyPair = Core.Security.Curve25519.GenerateKeyPair(); let changeVerificatorHash = Core.Models.Request.ChangeVerificatorHash() - changeVerificatorHash.old_verificator_hash = SettingsController.Settings?.verificator_hash + changeVerificatorHash.old_verificator_hash = Settings?.verificator_hash changeVerificatorHash.new_verificator_hash = Core.Security.SHA512.HMAC(message: Core.Security.SHA512.VerificatorHashingValue.data(using: .utf8)!, key: String(decoding: newPassAESkey, as: UTF8.self)) - changeVerificatorHash.udid = SettingsController.Settings?.udid + changeVerificatorHash.udid = Settings?.udid changeVerificatorHash.pin = pinNew @@ -660,23 +660,23 @@ class SettingsController: UIViewController, UITextFieldDelegate, UpdatingParentC let keyNewPass = Core.Security.AES.GetKey(password: newPass) - SettingsController.Settings!.password_reset_hash = NSUUID().uuidString + self.Settings!.password_reset_hash = NSUUID().uuidString - let pwdPlus = (SettingsController.Settings!.password_reset_hash ?? "") + changeVerificatorHash.pin! + let pwdPlus = (self.Settings!.password_reset_hash ?? "") + changeVerificatorHash.pin! let passwordHashKey = Core.Security.AES.GetKey( password: pwdPlus) - SettingsController.Settings!.password_hash = Core.Security.AES.Encrypt(value: newPass, password: String(decoding: passwordHashKey, as: UTF8.self)) + self.Settings!.password_hash = Core.Security.AES.Encrypt(value: newPass, password: String(decoding: passwordHashKey, as: UTF8.self)) - SettingsController.Settings!.verificator_hash = Core.Security.SHA512.HMAC( + self.Settings!.verificator_hash = Core.Security.SHA512.HMAC( message: Core.Security.SHA512.VerificatorHashingValue.data(using: .utf8)!, key: String(decoding: keyNewPass, as: UTF8.self)) - SettingsController.Settings!.hashed_private_key = Core.Security.AES.Encrypt(value: decrypted_private_key!, password: String(decoding: keyNewPass, as: UTF8.self)) + self.Settings!.hashed_private_key = Core.Security.AES.Encrypt(value: decrypted_private_key!, password: String(decoding: keyNewPass, as: UTF8.self)) - if(!SettingsController.Settings!.save(atPath: Core.System.SettingsPath())) + if(!self.Settings!.save(atPath: Core.System.SettingsPath())) { self.PasswordActivity_HideLoading(message: Core.Lang.Get(key: "ERROR_COULD_NOT_SAVE")) Core.Log.Critical(msg: "Could not save settings to the file", namespace: "SettingsController", method: "PasswordChange") diff --git a/Befund/Screens/Base.lproj/Main.storyboard b/Befund/Screens/Base.lproj/Main.storyboard index d0f3b72..9d77204 100644 --- a/Befund/Screens/Base.lproj/Main.storyboard +++ b/Befund/Screens/Base.lproj/Main.storyboard @@ -1,6 +1,6 @@ - + @@ -14,14 +14,14 @@ - + - + - + - + - + @@ -87,14 +87,13 @@ - + - - + - + - - - + - + - + - + @@ -2681,10 +2679,10 @@ - + - + @@ -2719,14 +2717,13 @@ - + - - + - +