From d4f582914aa00aee0a1e15753f1f4e2592a09302 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Wed, 28 Oct 2020 15:37:40 +0100
Subject: [PATCH] Fixed persisting lastSelectedExportFolder also on iOS

---
 .../BankingiOSApp.xcdatamodel/contents                       | 3 ++-
 ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift      | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
index 54a3821e..9db108b9 100644
--- a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
+++ b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
@@ -38,6 +38,7 @@
     </entity>
     <entity name="PersistedAppSettings" representedClassName="PersistedAppSettings" syncable="YES" codeGenerationType="class">
         <attribute name="automaticallyUpdateAccountsAfterMinutes" optional="YES" attributeType="Integer 32" defaultValueString="360" usesScalarValueType="NO"/>
+        <attribute name="lastSelectedExportFolder" optional="YES" attributeType="String"/>
         <attribute name="lockAppAfterMinutes" optional="YES" attributeType="Integer 32" defaultValueString="-1" usesScalarValueType="NO"/>
         <attribute name="screenshotsAllowed" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <relationship name="flickerCodeSettings" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="PersistedTanMethodSettings"/>
@@ -109,7 +110,7 @@
     </entity>
     <elements>
         <element name="PersistedAccountTransaction" positionX="-36" positionY="45" width="128" height="553"/>
-        <element name="PersistedAppSettings" positionX="-45" positionY="144" width="128" height="133"/>
+        <element name="PersistedAppSettings" positionX="-45" positionY="144" width="128" height="148"/>
         <element name="PersistedBankAccount" positionX="-54" positionY="63" width="128" height="418"/>
         <element name="PersistedBankData" positionX="-63" positionY="-18" width="128" height="298"/>
         <element name="PersistedTanMedium" positionX="-45" positionY="144" width="128" height="28"/>
diff --git a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
index 6983aca3..89a1bef2 100644
--- a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
@@ -324,7 +324,8 @@ class Mapper {
             screenshotsAllowed: settings.screenshotsAllowed,
             flickerCodeSettings: map(settings.flickerCodeSettings),
             qrCodeSettings: map(settings.qrCodeSettings),
-            photoTanSettings: map(settings.photoTanSettings))
+            photoTanSettings: map(settings.photoTanSettings),
+            lastSelectedExportFolder: settings.lastSelectedExportFolder)
         
         mapped.technicalId = settings.objectIDAsString
 
@@ -342,6 +343,8 @@ class Mapper {
         mapped.qrCodeSettings = map(settings.qrCodeSettings, context)
         mapped.photoTanSettings = map(settings.photoTanSettings, context)
         
+        mapped.lastSelectedExportFolder = settings.lastSelectedExportFolder
+        
         return mapped
     }