Przeglądaj źródła

refactor: apply xcode suggestion and lint fixes

dignifiedquire 2 lat temu
rodzic
commit
e344281133

+ 0 - 1
DcCore/DcCore/DC/Wrapper.swift

@@ -1194,7 +1194,6 @@ public class DcMsg {
     }
 
     public var isUnsupportedMediaFile: Bool {
-        let fileMime = filemime
         return filemime == "audio/ogg"
     }
 

+ 46 - 20
deltachat-ios.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -121,7 +121,7 @@
 		30E83EFD289BF32C0035614C /* ShortcutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E83EFC289BF32C0035614C /* ShortcutManager.swift */; };
 		30E8F2132447285600CE2C90 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2122447285600CE2C90 /* ShareViewController.swift */; };
 		30E8F2162447285600CE2C90 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 30E8F2142447285600CE2C90 /* MainInterface.storyboard */; };
-		30E8F21A2447285600CE2C90 /* Delta Chat.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 30E8F2102447285600CE2C90 /* Delta Chat.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		30E8F21A2447285600CE2C90 /* Delta Chat.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 30E8F2102447285600CE2C90 /* Delta Chat.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		30E8F2252447622300CE2C90 /* DcCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304219D1243F588500516852 /* DcCore.framework */; };
 		30E8F2422448B77600CE2C90 /* ChatListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2412448B77600CE2C90 /* ChatListController.swift */; };
 		30E8F2442449C64100CE2C90 /* ChatListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2432449C64100CE2C90 /* ChatListCell.swift */; };
@@ -240,15 +240,15 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		30E8F21B2447285600CE2C90 /* Embed App Extensions */ = {
+		30E8F21B2447285600CE2C90 /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				30E8F21A2447285600CE2C90 /* Delta Chat.appex in Embed App Extensions */,
+				30E8F21A2447285600CE2C90 /* Delta Chat.appex in Embed Foundation Extensions */,
 			);
-			name = "Embed App Extensions";
+			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -1111,7 +1111,7 @@
 				7837B63821E54CB400CDE126 /* Run Script */,
 				7837B64621E5532B00CDE126 /* ShellScript */,
 				304219D4243F588600516852 /* Embed Frameworks */,
-				30E8F21B2447285600CE2C90 /* Embed App Extensions */,
+				30E8F21B2447285600CE2C90 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
@@ -1148,8 +1148,9 @@
 		7A9FB1381FB061E2001FEA36 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "Jonas Reinsch";
 				TargetAttributes = {
 					30E8F20F2447285600CE2C90 = {
@@ -1820,8 +1821,12 @@
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = DcShare/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
 				MARKETING_VERSION = 1.36.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -1845,8 +1850,12 @@
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = DcShare/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
 				MARKETING_VERSION = 1.36.4;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
@@ -1883,6 +1892,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1909,7 +1919,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1944,6 +1954,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1964,10 +1975,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1992,8 +2004,11 @@
 					/usr/local/include,
 				);
 				INFOPLIST_FILE = "deltachat-ios/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi",
@@ -2062,8 +2077,11 @@
 					/usr/local/include,
 				);
 				INFOPLIST_FILE = "deltachat-ios/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi",
@@ -2120,7 +2138,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = "deltachat-iosTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "nayooti.deltachat-iosTests";
@@ -2140,7 +2162,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = "deltachat-iosTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "nayooti.deltachat-iosTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";

+ 2 - 2
deltachat-ios.xcodeproj/xcshareddata/xcschemes/deltachat-ios.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
-   version = "1.3">
+   LastUpgradeVersion = "1430"
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">

+ 2 - 2
deltachat-ios/AppDelegate.swift

@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var locationManager: LocationManager!
     var notificationManager: NotificationManager!
     private var backgroundTask: UIBackgroundTaskIdentifier = .invalid
-    var reachability: Reachability? = nil
+    var reachability: Reachability?
     var window: UIWindow?
     var notifyToken: String?
     var applicationInForeground: Bool = false
@@ -726,7 +726,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         dcContext.setStockTranslation(id: DC_STR_REMOVE_MEMBER_BY_OTHER, localizationKey: "remove_member_by_other")
         dcContext.setStockTranslation(id: DC_STR_GROUP_LEFT_BY_YOU, localizationKey: "group_left_by_you")
         dcContext.setStockTranslation(id: DC_STR_GROUP_LEFT_BY_OTHER, localizationKey: "group_left_by_other")
-        dcContext.setStockTranslation(id: DC_STR_GROUP_IMAGE_DELETED_BY_YOU, localizationKey: "group_image_deleted_by_you");
+        dcContext.setStockTranslation(id: DC_STR_GROUP_IMAGE_DELETED_BY_YOU, localizationKey: "group_image_deleted_by_you")
         dcContext.setStockTranslation(id: DC_STR_GROUP_IMAGE_DELETED_BY_OTHER, localizationKey: "group_image_deleted_by_other")
         dcContext.setStockTranslation(id: DC_STR_LOCATION_ENABLED_BY_YOU, localizationKey: "location_enabled_by_you")
         dcContext.setStockTranslation(id: DC_STR_LOCATION_ENABLED_BY_OTHER, localizationKey: "location_enabled_by_other")

+ 1 - 2
deltachat-ios/Controller/AccountSetup/AccountSetupController.swift

@@ -90,8 +90,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
 
     private lazy var providerInfoCell: ProviderInfoCell = {
         let cell = ProviderInfoCell()
-        cell.onInfoButtonPressed = {
-            [weak self] in
+        cell.onInfoButtonPressed = { [weak self] in
             self?.handleProviderInfoButton()
         }
         return cell

+ 0 - 1
deltachat-ios/Controller/Settings/SettingsViewController.swift

@@ -180,7 +180,6 @@ internal final class SettingsViewController: UITableViewController {
 
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-        let nc = NotificationCenter.default
         if let connectivityChangedObserver = self.connectivityChangedObserver {
             NotificationCenter.default.removeObserver(connectivityChangedObserver)
         }

+ 3 - 1
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -8,7 +8,9 @@ class AppCoordinator {
 
     private let window: UIWindow
     private let dcAccounts: DcAccounts
-    public  let allMediaTab = 0 // the order below is important as well - and there are two enums, here and at AppStateRestorer (this is error prone and could probably be merged)
+    // the order below is important as well - and there are two enums, here and at
+    // AppStateRestorer (this is error prone and could probably be merged)
+    public  let allMediaTab = 0
     private let qrTab = 1
     public  let chatsTab = 2
     private let settingsTab = 3

+ 0 - 1
deltachat-ios/Extensions/Character+Extentions.swift

@@ -14,4 +14,3 @@ extension Character {
     }
     var isEmoji: Bool { isSimpleEmoji || isCombinedIntoEmoji }
 }
-

+ 0 - 1
deltachat-ios/Extensions/UIEdgeInsets+Extensions.swift

@@ -36,5 +36,4 @@ internal extension UIEdgeInsets {
     var horizontal: CGFloat {
         return left + right
     }
-
 }

+ 2 - 2
deltachat-ios/Helper/ImageFormat.swift

@@ -29,7 +29,7 @@ extension ImageFormat {
                 return .webp
             }
 
-        case 0x00 where data.count >= 12 :
+        case 0x00 where data.count >= 12:
             let subdata = data[8...11]
 
             if let dataString = String(data: subdata, encoding: .ascii),
@@ -37,7 +37,7 @@ extension ImageFormat {
                 return .heic
             }
 
-        case 0x42 where data.count >= 2 :
+        case 0x42 where data.count >= 2:
             if data[1] == 0x4D {
                 return .bmp
             }

+ 1 - 1
deltachat-ios/View/MultilineTextFieldCell.swift

@@ -11,7 +11,7 @@ class MultilineTextFieldCell: UITableViewCell, UITextViewDelegate {
         return UIFont.preferredFont(forTextStyle: .body).pointSize * 4
     }
 
-    var onTextFieldChange:((_:UITextView) -> Void)?    // set this from outside to get notified about textfield changes
+    var onTextFieldChange: ((_: UITextView) -> Void)?    // set this from outside to get notified about textfield changes
 
     lazy var descriptionField: UITextField = {
         let textField = UITextField()

+ 1 - 1
deltachat-ios/View/ProviderInfoCell.swift

@@ -106,7 +106,7 @@ class ProviderInfoCell: UITableViewCell {
     }
 
     // MARK: - actions
-    @objc func infoButtonPressed(_:UIButton) {
+    @objc func infoButtonPressed(_: UIButton) {
         onInfoButtonPressed?()
     }
 }

+ 1 - 1
deltachat-ios/View/TextFieldCell.swift

@@ -32,7 +32,7 @@ class TextFieldCell: UITableViewCell {
 
     private var customConstraints: [NSLayoutConstraint] = []
 
-    var onTextFieldChange:((_:UITextField) -> Void)?	// set this from outside to get notified about textfield changes
+    var onTextFieldChange: ((_: UITextField) -> Void)?	// set this from outside to get notified about textfield changes
 
 
     public lazy var title: UILabel = {