Marino Faggiana 8 жил өмнө
parent
commit
fcce704879

+ 0 - 12
Nextcloud.xcodeproj/project.pbxproj

@@ -358,7 +358,6 @@
 		F77B0E8C1D118A16002130FE /* ReaderConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0EB81C889317008DAB36 /* ReaderConstants.m */; };
 		F77B0E8D1D118A16002130FE /* LMMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0F3E1C889339008DAB36 /* LMMediaPlayer.m */; };
 		F77B0E8F1D118A16002130FE /* CCSection.m in Sources */ = {isa = PBXBuildFile; fileRef = F78F6FAF1CC8CCB700F4EA25 /* CCSection.m */; };
-		F77B0E901D118A16002130FE /* CCManageHelp.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FEB6CF1BECADC100E7C415 /* CCManageHelp.m */; };
 		F77B0E911D118A16002130FE /* CCTemplates.m in Sources */ = {isa = PBXBuildFile; fileRef = F72137301BAFF0920012B613 /* CCTemplates.m */; };
 		F77B0E921D118A16002130FE /* CCCellMainTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = F70211F81BAC56E9003FC03E /* CCCellMainTransfer.m */; };
 		F77B0E951D118A16002130FE /* CCManageAsset.m in Sources */ = {isa = PBXBuildFile; fileRef = F7BFCCBF1B68C21900548E76 /* CCManageAsset.m */; };
@@ -382,7 +381,6 @@
 		F77B0EB91D118A16002130FE /* HRColorUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0DEC1C889300008DAB36 /* HRColorUtil.m */; };
 		F77B0EBE1D118A16002130FE /* CCNote.m in Sources */ = {isa = PBXBuildFile; fileRef = F721372A1BAFF0920012B613 /* CCNote.m */; };
 		F77B0EBF1D118A16002130FE /* RNEncryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F053B1C889184008DAB36 /* RNEncryptor.m */; };
-		F77B0EC21D118A16002130FE /* CCManageOptimizations.m in Sources */ = {isa = PBXBuildFile; fileRef = F7AB79F01BB1A3AD00A82F32 /* CCManageOptimizations.m */; };
 		F77B0EC31D118A16002130FE /* UIImage+Enhancing.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F04C21C889184008DAB36 /* UIImage+Enhancing.m */; };
 		F77B0EC61D118A16002130FE /* CCCellMain.m in Sources */ = {isa = PBXBuildFile; fileRef = F70211F51BAC56E9003FC03E /* CCCellMain.m */; };
 		F77B0EC71D118A16002130FE /* AESCrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F02AB1C889183008DAB36 /* AESCrypt.m */; };
@@ -1484,8 +1482,6 @@
 		F7A54C351C6267B500E2C8BF /* CCExifGeo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCExifGeo.m; sourceTree = "<group>"; };
 		F7A582D61A24DAB500E903D7 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AppDelegate.m; sourceTree = "<group>"; };
 		F7A582D71A24DAB500E903D7 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AppDelegate.h; sourceTree = "<group>"; };
-		F7AB79EF1BB1A3AD00A82F32 /* CCManageOptimizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCManageOptimizations.h; sourceTree = "<group>"; };
-		F7AB79F01BB1A3AD00A82F32 /* CCManageOptimizations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCManageOptimizations.m; sourceTree = "<group>"; };
 		F7ACE4291BAC0268006C0017 /* Acknowledgements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Acknowledgements.h; sourceTree = "<group>"; };
 		F7ACE42A1BAC0268006C0017 /* Acknowledgements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Acknowledgements.m; sourceTree = "<group>"; };
 		F7ACE42B1BAC0268006C0017 /* Acknowledgements.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Acknowledgements.rtf; sourceTree = "<group>"; };
@@ -1699,8 +1695,6 @@
 		F7FE125D1BAC03FB0041924B /* CCBKPasscode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBKPasscode.m; sourceTree = "<group>"; };
 		F7FE125E1BAC03FB0041924B /* CCCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCrypto.h; sourceTree = "<group>"; };
 		F7FE125F1BAC03FB0041924B /* CCCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCrypto.m; sourceTree = "<group>"; };
-		F7FEB6CE1BECADC100E7C415 /* CCManageHelp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCManageHelp.h; sourceTree = "<group>"; };
-		F7FEB6CF1BECADC100E7C415 /* CCManageHelp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCManageHelp.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -3000,10 +2994,6 @@
 				F7F6AC4D1E525AD300E8EB45 /* CCManageCryptoCloud.m */,
 				F73C002D1E55D7DF00EEEFA7 /* CCManageCryptoCloudSecurity.h */,
 				F73C002E1E55D7DF00EEEFA7 /* CCManageCryptoCloudSecurity.m */,
-				F7FEB6CE1BECADC100E7C415 /* CCManageHelp.h */,
-				F7FEB6CF1BECADC100E7C415 /* CCManageHelp.m */,
-				F7AB79EF1BB1A3AD00A82F32 /* CCManageOptimizations.h */,
-				F7AB79F01BB1A3AD00A82F32 /* CCManageOptimizations.m */,
 				F7A321AB1E9E6AD50069AD1B /* CCAdvanced.h */,
 				F7A321AC1E9E6AD50069AD1B /* CCAdvanced.m */,
 				F7ACE4301BAC0268006C0017 /* CCSettings.h */,
@@ -4297,7 +4287,6 @@
 				F77B0E8D1D118A16002130FE /* LMMediaPlayer.m in Sources */,
 				F77B0E8F1D118A16002130FE /* CCSection.m in Sources */,
 				F72AAECB1E5C60C700BB17E1 /* AHKActionSheetViewController.m in Sources */,
-				F77B0E901D118A16002130FE /* CCManageHelp.m in Sources */,
 				F77B0E911D118A16002130FE /* CCTemplates.m in Sources */,
 				F73CCDE11DC13776007E38D8 /* XLFormDatePickerCell.m in Sources */,
 				F72AAECD1E5C60C700BB17E1 /* UIWindow+AHKAdditions.m in Sources */,
@@ -4366,7 +4355,6 @@
 				F7F54D0D1E5B14C800E19C62 /* MWZoomingScrollView.m in Sources */,
 				F7F06EAD1DBFACC600099AE9 /* CTAssetSelectionLabel.m in Sources */,
 				F7659A701DC0B760004860C4 /* PSTGridLayoutSection.m in Sources */,
-				F77B0EC21D118A16002130FE /* CCManageOptimizations.m in Sources */,
 				F77B0EC31D118A16002130FE /* UIImage+Enhancing.m in Sources */,
 				F77B0EC61D118A16002130FE /* CCCellMain.m in Sources */,
 				F77B0EC71D118A16002130FE /* AESCrypt.m in Sources */,

+ 4 - 109
iOSClient/Main/Main.storyboard

@@ -48,17 +48,12 @@
                     <navigationItem key="navigationItem" id="1CO-Ie-Aaj"/>
                     <connections>
                         <segue destination="eZl-ut-xpC" kind="presentation" identifier="AcknowledgementsSegue" modalPresentationStyle="formSheet" id="J9C-Ex-Q6i"/>
-                        <segue destination="EIj-cr-7fd" kind="show" identifier="CCManageAccountSegue" id="u0T-X2-SEH"/>
                         <segue destination="DEi-yz-wEj" kind="show" identifier="CCManageCameraUploadSegue" id="Aij-5E-cNN"/>
-                        <segue destination="sOS-YU-Cbr" kind="show" identifier="CCManageOptimizationsSegue" id="JoS-OK-Poe"/>
-                        <segue destination="gTd-HL-PVY" kind="show" identifier="CCManageSynchronizationsSegue" id="MsD-Ag-XH5"/>
-                        <segue destination="HU7-az-TgV" kind="show" identifier="CCManageHelpSegue" id="bfB-KM-85a"/>
-                        <segue destination="Zc0-jh-3hD" kind="show" identifier="CCManageCryptoCloudSegue" id="BZx-hA-Ydj"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wVn-RD-GD2" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="12524" y="1218"/>
+            <point key="canvasLocation" x="11844" y="1218"/>
         </scene>
         <!--More-->
         <scene sceneID="Mdr-ch-zRI">
@@ -341,7 +336,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="TUv-7S-62D" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="12511" y="3246"/>
+            <point key="canvasLocation" x="13490" y="1218"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="eDq-6m-h8d">
@@ -360,47 +355,7 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="38M-dR-dlY" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="12511" y="2476"/>
-        </scene>
-        <!--Manage Account-->
-        <scene sceneID="OhO-6f-Vhc">
-            <objects>
-                <viewController id="EIj-cr-7fd" customClass="CCManageAccount" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="uyJ-km-0gk"/>
-                        <viewControllerLayoutGuide type="bottom" id="hEi-St-jlW"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="dTI-9C-Bf2">
-                        <rect key="frame" x="0.0" y="64" width="375" height="554"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" id="I4M-0q-oPz"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="EDa-LU-0rn" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="14583" y="2476"/>
-        </scene>
-        <!--Manage Crypto Cloud-->
-        <scene sceneID="cbW-au-eCe">
-            <objects>
-                <viewController id="Zc0-jh-3hD" customClass="CCManageCryptoCloud" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Mj6-7r-ybC"/>
-                        <viewControllerLayoutGuide type="bottom" id="qyW-zc-26J"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="y8W-PN-QtS">
-                        <rect key="frame" x="0.0" y="64" width="375" height="554"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" id="Hhs-Wj-nLB"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ksn-Ew-8Z0" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="13881" y="2472"/>
+            <point key="canvasLocation" x="12676" y="1218"/>
         </scene>
         <!--Manage Camera Upload-->
         <scene sceneID="YAa-hT-VHe">
@@ -420,27 +375,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="g5a-uE-sF6" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="13183" y="2476"/>
-        </scene>
-        <!--Manage Optimizations-->
-        <scene sceneID="dOW-Mw-bEM">
-            <objects>
-                <viewController id="sOS-YU-Cbr" customClass="CCManageOptimizations" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="tze-zu-iin"/>
-                        <viewControllerLayoutGuide type="bottom" id="MYl-TL-mVB"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="DkJ-LZ-yPy">
-                        <rect key="frame" x="0.0" y="64" width="375" height="554"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" id="f9e-Aq-ViU"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="0UA-CF-A4C" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="11145" y="2476"/>
+            <point key="canvasLocation" x="11844" y="2006"/>
         </scene>
         <!--Main Tab Bar Controller-->
         <scene sceneID="gY3-Ur-rTC">
@@ -658,46 +593,6 @@
             </objects>
             <point key="canvasLocation" x="8572" y="327"/>
         </scene>
-        <!--Manage Synchronizations-->
-        <scene sceneID="rlM-Pz-rta">
-            <objects>
-                <viewController id="gTd-HL-PVY" customClass="CCManageSynchronizations" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="9Kq-b8-Bh8"/>
-                        <viewControllerLayoutGuide type="bottom" id="uoD-Vb-rfP"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="cO8-G4-hHt">
-                        <rect key="frame" x="0.0" y="64" width="375" height="554"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" id="XMM-MK-ZBM"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="2YG-G9-yyB" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="11865" y="2476"/>
-        </scene>
-        <!--Manage Help-->
-        <scene sceneID="Kwp-bi-zU9">
-            <objects>
-                <viewController id="HU7-az-TgV" customClass="CCManageHelp" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="q5t-Kt-Dku"/>
-                        <viewControllerLayoutGuide type="bottom" id="wiG-3f-6XF"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="LNE-IV-JjC">
-                        <rect key="frame" x="0.0" y="64" width="375" height="554"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" id="Zzl-Z4-6Qp"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="oeH-9e-IVz" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="10463" y="2472"/>
-        </scene>
         <!--Navigation Controller-->
         <scene sceneID="cip-AF-Ks2">
             <objects>

+ 40 - 0
iOSClient/Settings/CCAdvanced.m

@@ -67,6 +67,28 @@
     row.action.formSelector = @selector(clearActivity:);
     [section addFormRow:row];
     
+    // Section OTTIMIZATIONS -------------------------------------------------
+    
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_optimized_photos_", nil)];
+    [form addFormSection:section];
+    section.footerTitle = NSLocalizedString(@"_optimized_photos_how_", nil);
+    
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"optimizedphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_optimized_photos_", nil)];
+    if ([CCUtility getOptimizedPhoto]) row.value = @"1";
+    else row.value = @"0";
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [section addFormRow:row];
+    
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_upload_del_photos_", nil)];
+    [form addFormSection:section];
+    section.footerTitle = [CCUtility localizableBrand:@"_upload_del_photos_how_" table:nil];
+    
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"uploadremovephoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_del_photos_", nil)];
+    if ([CCUtility getUploadAndRemovePhoto]) row.value = @"1";
+    else row.value = @"0";
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [section addFormRow:row];
+
     // Section CLEAR CACHE -------------------------------------------------
     
     section = [XLFormSectionDescriptor formSection];
@@ -125,6 +147,24 @@
         // Clear Date read Activity for force reload datasource
         app.activeActivity.storeDateFirstActivity = nil;
     }
+    
+    if ([rowDescriptor.tag isEqualToString:@"optimizedphoto"]) {
+        
+        if ([[rowDescriptor.value valueData] boolValue] == YES) {
+            [CCUtility setOptimizedPhoto:YES];
+        } else {
+            [CCUtility setOptimizedPhoto:NO];
+        }
+    }
+    
+    if ([rowDescriptor.tag isEqualToString:@"uploadremovephoto"]) {
+        
+        if ([[rowDescriptor.value valueData] boolValue] == YES) {
+            [CCUtility setUploadAndRemovePhoto:YES];
+        } else {
+            [CCUtility setUploadAndRemovePhoto:NO];
+        }
+    }
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 2 - 13
iOSClient/Settings/CCManageAccount.m

@@ -40,20 +40,9 @@
 }
 @end
 
-
 @implementation CCManageAccount
 
--  (id)initWithCoder:(NSCoder *)aDecoder
-{
-    if (self = [super initWithCoder:aDecoder])  {
-        
-        [self initializeForm];
-    }
-    
-    return self;
-}
-
-- (void)initializeForm
+-(id)init
 {
     XLFormDescriptor *form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_credentials_", nil)];
     XLFormSectionDescriptor *section;
@@ -105,7 +94,7 @@
     if (listAccount.count == 0) row.disabled = @YES;
     [section addFormRow:row];
     
-    self.form = form;
+    return [super initWithForm:form];
 }
 
 // Apparirà

+ 2 - 23
iOSClient/Settings/CCManageCryptoCloud.m

@@ -26,19 +26,7 @@
 
 @implementation CCManageCryptoCloud
 
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    
-    if (self) {
-        
-        [self initializeForm];
-    }
-    
-    return self;
-}
-
-- (void)initializeForm
+-(id)init
 {
     XLFormDescriptor *form ;
     XLFormSectionDescriptor *section;
@@ -73,16 +61,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    self.form = form;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    return [super initWithForm:form];
 }
 
 // Apparirà

+ 0 - 32
iOSClient/Settings/CCManageHelp.h

@@ -1,32 +0,0 @@
-//
-//  CCManageHelp.h
-//  Crypto Cloud Technology Nextcloud
-//
-//  Created by Marino Faggiana on 06/11/15.
-//  Copyright (c) 2014 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import "XLFormViewController.h"
-#import "XLForm.h"
-#import "CCIntro.h"
-
-@interface CCManageHelp : XLFormViewController <CCIntroDelegate, MFMailComposeViewControllerDelegate>
-
-@property (nonatomic, strong) CCIntro *intro;
-
-@end

+ 0 - 259
iOSClient/Settings/CCManageHelp.m

@@ -1,259 +0,0 @@
-//
-//  CCManageHelp.m
-//  Crypto Cloud Technology Nextcloud
-//
-//  Created by Marino Faggiana on 06/11/15.
-//  Copyright (c) 2014 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import "CCManageHelp.h"
-#import "CCUtility.h"
-#import "AppDelegate.h"
-
-@interface CCManageHelp ()
-
-@end
-
-@implementation CCManageHelp
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    
-    if (self) {
-        
-        [self initializeForm];
-    }
-    
-    return self;
-}
-
-- (void)initializeForm
-{
-    XLFormDescriptor *form ;
-    XLFormSectionDescriptor *section;
-    XLFormRowDescriptor *row;
-    
-    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_help_", nil)];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_help_tutorial_", nil)];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"intro" rowType:XLFormRowDescriptorTypeButton title:[CCUtility localizableBrand:@"_help_intro_" table:nil]];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsIntroduction] forKey:@"imageView.image"];
-    row.action.formSelector = @selector(intro:);
-    [section addFormRow:row];
-
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_help_activity_section_", nil)];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"activityVerboseHigh" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_help_activity_verbose_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsActivityHigh] forKey:@"imageView.image"];
-    if ([CCUtility getActivityVerboseHigh]) row.value = @"1";
-    else row.value = @"0";
-    [section addFormRow:row];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendMailActivity" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_activity_mail_", nil)];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsSendActivity] forKey:@"imageView.image"];
-    row.action.formSelector = @selector(sendMail:);
-    [section addFormRow:row];
-
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"clearActivityLog" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_activity_clear_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsClearActivity] forKey:@"imageView.image"];
-    row.action.formSelector = @selector(clearActivity:);
-    [section addFormRow:row];
-
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    self.form = form;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
-    
-    // Intro
-    self.intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.splitViewController.view];
-}
-
-// Apparirà
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
-}
-
-- (void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue
-{
-    [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
-    
-    if ([rowDescriptor.tag isEqualToString:@"activityVerboseHigh"]) {
-        
-        if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            [CCUtility setActivityVerboseHigh:true];
-        } else {
-            [CCUtility setActivityVerboseHigh:false];
-        }
-        
-        // Clear Date read Activity for force reload datasource
-        app.activeActivity.storeDateFirstActivity = nil;
-    }
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark === Intro ===
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)intro:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroCryptoCloud:0.1];
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark === Mail ===
-#pragma --------------------------------------------------------------------------------------------
-
-- (void) mailComposeController:(MFMailComposeViewController *)vc didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error
-{
-    switch (result)
-    {
-        case MFMailComposeResultCancelled:
-            [app messageNotification:@"_info_" description:@"_mail_deleted_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
-            break;
-        case MFMailComposeResultSaved:
-            [app messageNotification:@"_info_" description:@"_mail_saved_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
-            break;
-        case MFMailComposeResultSent:
-            [app messageNotification:@"_info_" description:@"_mail_sent_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
-            break;
-        case MFMailComposeResultFailed: {
-            NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"_mail_failure_", nil), [error localizedDescription]];
-            [app messageNotification:@"_error_" description:msg visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
-        }
-            break;
-        default:
-            break;
-    }
-    
-    // Close the Mail Interface
-    [self dismissViewControllerAnimated:YES completion:NULL];
-}
-
-- (void)sendMail:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    // Email Subject
-    NSString *emailTitle = NSLocalizedString(@"_information_req_", nil);
-    // Email Content
-    NSString *messageBody;
-    // File Attachment
-    NSString *fileAttachment = @"";
-    // Email Recipents
-    NSArray *toRecipents;
-    
-    NSArray *activities = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount]];
-    
-    if ([activities count] == 0) {
-        
-        [app messageNotification:@"_info_" description:@"No activity found" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
-        return;
-    }
-    
-    for (TableActivity *activity in activities) {
-        
-        NSString *date, *type, *actionFile, *note;
-        
-        date = [[NSDateFormatter localizedStringFromDate:activity.date dateStyle:NSDateFormatterShortStyle timeStyle:NSDateFormatterMediumStyle] stringByPaddingToLength:22 withString:@" " startingAtIndex:0];
-        
-        if ([activity.type isEqual: k_activityTypeInfo])    type = @"Info   ";
-        if ([activity.type isEqual: k_activityTypeSuccess]) type = @"Success";
-        if ([activity.type isEqual: k_activityTypeFailure]) type = @"Failure";
-        
-        actionFile = [[NSString stringWithFormat:@"%@ %@", activity.action, activity.file] stringByPaddingToLength:100 withString:@" " startingAtIndex:0];
-        
-        if (activity.idActivity == 0) note = [NSString stringWithFormat:@"%@ Selector: %@", activity.note, activity.selector];
-        else note = activity.note;
-        note = [note stringByPaddingToLength:200 withString:@" " startingAtIndex:0];
-        
-        fileAttachment = [fileAttachment stringByAppendingString:[NSString stringWithFormat:@"| %@ | %@ | %@ | %@ |\n", date, type, actionFile, note]];
-    }
-    
-    messageBody = [NSString stringWithFormat:@"\n\n\n%@ Version %@ (%@)", k_brand,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
-    
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documentsDirectory = [paths objectAtIndex:0];
-    NSError *error;
-    
-    if ([fileAttachment writeToFile:[documentsDirectory stringByAppendingPathComponent:@"activity.txt"] atomically:YES encoding:NSUTF8StringEncoding error:&error]) {
-        
-        toRecipents = [NSArray arrayWithObject:k_mailMe];
-        
-        MFMailComposeViewController *mc = [[MFMailComposeViewController alloc] init];
-        mc.mailComposeDelegate = self;
-        [mc setSubject:emailTitle];
-        [mc setMessageBody:messageBody isHTML:NO];
-        [mc setToRecipients:toRecipents];
-        
-        NSData *noteData = [NSData dataWithContentsOfFile:[documentsDirectory stringByAppendingPathComponent:@"activity.txt"]];
-        [mc addAttachmentData:noteData mimeType:@"text/plain" fileName:@"activity.txt"];
-        
-        // Present mail view controller on screen
-        [self presentViewController:mc animated:YES completion:NULL];
-        
-    } else {
-        
-        [app messageNotification:@"_error_" description:@"Impossible create file body" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
-    }
-}
-
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark === Clear ===
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)clearActivity:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [CCCoreData flushTableActivityAccount:app.activeAccount];
-    
-    [app.activeActivity reloadDatasource];
-}
-
-@end

+ 0 - 30
iOSClient/Settings/CCManageOptimizations.h

@@ -1,30 +0,0 @@
-//
-//  CCManageOptimizations.h
-//  Crypto Cloud Technology Nextcloud
-//
-//  Created by Marino Faggiana on 22/09/15.
-//  Copyright (c) 2014 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import "XLFormViewController.h"
-#import "XLForm.h"
-
-@interface CCManageOptimizations : XLFormViewController
-
-
-@end

+ 0 - 115
iOSClient/Settings/CCManageOptimizations.m

@@ -1,115 +0,0 @@
-//
-//  CCManageOptimizations.m
-//  Crypto Cloud Technology Nextcloud
-//
-//  Created by Marino Faggiana on 22/09/15.
-//  Copyright (c) 2014 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#import "CCManageOptimizations.h"
-#import "CCUtility.h"
-#import "AppDelegate.h"
-
-@implementation CCManageOptimizations
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    
-    if (self) {
-        
-        [self initializeForm];        
-    }
-    
-    return self;
-}
-
-- (void)initializeForm
-{
-    XLFormDescriptor *form ;
-    XLFormSectionDescriptor *section;
-    XLFormRowDescriptor *row;
-
-    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_optimizations_", nil)];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_optimized_photos_", nil)];
-    [form addFormSection:section];
-    section.footerTitle = NSLocalizedString(@"_optimized_photos_how_", nil);
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"optimizedphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_optimized_photos_", nil)];
-    if ([CCUtility getOptimizedPhoto]) row.value = @"1";
-    else row.value = @"0";
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [section addFormRow:row];
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_upload_del_photos_", nil)];
-    [form addFormSection:section];
-    section.footerTitle = [CCUtility localizableBrand:@"_upload_del_photos_how_" table:nil];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"uploadremovephoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_del_photos_", nil)];
-    if ([CCUtility getUploadAndRemovePhoto]) row.value = @"1";
-    else row.value = @"0";
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [section addFormRow:row];
-
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    self.form = form;
-}
-
-// Apparirà
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
-}
-
--(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue
-{
-    [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
-    
-    if ([rowDescriptor.tag isEqualToString:@"optimizedphoto"]) {
-        
-        if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            
-            [CCUtility setOptimizedPhoto:YES];
-            
-        } else {
-            
-            [CCUtility setOptimizedPhoto:NO];
-        }
-    }
-    
-    if ([rowDescriptor.tag isEqualToString:@"uploadremovephoto"]) {
-        
-        if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            
-            [CCUtility setUploadAndRemovePhoto:YES];
-            
-        } else {
-            
-            [CCUtility setUploadAndRemovePhoto:NO];
-        }
-    }
-}
-
-@end

+ 4 - 68
iOSClient/Settings/CCSettings.m

@@ -27,6 +27,8 @@
 #import "OCCapabilities.h"
 #import "CCSynchronize.h"
 #import "CCAdvanced.h"
+#import "CCManageCryptoCloud.h"
+#import "CCManageAccount.h"
 
 #define alertViewEsci 1
 #define alertViewAzzeraCache 2
@@ -108,15 +110,7 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"changecredentials" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_change_credentials_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsCredentials] forKey:@"imageView.image"];
-    row.action.formSegueIdentifier = @"CCManageAccountSegue";
-    [section addFormRow:row];
-    
-    // quota
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"quota" rowType:XLFormRowDescriptorTypeButton title:@""];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:@(NSTextAlignmentCenter) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
-    row.action.formSelector = @selector(quota:);
+    row.action.viewControllerClass = [CCManageAccount class];
     [section addFormRow:row];
     
     // Section : USER INFORMATION -------------------------------------------
@@ -171,17 +165,6 @@
     row.action.formSegueIdentifier = @"CCManageCameraUploadSegue";
     [section addFormRow:row];
 
-    // Section OPTIMIZATIONS ------------------------------------------------
-    
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"optimizations" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_optimizations_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsOptimizations] forKey:@"imageView.image"];
-    row.action.formSegueIdentifier = @"CCManageOptimizationsSegue";
-    [section addFormRow:row];
-
     // Section FOLDERS FAVORITES OFFLINE ------------------------------------
     
     section = [XLFormSectionDescriptor formSection];
@@ -203,7 +186,7 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"cryptocloud" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_crypto_cloud_system_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsCryptoCloud] forKey:@"imageView.image"];
-    row.action.formSegueIdentifier = @"CCManageCryptoCloudSegue";
+    row.action.viewControllerClass = [CCManageCryptoCloud class];
     [section addFormRow:row];
 #endif
     
@@ -227,13 +210,6 @@
     };
     [section addFormRow:row];
     
-    // Help
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"help" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsHelp] forKey:@"imageView.image"];
-    row.action.formSegueIdentifier = @"CCManageHelpSegue";
-    [section addFormRow:row];
-
     // Contact us mail
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendmail" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_contact_by_email_", nil)];
     [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
@@ -287,35 +263,6 @@
     [super viewDidAppear:animated];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark === TableView ===
-#pragma --------------------------------------------------------------------------------------------
-
--(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
-{
-    if (section == 1) {
-        
-        UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 0)];
-        view.backgroundColor = [UIColor clearColor];
-        
-        UIProgressView *progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
-        progressView.frame = CGRectMake(10, -23, self.tableView.frame.size.width-10-10, 0);
-        progressView.trackTintColor = [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:0.6];
-        progressView.progressTintColor = COLOR_PROGRESS_BAR_QUOTA;
-        progressView.layer.borderWidth = 0.05;
-        progressView.layer.borderColor = [COLOR_BRAND CGColor];
-        CGAffineTransform transform = CGAffineTransformMakeScale(1.0f, 10.0f);
-        progressView.transform = transform;
-        progressView.progress = [_tableAccount.quotaRelative floatValue] / 100;
-        
-        [view addSubview:progressView];
-        
-        return view;
-    }
-    
-    return nil;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark === Chiamate dal Form ===
 #pragma --------------------------------------------------------------------------------------------
@@ -334,7 +281,6 @@
     XLFormRowDescriptor *rowVersionServer = [self.form formRowWithTag:@"versionserver"];
     XLFormRowDescriptor *rowUrlCloud = [self.form formRowWithTag:@"urlcloud"];
     XLFormRowDescriptor *rowUserNameCloud = [self.form formRowWithTag:@"usernamecloud"];
-    XLFormRowDescriptor *rowQuota = [self.form formRowWithTag:@"quota"];
 
     XLFormRowDescriptor *rowUserFullName = [self.form formRowWithTag:@"userfullname"];
     XLFormRowDescriptor *rowUserAddress = [self.form formRowWithTag:@"useraddress"];
@@ -365,11 +311,6 @@
     rowVersionServer.value = [NSString stringWithFormat:@"%lu.%lu.%lu",(unsigned long)[_tableAccount.versionMajor integerValue], (unsigned long)[_tableAccount.versionMinor integerValue], (unsigned long)[_tableAccount.versionMicro integerValue]];
     rowUrlCloud.value = app.activeUrl;
     rowUserNameCloud.value = app.activeUser;
-    NSString *quota = [CCUtility transformedSize:[_tableAccount.quotaTotal doubleValue]];
-    //NSString *quotaAvailable = [CCUtility transformedSize:[_tableAccount.quotaFree doubleValue]];
-    NSString *quotaUsed = [CCUtility transformedSize:[_tableAccount.quotaUsed doubleValue]];
-    rowQuota.title = [NSString stringWithFormat:NSLocalizedString(@"_quota_using_", nil), quotaUsed, quota];
-    //rowQuota.title = [NSString stringWithFormat:@"%@ / %@ %@", quota, quotaAvailable, NSLocalizedString(@"_available_", nil)];
     
     rowUserFullName.value = _tableAccount.displayName;
     if ([_tableAccount.displayName isEqualToString:@""]) rowUserFullName.hidden = @YES;
@@ -571,11 +512,6 @@
     
 }
 
-- (void)quota:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-}
-
 - (void)synchronizeFavorites
 {
     NSArray *recordsTableMetadata = [CCCoreData  getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (favorite == 1)", app.activeAccount] context:nil];