Land AN 6.2 (linphone 6.2 rebase + AN customizations) onto main - #40
Merged
Conversation
…e's an error after adding participants
…en TelecomManager APIs aren't available on device
…e friend through another app
…create chat room fragment
…recording player & chatroom)
…om sheet while pressing a digit
…tion from Weblate
…when call is being paused by remote
… changed after account was configured
…e while conference is paused + hide conference SIP URI in call ended screen
…on't wait for it to be actually sent to display it)
# Conflicts: # CHANGELOG.md # README.md # app/build.gradle.kts # app/src/main/assets/linphonerc_factory # app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt # app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt # app/src/main/java/org/linphone/compatibility/Compatibility.kt # app/src/main/java/org/linphone/contacts/ContactLoader.kt # app/src/main/java/org/linphone/contacts/ContactsManager.kt # app/src/main/java/org/linphone/core/CoreContext.kt # app/src/main/java/org/linphone/core/CorePreferences.kt # app/src/main/java/org/linphone/notifications/NotificationsManager.kt # app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt # app/src/main/java/org/linphone/telecom/TelecomManager.kt # app/src/main/java/org/linphone/ui/assistant/fragment/RecoverAccountFragment.kt # app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt # app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt # app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt # app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt # app/src/main/java/org/linphone/ui/call/CallActivity.kt # app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceAddParticipantsFragment.kt # app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt # app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt # app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt # app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt # app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt # app/src/main/java/org/linphone/ui/main/MainActivity.kt # app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsFilesAdapter.kt # app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt # app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt # app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt # app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt # app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt # app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt # app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt # app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt # app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt # app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt # app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt # app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt # app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt # app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt # app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt # app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt # app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt # app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt # app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt # app/src/main/java/org/linphone/ui/main/history/model/NumpadModel.kt # app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt # app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt # app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt # app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt # app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt # app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsDeveloperFragment.kt # app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt # app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt # app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt # app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt # app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt # app/src/main/java/org/linphone/ui/main/sso/fragment/SingleSignOnFragment.kt # app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt # app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt # app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt # app/src/main/java/org/linphone/utils/AudioUtils.kt # app/src/main/java/org/linphone/utils/LinphoneUtils.kt # app/src/main/res/color/in_call_button_background_tint_color.xml # app/src/main/res/layout-land/bottom_nav_bar.xml # app/src/main/res/layout-land/call_active_fragment.xml # app/src/main/res/layout-land/call_incoming_fragment.xml # app/src/main/res/layout-land/call_outgoing_fragment.xml # app/src/main/res/layout-land/contacts_list_fragment.xml # app/src/main/res/layout-land/main_activity_top_bar.xml # app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml # app/src/main/res/layout/account_settings_fragment.xml # app/src/main/res/layout/assistant_landing_fragment.xml # app/src/main/res/layout/assistant_recover_account_fragment.xml # app/src/main/res/layout/bottom_nav_bar.xml # app/src/main/res/layout/call_actions_generic.xml # app/src/main/res/layout/call_active_conference_fragment.xml # app/src/main/res/layout/call_active_fragment.xml # app/src/main/res/layout/call_audio_device_list_cell.xml # app/src/main/res/layout/call_incoming_actions.xml # app/src/main/res/layout/call_incoming_fragment.xml # app/src/main/res/layout/call_media_encryption_info.xml # app/src/main/res/layout/call_outgoing_fragment.xml # app/src/main/res/layout/call_transfer_fragment.xml # app/src/main/res/layout/calls_list_fragment.xml # app/src/main/res/layout/chat_bubble_content_grid_cell.xml # app/src/main/res/layout/chat_bubble_long_press_menu.xml # app/src/main/res/layout/chat_bubble_single_file_content.xml # app/src/main/res/layout/chat_conversation_popup_menu.xml # app/src/main/res/layout/chat_info_fragment.xml # app/src/main/res/layout/chat_message_forward_fragment.xml # app/src/main/res/layout/contacts_list_fragment.xml # app/src/main/res/layout/generic_add_participants_fragment.xml # app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml # app/src/main/res/layout/help_debug_fragment.xml # app/src/main/res/layout/help_fragment.xml # app/src/main/res/layout/history_fragment.xml # app/src/main/res/layout/main_activity_alert_top_bar.xml # app/src/main/res/layout/main_activity_in_call_top_bar.xml # app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml # app/src/main/res/layout/main_activity_top_bar.xml # app/src/main/res/layout/recording_player_fragment.xml # app/src/main/res/layout/settings_advanced_fragment.xml # app/src/main/res/layout/settings_contacts_ldap.xml # app/src/main/res/layout/settings_developer_fragment.xml # app/src/main/res/layout/settings_fragment.xml # app/src/main/res/layout/settings_user_interface.xml # app/src/main/res/layout/start_call_fragment.xml # app/src/main/res/layout/start_call_numpad_bottom_sheet.xml # app/src/main/res/layout/start_chat_fragment.xml # app/src/main/res/navigation/assistant_nav_graph.xml # app/src/main/res/navigation/main_nav_graph.xml # app/src/main/res/values-ca/strings.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fi/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-sk/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/dimen.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # app/src/main/res/xml/locales_config.xml # gradle/libs.versions.toml # gradle/wrapper/gradle-wrapper.properties
SIP address visibility: - Hide informational SIP-URI displays (cruft for non-technical users), still toggle-managed. Add suppress_sip_addresses (functional blocks incl. contact picker) as a sibling to hide_sip_addresses (informational only; overridden by suppress). Splitting these re-enables hide=true safely — hide=true alone had emptied the picker and broke contact selection. - Add getDisplayAddress: username-only for the account's home domain (keyed on the account domain, since app/default_domain isn't provisioned), full URI for external SIP or when only_display_sip_uri_username is off. Video: force off (server can't carry it) via linphonerc_factory (capture/display off, no auto initiate/accept); drop imperative CoreContext override; hide the auto-answer-with-video toggle. Chat: allow voice-to-text by dropping upstream flagNoPersonalizedLearning. Cleanup: remove the recover-phone-account flow and other stale 6.0.0 merge-base artifacts unreferenced by 6.2.
VCard4 import leaves each friend's send_subscribe off, and with no RLS address the list-level flag alone won't subscribe them — so provisioned directory extensions had no presence. After the VCard4 directory list syncs, enable per-friend subscribe on friends whose SIP address is on the account's home domain (extensions; matches the old inline subscribe=1 for short numbers) and update the list's subscriptions. Re-runs each sync since import recreates the friends. External SIP and PSTN (no SIP address) get none.
Only main (beta) and testing (alpha) were distributed; release/* branches built an artifact but went nowhere. Trigger the workflow on release/** and upload those builds to alpha, so release branches reach preprod without a prod (beta) release.
Merging builds a local conference via Conference.addParticipants over every call. A call still connecting/ringing has no stable media stream, so joining it to the mixer aborts liblinphone (StreamsGroup::joinMixerSession() already joined!, a native SIGABRT that kills the process and strands the live calls). Guard mergeCallsIntoConference to require every call's media be established, and hide the merge button until then.
Alpha already carries versionCode 60020009 (6.2.9) from the CI-to-alpha change; bump so the conference-merge crash fix uploads without a duplicate-version-code rejection.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Promotes release/6.2 to mainline. This lands AN's rebranding onto the
linphone-android 6.2 base, re-applies the AN customizations on top of it, and
brings main from the 6.0-era line up to 6.2.10.
Key AN commits on top of the upstream 6.2 base:
native SIGABRT when merging a still-connecting call into a conference)
The remainder are upstream linphone/release/6.2 commits inherited via the
integrate/6.2 rebase merge.
main is fully contained in release/6.2, so this merges without conflicts.