Linphone - update recipe

This commit is contained in:
Licaon_Kter 2021-09-02 12:07:57 +03:00
parent 2c21bd05cd
commit 885aeacb2f
2 changed files with 46 additions and 2 deletions

View file

@ -764,11 +764,13 @@ Builds:
- apt-get install -y doxygen pkgconf python3-pystache python3-six yasm
- apt-get install -y -t stretch-backports-sloppy libarchive13
- apt-get install -y -t stretch-backports cmake
patch:
- 4.5.2.patch
gradle:
- yes
output: app/build/outputs/apk/release/linphone-android-release-*.apk
srclibs:
- linphone-sdk@5.0.14
- linphone-sdk@5.0.15
rm:
- app/google-services.json
prebuild:
@ -792,7 +794,7 @@ Builds:
- pushd $$linphone-sdk$$
- mkdir build-sdk
- cd build-sdk
- cmake .. -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64,
- cmake .. -DENABLE_GPL_THIRD_PARTIES=YES -DLINPHONESDK_PLATFORM=Android -DLINPHONESDK_ANDROID_ARCHS="arm64,
armv7, x86" -DCMAKE_BUILD_TYPE=Release
- cmake --build . --parallel $(nproc)
- popd

View file

@ -0,0 +1,42 @@
--- a/app/src/main/res/layout/settings_network_fragment.xml
+++ b/app/src/main/res/layout/settings_network_fragment.xml
@@ -79,13 +79,6 @@
<include
layout="@layout/settings_widget_switch"
- linphone:title="@{@string/network_settings_push_notifications_title}"
- linphone:listener="@{viewModel.pushNotificationsListener}"
- linphone:checked="@={viewModel.pushNotifications}"
- linphone:enabled="@{viewModel.pushNotificationsAvailable}"/>
-
- <include
- layout="@layout/settings_widget_switch"
linphone:title="@{@string/network_settings_random_ports_title}"
linphone:listener="@{viewModel.randomPortsListener}"
linphone:checked="@={viewModel.randomPorts}"/>
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
@@ -38,14 +38,6 @@
}
val allowIpv6 = MutableLiveData<Boolean>()
- val pushNotificationsListener = object : SettingListenerStub() {
- override fun onBoolValueChanged(newValue: Boolean) {
- core.isPushNotificationEnabled = newValue
- }
- }
- val pushNotifications = MutableLiveData<Boolean>()
- val pushNotificationsAvailable = MutableLiveData<Boolean>()
-
val randomPortsListener = object : SettingListenerStub() {
override fun onBoolValueChanged(newValue: Boolean) {
val port = if (newValue) -1 else 5060
@@ -69,8 +61,6 @@
init {
wifiOnly.value = core.wifiOnlyEnabled()
allowIpv6.value = core.ipv6Enabled()
- pushNotifications.value = core.isPushNotificationEnabled
- pushNotificationsAvailable.value = core.isPushNotificationAvailable
randomPorts.value = getTransportPort() == -1
sipPort.value = getTransportPort()
}