diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
index 52bbf21734..11a015c9a7 100644
--- a/TCHAP_CHANGES.md
+++ b/TCHAP_CHANGES.md
@@ -1,3 +1,11 @@
+Changes in Tchap 2.11.5 (2024-05-23)
+====================================
+
+Other changes
+-------------
+ - Suppression du variant sans VoIP. ([#1047](https://github.com/tchapgouv/tchap-android/issues/1047))
+
+
Changes in Tchap 2.11.4 (2024-05-16)
====================================
@@ -11,7 +19,7 @@ Changes in Tchap 2.11.3 (2024-05-14)
Features ✨
----------
- - Activation des appels vocaux pour toutes les instances. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))
+ - Activation des appels vocaux pour toutes les instances en beta externe. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))
Other changes
-------------
@@ -23,7 +31,7 @@ Changes in Tchap 2.11.2 (2024-04-30)
Features ✨
----------
- - Activation des appels vocaux pour les instances Diplomatie et Finances ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))
+ - Activation des appels vocaux pour les instances Diplomatie et Finances en beta externe ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))
Improvements 🙌
--------------
diff --git a/towncrier.toml b/towncrier.toml
index 2269978d6e..558b719f8d 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -1,5 +1,5 @@
[tool.towncrier]
- version = "2.11.4"
+ version = "2.11.5"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index f51ac4b697..af841c8220 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 11
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
-ext.versionPatch = 4
+ext.versionPatch = 5
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@@ -352,7 +352,6 @@ android {
withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
withpinning { dimension "pinning" }
withoutpinning { dimension "pinning" }
@@ -445,24 +444,6 @@ configurations {
gplayTchapWithvoipWithpinningDebugImplementation
- fdroidBtchapWithoutvoipWithpinningDebugImplementation
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation
- fdroidTchapWithoutvoipWithpinningDebugImplementation
-
- gplayBtchapWithoutvoipWithpinningDebugImplementation
- gplayDevTchapWithoutvoipWithpinningDebugImplementation
- gplayTchapWithoutvoipWithpinningDebugImplementation
-
-
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation
-
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation
- gplayTchapWithoutvoipWithoutpinningDebugImplementation
-
-
fdroidBtchapWithdmvoipWithpinningDebugImplementation
fdroidDevTchapWithdmvoipWithpinningDebugImplementation
fdroidTchapWithdmvoipWithpinningDebugImplementation
@@ -563,45 +544,6 @@ dependencies {
fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
- gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
gplayBtchapWithdmvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
gplayBtchapWithdmvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
diff --git a/vector-config/build.gradle b/vector-config/build.gradle
index c65050ac78..e7a50f829d 100644
--- a/vector-config/build.gradle
+++ b/vector-config/build.gradle
@@ -20,7 +20,6 @@ android {
productFlavors {
withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
devTchap { dimension "target" }
btchap { dimension "target" }
diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index e30415e59d..f9439b9f00 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -4,5 +4,7 @@
truefalse
-
+
+ agent.dinum.tchap.gouv.fr
+
diff --git a/vector-config/src/withoutvoip/res/values/config-features.xml b/vector-config/src/withoutvoip/res/values/config-features.xml
deleted file mode 100755
index bcf6dbbff3..0000000000
--- a/vector-config/src/withoutvoip/res/values/config-features.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- false
-
diff --git a/vector/build.gradle b/vector/build.gradle
index 88f43e6b72..4102d4d435 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -93,7 +93,6 @@ android {
withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
withpinning { dimension "pinning" }
withoutpinning { dimension "pinning" }
@@ -272,7 +271,6 @@ dependencies {
// Tchap: Manage jitsi lib
// WebRTC
- withoutvoipImplementation('org.jitsi:webrtc:111.0.1')
withdmvoipImplementation('org.jitsi:webrtc:111.0.1')
// Jitsi
withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') {
diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt
index 76fba55904..807fd4b4ef 100644
--- a/vector/src/main/java/im/vector/app/features/location/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/location/Config.kt
@@ -16,13 +16,13 @@
package im.vector.app.features.location
+// Tchap: Generate and load map on device
+// const val MAP_BASE_URL = "https://api.maptiler.com/maps/streets/style.json"
+// const val STATIC_MAP_BASE_URL = "https://api.maptiler.com/maps/basic/static/"
// Tchap: Tiles from IGN
// const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
// Tchap: Tiles from geo.data.gouv.fr
const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
-// Tchap: Generate and load map on device
-// const val MAP_BASE_URL = "https://api.maptiler.com/maps/streets/style.json"
-// const val STATIC_MAP_BASE_URL = "https://api.maptiler.com/maps/basic/static/"
const val DEFAULT_PIN_ID = "DEFAULT_PIN_ID"
const val INITIAL_MAP_ZOOM_IN_PREVIEW = 15.0
diff --git a/vector/src/withoutvoip/assets/open_source_licenses.html b/vector/src/withoutvoip/assets/open_source_licenses.html
deleted file mode 100755
index ec0f56295a..0000000000
--- a/vector/src/withoutvoip/assets/open_source_licenses.html
+++ /dev/null
@@ -1,655 +0,0 @@
-
-
-
-
-
-
-
Tchap Android
-
Third Party Licenses
-
-
-
-
- glide
-
- Copyright 2014 Google, Inc. All rights reserved.
-
-
-
-License for everything not in third_party and not otherwise marked:
-
-Copyright 2014 Google, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this list of
- conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice, this list
- of conditions and the following disclaimer in the documentation and/or other materials
- provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``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 GOOGLE, INC. 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.
-
-The views and conclusions contained in the software and documentation are those of the
-authors and should not be interpreted as representing official policies, either expressed
-or implied, of Google, Inc.
----------------------------------------------------------------------------------------------
-License for third_party/disklrucache:
-
-Copyright 2012 Jake Wharton
-Copyright 2011 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
----------------------------------------------------------------------------------------------
-License for third_party/gif_decoder:
-
-Copyright (c) 2013 Xcellent Creations, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-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.
----------------------------------------------------------------------------------------------
-License for third_party/gif_encoder/AnimatedGifEncoder.java and
-third_party/gif_encoder/LZWEncoder.java:
-
-No copyright asserted on the source code of this class. May be used for any
-purpose, however, refer to the Unisys LZW patent for restrictions on use of
-the associated LZWEncoder class. Please forward any corrections to
-kweiner@fmsware.com.
-
------------------------------------------------------------------------------
-License for third_party/gif_encoder/NeuQuant.java
-
-Copyright (c) 1994 Anthony Dekker
-
-NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
-"Kohonen neural networks for optimal colour quantization" in "Network:
-Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
-the algorithm.
-
-Any party obtaining a copy of these files from the author, directly or
-indirectly, is granted, free of charge, a full and unrestricted irrevocable,
-world-wide, paid up, royalty-free, nonexclusive right and license to deal in
-this software and documentation files (the "Software"), including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons who
-receive copies from any such party to do so, with the only requirement being
-that this copyright notice remain intact.
-
-
-
-
- Stetho
-
- Copyright (c) 2015, Facebook, Inc. All rights reserved.
-
-
-
-BSD License
-
-For Stetho software
-
-Copyright (c) 2015, Facebook, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-* Neither the name Facebook nor the names of its contributors may be used to
-endorse or promote products derived from this software without specific
-prior written permission.
-
-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 HOLDER 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.
-
-
-
-
- Tapadoo/Alerter
-
- Tapadoo/Alerter is licensed under the MIT License
- Copyright 2017 Tapadoo, Dublin.
-
-
-
-
-Copyright 2017 Tapadoo, Dublin.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-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.
-
-
-
-
-
- hyuwah/DraggableView
-
- hyuwah/DraggableView is licensed under the MIT License
- Copyright (c) 2018 Muhammad Wahyudin
-
-
-
-
-Copyright (c) 2018 Muhammad Wahyudin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-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.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-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 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.
-
-
-
-
- textdrawable
-
- textdrawable is licensed under the MIT License
-
-
-
-
-
- posthog-android
-
- https://github.com/PostHog/posthog-android
- PostHog Android integration is licensed under the MIT License
-
-
-
-
- Apache License
-
- Version 2.0, January 2004
-
-
-
- Matrix SDK
-
- Copyright (c) 2019 The Matrix.org Foundation C.I.C
-
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- Opus
-
- Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
- Copyright (c) 2017 Jean-Marc Valin
-
-
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-- Neither the name of Internet Society, IETF or IETF Trust, nor the names of specific contributors, may be used to endorse or promote products derived from this software without specific prior written permission.
-
-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.
-
-
-
-
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/VectorCallActivity.kt
deleted file mode 100644
index cf7a52bd3e..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/VectorCallActivity.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call
-
-import android.content.Context
-import android.content.Intent
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
-import android.graphics.Color
-import android.os.Bundle
-import android.os.Parcelable
-import android.view.View
-import android.view.WindowManager
-import com.airbnb.mvrx.Mavericks
-import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityCallBinding
-import im.vector.app.features.call.webrtc.WebRtcCall
-import im.vector.lib.core.utils.compat.getParcelableExtraCompat
-import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.logger.LoggerTag
-import timber.log.Timber
-import javax.inject.Inject
-
-@Parcelize
-data class CallArgs(
- val signalingRoomId: String,
- val callId: String,
- val participantUserId: String,
- val isIncomingCall: Boolean,
- val isVideoCall: Boolean
-) : Parcelable
-
-private val loggerTag = LoggerTag("VectorCallActivity", LoggerTag.VOIP)
-
-@AndroidEntryPoint
-class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionListener {
-
- override fun getBinding() = ActivityCallBinding.inflate(layoutInflater)
-
- private lateinit var callArgs: CallArgs
-
- @Inject lateinit var viewModelFactory: VectorCallViewModel.Factory
-
- override fun onCreate(savedInstanceState: Bundle?) {
- @Suppress("DEPRECATION")
- window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
- window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
- window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
- window.statusBarColor = Color.TRANSPARENT
- window.navigationBarColor = Color.BLACK
- super.onCreate(savedInstanceState)
-
- if (intent.hasExtra(Mavericks.KEY_ARG)) {
- callArgs = intent.getParcelableExtraCompat(Mavericks.KEY_ARG)!!
- } else {
- Timber.tag(loggerTag.value).e("missing callArgs for VectorCall Activity")
- finish()
- }
- }
-
- companion object {
- private const val EXTRA_MODE = "EXTRA_MODE"
-
- const val INCOMING_RINGING = "INCOMING_RINGING"
- const val INCOMING_ACCEPT = "INCOMING_ACCEPT"
-
- fun newIntent(context: Context, call: WebRtcCall, mode: String?): Intent {
- return Intent(context, VectorCallActivity::class.java).apply {
- // what could be the best flags?
- flags = Intent.FLAG_ACTIVITY_NEW_TASK
- putExtra(Mavericks.KEY_ARG, CallArgs(call.nativeRoomId, call.callId, call.mxCall.opponentUserId, !call.mxCall.isOutgoing, call.mxCall.isVideoCall))
- putExtra(EXTRA_MODE, mode)
- }
- }
-
- fun newIntent(context: Context,
- callId: String,
- signalingRoomId: String,
- otherUserId: String,
- isIncomingCall: Boolean,
- isVideoCall: Boolean,
- mode: String?): Intent {
- return Intent(context, VectorCallActivity::class.java).apply {
- // what could be the best flags?
- flags = FLAG_ACTIVITY_CLEAR_TOP
- putExtra(Mavericks.KEY_ARG, CallArgs(signalingRoomId, callId, otherUserId, isIncomingCall, isVideoCall))
- putExtra(EXTRA_MODE, mode)
- }
- }
- }
-
- override fun didTapAudioSettings() = Unit
-
- override fun didAcceptIncomingCall() = Unit
-
- override fun didDeclineIncomingCall() = Unit
-
- override fun didEndCall() = Unit
-
- override fun didTapToggleMute() = Unit
-
- override fun didTapToggleVideo() = Unit
-
- override fun didTapMore() = Unit
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/ConferenceEvent.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/conference/ConferenceEvent.kt
deleted file mode 100644
index 7151e922d5..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/ConferenceEvent.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2021 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.conference
-
-import android.content.Context
-import androidx.lifecycle.LifecycleObserver
-
-sealed class ConferenceEvent(open val data: Map) {
- data class Terminated(override val data: Map) : ConferenceEvent(data)
- data class WillJoin(override val data: Map) : ConferenceEvent(data)
- data class Joined(override val data: Map) : ConferenceEvent(data)
-
- fun extractConferenceUrl(): String? {
- return null
- }
-}
-
-class ConferenceEventEmitter(private val context: Context) { fun emitConferenceEnded() {} }
-
-class ConferenceEventObserver(private val context: Context, private val onBroadcastEvent: (ConferenceEvent) -> Unit) : LifecycleObserver
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
deleted file mode 100644
index 95c6be8325..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.conference
-
-import com.airbnb.mvrx.MavericksViewModelFactory
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import im.vector.app.core.di.MavericksAssistedViewModelFactory
-import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.platform.EmptyAction
-import im.vector.app.core.platform.EmptyViewEvents
-import im.vector.app.core.platform.VectorViewModel
-
-class JitsiCallViewModel @AssistedInject constructor(
- @Assisted initialState: JitsiCallViewState
-) : VectorViewModel(initialState) {
-
- @AssistedFactory
- interface Factory : MavericksAssistedViewModelFactory {
- override fun create(initialState: JitsiCallViewState): JitsiCallViewModel
- }
-
- override fun handle(action: EmptyAction) {
- // No op
- }
-
- companion object : MavericksViewModelFactory by hiltMavericksViewModelFactory() {
- const val ENABLE_VIDEO_OPTION = "ENABLE_VIDEO_OPTION"
- }
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewState.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
deleted file mode 100644
index 7ecd44b9b0..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.conference
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.widgets.model.Widget
-
-data class JitsiCallViewState(
- val roomId: String = "",
- val widgetId: String = "",
- val enableVideo: Boolean = false,
- val widget: Async = Uninitialized
-) : MavericksState {
-
- constructor(args: VectorJitsiActivity.Args) : this(
- roomId = args.roomId,
- widgetId = args.widgetId,
- enableVideo = args.enableVideo
- )
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiService.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiService.kt
deleted file mode 100644
index 0e6e0fe0f8..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/JitsiService.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2021 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.conference
-
-import im.vector.app.R
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.raw.wellknown.getElementWellknown
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.raw.RawService
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.widgets.model.Widget
-import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-import javax.inject.Inject
-
-class JitsiService @Inject constructor(
- private val session: Session,
- private val rawService: RawService,
- private val stringProvider: StringProvider) {
-
- suspend fun createJitsiWidget(roomId: String, withVideo: Boolean): Widget {
- // Build data for a jitsi widget
- val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + System.currentTimeMillis()
- val preferredJitsiDomain = tryOrNull {
- rawService.getElementWellknown(session.sessionParams)
- ?.jitsiServer
- ?.preferredDomain
- }
- val jitsiDomain = preferredJitsiDomain ?: stringProvider.getString(R.string.preferred_jitsi_domain)
-
- val widgetEventContent = mapOf(
- "type" to WidgetType.Jitsi.legacy,
- "data" to mapOf(
- "domain" to jitsiDomain,
- "isAudioOnly" to !withVideo
- ),
- "creatorUserId" to session.myUserId,
- "id" to widgetId,
- "name" to "jitsi"
- )
-
- return session.widgetService().createRoomWidget(roomId, widgetId, widgetEventContent)
- }
-
- @Suppress("UNUSED_PARAMETER")
- fun extractJitsiWidgetData(widget: Widget): JitsiWidgetData? = null
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
deleted file mode 100644
index 3111b7ce8f..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.conference
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.os.Parcelable
-import com.airbnb.mvrx.Mavericks
-import im.vector.app.databinding.ActivityJitsiBinding
-import kotlinx.parcelize.Parcelize
-
-class VectorJitsiActivity : Activity() {
-
- @Parcelize
- data class Args(
- val roomId: String,
- val widgetId: String,
- val enableVideo: Boolean
- ) : Parcelable
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- val binding = ActivityJitsiBinding.inflate(layoutInflater)
- setContentView(binding.root)
- }
-
- companion object {
- fun newIntent(context: Context, roomId: String, widgetId: String, enableVideo: Boolean): Intent {
- return Intent(context, VectorJitsiActivity::class.java).apply {
- putExtra(Mavericks.KEY_ARG, Args(roomId, widgetId, enableVideo))
- }
- }
- }
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
deleted file mode 100644
index 6654508268..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.webrtc
-
-import im.vector.app.core.utils.TextUtils.formatDuration
-import im.vector.app.features.call.CameraType
-import im.vector.app.features.call.CaptureFormat
-import org.matrix.android.sdk.api.session.call.MxCall
-import org.matrix.android.sdk.api.session.room.model.call.CallAssertedIdentityContent
-import org.matrix.android.sdk.api.session.room.model.call.EndCallReason
-import org.threeten.bp.Duration
-import org.webrtc.VideoCapturer
-
-private const val STREAM_ID = "userMedia"
-
-@Suppress("UNUSED_PARAMETER")
-class WebRtcCall(
- val mxCall: MxCall,
- // This is where the call is placed from an ui perspective.
- // In case of virtual room, it can differs from the signalingRoomId.
- val nativeRoomId: String
-) : MxCall.StateListener {
-
- interface Listener : MxCall.StateListener {
- fun onCaptureStateChanged() {}
- fun onCameraChanged() {}
- fun onHoldUnhold() {}
- fun assertedIdentityChanged() {}
- fun onTick(formattedDuration: String) {}
- override fun onStateUpdate(call: MxCall) {}
- }
-
- fun addListener(listener: Listener) = Unit
-
- fun removeListener(listener: Listener) = Unit
-
- val callId = mxCall.callId
-
- // room where call signaling is placed. In case of virtual room it can differs from the nativeRoomId.
- val signalingRoomId = mxCall.roomId
-
- // Mute status
- var micMuted = false
- private set
- var videoMuted = false
- private set
- var isRemoteOnHold = false
- private set
- var isLocalOnHold = false
- private set
-
- var remoteAssertedIdentity: CallAssertedIdentityContent.AssertedIdentity? = null
- private set
-
- var videoCapturerIsInError = false
-
- init {
- mxCall.addListener(this)
- }
-
- fun formattedDuration(): String {
- return formatDuration(Duration.ofMillis(0L))
- }
-
- /**
- * Without consultation
- */
- fun transferToUser(targetUserId: String, targetRoomId: String?) = Unit
-
- /**
- * With consultation
- */
- fun transferToCall(transferTargetCall: WebRtcCall) = Unit
-
- fun acceptIncomingCall() = Unit
-
- /**
- * Sends a DTMF digit to the other party
- * @param digit The digit (nb. string - '#' and '*' are dtmf too)
- */
- fun sendDtmfDigit(digit: String) = Unit
-
- fun setCaptureFormat(format: CaptureFormat) = Unit
-
- fun updateRemoteOnHold(onHold: Boolean) = Unit
-
- fun muteCall(muted: Boolean) = Unit
-
- fun enableVideo(enabled: Boolean) = Unit
-
- fun canSwitchCamera(): Boolean = false
-
- fun switchCamera() = Unit
-
- fun currentCameraType(): CameraType? = null
-
- fun currentCaptureFormat(): CaptureFormat = CaptureFormat.HD
-
- fun endCall(reason: EndCallReason = EndCallReason.USER_HANGUP) = Unit
-
- // MxCall.StateListener
-
- override fun onStateUpdate(call: MxCall) = Unit
-
- fun startSharingScreen(videoCapturer: VideoCapturer) = Unit
-
- fun stopSharingScreen() = Unit
-
- fun isSharingScreen(): Boolean = false
-}
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
deleted file mode 100644
index b77eadd5d9..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2021 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.webrtc
-
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.util.MatrixItem
-
-@Suppress("UNUSED", "UNUSED_PARAMETER")
-fun WebRtcCall.getOpponentAsMatrixItem(session: Session): MatrixItem? = null
diff --git a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
deleted file mode 100644
index 9933321512..0000000000
--- a/vector/src/withoutvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.call.webrtc
-
-import android.content.Context
-import androidx.lifecycle.LifecycleObserver
-import im.vector.app.features.call.audio.CallAudioManager
-import im.vector.app.features.call.lookup.CallProtocolsChecker
-import org.matrix.android.sdk.api.logger.LoggerTag
-import org.matrix.android.sdk.api.session.call.CallListener
-import org.matrix.android.sdk.api.session.call.CallState
-import org.matrix.android.sdk.api.session.call.MxCall
-import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
-import org.matrix.android.sdk.api.session.room.model.call.CallAssertedIdentityContent
-import org.matrix.android.sdk.api.session.room.model.call.CallCandidatesContent
-import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
-import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
-import org.matrix.android.sdk.api.session.room.model.call.CallNegotiateContent
-import org.matrix.android.sdk.api.session.room.model.call.CallRejectContent
-import org.matrix.android.sdk.api.session.room.model.call.CallSelectAnswerContent
-import timber.log.Timber
-import java.util.concurrent.atomic.AtomicReference
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Manage peerConnectionFactory & Peer connections outside of activity lifecycle to resist configuration changes
- * Use app context
- */
-private val loggerTag = LoggerTag("WebRtcCallManager", LoggerTag.VOIP)
-
-@Singleton
-@Suppress("UNUSED_PARAMETER")
-class WebRtcCallManager @Inject constructor(
- context: Context
-) : CallListener, LifecycleObserver {
-
- interface Listener {
- fun onCallEnded(callId: String) = Unit
- fun onCurrentCallChange(call: WebRtcCall?) = Unit
- fun onAudioDevicesChange() = Unit
- }
-
- val supportedPSTNProtocol: String? = null
-
- val supportsPSTNProtocol = false
-
- val supportsVirtualRooms = false
-
- fun addProtocolsCheckerListener(listener: CallProtocolsChecker.Listener) = Unit
-
- fun removeProtocolsCheckerListener(listener: CallProtocolsChecker.Listener) = Unit
-
- fun addListener(listener: Listener) = Unit
-
- fun removeListener(listener: Listener) = Unit
-
- val audioManager = CallAudioManager(context, null)
-
- var currentCall: AtomicReference = AtomicReference(null)
-
- fun getCallById(callId: String): WebRtcCall? = null
-
- fun getCallsByRoomId(roomId: String): List = emptyList()
-
- fun getTransfereeForCallId(callId: String): WebRtcCall? = null
-
- fun getCurrentCall(): WebRtcCall? = null
-
- fun getCalls(): List = emptyList()
-
- fun checkForProtocolsSupportIfNeeded() = Unit
-
- fun headSetButtonTapped() {
- Timber.tag(loggerTag.value).v("headSetButtonTapped")
- val call = getCurrentCall() ?: return
- if (call.mxCall.state is CallState.LocalRinging) {
- call.acceptIncomingCall()
- }
- if (call.mxCall.state is CallState.Connected) {
- // end call?
- call.endCall()
- }
- }
-
- fun startOutgoingCall(nativeRoomId: String, otherUserId: String, isVideoCall: Boolean, transferee: WebRtcCall? = null) = Unit
-
- override fun onCallIceCandidateReceived(mxCall: MxCall, iceCandidatesContent: CallCandidatesContent) = Unit
-
- fun endCallForRoom(roomId: String) = Unit
-
- override fun onCallInviteReceived(mxCall: MxCall, callInviteContent: CallInviteContent) = Unit
-
- override fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) = Unit
-
- override fun onCallHangupReceived(callHangupContent: CallHangupContent) = Unit
-
- override fun onCallRejectReceived(callRejectContent: CallRejectContent) = Unit
-
- override fun onCallSelectAnswerReceived(callSelectAnswerContent: CallSelectAnswerContent) = Unit
-
- override fun onCallNegotiateReceived(callNegotiateContent: CallNegotiateContent) = Unit
-
- override fun onCallManagedByOtherSession(callId: String) = Unit
-
- override fun onCallAssertedIdentityReceived(callAssertedIdentityContent: CallAssertedIdentityContent) = Unit
-}
diff --git a/vector/src/withoutvoip/res/layout/activity_call.xml b/vector/src/withoutvoip/res/layout/activity_call.xml
deleted file mode 100644
index 795faad6b1..0000000000
--- a/vector/src/withoutvoip/res/layout/activity_call.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-