it-as
/
patbef-iOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commt

This commit is contained in:
Artur Savitskiy 2024-06-14 15:07:14 +02:00
parent 195486b149
commit 5da328a03b
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Befund.xcodeproj/project.pbxproj
View File

@ -929,7 +929,7 @@
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = W86CN3N7WD;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD;
GENERATE_INFOPLIST_FILE = YES;
@ -971,7 +971,7 @@
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = W86CN3N7WD;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W86CN3N7WD;
GENERATE_INFOPLIST_FILE = YES;

2
Befund/Controllers/SettingsController.swift
View File

@ -425,7 +425,7 @@ class SettingsController: UIViewController, UITextFieldDelegate, UpdatingParentC
@IBAction func ButtonAGBOpenClick(_ sender: Any)
{
let localUrl = Core.Lang.Get(key: "AGB_POLICY_LINK")
let settingsAGBController = AGBPolicyController.InitWebViewController(url: localUrl, previewOnly: true, btnText: Core.Lang.Get(key: "BTN_BACK"), labText: "Datenschutzerklärung")
let settingsAGBController = AGBPolicyController.InitWebViewController(url: localUrl, previewOnly: true, btnText: Core.Lang.Get(key: "BTN_BACK"), labText: Core.Lang.Get(key: "LBL_PRIVACY_POLICY"))
settingsAGBController.modalPresentationStyle = .fullScreen
let transition = CATransition()

5
Befund/Controllers/SupportController.swift
View File

@ -89,6 +89,11 @@ class SupportController: UIViewController, UITextFieldDelegate, UIAlertViewDeleg
self.topicDownPicker = DownPicker(textField: self.support_txtTopic, withData: (SupportTopicsUnregistered as! [Any]))
}
self.topicDownPicker.setPlaceholder(Core.Lang.Get(key: "LBL_PLEASE_SELECT"))
self.topicDownPicker.setPlaceholderWhileSelecting(Core.Lang.Get(key: "LBL_PLEASE_SELECT"))
self.topicDownPicker.setToolbarDoneButtonText(Core.Lang.Get(key: "BTN_DONE"))
self.topicDownPicker.setToolbarCancelButtonText(Core.Lang.Get(key: "BTN_CANCEL"))
self.supportPassword_Overlay.frame = self.view.frame
self.view.addSubview(self.supportPassword_Overlay)
self.supportPassword_Overlay.isHidden = true

17
Befund/Core/Models/Settings.swift
View File

@ -11,6 +11,7 @@ extension Core.Models
{
public class Settings
{
public static var policyAgbExplainedKey: String = "policy_accepted_1_2_3"
public var public_key: String? = nil
public var hashed_private_key: String? = nil
public var verificator_hash: String? = nil
@ -141,7 +142,7 @@ extension Core.Models
result?.pushNotificationAccepted = false
}
let AGBAccepted = dic!.value(forKey: "agb_accepted")
let AGBAccepted = dic!.value(forKey: policyAgbExplainedKey)
if (AGBAccepted != nil)
{
result?.policyAGBExplained = ((AGBAccepted as? NSNumber)!).boolValue
@ -150,23 +151,9 @@ extension Core.Models
{
result?.policyAGBExplained = false
}
//let host = dic!.value(forKey: "host")
//if(host != nil)
//{
//result!.host = Core.Https.Servers(rawValue: host as! String)!
//}
//result!.host = .LABOR_HANNOVER
}
}
//if(result != nil &&
// (result!.public_key == nil || result!.hashed_private_key == nil || result!.verificator_hash == nil))
//{
// result = nil
//}
return result
}

2
Befund/Info.plist
View File

@ -8,7 +8,7 @@
<string>en</string>
</array>
<key>LSMinimumSystemVersion</key>
<string>12.5</string>
<string>13.0</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>