Skip to content
This repository was archived by the owner on Apr 13, 2026. It is now read-only.

Commit 9119d0f

Browse files
metsmametsma
committed
Settings
Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 84a1936 commit 9119d0f

15 files changed

Lines changed: 624 additions & 51 deletions

‎MoppApp/MoppApp.xcodeproj/project.pbxproj‎

Lines changed: 139 additions & 15 deletions
Large diffs are not rendered by default.

‎MoppApp/MoppApp.xcodeproj/xcshareddata/xcschemes/MoppApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎MoppApp/MoppApp.xcodeproj/xcshareddata/xcschemes/MoppAppTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎MoppApp/MoppApp.xcodeproj/xcshareddata/xcschemes/shareExtension.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1620"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎MoppApp/MoppApp/ContainerActions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ extension ContainerActions where Self: UIViewController {
324324
if landingViewController.containerType == .asic {
325325
containerFilename = FileUtil.getFileName(currentFileName: filename) + "." + DefaultContainerFormat
326326
} else {
327-
containerFilename = FileUtil.getFileName(currentFileName: filename) + "." + ContainerFormatCdoc
327+
containerFilename = FileUtil.getFileName(currentFileName: filename) + "." + (DefaultsHelper.useCDoc2Encryption ? ContainerFormatCdoc2 : ContainerFormatCdoc)
328328
}
329329

330330
var containerPath = MoppFileManager.shared.filePath(withFileName: containerFilename)

‎MoppApp/MoppApp/ContainerViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ extension ContainerViewController : ContainerHeaderDelegate {
850850
private func asicContainerExists(container: MoppLibContainer?) -> Bool {
851851
guard let signingContainer = container,
852852
!signingContainer.filePath.isEmpty,
853-
URL(fileURLWithPath: signingContainer.filePath).pathExtension != ContainerFormatCdoc else {
853+
!URL(fileURLWithPath: signingContainer.filePath).pathExtension.isCryptoContainerExtension else {
854854
return false
855855
}
856856

@@ -860,7 +860,7 @@ extension ContainerViewController : ContainerHeaderDelegate {
860860
private func cdocContainerExists(container: CryptoContainer?) -> Bool {
861861
guard let cryptoContainer = container,
862862
!cryptoContainer.filePath.isEmpty,
863-
URL(fileURLWithPath: cryptoContainer.filePath).pathExtension == ContainerFormatCdoc else {
863+
URL(fileURLWithPath: cryptoContainer.filePath).pathExtension.isCryptoContainerExtension else {
864864
return false
865865
}
866866

@@ -919,7 +919,7 @@ extension ContainerViewController : ContainerHeaderDelegate {
919919
return
920920
}
921921

922-
let isContainerCdoc: Bool = containerExtension == ContainerFormatCdoc
922+
let isContainerCdoc: Bool = containerExtension.isCryptoContainerExtension
923923

924924
guard let newContainerPath: URL = self.getNewContainerUrlPath(isContainerCdoc: isContainerCdoc, asicContainer: asicContainer, cdocContainer: cdocContainer, newContainerName: textFieldText, containerExtension: containerExtension), newContainerPath.isFileURL else {
925925
printLog("Failed to get container path")

‎MoppApp/MoppApp/DefaultsHelper.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import Foundation
2525
import SkSigningLib
26+
import MoppUI
2627

2728
let ContainerFormatAdoc = "adoc"
2829
let ContainerFormatBdoc = "bdoc"
@@ -391,4 +392,13 @@ class DefaultsHelper
391392
return UserDefaults.standard.bool(forKey: kNfcShowCanMessage)
392393
}
393394
}
395+
396+
class var useCDoc2Encryption: Bool {
397+
set {
398+
UserDefaults.standard.set(newValue, forKey: kUseCDoc2Encryption)
399+
}
400+
get {
401+
return UserDefaults.standard.bool(forKey: kUseCDoc2Encryption)
402+
}
403+
}
394404
}

‎MoppApp/MoppApp/FileManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class MoppFileManager {
276276
completionHandler(true, saveTempFileToLocation)
277277
return
278278
}, failure: { (error) in
279-
printLog("Failed to save file. Error: \(error.localizedDescription ?? "No error to display")")
279+
printLog("Failed to save file. Error: \(error.localizedDescription)")
280280
completionHandler(false, nil)
281281
return
282282
})

‎MoppApp/MoppApp/Info.plist‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
77
<key>CFBundleDisplayName</key>
88
<string>RIA DigiDoc</string>
99
<key>CFBundleDocumentTypes</key>
@@ -198,6 +198,21 @@
198198
<string>public.data</string>
199199
</array>
200200
</dict>
201+
<dict>
202+
<key>CFBundleIconFiles</key>
203+
<array>
204+
<string>digidoc_76.png</string>
205+
<string>digidoc_1024.png</string>
206+
</array>
207+
<key>CFBundleTypeName</key>
208+
<string>DigiDoc file cdoc2</string>
209+
<key>LSHandlerRank</key>
210+
<string>Owner</string>
211+
<key>LSItemContentTypes</key>
212+
<array>
213+
<string>ee.ria.digidoc-cdoc2</string>
214+
</array>
215+
</dict>
201216
</array>
202217
<key>CFBundleExecutable</key>
203218
<string>$(EXECUTABLE_NAME)</string>
@@ -234,8 +249,6 @@
234249
<true/>
235250
<key>LSSupportsOpeningDocumentsInPlace</key>
236251
<true/>
237-
<key>NFCReaderUsageDescription</key>
238-
<string>This app uses NFC to scan ID-cards</string>
239252
<key>NSAppTransportSecurity</key>
240253
<dict>
241254
<key>NSExceptionDomains</key>
@@ -252,6 +265,8 @@
252265
</dict>
253266
</dict>
254267
</dict>
268+
<key>NFCReaderUsageDescription</key>
269+
<string>This app uses NFC to scan ID-cards</string>
255270
<key>NSBluetoothAlwaysUsageDescription</key>
256271
<string>Bluetooth card reader is used to read data from ID card</string>
257272
<key>NSBluetoothPeripheralUsageDescription</key>
@@ -286,7 +301,7 @@
286301
<string>LaunchScreen</string>
287302
<key>UIRequiredDeviceCapabilities</key>
288303
<array>
289-
<string>armv7</string>
304+
<string>arm64</string>
290305
</array>
291306
<key>UIStatusBarStyle</key>
292307
<string>UIStatusBarStyleDarkContent</string>
@@ -713,6 +728,35 @@
713728
</array>
714729
</dict>
715730
</dict>
731+
<dict>
732+
<key>CFBundleIconFiles</key>
733+
<array>
734+
<string>digidoc_76.png</string>
735+
<string>digidoc_1024.png</string>
736+
</array>
737+
<key>UTTypeConformsTo</key>
738+
<array>
739+
<string>public.data</string>
740+
</array>
741+
<key>UTTypeDescription</key>
742+
<string>DigiDoc Container cdoc2</string>
743+
<key>UTTypeIconFiles</key>
744+
<array/>
745+
<key>UTTypeIdentifier</key>
746+
<string>ee.ria.digidoc-cdoc2</string>
747+
<key>UTTypeTagSpecification</key>
748+
<dict>
749+
<key>public.filename-extension</key>
750+
<array>
751+
<string>cdoc2</string>
752+
<string>CDOC2</string>
753+
</array>
754+
<key>public.mime-type</key>
755+
<array>
756+
<string>application/x-cdoc2</string>
757+
</array>
758+
</dict>
759+
</dict>
716760
</array>
717761
<key>UTImportedTypeDeclarations</key>
718762
<array>
@@ -1095,6 +1139,36 @@
10951139
</array>
10961140
</dict>
10971141
</dict>
1142+
<dict>
1143+
<key>CFBundleIconFiles</key>
1144+
<array>
1145+
<string>digidoc_76.png</string>
1146+
<string>digidoc_1024.png</string>
1147+
</array>
1148+
<key>UTTypeConformsTo</key>
1149+
<array>
1150+
<string>public.data</string>
1151+
<string>public.cdoc2</string>
1152+
</array>
1153+
<key>UTTypeDescription</key>
1154+
<string>Digidoc Container cdoc2</string>
1155+
<key>UTTypeIconFiles</key>
1156+
<array/>
1157+
<key>UTTypeIdentifier</key>
1158+
<string>ee.ria.digidoc</string>
1159+
<key>UTTypeTagSpecification</key>
1160+
<dict>
1161+
<key>public.filename-extension</key>
1162+
<array>
1163+
<string>cdoc2</string>
1164+
<string>CDOC2</string>
1165+
</array>
1166+
<key>public.mime-type</key>
1167+
<array>
1168+
<string>application/x-cdoc2</string>
1169+
</array>
1170+
</dict>
1171+
</dict>
10981172
</array>
10991173
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
11001174
<array>

‎MoppApp/MoppApp/MimeTypeExtractor.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class MimeTypeExtractor {
255255
var isCdoc: Bool = false
256256

257257
MimeTypeDecoder().getMimeType(fileString: fileDataAscii ?? "") { (containerExtension) in
258-
if containerExtension == ContainerFormatCdoc {
258+
if containerExtension.isCryptoContainerExtension {
259259
isCdoc = true
260260
}
261261
}

0 commit comments

Comments
 (0)