Merge branch 'release/v4.1.1'

TwoFAS/Common/CoreData+.swift

@@ -49,4 +49,12 @@ public extension Array {
         let index = at > count ? count : at
         insert(item, at: index)
     }
+
+    mutating func safeRemoval(at index: Int) {
+        guard index < count else {
+            Log("Trying to remove item out of array length! index: \(index), count: \(count)", severity: .error)
+            return
+        }
+        remove(at: index)
+    }
 }

TwoFAS/Common/IconDescriptionDatabaseImpl+Database.swift

@@ -469,6 +469,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "24D139A7-9783-4668-BB22-59696C118069")!,
                 name: "Bitfinex"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "28703409-A58E-473D-9690-BA490C139F34")!,
+                name: "Healthchecks"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "400FCED8-6FAC-488A-8154-85BE47D84ABE")!,
                 name: "Chargebee"
@@ -585,6 +589,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "C6360125-33FE-492A-A2CD-57DD72C18CD3")!,
                 name: "Storj.io"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "A713516C-1656-40B8-91BA-85E986805575")!,
+                name: "Rapid"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "B92626FE-68FF-449E-BA64-3E92D55AC2D2")!,
                 name: "Dr. Windows"
@@ -653,6 +661,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "2100A131-7869-4CA6-B476-F1FC0EF103BF")!,
                 name: "Facebook"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "20C994FC-BFC4-4FFA-A2ED-B469E03451F1")!,
+                name: "Render"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "D506BFDD-D5CA-4AB4-A4C1-960B445226F4")!,
                 name: "EnZona"
@@ -917,6 +929,10 @@ final class IconDescriptionDatabaseGenerated {
                 iconTypeID: IconTypeID(uuidString: "2BFE0CFC-B557-4F2D-988C-72015254B671")!,
                 name: "Patreon"
             ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "75D24465-2516-4598-A709-D28BBC17337B")!,
+                name: "Fly"
+            ),
             .init(
                 iconTypeID: IconTypeID(uuidString: "BEBE73C4-8079-42AC-B735-5B991367CA25")!,
                 name: "DX Email PRO"
@@ -1432,5 +1448,9 @@ final class IconDescriptionDatabaseGenerated {
             .init(
                 iconTypeID: IconTypeID(uuidString: "1A0ADFA5-37EA-4315-8B48-EE1D7297B1B1")!,
                 name: "Kite"
+            ),
+            .init(
+                iconTypeID: IconTypeID(uuidString: "7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326")!,
+                name: "Roberts Space Industries"
             )]}()
 }

TwoFAS/Common/Icons.xcassets/20C994FC-BFC4-4FFA-A2ED-B469E03451F1.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "20C994FC-BFC4-4FFA-A2ED-B469E03451F1@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "20C994FC-BFC4-4FFA-A2ED-B469E03451F1@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "20C994FC-BFC4-4FFA-A2ED-B469E03451F1@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/28703409-A58E-473D-9690-BA490C139F34.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "28703409-A58E-473D-9690-BA490C139F34@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "28703409-A58E-473D-9690-BA490C139F34@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "28703409-A58E-473D-9690-BA490C139F34@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/75D24465-2516-4598-A709-D28BBC17337B.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "75D24465-2516-4598-A709-D28BBC17337B@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "75D24465-2516-4598-A709-D28BBC17337B@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "75D24465-2516-4598-A709-D28BBC17337B@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/Icons.xcassets/A713516C-1656-40B8-91BA-85E986805575.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [  {
+    "filename": "A713516C-1656-40B8-91BA-85E986805575@1x.png",
+    "idiom": "universal",
+    "scale": "1x"
+  },
+  {
+    "filename": "A713516C-1656-40B8-91BA-85E986805575@2x.png",
+    "idiom": "universal",
+    "scale": "2x"
+  },
+  {
+    "filename": "A713516C-1656-40B8-91BA-85E986805575@3x.png",
+    "idiom": "universal",
+    "scale": "3x"
+  }],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

TwoFAS/Common/ServiceDefinitionDatabaseImpl+Database.swift

@@ -927,6 +927,14 @@ final class ServiceDefinitionDatabaseGenerated {
                 matchingRules: [.init(field: .label, text: "Bitfinex", matcher: .startsWith, ignoreCase: true)],
                 iconTypeID: UUID(uuidString: "24D139A7-9783-4668-BB22-59696C118069")!
             ),
+            .init(
+                serviceTypeID: UUID(uuidString: "51FB583D-61D0-4BFE-8F6E-5E44ADC233BF")!,
+                name: "Healthchecks",
+                issuer: ["Healthchecks.io"],
+                tags: nil,
+                matchingRules: nil,
+                iconTypeID: UUID(uuidString: "28703409-A58E-473D-9690-BA490C139F34")!
+            ),
             .init(
                 serviceTypeID: UUID(uuidString: "5318083F-0330-4384-869F-8C76AD862337")!,
                 name: "Chargebee",
@@ -1167,6 +1175,14 @@ final class ServiceDefinitionDatabaseGenerated {
                 matchingRules: [.init(field: .issuer, text: "STORJ", matcher: .startsWith, ignoreCase: true)],
                 iconTypeID: UUID(uuidString: "C6360125-33FE-492A-A2CD-57DD72C18CD3")!
             ),
+            .init(
+                serviceTypeID: UUID(uuidString: "66E3C12A-D465-427A-8561-1289D6E5BFC5")!,
+                name: "Rapid",
+                issuer: nil,
+                tags: ["API"],
+                matchingRules: [.init(field: .label, text: "RapidAPI", matcher: .startsWith, ignoreCase: true)],
+                iconTypeID: UUID(uuidString: "A713516C-1656-40B8-91BA-85E986805575")!
+            ),
             .init(
                 serviceTypeID: UUID(uuidString: "678BF6BE-C919-49C4-AD4E-3FF5D2141803")!,
                 name: "Dr. Windows",
@@ -1303,6 +1319,14 @@ final class ServiceDefinitionDatabaseGenerated {
                 matchingRules: nil,
                 iconTypeID: UUID(uuidString: "2100A131-7869-4CA6-B476-F1FC0EF103BF")!
             ),
+            .init(
+                serviceTypeID: UUID(uuidString: "783CD328-E505-426F-821B-E281FB8E9EDA")!,
+                name: "Render",
+                issuer: ["render.com"],
+                tags: nil,
+                matchingRules: nil,
+                iconTypeID: UUID(uuidString: "20C994FC-BFC4-4FFA-A2ED-B469E03451F1")!
+            ),
             .init(
                 serviceTypeID: UUID(uuidString: "79549405-BA55-4C7B-9D48-3B15002B5B30")!,
                 name: "EnZona",
@@ -1839,6 +1863,14 @@ final class ServiceDefinitionDatabaseGenerated {
                 matchingRules: nil,
                 iconTypeID: UUID(uuidString: "2BFE0CFC-B557-4F2D-988C-72015254B671")!
             ),
+            .init(
+                serviceTypeID: UUID(uuidString: "A7516A9C-2DBD-4ABA-8E9D-50A6D8815C7D")!,
+                name: "Fly",
+                issuer: ["Fly.io"],
+                tags: nil,
+                matchingRules: nil,
+                iconTypeID: UUID(uuidString: "75D24465-2516-4598-A709-D28BBC17337B")!
+            ),
             .init(
                 serviceTypeID: UUID(uuidString: "A85B7921-5DA3-43AF-BA05-9AAC1FC9A6D4")!,
                 name: "DX Email PRO",
@@ -2268,7 +2300,7 @@ final class ServiceDefinitionDatabaseGenerated {
                 serviceTypeID: UUID(uuidString: "CB5E1F42-22EE-4993-A04F-9476A9C7C2B3")!,
                 name: "PlayStation",
                 issuer: nil,
-                tags: ["PS", "SONY", "PS4", "PS5"],
+                tags: ["PS", "SONY"],
                 matchingRules: nil,
                 iconTypeID: UUID(uuidString: "4A1E6984-020D-4184-8844-1D1465A925CC")!
             ),
@@ -2872,5 +2904,13 @@ final class ServiceDefinitionDatabaseGenerated {
                 tags: ["ZERODHA"],
                 matchingRules: nil,
                 iconTypeID: UUID(uuidString: "1A0ADFA5-37EA-4315-8B48-EE1D7297B1B1")!
+            ),
+            .init(
+                serviceTypeID: UUID(uuidString: "FF0ED7B6-0716-46FA-8646-052883572F1F")!,
+                name: "Roberts Space Industries",
+                issuer: ["Roberts Space Industries"],
+                tags: nil,
+                matchingRules: nil,
+                iconTypeID: UUID(uuidString: "7C4A3FA2-5A2D-43E0-B87E-5C3628EAE326")!
             )]}()
 }

TwoFAS/Sync/SyncHandler.swift

@@ -225,7 +225,7 @@ final class SyncHandler {
                                 list[cloudEntry.index] = currentEntry.item
                             } else {
                                 Log("SyncHandler - Creation: Moving to new order", module: .cloudSync)
-                                list.remove(at: cloudEntry.index)
+                                list.safeRemoval(at: cloudEntry.index)
                                 list.safeInsert(currentEntry.item, at: currentEntry.index)
                             }
                             listToSend[type] = list
@@ -267,7 +267,7 @@ final class SyncHandler {
                                 list[cloudEntry.index] = currentEntry.item
                             } else {
                                 Log("SyncHandler - Modification: Item overrided with local one", module: .cloudSync)
-                                list.remove(at: cloudEntry.index)
+                                list.safeRemoval(at: cloudEntry.index)
                                 list.safeInsert(currentEntry.item, at: currentEntry.index)
                             }
                             listToSend[type] = list

TwoFAS/TwoFAS.xcodeproj/project.pbxproj

@@ -8545,7 +8545,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
@@ -8586,7 +8586,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
 					"-ObjC",
@@ -8860,7 +8860,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8888,7 +8888,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASAuth;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9191,7 +9191,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASWidget;
@@ -9221,7 +9221,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -9248,7 +9248,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASServiceIntent;
@@ -9276,7 +9276,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.1;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.twofas.org.TwoFASServiceIntent;
 				PRODUCT_NAME = "$(TARGET_NAME)";

TwoFAS/TwoFAS/Root/Modules/Settings/Trash/Presenter/TrashPresenter.swift

@@ -44,7 +44,7 @@ final class TrashPresenter {
 
     func handleTrashing(at indexPath: IndexPath) {
         let list = interactor.listTrashedServices()
-        let serviceData = list[indexPath.row]
+        guard let serviceData = list[safe: indexPath.row] else { return }
         flowController.toDelete(with: serviceData)
     }
 

TwoFAS/TwoFAS/Root/Modules/Tokens/View/TokensViewController.swift

@@ -58,7 +58,10 @@ final class TokensViewController: UIViewController {
     }
 
     func scrollToTop() {
-        gridView.scrollToItem(at: IndexPath(row: 0, section: 0), at: .top, animated: true)
+        let snapshot = dataSource.snapshot()
+        let indexPath = IndexPath(row: 0, section: 0)
+        guard snapshot.item(for: indexPath) != nil else { return }
+        gridView.scrollToItem(at: indexPath, at: .top, animated: true)
     }
 
     // MARK: - App events