5.0.4 (171)

Reduce annoyance
Show donation in onboarding flow
2021-08-06 21:52:24 -07:00 · 2021-08-06 21:52:24 -07:00 · 2021-08-06 21:52:24 -07:00 · 2021-08-06 21:52:24 -07:00 · 2021-01-18 10:43:51 -08:00 · 2021-01-17 19:43:26 +01:00
39 changed files with 495 additions and 414 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+.env
 .DS_Store
 build
 *.mode1v3
@ -16,3 +17,5 @@ com.mono0926.LicensePlist.Output/
 Secrets.plist
 Preview.html
 fastlane/report.xml
+fastlane/test_output/
+.ruby-version
--- a/.travis.yml
+++ b/.travis.yml
@ -1,4 +1,4 @@
-osx_image: xcode11.3
+osx_image: xcode12
 language: objective-c

 # Handle git submodules yourself
@ -9,7 +9,7 @@ git:
 # Use sed to replace the SSH URL with the public URL, then initialize submodules
 before_install:
  # Fix Travis  xcodebuild exited with 65 https://github.com/travis-ci/travis-ci/issues/6675#issuecomment-257964767
-  - export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (13" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
+  - export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (14" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
  - echo $IOS_SIMULATOR_UDID
  - bundle install # We need a pre-release CocoaPods version
  - sed -i -e 's/git@github.com:/git:\/\/github.com\//' .gitmodules
--- a/ChatSecure.xcodeproj/project.pbxproj
+++ b/ChatSecure.xcodeproj/project.pbxproj
@ -2235,7 +2235,7 @@
 				CLASSPREFIX = OTR;
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 1110;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Chris Ballinger";
 				TargetAttributes = {
 					6365CEFB1E2453F6009E213F = {
@ -3030,6 +3030,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 = NO;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3095,6 +3096,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 = NO;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3140,7 +3142,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 167;
+				CURRENT_PROJECT_VERSION = 171;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
@ -3156,7 +3158,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.2;
+				MARKETING_VERSION = 5.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@ -3178,7 +3180,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 167;
+				CURRENT_PROJECT_VERSION = 171;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@ -3194,7 +3196,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.2;
+				MARKETING_VERSION = 5.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@ -3271,6 +3273,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 = NO;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3324,10 +3327,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 167;
+				CURRENT_PROJECT_VERSION = 171;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
+				EXCLUDED_ARCHS = arm64;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@ -3340,7 +3344,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.2;
+				MARKETING_VERSION = 5.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@ -3469,6 +3473,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 = NO;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3514,10 +3519,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 167;
+				CURRENT_PROJECT_VERSION = 171;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
+				EXCLUDED_ARCHS = arm64;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@ -3530,7 +3536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.2;
+				MARKETING_VERSION = 5.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
--- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure
+++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme
+++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme
+++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme
+++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme
+++ b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@ -12,15 +12,6 @@
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES"
      disableMainThreadChecker = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6396AF991A169D54009F3E6C"
-            BuildableName = "ChatSecure.app"
-            BlueprintName = "ChatSecure"
-            ReferencedContainer = "container:ChatSecure.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
@ -1,26 +1,26 @@
 name: AFNetworking, nameSpecified: 
 body: Copyright (c) 2011-2…
-version: 3.2.1
+version: 4.0.1

 name: AFNetworking, nameSpecified: 
 body: Copyright (c) 2011-2…
-version: 3.2.1
+version: 4.0.1

 name: AFNetworking, nameSpecified: 
 body: Copyright (c) 2011-2…
-version: 3.2.1
+version: 4.0.1

 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 5.0.5
+version: 5.4.3

 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 5.0.5
+version: 5.4.3

 name: Alamofire, nameSpecified: 
 body: Copyright (c) 2014-2…
-version: 5.0.5
+version: 5.4.3

 name: ARChromeActivity, nameSpecified: 
 body: ARChromeActivity
@ -75,51 +75,51 @@ version: 1.1

 name: ChatSecureCore, nameSpecified: 
 body: ChatSecure, an OTR-c…
-version: 0.1.0
+version: 1.0.0

 name: ChatSecureCore, nameSpecified: 
 body: ChatSecure, an OTR-c…
-version: 0.1.0
+version: 1.0.0

 name: ChatSecureCore, nameSpecified: 
 body: ChatSecure, an OTR-c…
-version: 0.1.0
+version: 1.0.0

 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.4
+version: 7.6.5

 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.4
+version: 7.6.5

 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.4
+version: 7.6.5

 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.1
+version: 3.7.2

 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.1
+version: 3.7.2

 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.1
+version: 3.7.2

 name: DTFoundation, nameSpecified: 
 body: Copyright (c) 2011, …
-version: 1.7.14
+version: 1.7.18

 name: DTFoundation, nameSpecified: 
 body: Copyright (c) 2011, …
-version: 1.7.14
+version: 1.7.18

 name: DTFoundation, nameSpecified: 
 body: Copyright (c) 2011, …
-version: 1.7.14
+version: 1.7.18

 name: FormatterKit, nameSpecified: 
 body: Copyright (c) 2011–2…
@ -147,15 +147,15 @@ version: 3.5.4

 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.5
+version: 2.1.7

 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.5
+version: 2.1.7

 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.5
+version: 2.1.7

 name: IOCipher, nameSpecified: 
 body: 		  GNU LESSER GENER…
@ -213,15 +213,15 @@ version: 5.3.1

 name: Kvitto, nameSpecified: 
 body: Copyright (c) 2015, …
-version: 1.0.3
+version: 1.0.6

 name: Kvitto, nameSpecified: 
 body: Copyright (c) 2015, …
-version: 1.0.3
+version: 1.0.6

 name: Kvitto, nameSpecified: 
 body: Copyright (c) 2015, …
-version: 1.0.3
+version: 1.0.6

 name: KVOController, nameSpecified: 
 body: BSD License
@ -275,19 +275,19 @@ name: LicensePlist, nameSpecified:
 body: MIT License

 Copyrig…
-version: 2.14.0
+version: 3.13.0

 name: LicensePlist, nameSpecified: 
 body: MIT License

 Copyrig…
-version: 2.14.0
+version: 3.13.0

 name: LicensePlist, nameSpecified: 
 body: MIT License

 Copyrig…
-version: 2.14.0
+version: 3.13.0

 name: LumberjackConsole, nameSpecified: 
 body: Apache License
@ -306,15 +306,15 @@ version: 3.3.1

 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.1
+version: 2.1.6

 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.1
+version: 2.1.6

 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.1
+version: 2.1.6

 name: MBProgressHUD, nameSpecified: 
 body: Copyright © 2009-202…
@ -381,15 +381,15 @@ version: 3.0.0

 name: ParkedTextField, nameSpecified: 
 body: The MIT License (MIT…
-version: 0.5.0
+version: 1.0.0

 name: ParkedTextField, nameSpecified: 
 body: The MIT License (MIT…
-version: 0.5.0
+version: 1.0.0

 name: ParkedTextField, nameSpecified: 
 body: The MIT License (MIT…
-version: 0.5.0
+version: 1.0.0

 name: ProxyKit, nameSpecified: 
 body: The MIT License (MIT…
@ -405,15 +405,15 @@ version: 1.2.0

 name: PureLayout, nameSpecified: 
 body: This code is distrib…
-version: 3.1.5
+version: 3.1.8

 name: PureLayout, nameSpecified: 
 body: This code is distrib…
-version: 3.1.5
+version: 3.1.8

 name: PureLayout, nameSpecified: 
 body: This code is distrib…
-version: 3.1.5
+version: 3.1.8

 name: QRCodeReaderViewController, nameSpecified: 
 body: The MIT License (MIT…
@ -440,15 +440,15 @@ body: Copyright (c) 2010-2…
 version: 1.5.3

 name: SignalProtocolC, nameSpecified: 
-body:         Copyright 20…
+body:                 Copy…
 version: 2.3.2

 name: SignalProtocolC, nameSpecified: 
-body:         Copyright 20…
+body:                 Copy…
 version: 2.3.2

 name: SignalProtocolC, nameSpecified: 
-body:         Copyright 20…
+body:                 Copy…
 version: 2.3.2

 name: SignalProtocolObjC, nameSpecified: 
@ -465,63 +465,63 @@ version: 1.1.0

 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
-version: 4.3.0
+version: 4.4.3

 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
-version: 4.3.0
+version: 4.4.3

 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
+version: 4.4.3
+
+name: TTTAttributedLabel, nameSpecified: 
+body: Copyright (c) 2011 M…
+version: 2.0.0
+
+name: TTTAttributedLabel, nameSpecified: 
+body: Copyright (c) 2011 M…
+version: 2.0.0
+
+name: TTTAttributedLabel, nameSpecified: 
+body: Copyright (c) 2011 M…
+version: 2.0.0
+
+name: XLForm, nameSpecified: 
+body: The MIT License (MIT…
 version: 4.3.0

-name: TTTAttributedLabel, nameSpecified: 
-body: Copyright (c) 2011 M…
-version: 2.0.0
-
-name: TTTAttributedLabel, nameSpecified: 
-body: Copyright (c) 2011 M…
-version: 2.0.0
-
-name: TTTAttributedLabel, nameSpecified: 
-body: Copyright (c) 2011 M…
-version: 2.0.0
+name: XLForm, nameSpecified: 
+body: The MIT License (MIT…
+version: 4.3.0

 name: XLForm, nameSpecified: 
 body: The MIT License (MIT…
-version: 4.1.0
-
-name: XLForm, nameSpecified: 
-body: The MIT License (MIT…
-version: 4.1.0
-
-name: XLForm, nameSpecified: 
-body: The MIT License (MIT…
-version: 4.1.0
+version: 4.3.0

 name: XMPPFramework, nameSpecified: 
 body: GCDAsyncSocket: (Pub…
-version: 4.1.0
+version: 4.1.1

 name: XMPPFramework, nameSpecified: 
 body: GCDAsyncSocket: (Pub…
-version: 4.1.0
+version: 4.1.1

 name: XMPPFramework, nameSpecified: 
 body: GCDAsyncSocket: (Pub…
-version: 4.1.0
+version: 4.1.1

 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 4.0
+version: 4.0.1

 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 4.0
+version: 4.0.1

 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 4.0
+version: 4.0.1

 name: YapTaskQueue, nameSpecified: 
 body: This is free and une…
@ -571,4 +571,4 @@ body: This file contains t…

 add-version-numbers: true

-LicensePlist Version: 2.14.0
+LicensePlist Version: 3.13.0
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist
@ -14,7 +14,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/AFNetworking</string>
 			<key>Title</key>
-			<string>AFNetworking (3.2.1)</string>
+			<string>AFNetworking (4.0.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -22,7 +22,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Alamofire</string>
 			<key>Title</key>
-			<string>Alamofire (5.0.5)</string>
+			<string>Alamofire (5.4.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -62,7 +62,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/ChatSecureCore</string>
 			<key>Title</key>
-			<string>ChatSecureCore (0.1.0)</string>
+			<string>ChatSecureCore (1.0.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -70,7 +70,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/CocoaAsyncSocket</string>
 			<key>Title</key>
-			<string>CocoaAsyncSocket (7.6.4)</string>
+			<string>CocoaAsyncSocket (7.6.5)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -78,7 +78,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/CocoaLumberjack</string>
 			<key>Title</key>
-			<string>CocoaLumberjack (3.6.1)</string>
+			<string>CocoaLumberjack (3.7.2)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -86,7 +86,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/DTFoundation</string>
 			<key>Title</key>
-			<string>DTFoundation (1.7.14)</string>
+			<string>DTFoundation (1.7.18)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -110,7 +110,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/HTMLReader</string>
 			<key>Title</key>
-			<string>HTMLReader (2.1.5)</string>
+			<string>HTMLReader (2.1.7)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -150,7 +150,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Kvitto</string>
 			<key>Title</key>
-			<string>Kvitto (1.0.3)</string>
+			<string>Kvitto (1.0.6)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -222,7 +222,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/LicensePlist</string>
 			<key>Title</key>
-			<string>LicensePlist (2.14.0)</string>
+			<string>LicensePlist (3.13.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -238,7 +238,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Mantle</string>
 			<key>Title</key>
-			<string>Mantle (2.1.1)</string>
+			<string>Mantle (2.1.6)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -294,7 +294,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/ParkedTextField</string>
 			<key>Title</key>
-			<string>ParkedTextField (0.5.0)</string>
+			<string>ParkedTextField (1.0.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -310,7 +310,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/PureLayout</string>
 			<key>Title</key>
-			<string>PureLayout (3.1.5)</string>
+			<string>PureLayout (3.1.8)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -350,7 +350,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/SQLCipher</string>
 			<key>Title</key>
-			<string>SQLCipher (4.3.0)</string>
+			<string>SQLCipher (4.4.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -374,7 +374,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/XLForm</string>
 			<key>Title</key>
-			<string>XLForm (4.1.0)</string>
+			<string>XLForm (4.3.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -382,7 +382,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/XMPPFramework</string>
 			<key>Title</key>
-			<string>XMPPFramework (4.1.0)</string>
+			<string>XMPPFramework (4.1.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@ -390,7 +390,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/YapDatabase</string>
 			<key>Title</key>
-			<string>YapDatabase (4.0)</string>
+			<string>YapDatabase (4.0.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/AFNetworking.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/AFNetworking.plist
@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>FooterText</key>
-			<string>Copyright (c) 2011-2016 Alamofire Software Foundation (http://alamofire.org/)
+			<string>Copyright (c) 2011-2020 Alamofire Software Foundation (http://alamofire.org/)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Alamofire.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Alamofire.plist
@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>FooterText</key>
-			<string>Copyright (c) 2014-2020 Alamofire Software Foundation (http://alamofire.org/)
+			<string>Copyright (c) 2014-2021 Alamofire Software Foundation (http://alamofire.org/)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/CocoaLumberjack.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/CocoaLumberjack.plist
@ -8,7 +8,7 @@
 			<key>FooterText</key>
 			<string>BSD 3-Clause License

-Copyright (c) 2010-2020, Deusty, LLC
+Copyright (c) 2010-2021, Deusty, LLC
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Mantle.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Mantle.plist
@ -13,11 +13,19 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of

 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---
-
-**This project uses portions of code from the Proton framework.**
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>**This project uses portions of code from the Proton framework.**
 **Proton is copyright (c) 2012, Bitswift, Inc.**
 **All rights reserved.**

--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/SignalProtocolC.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/SignalProtocolC.plist
@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>FooterText</key>
-			<string>        Copyright 2015-2016 Open Whisper Systems
+			<string>                Copyright 2015-2016 Open Whisper Systems

 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html

--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Tor.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/Tor.plist
@ -291,11 +291,19 @@ src/ext/mulodi4.c is distributed under this license:
     license.  As a contributor, you agree to allow your code to be
     used under both.

-     Full text of the relevant licenses is included below.
-
-     =========================================================================
-
-     University of Illinois/NCSA
+     Full text of the relevant licenses is included below.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>     University of Illinois/NCSA
     Open Source License

     Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT
@ -340,11 +348,19 @@ src/ext/mulodi4.c is distributed under this license:
     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-     OTHER DEALINGS WITH THE SOFTWARE.
-
-     =========================================================================
-
-     Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT
+     OTHER DEALINGS WITH THE SOFTWARE.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>     Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT

     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/XMPPFramework.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/XMPPFramework.plist
@ -10,11 +10,19 @@

 This class is released under the public domain.
 Originally created by Robbie Hanson in Q3 2010.
-Updated and maintained by Deusty LLC and the Mac/iOS development community.
-
------------------------------------------------------------
-
-CocoaLumberjack: (BSD Style License)
+Updated and maintained by Deusty LLC and the Mac/iOS development community.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>CocoaLumberjack: (BSD Style License)

 Copyright (c) 2010, Deusty, LLC
 All rights reserved.
@ -31,11 +39,19 @@ with or without modification, are permitted provided that the following conditio
  derived from this software without specific prior
  written permission of Deusty, LLC.

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
------------------------------------------------------------
-
-
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>
 XMPPStream and all other source code: (BSD Style License)

 Software License Agreement (BSD License)
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/libevent.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/libevent.plist
@ -58,11 +58,19 @@ ht-internal.h:
   Copyright (c) 2002 Christopher Clark

 minheap-internal.h:
-   Copyright (c) 2006 Maxim Yegorushkin &lt;maxim.yegorushkin@gmail.com&gt;
-
-==============================
-
-The arc4module is available under the following, sometimes called the
+   Copyright (c) 2006 Maxim Yegorushkin &lt;maxim.yegorushkin@gmail.com&gt;</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The arc4module is available under the following, sometimes called the
 "OpenBSD" license:

   Copyright (c) 1996, David Mazieres &lt;dm@uun.org&gt;
--- a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/libidn.plist
+++ b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/libidn.plist
@ -28,11 +28,19 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-===============================================
-
-Libidn COPYING -- Explanation of licensing conditions.
+THE SOFTWARE.</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>----------------------------------------</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Libidn COPYING -- Explanation of licensing conditions.
 Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.

--- a/ChatSecureCore.podspec
+++ b/ChatSecureCore.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = 'ChatSecureCore'
-  s.version          = '0.1.0'
+  s.version          = '1.0.0'
  s.summary          = 'A short description of ChatSecureCore.'

  s.description      = <<-DESC
@ -34,13 +34,13 @@ TODO: Add long description of the pod here.
  s.dependency 'BButton', '~> 4.0'
  s.dependency 'ARChromeActivity', '~> 1.0'
  s.dependency 'QRCodeReaderViewController', '~> 4.0'
-  s.dependency 'ParkedTextField'
+  s.dependency 'ParkedTextField', '~> 1.0'

  s.dependency 'JSQMessagesViewController'
  s.dependency 'LumberjackConsole'

  # Utility
-  s.dependency 'CocoaLumberjack/Swift', '~> 3.6.0'
+  s.dependency 'CocoaLumberjack/Swift', '~> 3.7'
  s.dependency 'MWFeedParser', '~> 1.0'
  s.dependency 'BBlock', '~> 1.2'
  s.dependency 'LicensePlist'
@ -54,7 +54,7 @@ TODO: Add long description of the pod here.

  s.dependency 'ChatSecure-Push-iOS'

-  s.dependency 'SQLCipher', '~> 4.3.0'
+  s.dependency 'SQLCipher', '~> 4.4'
  s.dependency 'YapDatabase/SQLCipher', '~> 4.0'

  s.dependency 'libsqlfs/SQLCipher'
@ -70,7 +70,7 @@ TODO: Add long description of the pod here.

  s.dependency "Mantle"
  s.dependency "HTMLReader", '~> 2.1.1'
-  s.dependency "AFNetworking/Security", '~> 3.1'
+  s.dependency "AFNetworking/Security", '~> 4.0'
  s.dependency "ZXingObjC/QRCode", '~> 3.6'
  s.dependency "SAMKeychain", '~> 1.5'
  s.dependency "MBProgressHUD", '~> 1.1'
--- a/ChatSecureCore/Classes/Controllers/OTRSignalStorageManager.swift
+++ b/ChatSecureCore/Classes/Controllers/OTRSignalStorageManager.swift
@ -101,7 +101,7 @@ extension OMEMOBundle {
    }
 }

-public protocol OTRSignalStorageManagerDelegate: class {
+public protocol OTRSignalStorageManagerDelegate: AnyObject {
    /** Generate a new account key*/
    func generateNewIdenityKeyPairForAccountKey(_ accountKey:String) -> OTRAccountSignalIdentity
 }
--- a/ChatSecureCore/Classes/Controllers/PushStorage.swift
+++ b/ChatSecureCore/Classes/Controllers/PushStorage.swift
@ -10,7 +10,7 @@ import Foundation
 import ChatSecure_Push_iOS
 import YapDatabase

-@objc public protocol PushStorageProtocol: class {
+@objc public protocol PushStorageProtocol: AnyObject {
    func thisDevicePushAccount() -> Account?
    func hasPushAccount() -> Bool
    func saveThisAccount(_ account:Account)
--- a/ChatSecureCore/Classes/Controllers/XMPP/OTRXMPPManager.m
+++ b/ChatSecureCore/Classes/Controllers/XMPP/OTRXMPPManager.m
@ -56,7 +56,7 @@
 #import "OTRXMPPTorManager.h"
 #import "OTRTorManager.h"
@import OTRAssets;
-
+@import ChatSecure_Push_iOS;

 NSTimeInterval const kOTRChatStatePausedTimeout   = 5;
 NSTimeInterval const kOTRChatStateInactiveTimeout = 120;
--- a/Storage/OTRXMPPRoomMessage.swift
+++ b/Storage/OTRXMPPRoomMessage.swift
@ -120,7 +120,7 @@ extension OTRXMPPRoomMessage {
    }
 }

-extension OTRXMPPRoomMessage:YapDatabaseRelationshipNode {
+extension OTRXMPPRoomMessage: YapDatabaseRelationshipNode_ObjC {
    //MARK: YapRelationshipNode
    public func yapDatabaseRelationshipEdges() -> [YapDatabaseRelationshipEdge]? {
        
--- a/Controllers/OTRInviteViewController.m
+++ b/Controllers/OTRInviteViewController.m
@ -196,7 +196,13 @@ static CGFloat const kOTRButtonHeight = 40;

 - (void)skipPressed:(id)sender
 {
-    [self dismissViewControllerAnimated:YES completion:nil];
+    if (OTRBranding.allowsDonation && !TransactionObserver.hasValidReceipt) {
+        PurchaseViewController *purchaseVC = [PurchaseViewController fromBundle];
+        [self.navigationController setNavigationBarHidden:YES animated:YES];
+        [self.navigationController pushViewController:purchaseVC animated:YES];
+    } else {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
 }

 - (void)shareSMSPressed:(id)sender
--- a/Controllers/OTRLogListViewController.swift
+++ b/Controllers/OTRLogListViewController.swift
@ -38,7 +38,7 @@ import LumberjackConsole
        #if DEBUG
            debugPrint("Enabling os_log logger...")
            DDLog.add(DDOSLogger.sharedInstance)
-            DDLogVerbose("os_log logger enabled.")
+        debugPrint("os_log logger enabled.")
        #endif
        
        // allow file-based debug logging if user has enabled it
@ -49,12 +49,12 @@ import LumberjackConsole
            fileLogger.doNotReuseLogFiles = true
            DDLog.add(fileLogger)
            self.fileLogger = fileLogger
-            DDLogVerbose("File logger enabled.")
+            debugPrint("File logger enabled.")
            
            let consoleLogger = PTEConsoleLogger()
            DDLog.add(consoleLogger)
            self.consoleLogger = consoleLogger
-            DDLogVerbose("Console logger enabled.")
+            debugPrint("Console logger enabled.")
        } else {
            self.fileLogger = nil
            self.consoleLogger = nil
@ -86,7 +86,7 @@ import LumberjackConsole
                do {
                    try FileManager.default.removeItem(atPath: logsDirectory)
                } catch {
-                    DDLogError("Error deleting log files! \(error)")
+                    debugPrint("Error deleting log files! \(error)")
                }
            }
            setupLogging()
--- a/Controllers/Previews/OTRInviteViewController_Previews.swift
+++ b/Controllers/Previews/OTRInviteViewController_Previews.swift
@ -10,14 +10,16 @@
 import SwiftUI

 /// Unfortunately Xcode cannot seem to create Previews with our current build configuration
+/// seems related to using `MACH_O_TYPE=staticlib` for our frameworks
+/// https://twitter.com/_andersha/status/1405925636565262341
@available(iOS 13.0, *)
 struct OTRInviteViewController_Previews: PreviewProvider {
    static var previews: some View {
        Group {
            UIViewControllerPreview {
-                OTRInviteViewController(account: OTRAccount(username: "user@example.com", accountType: .jabber)!)
+                OTRInviteViewController(account: OTRXMPPAccount(username: "user@example.com", accountType: .jabber)!)
            }
-            .previewDevice("iPhone 11 Pro Max")
+            .previewDevice("iPhone 12 Pro Max")
            .previewLayout(.sizeThatFits)
        }
    }
--- a/Controllers/PurchaseViewController.swift
+++ b/Controllers/PurchaseViewController.swift
@ -14,10 +14,17 @@ import OTRAssets
 import Kvitto

 extension PurchaseViewController {
-    @objc public class func show(from viewController: UIViewController) {
+    @objc public class func fromBundle() -> Self {
        let assets = OTRAssets.resourcesBundle
        let storyboard = UIStoryboard(name: "Purchase", bundle: assets)
-        guard let vc = storyboard.instantiateInitialViewController() else { return }
+        guard let vc = storyboard.instantiateInitialViewController() as? Self else {
+            fatalError("Could not create PurchaseViewController from storyboard!")
+        }
+        return vc
+    }
+    
+    @objc public class func show(from viewController: UIViewController) {
+        let vc = fromBundle()
        vc.modalPresentationStyle = .formSheet
        let nav = UINavigationController(rootViewController: vc)
        nav.isNavigationBarHidden = true
@ -36,6 +43,7 @@ extension Bundle {
    }
 }

+@objc
 public class PurchaseViewController: UIViewController {
    @IBOutlet weak var bigMoneyButton: UIButton!
    @IBOutlet weak var smallMoneyButton: UIButton!
@ -48,15 +56,9 @@ public class PurchaseViewController: UIViewController {
    }
    
    enum Product: String, CaseIterable {
-        #if targetEnvironment(macCatalyst)
-        case small = "3_donation_monthly_mac"
-        case medium = "6_donation_monthly_mac"
-        case big = "20_donation_monthly_mac"
-        #else
        case small = "3_donation_monthly"
        case medium = "6_donation_monthly"
        case big = "20_donation_monthly"
-        #endif

        static var allProductsSet: Set<String> { Set(allCases.map { $0.rawValue }) }
        var emoji: String {
--- a/ChatSecureCore/Classes/Views/Cells/OTRConversationCell.m
+++ b/ChatSecureCore/Classes/Views/Cells/OTRConversationCell.m
@ -210,7 +210,6 @@
                            @"conversationLabel": self.conversationLabel,
                            @"dateLabel":self.dateLabel,
                            @"nameLabel":self.nameLabel,
-                            @"conversationLabel":self.conversationLabel,
                            @"accountLabel":self.accountLabel};
    
    NSDictionary *metrics = @{@"margin":[NSNumber numberWithFloat:OTRBuddyImageCellPadding]};
--- a/2
+++ b/2
@ -1,6 +1,4 @@
 source "https://rubygems.org"

 gem 'cocoapods'
-# Waiting for https://github.com/CocoaPods/CocoaPods/pull/9470
-#  gem 'cocoapods', '1.9.0.beta.2'
 gem 'fastlane'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,45 +1,45 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.1)
+    algoliasearch (1.27.5)
      httpclient (~> 2.8, >= 2.8.3)
      json (>= 1.5.1)
+    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.288.0)
-    aws-sdk-core (3.92.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.484.0)
+    aws-sdk-core (3.119.0)
+      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.30.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.1)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.98.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    babosa (1.0.3)
+    aws-sigv4 (1.2.4)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
    claide (1.0.3)
-    cocoapods (1.9.1)
-      activesupport (>= 4.0.2, < 5)
+    cocoapods (1.10.2)
+      addressable (~> 2.6)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.1)
+      cocoapods-core (= 1.10.2)
      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-stats (>= 1.0.0, < 2.0)
      cocoapods-trunk (>= 1.4.0, < 2.0)
      cocoapods-try (>= 1.1.0, < 2.0)
      colored2 (~> 3.1)
@ -49,79 +49,97 @@ GEM
      molinillo (~> 0.6.6)
      nap (~> 1.0)
      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.1)
-      activesupport (>= 4.0.2, < 6)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.2)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
      algoliasearch (~> 1.0)
      concurrent-ruby (~> 1.1)
      fuzzy_match (~> 2.0.4)
      nap (~> 1.0)
      netrc (~> 0.11)
+      public_suffix
      typhoeus (~> 1.0)
    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.3.0)
+    cocoapods-downloader (1.4.0)
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.1)
+    cocoapods-trunk (1.5.0)
      nap (>= 0.8, < 2.0)
      netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
    colored (1.2)
    colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    concurrent-ruby (1.1.6)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    digest-crc (0.5.1)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.1.9)
+    declarative (0.0.20)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.5)
-    emoji_regex (1.0.1)
+    dotenv (2.7.6)
+    emoji_regex (3.2.2)
    escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    excon (0.73.0)
-    faraday (0.17.3)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
+    excon (0.85.0)
+    faraday (1.6.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.7)
-    fastlane (2.144.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
+      faraday (~> 1.0)
+    fastimage (2.2.4)
+    fastlane (2.191.0)
      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.2, < 2.0.0)
+      babosa (>= 1.0.3, < 2.0.0)
      bundler (>= 1.12.0, < 3.0.0)
      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
+      emoji_regex (>= 0.1, < 4.0)
      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 0.17)
+      faraday (~> 1.0)
      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.13.1)
+      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.29.2, < 0.37.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
      json (< 3.0.0)
-      jwt (~> 2.1.0)
+      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multi_xml (~> 0.5)
      multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
      plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.3.0, < 2.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
      terminal-notifier (>= 2.0.0, < 3.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
@ -130,72 +148,84 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.12.2)
+    ffi (1.15.3)
    fourflusher (2.3.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
-    google-api-client (0.36.4)
+    google-apis-androidpublisher_v3 (0.10.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-core (0.4.1)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.5.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-storage_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.1)
+    google-cloud-env (1.5.0)
      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    google-cloud-storage (1.25.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.34.1)
      addressable (~> 2.5)
      digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.1)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (0.11.0)
+    googleauth (0.17.0)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (~> 0.12)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+      signet (~> 0.14)
+    highline (2.0.3)
+    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
    jmespath (1.4.0)
-    json (2.3.0)
-    jwt (2.1.0)
+    json (2.5.1)
+    jwt (2.2.3)
    memoist (0.16.2)
-    mini_magick (4.10.1)
-    mini_mime (1.0.2)
-    minitest (5.14.0)
+    mini_magick (4.11.0)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
    molinillo (0.6.6)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
+    multi_json (1.15.0)
    multipart-post (2.0.0)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
    nap (1.1.0)
-    naturally (2.2.0)
+    naturally (2.2.1)
    netrc (0.11.0)
-    os (1.0.1)
-    plist (3.5.0)
-    public_suffix (2.0.5)
-    representable (3.0.4)
+    os (1.1.1)
+    plist (3.6.0)
+    public_suffix (4.0.6)
+    rake (13.0.6)
+    representable (3.1.1)
      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
+    rexml (3.2.5)
    rouge (2.0.7)
    ruby-macho (1.4.0)
-    rubyzip (1.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.13.2)
+    signet (0.15.0)
      addressable (~> 2.3)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
@ -203,34 +233,36 @@ GEM
    simctl (1.6.8)
      CFPropertyList
      naturally
-    slack-notifier (2.3.2)
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
    thread_safe (0.3.6)
+    trailblazer-option (0.1.1)
    tty-cursor (0.7.1)
-    tty-screen (0.7.1)
+    tty-screen (0.8.1)
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
      thread_safe (~> 0.1)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
    unicode-display_width (1.7.0)
+    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.15.0)
+    xcodeproj (1.20.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
    xcpretty (0.3.0)
      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
      xcpretty (~> 0.2, >= 0.0.7)

 PLATFORMS
@ -241,4 +273,4 @@ DEPENDENCIES
  fastlane

 BUNDLED WITH
-   1.17.2
+   2.1.4
--- a/17
+++ b/17
@ -14,14 +14,11 @@ workspace 'ChatSecure.xcworkspace'
 project 'ChatSecure.xcodeproj', 'iOS_Debug' => :debug, 'macOS_Debug' => :debug, 'iOS_Release' => :release, 'macOS_Release' => :release

 abstract_target 'ChatSecureCorePods' do  
+  pod 'ZXingObjC/QRCode', :git => 'https://github.com/zxingify/zxingify-objc.git', :tag => '3.6.7'

-  # https://github.com/zxingify/zxingify-objc/pull/491
-  pod 'ZXingObjC/QRCode', :git => 'https://github.com/ChatSecure/ZXingObjC.git', :branch => 'fix-catalyst'
+  pod 'SQLCipher'

-  # Catalyst patch won't be merged upstream
-  pod 'SQLCipher', :git => 'https://github.com/ChatSecure/sqlcipher.git', :branch => 'v4.3.0-catalyst'
-
-  pod 'ParkedTextField', :git => 'https://github.com/gmertk/ParkedTextField.git', :commit => 'a3800e3' # Swift 4.2
+  pod 'ParkedTextField', :git => 'https://github.com/gmertk/ParkedTextField.git', :tag => '1.0.0'
  pod 'JSQMessagesViewController', :path => 'Submodules/JSQMessagesViewController/JSQMessagesViewController.podspec'

  pod 'LumberjackConsole', :path => 'Submodules/LumberjackConsole/LumberjackConsole.podspec'
@ -32,9 +29,6 @@ abstract_target 'ChatSecureCorePods' do

  pod 'ChatSecure-Push-iOS', :path => 'Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec'

-  # Waiting on merge https://github.com/yapstudios/YapDatabase/pull/492
-  pod 'YapDatabase/SQLCipher', :path => 'Submodules/YapDatabase/YapDatabase.podspec'
-
  # The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
  pod 'libsqlfs/SQLCipher', :path => 'Submodules/libsqlfs/libsqlfs.podspec'

@ -56,9 +50,10 @@ end

 def fix_config(config)
  # https://github.com/CocoaPods/CocoaPods/issues/8069#issuecomment-420044112
-  if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-    config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
+  if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 12.0
+    config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
  end
+  config.build_settings['CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER'] = 'NO'
  # https://github.com/CocoaPods/CocoaPods/issues/8891
  if config.build_settings['DEVELOPMENT_TEAM'].nil?
    config.build_settings['DEVELOPMENT_TEAM'] = '4T8JLQR6GR'
--- a/Podfile.lock
+++ b/Podfile.lock
@ -1,6 +1,6 @@
 PODS:
-  - AFNetworking/Security (3.2.1)
-  - Alamofire (5.0.5)
+  - AFNetworking/Security (4.0.1)
+  - Alamofire (5.4.3)
  - ARChromeActivity (1.0.6)
  - BBlock (1.2.1):
    - BBlock/AppKit (= 1.2.1)
@ -12,15 +12,15 @@ PODS:
  - BBlock/UIKit (1.2.1)
  - BButton (4.0.2)
  - ChatSecure-Push-iOS (1.1)
-  - ChatSecureCore (0.1.0):
-    - AFNetworking/Security (~> 3.1)
+  - ChatSecureCore (1.0.0):
+    - AFNetworking/Security (~> 4.0)
    - Alamofire (~> 5.0)
    - ARChromeActivity (~> 1.0)
    - BBlock (~> 1.2)
    - BButton (~> 4.0)
    - ChatSecure-Push-iOS
    - CocoaAsyncSocket (~> 7.6.0)
-    - CocoaLumberjack/Swift (~> 3.6.0)
+    - CocoaLumberjack/Swift (~> 3.7)
    - FormatterKit/TimeIntervalFormatter (~> 1.8)
    - FormatterKit/UnitOfInformationFormatter (~> 1.8)
    - GCDWebServer (~> 3.4)
@ -39,27 +39,27 @@ PODS:
    - OpenInChrome (~> 0.0)
    - OTRAssets
    - OTRKit
-    - ParkedTextField
+    - ParkedTextField (~> 1.0)
    - ProxyKit/Client (~> 1.2.0)
    - PureLayout (~> 3.0)
    - QRCodeReaderViewController (~> 4.0)
    - SAMKeychain (~> 1.5)
    - SignalProtocolObjC
-    - SQLCipher (~> 4.3.0)
+    - SQLCipher (~> 4.4)
    - TTTAttributedLabel (~> 2.0)
    - XLForm (~> 4.1)
    - XMPPFramework/Swift
    - YapDatabase/SQLCipher (~> 4.0)
    - YapTaskQueue/SQLCipher
    - ZXingObjC/QRCode (~> 3.6)
-  - CocoaAsyncSocket (7.6.4)
-  - CocoaLumberjack (3.6.1):
-    - CocoaLumberjack/Core (= 3.6.1)
-  - CocoaLumberjack/Core (3.6.1)
-  - CocoaLumberjack/Swift (3.6.1):
+  - CocoaAsyncSocket (7.6.5)
+  - CocoaLumberjack (3.7.2):
+    - CocoaLumberjack/Core (= 3.7.2)
+  - CocoaLumberjack/Core (3.7.2)
+  - CocoaLumberjack/Swift (3.7.2):
    - CocoaLumberjack/Core
-  - DTFoundation/Core (1.7.14)
-  - DTFoundation/DTASN1 (1.7.14):
+  - DTFoundation/Core (1.7.18)
+  - DTFoundation/DTASN1 (1.7.18):
    - DTFoundation/Core
  - FormatterKit/Resources (1.9.0)
  - FormatterKit/TimeIntervalFormatter (1.9.0):
@ -69,7 +69,7 @@ PODS:
  - GCDWebServer (3.5.4):
    - GCDWebServer/Core (= 3.5.4)
  - GCDWebServer/Core (3.5.4)
-  - HTMLReader (2.1.5)
+  - HTMLReader (2.1.7)
  - IOCipher/common (0.1.0):
    - CocoaLumberjack
    - libsqlfs/SQLCipher
@ -86,24 +86,24 @@ PODS:
    - KissXML/Additions
    - KissXML/Core
  - KissXML/Core (5.3.1)
-  - Kvitto (1.0.3):
-    - DTFoundation/DTASN1 (~> 1.7.13)
-    - Kvitto/Core (= 1.0.3)
-  - Kvitto/Core (1.0.3):
-    - DTFoundation/DTASN1 (~> 1.7.13)
+  - Kvitto (1.0.6):
+    - DTFoundation/DTASN1 (~> 1.7.17)
+    - Kvitto/Core (= 1.0.6)
+  - Kvitto/Core (1.0.6):
+    - DTFoundation/DTASN1 (~> 1.7.17)
  - KVOController (1.2.0)
  - libidn (1.35)
  - libsqlfs/common (1.3.2)
  - libsqlfs/SQLCipher (1.3.2):
    - libsqlfs/common
    - SQLCipher (>= 3.4.0)
-  - LicensePlist (2.14.0)
+  - LicensePlist (3.13.0)
  - LumberjackConsole (3.3.1):
    - CocoaLumberjack (>= 3.x)
    - NBUCore (>= 2.1.0)
-  - Mantle (2.1.1):
-    - Mantle/extobjc (= 2.1.1)
-  - Mantle/extobjc (2.1.1)
+  - Mantle (2.1.6):
+    - Mantle/extobjc (= 2.1.6)
+  - Mantle/extobjc (2.1.6)
  - MBProgressHUD (1.2.0)
  - MWFeedParser (1.0.1):
    - MWFeedParser/FeedParser (= 1.0.1)
@ -118,136 +118,136 @@ PODS:
  - OpenInChrome (0.0.1)
  - OTRAssets (0.1.0)
  - OTRKit (3.0.0)
-  - ParkedTextField (0.5.0)
+  - ParkedTextField (1.0.0)
  - ProxyKit/Client (1.2.0):
    - ProxyKit/common
  - ProxyKit/common (1.2.0):
    - CocoaAsyncSocket (~> 7.6)
    - CocoaLumberjack
-  - PureLayout (3.1.5)
+  - PureLayout (3.1.8)
  - QRCodeReaderViewController (4.0.2)
  - SAMKeychain (1.5.3)
  - SignalProtocolC (2.3.2)
  - SignalProtocolObjC (1.1.0):
    - SignalProtocolC (~> 2.3.2)
-  - SQLCipher (4.3.0):
-    - SQLCipher/standard (= 4.3.0)
-  - SQLCipher/common (4.3.0)
-  - SQLCipher/standard (4.3.0):
+  - SQLCipher (4.4.3):
+    - SQLCipher/standard (= 4.4.3)
+  - SQLCipher/common (4.4.3)
+  - SQLCipher/standard (4.4.3):
    - SQLCipher/common
  - TTTAttributedLabel (2.0.0)
-  - XLForm (4.1.0)
-  - XMPPFramework/default (4.1.0):
+  - XLForm (4.3.0)
+  - XMPPFramework/default (4.1.1):
    - CocoaAsyncSocket (~> 7.6)
    - CocoaLumberjack
    - KissXML (~> 5.2)
    - libidn (~> 1.35)
-  - XMPPFramework/Swift (4.1.0):
+  - XMPPFramework/Swift (4.1.1):
    - CocoaLumberjack/Swift
    - XMPPFramework/default
-  - YapDatabase/SQLCipher (4.0):
-    - YapDatabase/SQLCipher/Core (= 4.0)
-    - YapDatabase/SQLCipher/Extensions (= 4.0)
-  - YapDatabase/SQLCipher-ObjC/Core (4.0):
+  - YapDatabase/SQLCipher (4.0.1):
+    - YapDatabase/SQLCipher/Core (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions (= 4.0.1)
+  - YapDatabase/SQLCipher-ObjC/Core (4.0.1):
    - SQLCipher (>= 3.4.0)
-  - YapDatabase/SQLCipher-ObjC/Extensions/ActionManager (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/ActionManager (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
    - YapDatabase/SQLCipher-ObjC/Extensions/AutoView
-  - YapDatabase/SQLCipher-ObjC/Extensions/AutoView (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/AutoView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
    - YapDatabase/SQLCipher-ObjC/Extensions/View
-  - YapDatabase/SQLCipher-ObjC/Extensions/CloudCore (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/CloudCore (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/CloudKit (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/CloudKit (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/CrossProcessNotification (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/CrossProcessNotification (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/FilteredView (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/FilteredView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
    - YapDatabase/SQLCipher-ObjC/Extensions/View
-  - YapDatabase/SQLCipher-ObjC/Extensions/FullTextSearch (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/FullTextSearch (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/Hooks (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/Hooks (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/ManualView (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/ManualView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
    - YapDatabase/SQLCipher-ObjC/Extensions/View
-  - YapDatabase/SQLCipher-ObjC/Extensions/Relationships (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/Relationships (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/RTreeIndex (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/RTreeIndex (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/SearchResultsView (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/SearchResultsView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
    - YapDatabase/SQLCipher-ObjC/Extensions/AutoView
    - YapDatabase/SQLCipher-ObjC/Extensions/FullTextSearch
-  - YapDatabase/SQLCipher-ObjC/Extensions/SecondaryIndex (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/SecondaryIndex (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher-ObjC/Extensions/View (4.0):
+  - YapDatabase/SQLCipher-ObjC/Extensions/View (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher/Core (4.0):
+  - YapDatabase/SQLCipher/Core (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Core
-  - YapDatabase/SQLCipher/Extensions (4.0):
+  - YapDatabase/SQLCipher/Extensions (4.0.1):
    - YapDatabase/SQLCipher/Core
-    - YapDatabase/SQLCipher/Extensions/ActionManager (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/AutoView (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/CloudCore (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/CloudKit (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/FilteredView (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/Hooks (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/ManualView (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/Relationships (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/SearchResultsView (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 4.0)
-    - YapDatabase/SQLCipher/Extensions/View (= 4.0)
-  - YapDatabase/SQLCipher/Extensions/ActionManager (4.0):
+    - YapDatabase/SQLCipher/Extensions/ActionManager (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/AutoView (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/CloudCore (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/CloudKit (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/FilteredView (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/Hooks (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/ManualView (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/Relationships (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/SearchResultsView (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 4.0.1)
+    - YapDatabase/SQLCipher/Extensions/View (= 4.0.1)
+  - YapDatabase/SQLCipher/Extensions/ActionManager (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/ActionManager
    - YapDatabase/SQLCipher/Core
    - YapDatabase/SQLCipher/Extensions/AutoView
-  - YapDatabase/SQLCipher/Extensions/AutoView (4.0):
+  - YapDatabase/SQLCipher/Extensions/AutoView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/AutoView
    - YapDatabase/SQLCipher/Core
    - YapDatabase/SQLCipher/Extensions/View
-  - YapDatabase/SQLCipher/Extensions/CloudCore (4.0):
+  - YapDatabase/SQLCipher/Extensions/CloudCore (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/CloudCore
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/CloudKit (4.0):
+  - YapDatabase/SQLCipher/Extensions/CloudKit (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/CloudKit
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (4.0):
+  - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/CrossProcessNotification
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/FilteredView (4.0):
+  - YapDatabase/SQLCipher/Extensions/FilteredView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/FilteredView
    - YapDatabase/SQLCipher/Core
    - YapDatabase/SQLCipher/Extensions/View
-  - YapDatabase/SQLCipher/Extensions/FullTextSearch (4.0):
+  - YapDatabase/SQLCipher/Extensions/FullTextSearch (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/FullTextSearch
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/Hooks (4.0):
+  - YapDatabase/SQLCipher/Extensions/Hooks (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/Hooks
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/ManualView (4.0):
+  - YapDatabase/SQLCipher/Extensions/ManualView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/ManualView
    - YapDatabase/SQLCipher/Core
    - YapDatabase/SQLCipher/Extensions/View
-  - YapDatabase/SQLCipher/Extensions/Relationships (4.0):
+  - YapDatabase/SQLCipher/Extensions/Relationships (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/Relationships
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/RTreeIndex (4.0):
+  - YapDatabase/SQLCipher/Extensions/RTreeIndex (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/RTreeIndex
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/SearchResultsView (4.0):
+  - YapDatabase/SQLCipher/Extensions/SearchResultsView (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/SearchResultsView
    - YapDatabase/SQLCipher/Core
    - YapDatabase/SQLCipher/Extensions/AutoView
    - YapDatabase/SQLCipher/Extensions/FullTextSearch
-  - YapDatabase/SQLCipher/Extensions/SecondaryIndex (4.0):
+  - YapDatabase/SQLCipher/Extensions/SecondaryIndex (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/SecondaryIndex
    - YapDatabase/SQLCipher/Core
-  - YapDatabase/SQLCipher/Extensions/View (4.0):
+  - YapDatabase/SQLCipher/Extensions/View (4.0.1):
    - YapDatabase/SQLCipher-ObjC/Extensions/View
    - YapDatabase/SQLCipher/Core
  - YapTaskQueue/SQLCipher (0.3.0):
@ -265,13 +265,12 @@ DEPENDENCIES:
  - LumberjackConsole (from `Submodules/LumberjackConsole/LumberjackConsole.podspec`)
  - OTRAssets (from `OTRAssets.podspec`)
  - OTRKit (from `Submodules/OTRKit/OTRKit.podspec`)
-  - ParkedTextField (from `https://github.com/gmertk/ParkedTextField.git`, commit `a3800e3`)
+  - ParkedTextField (from `https://github.com/gmertk/ParkedTextField.git`, tag `1.0.0`)
  - SignalProtocolObjC (from `Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec`)
-  - SQLCipher (from `https://github.com/ChatSecure/sqlcipher.git`, branch `v4.3.0-catalyst`)
+  - SQLCipher
  - XMPPFramework/Swift (from `Submodules/XMPPFramework/XMPPFramework.podspec`)
-  - YapDatabase/SQLCipher (from `Submodules/YapDatabase/YapDatabase.podspec`)
  - YapTaskQueue/SQLCipher (from `Submodules/YapTaskQueue/YapTaskQueue.podspec`)
-  - ZXingObjC/QRCode (from `https://github.com/ChatSecure/ZXingObjC.git`, branch `fix-catalyst`)
+  - ZXingObjC/QRCode (from `https://github.com/zxingify/zxingify-objc.git`, tag `3.6.7`)

 SPEC REPOS:
  trunk:
@ -302,8 +301,10 @@ SPEC REPOS:
    - QRCodeReaderViewController
    - SAMKeychain
    - SignalProtocolC
+    - SQLCipher
    - TTTAttributedLabel
    - XLForm
+    - YapDatabase

 EXTERNAL SOURCES:
  ChatSecure-Push-iOS:
@ -323,80 +324,72 @@ EXTERNAL SOURCES:
  OTRKit:
    :path: Submodules/OTRKit/OTRKit.podspec
  ParkedTextField:
-    :commit: a3800e3
    :git: https://github.com/gmertk/ParkedTextField.git
+    :tag: 1.0.0
  SignalProtocolObjC:
    :path: Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec
-  SQLCipher:
-    :branch: v4.3.0-catalyst
-    :git: https://github.com/ChatSecure/sqlcipher.git
  XMPPFramework:
    :path: Submodules/XMPPFramework/XMPPFramework.podspec
-  YapDatabase:
-    :path: Submodules/YapDatabase/YapDatabase.podspec
  YapTaskQueue:
    :path: Submodules/YapTaskQueue/YapTaskQueue.podspec
  ZXingObjC:
-    :branch: fix-catalyst
-    :git: https://github.com/ChatSecure/ZXingObjC.git
+    :git: https://github.com/zxingify/zxingify-objc.git
+    :tag: 3.6.7

 CHECKOUT OPTIONS:
  ParkedTextField:
-    :commit: a3800e3
    :git: https://github.com/gmertk/ParkedTextField.git
-  SQLCipher:
-    :commit: f3e2f453753d15082e24b2508f925d71bc118d36
-    :git: https://github.com/ChatSecure/sqlcipher.git
+    :tag: 1.0.0
  ZXingObjC:
-    :commit: 6fe9370caa44e5b2f630f4d58883e7c82367ecdd
-    :git: https://github.com/ChatSecure/ZXingObjC.git
+    :git: https://github.com/zxingify/zxingify-objc.git
+    :tag: 3.6.7

 SPEC CHECKSUMS:
-  AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
-  Alamofire: df2f8f826963b08b9a870791ad48e07a10090b2e
+  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
+  Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9
  ARChromeActivity: 5dcf9b9f09323761f992aff3525cdd777f83609d
  BBlock: c56d7f72597ffe1634fcdc73836c5c0fed3271be
  BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27
  ChatSecure-Push-iOS: b1e7f4133afb77a42464aa0be96b14e03edcef29
-  ChatSecureCore: d29dc259e8b44c9020d06a41789ea017a8c351b8
-  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
-  CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
-  DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
+  ChatSecureCore: ab9ae249d5c51003a44d1bef1a5478ada4edcd50
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
+  CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
+  DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
  FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
  GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
-  HTMLReader: 8056b3418baad09718902a1b39361c63b14a894f
+  HTMLReader: ee1916031d637f3dd6865c048ee81f8dd4a1dda8
  IOCipher: 89435857693a11d24024cbc3da541549eb36fb0e
  JSQMessagesViewController: eade14c4687901c4e53dec681b8e3021269a2b38
  JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9
  KissXML: 5c8e0f2e8b9f071d3e1ae123dec3eb5da615c10c
-  Kvitto: d451f893f84ad669850b7cb7d3f8781363e14232
+  Kvitto: f02b3f84d84a383504fc57cfe824934c7ed782c0
  KVOController: d72ace34afea42468329623b3379ab3cd1d286b6
  libidn: e4576a956b797c584c77aaedfc6e3dd639b61bdc
  libsqlfs: b3c1be163c2fba6b041379cfa5861033783ddae9
-  LicensePlist: d52efb2ce5d3cf58833d362f82967ba4af25fe9a
+  LicensePlist: 4e87d3438e03ae2d368ff5bd85344aa03ca722eb
  LumberjackConsole: 218fed8e807ba6ce0bedbba06b7b295dc0efaf0c
-  Mantle: 35238ae6f2e2b2d474fa7b67fee82a59fea71915
+  Mantle: 4c0ed6ce47c96eccc4dc3bb071deb3def0e2c3be
  MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
  MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
  NBUCore: 201af50441f48513ef6d5823a5fc12c9e1f288cd
  OpenInChrome: f1f3f9dec682216fe78a0d7fe0b5b263d6312c32
  OTRAssets: 9b824cfbe6bdcbf71ac504688031d90f0d460b61
  OTRKit: f61c247f6f711ed1d1c97179f2630bc790c89272
-  ParkedTextField: 865c835f54b39c611b580e0fe60199538cbc2f67
+  ParkedTextField: 7a056596082cf587aec589d074b2c0b1b07b9bc3
  ProxyKit: ae9ed36909d0e68b27087eb3ed5aa35c86f8bff0
-  PureLayout: 9b4ad47b2f0388c84ff534af23d96e720c1b875a
+  PureLayout: a4afb3d79dd958564ce33d22c89f407280d8e6a8
  QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
  SignalProtocolC: 051512e9f3abfeb4120c5e9673af9ae0ee370070
  SignalProtocolObjC: b992ed29c3b7b453510ff0102ed16ef143f7efd2
-  SQLCipher: d305a7bd9af4b64f095c79bdc1a1fa50f2a15116
+  SQLCipher: 155ffeafc9ac102e5c9b68e3e9a1297a98a27096
  TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
-  XLForm: 7ee02761be8a369d1ad1bbffe738b97083d94f3e
-  XMPPFramework: 8b7ce3a5d8f95d1f9e1389e20431ffa06f399d77
-  YapDatabase: 260b1b0b3e6ae6775383edc923e19813586615eb
+  XLForm: a439f9512078ed538e8335c8b06d3f3286bbfd37
+  XMPPFramework: aab9f421bbe4b5072b04923446a9ad641813ec0c
+  YapDatabase: 350ab72b61f9dcc32504594da1a52a93f5ef1476
  YapTaskQueue: 390669f5ef248a515e2a0d955de9d2529e2c7fa5
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: e559e1c4d42575a15d20d7bebae903eb2b3fb2a2
+PODFILE CHECKSUM: 5da54631e44f5213ceba3b259c30ea7af1287c1c

-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.2
--- a/README.md
+++ b/README.md
@ -21,8 +21,6 @@ However, developing and supporting this project is hard work and costs real mone

 * [GitHub Sponsors](https://github.com/sponsors/chrisballinger)
 * [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=F9SM36SQY5EN8)
-* [Bitcoin](bitcoin:bc1qrpswdcrga6w74sm08wy9mult6jp7zt5vjtx0zx?message=ChatSecure%20Donations) `bc1qrpswdcrga6w74sm08wy9mult6jp7zt5vjtx0zx`
-

 ## Localization

--- a/Submodules/CPAProxy
+++ b/Submodules/CPAProxy
@ -1 +1 @@
-Subproject commit abc359dfe1878b96430d5bc4ac15849a145e73f7
+Subproject commit 27930ed91c1f070783ff139170743b704061561a
--- a/Submodules/IOCipher
+++ b/Submodules/IOCipher
@ -1 +1 @@
-Subproject commit 89aee7f8c7f0e23a484d17e70cd8ea2836d22edd
+Subproject commit e3148cee376875c8fa874e7e4d92bf9b8e50bec1
--- a/Submodules/OTRKit
+++ b/Submodules/OTRKit
@ -1 +1 @@
-Subproject commit e2e4c19dfc694947a88c22c83eb4ec3cc9ea94f1
+Subproject commit ad8d85e48c96061774082fb12e37cdf10d4d4824
--- a/Submodules/XMPPFramework
+++ b/Submodules/XMPPFramework
@ -1 +1 @@
-Subproject commit 41db712db95b17cc12d01f081e6d0accb2be7cd5
+Subproject commit 3712c989001e06ecdb2c87d340c4524a520f2ce2
--- a/Submodules/YapDatabase
+++ b/Submodules/YapDatabase
@ -1 +1 @@
-Subproject commit df26a1c91bf522db7607d0bb1d74fed9284fc3bb
+Subproject commit cc4dbb17421221519c72e9f222a8631c7ebf5db7
Author	SHA1	Message	Date
Chris Ballinger	38d6abba3e	5.0.4 (171)	2021-08-06 21:52:24 -07:00
Chris Ballinger	77bfacdf9b	Reduce annoyance	2021-08-06 21:52:24 -07:00
Chris Ballinger	f8b7360e46	Show donation in onboarding flow	2021-08-06 21:52:24 -07:00
Chris Ballinger	c81e2d1a9b	Update dependencies and fix warnings	2021-08-06 21:52:24 -07:00
Chris Ballinger	6a5d4b32b7	Merge pull request #1226 from stigger/master Update IOCipher dependency	2021-01-18 10:43:51 -08:00
Vyacheslav Karpukhin	267d5f75fd	Update IOCipher dependency	2021-01-17 19:43:26 +01:00
Chris Ballinger	4e170ec200	Disable Apple Silicon for Catalyst	2021-01-14 23:16:44 -08:00
Chris Ballinger	1cf0633f78	5.0.3 (169)	2021-01-14 23:05:16 -08:00
Chris Ballinger	5ba021e086	Fix Catalyst donations	2021-01-14 22:17:53 -08:00
Chris Ballinger	8b0ec50ca2	Merge pull request #1215 from ChatSecure/xcode-12 Xcode 12 Updates	2021-01-14 22:11:40 -08:00
Chris Ballinger	1a2894f7a2	Updates	2021-01-14 22:08:47 -08:00
Chris Ballinger	837a26f020	Update dependencies	2021-01-14 21:51:07 -08:00
Chris Ballinger	f8e26d1de0	Fixing issues with Xcode 12	2020-09-24 20:54:27 -07:00