Merge branch 'develop'

# Conflicts: # entourage/Classes/Controller/OTWebViewController.m.orig
ReseauEntourage · Feb 4, 2022 · 1db9a34 · 1db9a34
2 parents 47c94b0 + 78969d4
commit 1db9a34
Show file tree

Hide file tree

Showing 725 changed files with 1,016 additions and 1,102 deletions.
diff --git a/Podfile b/Podfile
@@ -8,15 +8,11 @@ def sharedPods
     platform :ios, '11.0'
 
     pod 'AFNetworking', '~> 4.0'
-    pod 'IQKeyboardManager', '~> 6.5'
+    pod 'IQKeyboardManager', '~> 6.5.9'
     pod 'SVProgressHUD', '~> 2.2'
     pod 'SimpleKeychain', '~> 0.7'
     pod 'AWSS3', '~> 2.19.0'
     pod 'kingpin', '0.3.1'
-    pod 'Firebase/Analytics', '~> 8.0.0'
-    pod 'Firebase/Messaging', '~> 8.0.0'
-    pod 'Firebase/Crashlytics', '~> 8.0.0'
-    pod 'Firebase/RemoteConfig', '~> 8.0.0'
     pod 'SnapKit', '~> 4.0.0'
     pod 'GooglePlaces', '~> 5.1.0'
     pod 'TTTAttributedLabel'

diff --git a/Podfile.lock b/Podfile.lock
@@ -17,143 +17,19 @@ PODS:
   - AWSCore (2.19.1)
   - AWSS3 (2.19.1):
     - AWSCore (= 2.19.1)
-  - Firebase/Analytics (8.0.0):
-    - Firebase/Core
-  - Firebase/Core (8.0.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 8.0.0)
-  - Firebase/CoreOnly (8.0.0):
-    - FirebaseCore (= 8.0.0)
-  - Firebase/Crashlytics (8.0.0):
-    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 8.0.0)
-  - Firebase/Messaging (8.0.0):
-    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 8.0.0)
-  - Firebase/RemoteConfig (8.0.0):
-    - Firebase/CoreOnly
-    - FirebaseRemoteConfig (~> 8.0.0)
-  - FirebaseABTesting (8.8.0):
-    - FirebaseCore (~> 8.0)
-  - FirebaseAnalytics (8.0.0):
-    - FirebaseAnalytics/AdIdSupport (= 8.0.0)
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/MethodSwizzler (~> 7.4)
-    - GoogleUtilities/Network (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-    - nanopb (~> 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (8.0.0):
-    - FirebaseAnalytics/Base (= 8.0.0)
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleAppMeasurement (= 8.0.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/MethodSwizzler (~> 7.4)
-    - GoogleUtilities/Network (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-    - nanopb (~> 2.30908.0)
-  - FirebaseAnalytics/Base (8.0.0):
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/MethodSwizzler (~> 7.4)
-    - GoogleUtilities/Network (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-    - nanopb (~> 2.30908.0)
-  - FirebaseCore (8.0.0):
-    - FirebaseCoreDiagnostics (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/Logger (~> 7.4)
-  - FirebaseCoreDiagnostics (8.0.0):
-    - GoogleDataTransport (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/Logger (~> 7.4)
-    - nanopb (~> 2.30908.0)
-  - FirebaseCrashlytics (8.0.0):
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleDataTransport (~> 9.0)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstallations (8.0.0):
-    - FirebaseCore (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/UserDefaults (~> 7.4)
-    - PromisesObjC (~> 1.2)
-  - FirebaseMessaging (8.0.0):
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/Reachability (~> 7.4)
-    - GoogleUtilities/UserDefaults (~> 7.4)
-  - FirebaseRemoteConfig (8.0.0):
-    - FirebaseABTesting (~> 8.0)
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-  - GoogleAppMeasurement (8.0.0):
-    - GoogleAppMeasurement/AdIdSupport (= 8.0.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/MethodSwizzler (~> 7.4)
-    - GoogleUtilities/Network (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-    - nanopb (~> 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (8.0.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
-    - GoogleUtilities/MethodSwizzler (~> 7.4)
-    - GoogleUtilities/Network (~> 7.4)
-    - "GoogleUtilities/NSData+zlib (~> 7.4)"
-    - nanopb (~> 2.30908.0)
-  - GoogleDataTransport (9.0.0):
-    - GoogleUtilities/Environment (~> 7.2)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
   - GooglePlaces (5.1.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.4.1):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.4.1):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.4.1):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.4.1):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.4.1):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.4.1)"
-  - GoogleUtilities/Reachability (7.4.1):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.4.1):
-    - GoogleUtilities/Logger
-  - IQKeyboardManager (6.5.6)
+  - IQKeyboardManager (6.5.9)
   - kingpin (0.3.1)
-  - nanopb (2.30908.0):
-    - nanopb/decode (= 2.30908.0)
-    - nanopb/encode (= 2.30908.0)
-  - nanopb/decode (2.30908.0)
-  - nanopb/encode (2.30908.0)
-  - PromisesObjC (1.2.12)
-  - SimpleKeychain (0.12.2)
+  - SimpleKeychain (0.12.5)
   - SnapKit (4.0.1)
   - SVProgressHUD (2.2.5)
   - TTTAttributedLabel (2.0.0)
 
 DEPENDENCIES:
   - AFNetworking (~> 4.0)
   - AWSS3 (~> 2.19.0)
-  - Firebase/Analytics (~> 8.0.0)
-  - Firebase/Crashlytics (~> 8.0.0)
-  - Firebase/Messaging (~> 8.0.0)
-  - Firebase/RemoteConfig (~> 8.0.0)
   - GooglePlaces (~> 5.1.0)
-  - IQKeyboardManager (~> 6.5)
+  - IQKeyboardManager (~> 6.5.9)
   - kingpin (= 0.3.1)
   - SimpleKeychain (~> 0.7)
   - SnapKit (~> 4.0.0)
@@ -165,23 +41,9 @@ SPEC REPOS:
     - AFNetworking
     - AWSCore
     - AWSS3
-    - Firebase
-    - FirebaseABTesting
-    - FirebaseAnalytics
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseCrashlytics
-    - FirebaseInstallations
-    - FirebaseMessaging
-    - FirebaseRemoteConfig
-    - GoogleAppMeasurement
-    - GoogleDataTransport
     - GooglePlaces
-    - GoogleUtilities
     - IQKeyboardManager
     - kingpin
-    - nanopb
-    - PromisesObjC
     - SimpleKeychain
     - SnapKit
     - SVProgressHUD
@@ -191,28 +53,14 @@ SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   AWSCore: 55c154ae27efc5c98bdc30a0eeea5a35d10a2ab5
   AWSS3: 2272253b098d07803af8dd20ce6ce7302bcffb47
-  Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
-  FirebaseABTesting: 981336dd14d84787e33466e4247f77ec2343f8d9
-  FirebaseAnalytics: dcb92c7c9ef4fa7ffac276e8f87bd4fc8c97f1b8
-  FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
-  FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
-  FirebaseCrashlytics: 69cddb6bfa7656c5346e603bc85b029392252ee6
-  FirebaseInstallations: c4aab1005d6547b00a7529777fe52f5d4d45165b
-  FirebaseMessaging: 1a33b4af3c8042ed6ddacb6c031894af2064bfab
-  FirebaseRemoteConfig: 055f6b5ba1751547596ded5032c4d5c6054ca501
-  GoogleAppMeasurement: c6bbc9753d046b5456dd4f940057fbad2c28419e
-  GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
   GooglePlaces: c57cd5aa7e91d10fa5106c792de74f3bd6436260
-  GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
-  IQKeyboardManager: 2a6e97afdafc7becf0cb17a9a8d795e3a980717f
+  IQKeyboardManager: 241cc94ccabc9deb8f8bd7d12f00d73288d13ecc
   kingpin: 52bb578006bdeb881db225e6ff1a4228375cbfbf
-  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
-  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
-  SimpleKeychain: d6a74781e20ebac8cd89deebf593587913aeed07
+  SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26
   SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
 
-PODFILE CHECKSUM: 3818d5fb374a3b793aa7bfc88cfc4ce8a4701254
+PODFILE CHECKSUM: 99f172683c7402eb729285588e67c682424b75f6
 
 COCOAPODS: 1.11.2
diff --git a/README.md b/README.md
@@ -9,6 +9,23 @@ Our goal is to create a local social network on smartphones to help the HOMELESS
 
 ...
 
+## Upload Symbols to Firebase
+
+Crashlytics requires you to upload debug symbols.
+You can use a run script build phase for Xcode to automatically upload debug symbols post-build. Find the run script here:
+${BUILD_DIR%Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run
+
+Another option for uploading symbols is to use the [upload-symbols](https://github.com/firebase/firebase-ios-sdk/raw/master/Crashlytics/upload-symbols) script. Place the script in a subdirectory of your project file (for example scripts/upload-symbols), then make sure that the script is executable:
+chmod +x scripts/upload-symbols
+This script can be used to manually upload dSYM files. For usage notes and additional instructions for the script, run upload-symbols without any parameters.
+
+## Pod dependencies
+AWSS3: stuck to 2.19.X because:
+> AWS SDK for iOS 2.20.0
+> Breaking Changes
+> Removed deprecated clients AWS Mobile SDK for iOS has removed these deprecated clients (PR #3281):
+> AWSS3TransferManager - Use Amplify Storage for uploads and downloads with Amazon S3.
+
 ## Authors
 
 * **François Pellissier** - *Coordination* - [FrPellissier](https://github.com/FrPellissier)

diff --git a/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactInfoCell.h b/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactInfoCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 9/19/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactInfoCell.m b/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactInfoCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 9/19/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTContactInfoCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactPhoneCell.h b/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactPhoneCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 9/19/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactPhoneCell.m b/Shared/Classes/Controller/ActiveFeedItem/AddressBookCells/OTContactPhoneCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 9/19/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTContactPhoneCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatCellBase.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatCellBase.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/7/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatCellBase.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatCellBase.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/7/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatDateCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatDateCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by veronica.gliga on 23/03/2017.
-//  Copyright © 2017 OCTO Technology. All rights reserved.
+//  Copyright © 2017 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatDateCell.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTChatDateCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by veronica.gliga on 23/03/2017.
-//  Copyright © 2017 OCTO Technology. All rights reserved.
+//  Copyright © 2017 Entourage. All rights reserved.
 //
 
 #import "OTChatDateCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEncounterCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEncounterCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/8/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEncounterCell.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEncounterCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/8/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTEncounterCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEventCreatedCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEventCreatedCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by Smart Care on 03/08/2018.
-//  Copyright © 2018 OCTO Technology. All rights reserved.
+//  Copyright © 2018 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEventCreatedCell.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTEventCreatedCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by Smart Care on 03/08/2018.
-//  Copyright © 2018 OCTO Technology. All rights reserved.
+//  Copyright © 2018 Entourage. All rights reserved.
 //
 #define BUTTON_MARGIN 144
 

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTFeedClosedCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTFeedClosedCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by Smart Care on 04/10/2018.
-//  Copyright © 2018 OCTO Technology. All rights reserved.
+//  Copyright © 2018 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTFeedClosedCell.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTFeedClosedCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by Smart Care on 04/10/2018.
-//  Copyright © 2018 OCTO Technology. All rights reserved.
+//  Copyright © 2018 Entourage. All rights reserved.
 //
 
 #import "OTFeedClosedCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinAcceptedCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinAcceptedCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/8/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinAcceptedCell.m b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinAcceptedCell.m
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 8/8/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTJoinAcceptedCell.h"

diff --git a/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinRejectedCell.h b/Shared/Classes/Controller/ActiveFeedItem/ChatCells/OTJoinRejectedCell.h
@@ -3,7 +3,7 @@
 //  entourage
 //
 //  Created by sergiu buceac on 11/2/16.
-//  Copyright © 2016 OCTO Technology. All rights reserved.
+//  Copyright © 2016 Entourage. All rights reserved.
 //
 
 #import "OTChatCellBase.h"