Merge branch 'release/v5.2.0'

.gitattributes

@@ -1,3 +1,25 @@
 *.strings diff=localizablestrings
 TwoFAS/update.swift filter=git-crypt diff=git-crypt
-TwoFAS/Protection/Keys.swift filter=git-crypt diff=git-crypt
+TwoFAS/Protection/Keys.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift filter=git-crypt diff=git-crypt
+TwoFAS/Content/Assets/Assets.car filter=git-crypt diff=git-crypt
+TwoFAS/TwoFAS/Other/Guides/** filter=git-crypt diff=git-crypt

CONTRIBUTING.md

@@ -20,13 +20,15 @@ We welcome meaningful code contributions to the 2FAS for iOS project. If you are
 1. Fork this repository to your own GitHub account
 2. Clone the repository to your local machine
 3. Copy example Keys.swift from TwoFAS/opensource folder to TwoFAS/Protection (override the encrypted file)
-4. Create a new branch for your changes (e.g. `feature/new-login-screen`)
-4. Make your changes
-5. Check them using swiftlint (there should be no warnings from swiftlint or compiler)
-6. Check if Unit Tests are passing
-7. Commit them to your branch
-8. Push your branch to your fork on GitHub
-9. Open a pull request from your branch to the `develop` branch of this repository. Remember to resolve any merge conflicts
+4. Copy IconDescriptionDatabaseImpl+Database.swift and ServiceDefinitionDatabaseImpl+Database.swift from TwoFAS/opensource to TwoFAS/Content/Sources (override files)
+5. Copy Assets.car from TwoFAS/opensource to TwoFAS/Content/Assets (override the file)
+6. Create a new branch for your changes (e.g. `feature/new-login-screen`)
+7. Make your changes
+8. Check them using swiftlint (there should be no warnings from swiftlint or compiler)
+9. Check if Unit Tests are passing
+10. Commit them to your branch
+11. Push your branch to your fork on GitHub
+12. Open a pull request from your branch to the `develop` branch of this repository. Remember to resolve any merge conflicts
 
 Please make sure your pull request includes the following:
 

README.md

@@ -20,6 +20,8 @@ Please note that the graphics used in this app are not part of the open source p
 
 We use GitHub for bug reports. Please visit the [2FAS for iOS issues page](https://github.com/twofas/2fas-ios/issues) to search for and report any bugs you may have found. Before adding a new issue, please search for existing issues to avoid duplicates.
 
+For reporting security issues only, please send a detailed description of the vulnerability to security@2fas.com. Do not use this address for general inquiries or bug reports unrelated to security concerns.
+
 ## Getting Started
 
 1. Download the app from the [releases page](https://2fas.com).

TwoFAS/Base32/Base32.h

@@ -0,0 +1,30 @@
+//
+//  This file is part of the 2FAS iOS app (https://github.com/twofas/2fas-ios)
+//  Copyright © 2023 Two Factor Authentication Service, Inc.
+//  Contributed by Zbigniew Cisiński. All rights reserved.
+//
+//  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
+//  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 <https://www.gnu.org/licenses/>
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for Base32.
+FOUNDATION_EXPORT double Base32VersionNumber;
+
+//! Project version string for Base32.
+FOUNDATION_EXPORT const unsigned char Base32VersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <Base32/PublicHeader.h>
+
+#import "MF_Base32Additions.h"

TwoFAS/CodeSupport/Camera/CameraDelegate.swift

@@ -18,6 +18,7 @@
 //
 
 import Foundation
+import Data
 
 public protocol CameraDelegate: AnyObject {
     func didStartScanning()

TwoFAS/CodeSupport/Camera/Output/CameraOutputQRScanner.swift

@@ -21,6 +21,7 @@ import Foundation
 import AVFoundation
 import UIKit.UIView
 import Common
+import Data
 
 final class CameraOutputQRScanner: NSObject {
     private var metadataOutput: AVCaptureMetadataOutput?

TwoFAS/Common/Assets/ThemeColor.xcassets/ColorDivider.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF5",
+          "green" : "0xEF",
+          "red" : "0xEF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.100",
+          "green" : "0.100",
+          "red" : "0.100"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwoFAS/Common/Assets/ThemeColor.xcassets/ColorSecondary.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x96",
+          "green" : "0x96",
+          "red" : "0x96"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.450",
+          "green" : "0.450",
+          "red" : "0.500"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwoFAS/Common/Assets/ThemeColor.xcassets/ColorSecondaryDivider.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF2",
+          "green" : "0xF0",
+          "red" : "0xF0"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x93",
+          "green" : "0x8E",
+          "red" : "0x8E"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}