Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete withoutvoip flavor #1047

Merged
merged 2 commits into from
May 22, 2024
Merged

Delete withoutvoip flavor #1047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c1a5a
delete withoutvoip flavor
yostyle May 16, 2024
b07b548
Add changelog
yostyle May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions vector-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@ android {

withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
withoutvoip { dimension "voip" }

withpinning { dimension "pinning" }
withoutpinning { dimension "pinning" }
Expand Down Expand Up @@ -445,24 +444,6 @@ configurations {
gplayTchapWithvoipWithpinningDebugImplementation


fdroidBtchapWithoutvoipWithpinningDebugImplementation
fdroidDevTchapWithoutvoipWithpinningDebugImplementation
fdroidTchapWithoutvoipWithpinningDebugImplementation

gplayBtchapWithoutvoipWithpinningDebugImplementation
gplayDevTchapWithoutvoipWithpinningDebugImplementation
gplayTchapWithoutvoipWithpinningDebugImplementation


fdroidBtchapWithoutvoipWithoutpinningDebugImplementation
fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation
fdroidTchapWithoutvoipWithoutpinningDebugImplementation

gplayBtchapWithoutvoipWithoutpinningDebugImplementation
gplayDevTchapWithoutvoipWithoutpinningDebugImplementation
gplayTchapWithoutvoipWithoutpinningDebugImplementation


fdroidBtchapWithdmvoipWithpinningDebugImplementation
fdroidDevTchapWithdmvoipWithpinningDebugImplementation
fdroidTchapWithdmvoipWithpinningDebugImplementation
Expand Down Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion vector-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ android {
productFlavors {
withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
withoutvoip { dimension "voip" }

devTchap { dimension "target" }
btchap { dimension "target" }
Expand Down
4 changes: 0 additions & 4 deletions vector-config/src/withoutvoip/res/values/config-features.xml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions vector/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ android {

withvoip { dimension "voip" }
withdmvoip { dimension "voip" }
withoutvoip { dimension "voip" }

withpinning { dimension "pinning" }
withoutpinning { dimension "pinning" }
Expand Down Expand Up @@ -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') {
Expand Down
6 changes: 3 additions & 3 deletions vector/src/main/java/im/vector/app/features/location/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading