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

Jump to bottom

Enable visio on education instance #1108

Merged
merged 5 commits into from
Sep 19, 2024
Merged

Enable visio on education instance #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc12f1b
Enable visio on education instance
yostyle Sep 19, 2024
58349ce
Fix lint
yostyle Sep 19, 2024
f146e99
Add missing gradle file
yostyle Sep 19, 2024
b258b8b
Fix microphone issue on Android API 34
yostyle Sep 19, 2024
f604939
Fix lint
yostyle Sep 19, 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
1 change: 1 addition & 0 deletions changelog.d/1106.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Activation des appels vidéos pour Éducation.
1 change: 1 addition & 0 deletions changelog.d/1108.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correction du problème de microphone sur Android 14.
2 changes: 1 addition & 1 deletion towncrier.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.towncrier]
version = "2.13.3"
version = "2.13.4"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ext.versionMinor = 13
// 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'
Expand Down
1 change: 1 addition & 0 deletions vector-config/src/tchap/res/values/config-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@

<string-array name="tchap_is_visio_supported_homeservers" translatable="false">
<item>agent.dinum.tchap.gouv.fr</item>
<item>agent.education.tchap.gouv.fr</item>
</string-array>
</resources>
3 changes: 2 additions & 1 deletion vector/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

<!-- For CallAndroidService -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />

<!-- For VectorSyncAndroidService -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
Expand Down Expand Up @@ -362,7 +363,7 @@

<service
android:name=".core.services.CallAndroidService"
android:foregroundServiceType="phoneCall"
android:foregroundServiceType="microphone|phoneCall"
android:exported="false">
<!-- in order to get headset button events -->
<intent-filter>
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class HomeActivityViewModel @AssistedInject constructor(
Timber.v("DidAskUserConsent: $didAskUser")
if (!didAskUser) {
// TCHAP user already consented about analytics in the private policy
//_viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
// _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
_viewEvents.post(HomeActivityViewEvents.SetAnalyticsOptIn)
} else {
_viewEvents.post(HomeActivityViewEvents.ShowNotificationDialog)
Expand Down
Loading