Improved code

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -90,8 +90,8 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
 
         initializeForm()
 
-        let value = CCUtility.getTextRecognitionStatus()
-        setTextRecognition(newValue: value)
+        //let value = CCUtility.getTextRecognitionStatus()
+        //setTextRecognition(newValue: value)
     }
 
     // MARK: XLForm
@@ -328,8 +328,8 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         self.updateFormRow(rowFileName)
         self.tableView.reloadData()
 
-        CCUtility.setTextRecognitionStatus(newValue)
-        rowTextRecognition.value = newValue
+        //CCUtility.setTextRecognitionStatus(newValue)
+        //rowTextRecognition.value = newValue
 
         self.form.delegate = self
     }

iOSClient/Main/Create cloud/NCUploadScanDocument.swift

@@ -46,7 +46,6 @@ class NCUploadScanDocument: ObservableObject {
     @Published var userBaseUrl: NCUserBaseUrl
     @Published var serverUrl: String
 
-    @Published var isTextRecognition: Bool = false
     @Published var size: String = ""
     @Published var url: URL = Bundle.main.url(forResource: "Reasons to use Nextcloud", withExtension: "pdf")!
 
@@ -189,7 +188,8 @@ struct UploadScanDocumentView: View {
 
     @State var quality = 2.0
     @State var password: String = ""
-    @State var filename: String = ""
+    @State var filename: String = CCUtility.createFileNameDate("scan", extension: "pdf")
+    @State var isTextRecognition: Bool = CCUtility.getTextRecognitionStatus()
     @State var isSecured: Bool = true
     @State var isPresented = false
     @ObservedObject var uploadScanDocument: NCUploadScanDocument
@@ -261,10 +261,10 @@ struct UploadScanDocumentView: View {
                     }
 
                     HStack {
-                        Toggle(NSLocalizedString("_text_recognition_", comment: ""), isOn: $uploadScanDocument.isTextRecognition)
+                        Toggle(NSLocalizedString("_text_recognition_", comment: ""), isOn: $isTextRecognition)
                             .toggleStyle(SwitchToggleStyle(tint: Color(NCBrandColor.shared.brand)))
-                            .onChange(of: uploadScanDocument.isTextRecognition) { newValue in
-
+                            .onChange(of: isTextRecognition) { newValue in
+                                CCUtility.setTextRecognitionStatus(newValue)
                             }
                     }
                 }

iOSClient/Utility/CCUtility.h

@@ -154,8 +154,8 @@
 + (NSString *)getMediaSortDate;
 + (void)setMediaSortDate:(NSString *)value;
 
-+ (NSInteger)getTextRecognitionStatus;
-+ (void)setTextRecognitionStatus:(NSInteger)value;
++ (BOOL)getTextRecognitionStatus;
++ (void)setTextRecognitionStatus:(BOOL)value;
 + (NSString *)getDirectoryScanDocuments;
 + (void)setDirectoryScanDocuments:(NSString *)value;
 

iOSClient/Utility/CCUtility.m

@@ -593,20 +593,14 @@
     [UICKeyChainStore setString:value forKey:@"mediaSortDate" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
-+ (NSInteger)getTextRecognitionStatus
++ (BOOL)getTextRecognitionStatus
 {
-    NSString *value = [UICKeyChainStore stringForKey:@"textRecognitionStatus" service:NCGlobal.shared.serviceShareKeyChain];
-    
-    if (value == nil) {
-        return 0;
-    } else {
-        return [value integerValue];
-    }
+    return [[UICKeyChainStore stringForKey:@"textRecognitionStatus" service:NCGlobal.shared.serviceShareKeyChain] boolValue];
 }
 
-+ (void)setTextRecognitionStatus:(NSInteger)value
++ (void)setTextRecognitionStatus:(BOOL)value
 {
-    NSString *valueString = [@(value) stringValue];
+    NSString *valueString = (value) ? @"true" : @"false";
     [UICKeyChainStore setString:valueString forKey:@"textRecognitionStatus" service:NCGlobal.shared.serviceShareKeyChain];
 }