Commit Graph

53 Commits

Author SHA1 Message Date
JanNiklas Grabowski b298dedc22 chore: update from foss 1.11.19 (MESSENGER-6656)
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19

* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
  finish version++
  version++
  comments
  update submodule
  remove obsolete tests
  removed unused code
  update submodule
  fix
  Libolm removal
  update license macro
  update license
  Prepare for new sprint

# Conflicts:
#	Config/AppVersion.xcconfig
#	IDETemplateMacros.plist
#	LICENSE
#	README.md
#	Riot/Categories/MXSession+Riot.m
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
#	Riot/Managers/KeyValueStorage/KeyValueStore.swift
#	Riot/Managers/KeyValueStorage/KeychainStore.swift
#	Riot/Managers/KeyValueStorage/MemoryStore.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Managers/Settings/Shared/RiotSharedSettings.swift
#	Riot/Modules/Analytics/AnalyticsUIElement.swift
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Common/WebViewController/WebViewViewController.m
#	Riot/Modules/Contacts/Details/ContactDetailsViewController.m
#	Riot/Modules/Contacts/Views/ContactTableViewCell.m
#	Riot/Modules/Favorites/FavouritesViewController.h
#	Riot/Modules/Favorites/FavouritesViewController.m
#	Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
#	Riot/Modules/People/PeopleViewController.h
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
#	Riot/Modules/Room/DataSources/RoomDataSource.m
#	Riot/Modules/Room/Files/RoomFilesViewController.m
#	Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
#	Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
#	Riot/Modules/Rooms/RoomsViewController.h
#	Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
#	Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
#	Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
#	Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
#	Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/SplitView/SplitViewCoordinator.swift
#	Riot/Modules/SplitView/SplitViewCoordinatorType.swift
#	Riot/Modules/StartChat/StartChatViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/HTMLFormatter.swift
#	Riot/Utils/Tools.m
#	RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Frank Rotermund c8162a06dd MESSENGER-6142 remove jitsi, sentry, posthog and sublibraries 2024-06-18 14:35:38 +02:00
Frank Rotermund 8a186a37d8 Merge commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1' into feature/5433_foss_merge
* commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1': (36 commits)
  finish version++
  Release notes
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4)).
  Fix missing placeholder.
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Arabic)
  Translated using Weblate (Arabic)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Fix: Remove the “Quote” action from the menu of the selected message.
  Update RTE to 2.18.0 to fix an issue with Speech-to-Text
  Code cleanup
  Dismiss the keyboard and minimise the composer when pasting an image, a video or a file
  Fix: focus, keyboard visibility, composer height
  Restore composer tint color
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Modules/Room/RoomViewController.m
2023-12-20 15:11:56 +01:00
Mauro Romito cf5dc59acb safer check 2023-11-07 17:05:32 +01:00
Mauro Romito 7dbf2a8b60 fix completed 2023-11-07 16:30:13 +01:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Doug 4736eda160 Fix unarchiving of the widget manager config. (#6541) 2022-08-05 19:31:41 +01:00
aringenbach 5d73b50bf9 Enable nilability on Jitsi server URL 2022-03-22 14:10:09 +01:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
manuroe 0500f703b2 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Paulo Pinto b5b19e163a Standardise spelling and casing of integration manager
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-18 17:30:45 +01:00
Doug 0f720e56d7 Fix documentation warnings. 2021-07-02 16:46:27 +01:00
Stefan Ceriu 43f6c44c78 Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
ismailgulek 17e11c6663 Merge branch 'develop' into voip_design_updates 2021-05-04 19:10:22 +03:00
manuroe 721c8143d2 WidgetManager: Use the jitsi server defined in the homeserver wellknown
It was done in another PR at https://github.com/vector-im/element-ios/pull/3723/files#diff-530bc68fd973c8c954c5c4e673e9a9f0328943b4656440b8f997b4d718c51d6aR312

But the change was lost with other code updates.
2021-04-29 16:29:13 +02:00
SBiOSoftWhare ce3a9869ae WidgetManager: Update Jitsi domain retrieval. 2021-04-29 12:37:27 +02:00
ismailgulek dbb33a3f2d Read widget event types from NSE 2021-03-19 02:52:04 +03:00
manuroe 3f1473d3ec Widgets: roomId is optional 2021-02-01 15:28:59 +01:00
manuroe 2928e0af06 Widgets: Support $matrix_room_id and $matrix_widget_id parameters
#3987
2021-02-01 12:59:45 +01:00
SBiOSoftWhare dc6f077c02 WidgetManager: Use JitsiService to generate Jitsi widget content. 2020-10-27 15:35:57 +01:00
SBiOSoftWhare 9e8db7c79a JitsiWidgetData: Add authentication type field. 2020-10-27 15:30:15 +01:00
manuroe 8912465003 BuildSettings: Integrate applicationWebAppUrlString 2020-07-31 11:44:26 +02:00
manuroe b599147e5f BuildSettings: Integrate integrationsWidgetsUrls and rename it 2020-07-31 11:36:56 +02:00
manuroe 194d978d3d BuildSettings: Integrate integrations 2020-07-31 11:33:29 +02:00
manuroe fbf8b75c3c Jitsi: Create jitsi widget with v2 style but stay compatible with v1
We use `webAppUrl`and `jitsiServerURL` from the app plist for the url start (used only by web) and the default jitsi server
2020-04-24 12:24:11 +02:00
manuroe 32aa28b5a0 Jitsi: Support v2 widget data. Open a conference on the provided domain 2020-04-24 11:09:01 +02:00
manuroe 685b2931b0 Jitsi: Support v1 and v2 widget types 2020-04-24 09:04:49 +02:00
manuroe c40065bc41 Fix crash due to malformed widget
#2997
2020-02-17 09:25:17 +01:00
SBiOSoftWhare 118ee895a0 Widgets: Require scalar token validation to ensure terms display when retrieve widget URL. 2019-11-29 16:21:26 +01:00
manuroe aafc8e3acb Widgets: Display an error if the IM is disabled
#2843
2019-11-21 16:36:08 +01:00
manuroe 34570ce840 Merge tag 'v0.10.2' into develop
Finish IntegrationsManagerTerms

# Conflicts:
#	CHANGES.rst
2019-11-15 17:36:59 +01:00
manuroe 4a77c98275 Integrations: Fix terms consent display HTTP requests 2019-11-15 17:30:21 +01:00
manuroe c2bcee2392 Integrations: Fix terms consent display when they are required
(cherry picked from commit 394aedbf5fdfb7979775667287f0441e99427902)
2019-11-15 16:39:27 +01:00
manuroe 83f58771b7 Integrations: Use the integrations manager provided by the homeserver admin via .well-known
#2815
2019-11-07 18:46:50 +01:00
manuroe ae5da701bf Integrations: Fix terms consent display when they are required 2019-11-07 18:25:11 +01:00
SBiOSoftWhare c5963e4203 MXHTTPOperation: Remove nullability check before using mutateTo: method where needed. 2019-10-30 10:49:00 +01:00
manuroe a258907fea IM: Terms modal: Make computation of baseUrl more generic 2019-08-13 11:35:56 +02:00
manuroe 2828890597 IM: Detect not signed terms error
(cherry picked from commit 80877eabafc2184ef55c279d2a8f2db10d9735e3)
2019-08-09 15:30:58 +02:00
manuroe e910455e3a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe 53afe41f9a Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
manuroe 089835f3f4 Integrations: Make code support use of an integration manager other than modular/scalar.
The default value is still modular/scalar.
2019-06-21 11:26:34 +02:00
manuroe 1b853d1bb1 Widgets: Use scalar v1.1 2019-03-12 17:55:50 +01:00
manuroe f8ea427b62 Widgets: Attempt to re-register for a scalar token if ours is invalid
#2326

As the integration manager page (https://scalar-staging.riot.im/scalar-web) does not return a 403, check scalar token validity before opening it
2019-03-12 17:12:44 +01:00
manuroe eba5da7cb1 Widget: Pass scalar_token only when required 2019-03-12 15:56:19 +01:00
fridtjof 7ba712a6b6 use the Matrix SDK's method for percent encoding 2019-02-18 15:31:55 +01:00
fridtjof 23ed49d186 take care of percent encoding related deprecations 2019-02-04 21:22:43 +01:00