From 63d6e988d63a1f735ffc42513a201dc963fa04df Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Mon, 14 Mar 2022 16:05:54 +0100 Subject: [PATCH] Bug Fix: Files sent by Tchap Android 2 can't be read by Tchap iOS 1.2.2 #480 --- .../SupportingFiles/Info.plist | 4 +- Podfile | 2 +- Podfile.lock | 46 +++++++++---------- TCHAP_CHANGES.rst | 6 +++ Tchap.xcodeproj/project.pbxproj | 4 +- Tchap/SupportingFiles/Info.plist | 4 +- .../SupportingFiles/Info.plist | 4 +- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/BtchapShareExtension/SupportingFiles/Info.plist b/BtchapShareExtension/SupportingFiles/Info.plist index 97a9dcd9ca..8374f1941e 100644 --- a/BtchapShareExtension/SupportingFiles/Info.plist +++ b/BtchapShareExtension/SupportingFiles/Info.plist @@ -2,8 +2,6 @@ - UserDefaults - Btchap-Defaults CFBundleDevelopmentRegion fr CFBundleDisplayName @@ -47,5 +45,7 @@ NSExtensionPrincipalClass SharePresentingViewController + UserDefaults + Btchap-Defaults diff --git a/Podfile b/Podfile index 007a852272..ccc40f1653 100644 --- a/Podfile +++ b/Podfile @@ -14,7 +14,7 @@ use_frameworks! # $matrixKitVersion = '= 0.13.1' # $matrixKitVersion = :local # $matrixKitVersion = {'develop' => 'develop'} -$matrixKitVersion = {'develop' => 'dinum'} +$matrixKitVersion = {'dinum_prod' => 'dinum_prod'} ######################################## diff --git a/Podfile.lock b/Podfile.lock index b779fe2433..533338947f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -18,28 +18,28 @@ PODS: - BlueECC (1.2.5) - BlueRSA (1.0.34) - DGCollectionViewLeftAlignFlowLayout (1.0.4) - - Down (0.9.4) - - DTCoreText (1.6.25): - - DTCoreText/Core (= 1.6.25) + - Down (0.9.5) + - DTCoreText (1.6.26): + - DTCoreText/Core (= 1.6.26) - DTFoundation/Core (~> 1.7.5) - DTFoundation/DTAnimatedGIF (~> 1.7.5) - DTFoundation/DTHTMLParser (~> 1.7.5) - DTFoundation/UIKit (~> 1.7.5) - - DTCoreText/Core (1.6.25): + - DTCoreText/Core (1.6.26): - DTFoundation/Core (~> 1.7.5) - DTFoundation/DTAnimatedGIF (~> 1.7.5) - DTFoundation/DTHTMLParser (~> 1.7.5) - DTFoundation/UIKit (~> 1.7.5) - - DTCoreText/Extension (1.6.25): + - DTCoreText/Extension (1.6.26): - DTFoundation/Core (~> 1.7.5) - DTFoundation/DTAnimatedGIF (~> 1.7.5) - DTFoundation/DTHTMLParser (~> 1.7.5) - DTFoundation/UIKit (~> 1.7.5) - - DTFoundation/Core (1.7.16) - - DTFoundation/DTAnimatedGIF (1.7.16) - - DTFoundation/DTHTMLParser (1.7.16): + - DTFoundation/Core (1.7.18) + - DTFoundation/DTAnimatedGIF (1.7.18) + - DTFoundation/DTHTMLParser (1.7.18): - DTFoundation/Core - - DTFoundation/UIKit (1.7.16): + - DTFoundation/UIKit (1.7.18): - DTFoundation/Core - GBDeviceInfo (6.4.0): - GBDeviceInfo/Core (= 6.4.0) @@ -127,11 +127,11 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.1) - KTCenterFlowLayout (~> 1.3.1) - MatomoTracker (~> 7.2.2) - - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`) - - MatrixKit/AppExtension (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`) - - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum`) - - MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum`) - - MatrixSDK/SwiftSupport (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum`) + - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `dinum_prod`) + - MatrixKit/AppExtension (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `dinum_prod`) + - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum_prod`) + - MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum_prod`) + - MatrixSDK/SwiftSupport (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `dinum_prod`) - OLMKit - Reusable (~> 4.1) - RxSwift (~> 5.1.1) @@ -177,18 +177,18 @@ SPEC REPOS: EXTERNAL SOURCES: MatrixKit: - :branch: develop + :branch: dinum_prod :git: https://github.com/matrix-org/matrix-ios-kit.git MatrixSDK: - :branch: dinum + :branch: dinum_prod :git: https://github.com/matrix-org/matrix-ios-sdk.git CHECKOUT OPTIONS: MatrixKit: - :commit: 98839c1b1184931ff59d97a99aaff32068e53d7f + :commit: 0fa09ff9da48c7564fd6e9a60f8761c9a17b17aa :git: https://github.com/matrix-org/matrix-ios-kit.git MatrixSDK: - :commit: 93d2d4e67f6ec433d6fcd66f8a81cabd50df844a + :commit: 15bef88ebe21666fdf756d8def79461867f91bb6 :git: https://github.com/matrix-org/matrix-ios-sdk.git SPEC CHECKSUMS: @@ -197,9 +197,9 @@ SPEC CHECKSUMS: BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc BlueRSA: 6f9776d62d9773502415a7db3bcbb2bbb3f71fc3 DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399 - Down: 276f2c3eeeaf30345873bdad25f44b2640fcfa3a - DTCoreText: e92f4cf6b36d9d71ce4436d12cf089d74ab0596b - DTFoundation: e7781d9fd2f202bfd451fbbf8cab71ce83b46498 + Down: 7321a72d0747ed0061dce948bcff518fcb6df2bd + DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce + DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536 GBDeviceInfo: f29249891446a392e64b9c9bbef9554aad2a6beb GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3 HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19 @@ -225,6 +225,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 48a4a7bf0569fc429c871513d07357cf1be2f6ee +PODFILE CHECKSUM: 48c19387a7b58766e4d8db222b99f47d72f7771e -COCOAPODS: 1.10.0 +COCOAPODS: 1.11.2 diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst index ca2eb9922c..c209339d4d 100644 --- a/TCHAP_CHANGES.rst +++ b/TCHAP_CHANGES.rst @@ -1,3 +1,9 @@ +Changes in Tchap 1.2.3 (2022-03-14) +=================================================== + +Bug Fix: + * Files sent by Tchap Android 2 can't be read by Tchap iOS 1.2.2 #480 + Changes in Tchap 1.2.2 (2021-08-25) =================================================== diff --git a/Tchap.xcodeproj/project.pbxproj b/Tchap.xcodeproj/project.pbxproj index 537284d80b..e0875006f4 100644 --- a/Tchap.xcodeproj/project.pbxproj +++ b/Tchap.xcodeproj/project.pbxproj @@ -9740,7 +9740,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.2.2; + MARKETING_VERSION = 1.2.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -9792,7 +9792,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.2.2; + MARKETING_VERSION = 1.2.3; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/Tchap/SupportingFiles/Info.plist b/Tchap/SupportingFiles/Info.plist index 5b280c3c4f..b5da610a2d 100644 --- a/Tchap/SupportingFiles/Info.plist +++ b/Tchap/SupportingFiles/Info.plist @@ -28,6 +28,8 @@ 9ee16a62-a55e-4de2-8aaf-d697180e462f LSRequiresIPhoneOS + NSCalendarsUsageDescription + See your scheduled meetings in the app. NSCameraUsageDescription This allows you to take pictures or videos with the camera and send them in your conversations. You can also use the camera to set your profile picture. NSContactsUsageDescription @@ -38,8 +40,6 @@ The microphone is used when you record videos with the camera. NSPhotoLibraryUsageDescription This allows you to select pictures or videos from the photo library, and send them in your conversations. You can also use one of these pictures to set your profile picture. - NSCalendarsUsageDescription - See your scheduled meetings in the app. UIBackgroundModes remote-notification diff --git a/TchapShareExtension/SupportingFiles/Info.plist b/TchapShareExtension/SupportingFiles/Info.plist index 3925dfe6f9..bafc53dc43 100644 --- a/TchapShareExtension/SupportingFiles/Info.plist +++ b/TchapShareExtension/SupportingFiles/Info.plist @@ -2,8 +2,6 @@ - UserDefaults - Tchap-Defaults CFBundleDevelopmentRegion fr CFBundleDisplayName @@ -47,5 +45,7 @@ NSExtensionPrincipalClass SharePresentingViewController + UserDefaults + Tchap-Defaults