From 2cc0b10894e5c316c7a005b24b3dbf50a205d423 Mon Sep 17 00:00:00 2001 From: Yoan Pintas Date: Thu, 16 May 2024 16:57:03 +0200 Subject: [PATCH 1/2] Use maps from geo.data.gouv.fr (#1045) --- changelog.d/1046.feature | 1 + .../src/main/res/values/donottranslate.xml | 2 +- tools/release/sign_all_apks_yubi.sh | 15 +- towncrier.toml | 2 +- vector-app/build.gradle | 2 +- .../main/java/im/vector/app/config/Config.kt | 4 +- .../src/main/res/values/config-settings.xml | 2 +- .../im/vector/app/features/location/Config.kt | 2 +- .../assets/open_source_licenses.html | 277 +++++++++++++---- .../app/features/location/TchapConfig.kt | 20 -- .../assets/open_source_licenses.html | 277 +++++++++++++---- .../app/features/location/TchapConfig.kt | 20 -- .../withvoip/assets/open_source_licenses.html | 278 +++++++++++++++--- 13 files changed, 711 insertions(+), 191 deletions(-) create mode 100644 changelog.d/1046.feature delete mode 100644 vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt delete mode 100644 vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt diff --git a/changelog.d/1046.feature b/changelog.d/1046.feature new file mode 100644 index 0000000000..2558061566 --- /dev/null +++ b/changelog.d/1046.feature @@ -0,0 +1 @@ +Activation de la fonction de partage de localisation. \ No newline at end of file diff --git a/library/ui-strings/src/main/res/values/donottranslate.xml b/library/ui-strings/src/main/res/values/donottranslate.xml index ed1eaac26e..cd48ce9f9e 100755 --- a/library/ui-strings/src/main/res/values/donottranslate.xml +++ b/library/ui-strings/src/main/res/values/donottranslate.xml @@ -13,5 +13,5 @@ Crash the application. - © IGN + © Etalab © OpenMapTiles © Contributeurs OpenStreetMap diff --git a/tools/release/sign_all_apks_yubi.sh b/tools/release/sign_all_apks_yubi.sh index eb3a0db09d..a48aed10c7 100755 --- a/tools/release/sign_all_apks_yubi.sh +++ b/tools/release/sign_all_apks_yubi.sh @@ -23,7 +23,8 @@ then exit 1 fi -read -p "Please enter the artifact URL: " artifactUrl +read -p "Please enter the artifact URL for Gplay: " artifactGplayUrl +read -p "Please enter the artifact URL for F-Droid: " artifactFdroidUrl read -s -p "Please enter your GitHub token: " gitHubToken printf "\n================================================================================\n" @@ -34,7 +35,13 @@ set +e python3 ./tools/release/download_github_artifacts.py \ --token ${gitHubToken} \ - --artifactUrl ${artifactUrl} \ + --artifactUrl ${artifactGplayUrl} \ + --directory ${PARAM_DIRECTORY} \ + --ignoreErrors + +python3 ./tools/release/download_github_artifacts.py \ + --token ${gitHubToken} \ + --artifactUrl ${artifactFdroidUrl} \ --directory ${PARAM_DIRECTORY} \ --ignoreErrors @@ -45,10 +52,12 @@ printf "\n====================================================================== printf "Unzipping the artifact...\n" unzip ${PARAM_DIRECTORY}/GplayTchapWithdmvoipWithpinning-release-unsigned.zip -d ${PARAM_DIRECTORY} +unzip ${PARAM_DIRECTORY}/FdroidTchapWithdmvoipWithoutpinning-release-unsigned.zip -d ${PARAM_DIRECTORY} # Flatten folder hierarchy mv ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning/release/* ${PARAM_DIRECTORY} -rm -rf ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning +mv ${PARAM_DIRECTORY}/fdroidTchapWithdmvoipWithoutpinning/release/* ${PARAM_DIRECTORY} +rm -rf ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning ${PARAM_DIRECTORY}/fdroidTchapWithdmvoipWithoutpinning read -s -p "Enter your PIN: " pin diff --git a/towncrier.toml b/towncrier.toml index a6e8ae5104..2269978d6e 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.11.3" + version = "2.11.4" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 3511254d0c..f51ac4b697 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 = 3 +ext.versionPatch = 4 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt index 31dcf284f6..976131e804 100644 --- a/vector-config/src/main/java/im/vector/app/config/Config.kt +++ b/vector-config/src/main/java/im/vector/app/config/Config.kt @@ -46,8 +46,8 @@ object Config { */ const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false // Tchap: Disable UnifiedPush (use Firebase/background sync) - const val ENABLE_LOCATION_SHARING = false // Tchap: Disable Location Sharing - const val LOCATION_MAP_TILER_KEY = "" + const val ENABLE_LOCATION_SHARING = true + const val LOCATION_MAP_TILER_KEY = "" // Tchap: No key for map is needed /** * Whether to read the `io.element.functional_members` state event diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml index 06c87af0f1..1589292346 100755 --- a/vector-config/src/main/res/values/config-settings.xml +++ b/vector-config/src/main/res/values/config-settings.xml @@ -43,7 +43,7 @@ true - false + true true true 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 19cca280c1..76fba55904 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 @@ -19,7 +19,7 @@ package im.vector.app.features.location // 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" +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/" diff --git a/vector/src/withdmvoip/assets/open_source_licenses.html b/vector/src/withdmvoip/assets/open_source_licenses.html index 6b6a486510..9a72497b07 100755 --- a/vector/src/withdmvoip/assets/open_source_licenses.html +++ b/vector/src/withdmvoip/assets/open_source_licenses.html @@ -21,6 +21,7 @@ div { padding: 4px; } + @@ -173,6 +174,129 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +
+
+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.
+
+
+ + +
+
+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.
+
+ + + +

Apache License @@ -183,102 +307,130 @@

  • Matrix SDK
    - Copyright (c) 2016 OpenMarket Ltd -
    - Copyright (c) 2016-2017 Vector Creations Ltd + Copyright (c) 2019 The Matrix.org Foundation C.I.C +
    • +
  • + Dagger2
    - Copyright (c) 2018-2019 New Vector Ltd + Copyright 2012 The Dagger Authors +
    • +
  • + FlowBinding
    - Copyright (c) 2019 The Matrix.org Foundation C.I.C + Copyright 2019 Yang Chen
    • - + Copyright 2018 Airbnb, Inc. +
  • - Retrofit + arrow-core
    - Copyright 2013 Square, Inc. + Copyright (C) 2017 The Λrrow Authors
  • - okhttp + material
    - Copyright 2016 Square, Inc. + Copyright (C) 2016 Google
  • - ShortcutBadger + span
    - Copyright 2014 Leo Lin + Copyright 2018 Jun Gu
  • - html-textview + ru.noties.markwon
    - Copyright (C) 2013-2015 Dominik Schürmann + Copyright 2017 Dimitry Ivanov (mail@dimitryivanov.ru) +
    • +
  • + better-link-movement-method
    - Copyright (C) 2013-2015 Juha Kuitunen + Copyright 2018 Saket Narayan. +
    • +
  • + zxcvbn
    - Copyright (C) 2013 Mohammed Lakkadshaw + Copyright (c) 2012-2016 Dan Wheeler and Dropbox, Inc. +
    • +
  • + com.otaliastudios:autocomplete
    - Copyright (C) 2007 The Android Open Source Project + Copyright (c) 2017
  • - anddown + seismic
    - Copyright (c) 2016 CommonsWare, LLC + Copyright 2012 Square, Inc.
  • - zip4j + diff-match-patch
    - Copyright 2010 Srikanth Reddy Lingala + Copyright 2018 The diff-match-patch Authors. https://github.com/google/diff-match-patch
  • - SwipeBack + LazyThreeTenBp
    - Copyright 2015 Eric Liu + Copyright 2017 Gabriel Ittner.
  • - Libphonenumber + htmlcompressor
    - Copyright 2017 Google + Copyright 2017 Sergiy Kovalchuk
  • - Butter Knife + ZXing
    - Copyright 2013 Jake Wharton + Copyright 2007 ZXing authors
  • - Realm + barcodescanner
    - Copyright (c) 2011-2017 Realm Inc + Copyright (c) 2014 Dushyanth Maguluru
  • - FloatingActionButton + uCrop
    - Copyright (C) 2014 Jerzy Chalupski + Copyright 2017, Yalantis +
    • +
  • + BillCarsonFr/JsonViewer
  • - Spanny + Copyright (C) 2018 stfalcon.com +
    • + +
  • + PFLockScreen-Android +
    + Copyright 2018, Aleksandr Nikiforov
  • - PhotoView + Emoji
    - Copyright 2018 Chris Banes + Copyright (C) 2016 - Niklas Baudy, Ruben Gees, Mario Đanić and contributors
  • - Epoxy + JetradarMobile / android-snowfall
    - Copyright 2016 Airbnb, Inc. + Copyright 2016 JetRadar
  • - Anko + dialogs / android-dialer
    - Copyright 2016 JetBrains s.r.o. + Copyright (c) 2017-present, dialog LLC <info@dlg.im> 
    • @@ -458,25 +610,46 @@ 
    
       of your accepting any such warranty or additional liability.
    - +
    +    CC-BY 4.0
+
    + 
    +    ISC License
+
    + -Copyright 2017 Tapadoo, Dublin. + +
    +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-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:
+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+- 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.
 
-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.
+- 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/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt b/vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt deleted file mode 100644 index bf0fac34a6..0000000000 --- a/vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2024 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.location - -// Tchap: Tiles from geo.data.gouv.fr -const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json" diff --git a/vector/src/withoutvoip/assets/open_source_licenses.html b/vector/src/withoutvoip/assets/open_source_licenses.html index 6b6a486510..ec0f56295a 100755 --- a/vector/src/withoutvoip/assets/open_source_licenses.html +++ b/vector/src/withoutvoip/assets/open_source_licenses.html @@ -21,6 +21,7 @@ div { padding: 4px; } + @@ -173,6 +174,129 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +
    +
+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.
+
+
    + + +
    +
+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.
+
    + + + +

    Apache License @@ -183,102 +307,130 @@

  • Matrix SDK
    - Copyright (c) 2016 OpenMarket Ltd -
    - Copyright (c) 2016-2017 Vector Creations Ltd + Copyright (c) 2019 The Matrix.org Foundation C.I.C +
    • +
  • + Dagger2
    - Copyright (c) 2018-2019 New Vector Ltd + Copyright 2012 The Dagger Authors +
    • +
  • + FlowBinding
    - Copyright (c) 2019 The Matrix.org Foundation C.I.C + Copyright 2019 Yang Chen
    • - + Copyright 2018 Airbnb, Inc. +
  • - Retrofit + arrow-core
    - Copyright 2013 Square, Inc. + Copyright (C) 2017 The Λrrow Authors
  • - okhttp + material
    - Copyright 2016 Square, Inc. + Copyright (C) 2016 Google
  • - ShortcutBadger + span
    - Copyright 2014 Leo Lin + Copyright 2018 Jun Gu
  • - html-textview + ru.noties.markwon
    - Copyright (C) 2013-2015 Dominik Schürmann + Copyright 2017 Dimitry Ivanov (mail@dimitryivanov.ru) +
    • +
  • + better-link-movement-method
    - Copyright (C) 2013-2015 Juha Kuitunen + Copyright 2018 Saket Narayan. +
    • +
  • + zxcvbn
    - Copyright (C) 2013 Mohammed Lakkadshaw + Copyright (c) 2012-2016 Dan Wheeler and Dropbox, Inc. +
    • +
  • + com.otaliastudios:autocomplete
    - Copyright (C) 2007 The Android Open Source Project + Copyright (c) 2017
  • - anddown + seismic
    - Copyright (c) 2016 CommonsWare, LLC + Copyright 2012 Square, Inc.
  • - zip4j + diff-match-patch
    - Copyright 2010 Srikanth Reddy Lingala + Copyright 2018 The diff-match-patch Authors. https://github.com/google/diff-match-patch
  • - SwipeBack + LazyThreeTenBp
    - Copyright 2015 Eric Liu + Copyright 2017 Gabriel Ittner.
  • - Libphonenumber + htmlcompressor
    - Copyright 2017 Google + Copyright 2017 Sergiy Kovalchuk
  • - Butter Knife + ZXing
    - Copyright 2013 Jake Wharton + Copyright 2007 ZXing authors
  • - Realm + barcodescanner
    - Copyright (c) 2011-2017 Realm Inc + Copyright (c) 2014 Dushyanth Maguluru
  • - FloatingActionButton + uCrop
    - Copyright (C) 2014 Jerzy Chalupski + Copyright 2017, Yalantis +
    • +
  • + BillCarsonFr/JsonViewer
  • - Spanny + Copyright (C) 2018 stfalcon.com +
    • + +
  • + PFLockScreen-Android
    - Copyright 2015 Pavlovsky Ivan + Copyright 2018, Aleksandr Nikiforov
  • - PhotoView + Emoji
    - Copyright 2018 Chris Banes + Copyright (C) 2016 - Niklas Baudy, Ruben Gees, Mario Đanić and contributors
  • - Epoxy + JetradarMobile / android-snowfall
    - Copyright 2016 Airbnb, Inc. + Copyright 2016 JetRadar
  • - Anko + dialogs / android-dialer
    - Copyright 2016 JetBrains s.r.o. + Copyright (c) 2017-present, dialog LLC <info@dlg.im> 
    • @@ -458,25 +610,46 @@ 
    
       of your accepting any such warranty or additional liability.
    - +
    +    CC-BY 4.0
+
    + 
    +    ISC License
+
    + -Copyright 2017 Tapadoo, Dublin. + +
    +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-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:
+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+- 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.
 
-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.
+- 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/withpinning/java/im/vector/app/features/location/TchapConfig.kt b/vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt deleted file mode 100644 index 6cf410f3a2..0000000000 --- a/vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2024 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.location - -// Tchap: Tiles from IGN -const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json" diff --git a/vector/src/withvoip/assets/open_source_licenses.html b/vector/src/withvoip/assets/open_source_licenses.html index c34a288434..786638555b 100755 --- a/vector/src/withvoip/assets/open_source_licenses.html +++ b/vector/src/withvoip/assets/open_source_licenses.html @@ -21,6 +21,7 @@ div { padding: 4px; } + @@ -173,6 +174,129 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +
    +
+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.
+
+
    + + +
    +
+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.
+
    + + + +

    Apache License @@ -183,92 +307,130 @@

  • Matrix SDK
    - Copyright (c) 2016 OpenMarket Ltd + Copyright (c) 2019 The Matrix.org Foundation C.I.C +
    • +
  • + Dagger2
    - Copyright (c) 2016-2017 Vector Creations Ltd + Copyright 2012 The Dagger Authors +
    • +
  • + FlowBinding
    - Copyright (c) 2018-2019 New Vector Ltd + Copyright 2019 Yang Chen +
    • +
  • + Epoxy
    - Copyright (c) 2019 The Matrix.org Foundation C.I.C + Copyright 2016 Airbnb, Inc. +
    • +
  • + mvrx +
    + Copyright 2018 Airbnb, Inc.
  • - Jitsi Meet (jitsi-meet) + arrow-core
    - Copyright @ 2018-present 8x8, Inc. + Copyright (C) 2017 The Λrrow Authors +
    • +
  • + material
    - Copyright @ 2017-2018 Atlassian Pty Ltd + Copyright (C) 2016 Google +
    • +
  • + span +
    + Copyright 2018 Jun Gu
  • - Retrofit + ru.noties.markwon
    - Copyright 2013 Square, Inc. + Copyright 2017 Dimitry Ivanov (mail@dimitryivanov.ru)
  • - okhttp + better-link-movement-method
    - Copyright 2016 Square, Inc. + Copyright 2018 Saket Narayan.
  • - ShortcutBadger + zxcvbn
    - Copyright 2014 Leo Lin + Copyright (c) 2012-2016 Dan Wheeler and Dropbox, Inc.
  • - html-textview + com.otaliastudios:autocomplete
    - Copyright (C) 2013-2015 Dominik Schürmann + Copyright (c) 2017 +
    • +
  • + seismic
    - Copyright (C) 2013-2015 Juha Kuitunen + Copyright 2012 Square, Inc. +
    • +
  • + diff-match-patch
    - Copyright (C) 2013 Mohammed Lakkadshaw + Copyright 2018 The diff-match-patch Authors. https://github.com/google/diff-match-patch +
    • +
  • + LazyThreeTenBp
    - Copyright (C) 2007 The Android Open Source Project + Copyright 2017 Gabriel Ittner.
  • - anddown + htmlcompressor
    - Copyright (c) 2016 CommonsWare, LLC + Copyright 2017 Sergiy Kovalchuk
  • - zip4j + ZXing
    - Copyright 2010 Srikanth Reddy Lingala + Copyright 2007 ZXing authors
  • - SwipeBack + barcodescanner
    - Copyright 2015 Eric Liu + Copyright (c) 2014 Dushyanth Maguluru
  • - Libphonenumber + uCrop
    - Copyright 2017 Google + Copyright 2017, Yalantis
  • - Butter Knife + BillCarsonFr/JsonViewer +
    • +
  • + Copyright (C) 2018 stfalcon.com +
    • +
  • + Jitsi Meet (jitsi-meet)
    - Copyright 2013 Jake Wharton + Copyright @ 2020-present 8x8, Inc. +
    + Copyright @ 2017-2018 Atlassian Pty Ltd
  • - Realm + PFLockScreen-Android
    - Copyright (c) 2011-2017 Realm Inc + Copyright 2018, Aleksandr Nikiforov
  • - FloatingActionButton + Emoji
    - Copyright (C) 2014 Jerzy Chalupski + Copyright (C) 2016 - Niklas Baudy, Ruben Gees, Mario Đanić and contributors
  • - Spanny + JetradarMobile / android-snowfall
    - Copyright 2015 Pavlovsky Ivan + Copyright 2016 JetRadar
  • - PhotoView + dialogs / android-dialer
    - Copyright 2018 Chris Banes + Copyright (c) 2017-present, dialog LLC <info@dlg.im> 
    • @@ -447,5 +609,47 @@ 
    
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
    + +
    +    CC-BY 4.0
+
    + + +
    +    ISC License
+
    + + + +
    +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.
+
    + From 92fe5b319f006d05637d79d2fb0511a0fa820a5e Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 16 May 2024 18:56:11 +0200 Subject: [PATCH 2/2] Update changelog --- TCHAP_CHANGES.md | 8 ++++++++ changelog.d/1046.feature | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/1046.feature diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index 8f9664ae7c..52bbf21734 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,11 @@ +Changes in Tchap 2.11.4 (2024-05-16) +==================================== + +Features ✨ +---------- + - Activation de la fonction de partage de localisation. ([#1046](https://github.com/tchapgouv/tchap-android/issues/1046)) + + Changes in Tchap 2.11.3 (2024-05-14) ==================================== diff --git a/changelog.d/1046.feature b/changelog.d/1046.feature deleted file mode 100644 index 2558061566..0000000000 --- a/changelog.d/1046.feature +++ /dev/null @@ -1 +0,0 @@ -Activation de la fonction de partage de localisation. \ No newline at end of file