mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-17 20:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor CorePreferences by adding new values

Browse source
This commit is contained in:
Benoit Martins 2026-01-29 10:30:08 +01:00
parent 9072119031
commit 8d0f638d46
6 changed files with 269 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Linphone/Core/CoreContext.swift
View file

@ -59,41 +59,6 @@ class CoreContext: ObservableObject {
var digestAuthInfoPendingPasswordUpdate: AuthInfo?
static let appGroupName: String = {
Bundle.main.object(forInfoDictionaryKey: "APP_GROUP_NAME") as? String
?? {
fatalError("APP_GROUP_NAME not defined in Info.plist")
}()
}()
var teamID: String {
AppServices.config.getString(section: "app", key: "team_id", defaultString: "")
}
var earlymediaContentExtCatIdentifier: String {
AppServices.config.getString(section: "app", key: "extension_category", defaultString: "")
}
var serveraddress: String {
AppServices.config.getString(section: "app", key: "server", defaultString: "")
}
var defaultUsername: String {
AppServices.config.getString(section: "app", key: "user", defaultString: "")
}
var defaultPass: String {
AppServices.config.getString(section: "app", key: "pass", defaultString: "")
}
var pushNotificationsInterval: Int {
AppServices.config.getInt(section: "net", key: "pn-call-remote-push-interval", defaultValue: 3)
}
var voiceRecordingMaxDuration: Int {
AppServices.config.getInt(section: "app", key: "voice_recording_max_duration", defaultValue: 600000)
}
@Published var reloadID = UUID()
private init() {
@ -157,11 +122,11 @@ class CoreContext: ObservableObject {
coreQueue.async {
LoggingService.Instance.logLevel = LogLevel.Debug
Factory.Instance.logCollectionPath = Factory.Instance.getDataDir(context: UnsafeMutablePointer<Int8>(mutating: (CoreContext.appGroupName as NSString).utf8String))
Factory.Instance.logCollectionPath = Factory.Instance.getDataDir(context: UnsafeMutablePointer<Int8>(mutating: (SharedMainViewModel.appGroupName as NSString).utf8String))
Factory.Instance.enableLogCollection(state: LogCollectionState.Enabled)
Log.info("Checking if linphonerc file exists already. If not, creating one as a copy of linphonerc-default")
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: CoreContext.appGroupName)?
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: SharedMainViewModel.appGroupName)?
.appendingPathComponent("Library/Preferences/linphone") {
let rcFileUrl = rcDir.appendingPathComponent("linphonerc")
if !FileManager.default.fileExists(atPath: rcFileUrl.path) {
@ -179,7 +144,7 @@ class CoreContext: ObservableObject {
}
}
self.mCore = try? Factory.Instance.createSharedCoreWithConfig(config: AppServices.config, systemContext: Unmanaged.passUnretained(coreQueue).toOpaque(), appGroupId: CoreContext.appGroupName, mainCore: true)
self.mCore = try? Factory.Instance.createSharedCoreWithConfig(config: AppServices.config, systemContext: Unmanaged.passUnretained(coreQueue).toOpaque(), appGroupId: SharedMainViewModel.appGroupName, mainCore: true)
self.mCore.callkitEnabled = true
self.mCore.pushNotificationEnabled = true
@ -559,7 +524,7 @@ class CoreContext: ObservableObject {
}
func copyDatabaseFileToDocumentsDirectory() {
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: CoreContext.appGroupName)?
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: SharedMainViewModel.appGroupName)?
.appendingPathComponent("Library/Application Support/linphone") {
let rcFileUrl = rcDir.appendingPathComponent("linphone.db")
let directory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first

434
Linphone/Core/CorePreferences.swift
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of linphone-iphone
* This file is part of Linphone
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -28,30 +28,39 @@ class CorePreferences {
self.config = config
}
var printLogsInLogcat: Bool {
var acceptEarlyMedia: Bool {
get {
config.getBool(section: "app", key: "debug", defaultValue: true)
config.getBool(section: "sip", key: "incoming_calls_early_media", defaultValue: false)
}
set {
config.setBool(section: "app", key: "debug", value: newValue)
config.setBool(section: "sip", key: "incoming_calls_early_media", value: newValue)
}
}
var firstLaunch: Bool {
var allowOutgoingEarlyMedia: Bool {
get {
config.getBool(section: "app", key: "first_6.0_launch", defaultValue: true)
config.getBool(section: "sip", key: "real_early_media", defaultValue: false)
}
set {
config.setBool(section: "app", key: "first_6.0_launch", value: newValue)
config.setBool(section: "sip", key: "real_early_media", value: newValue)
}
}
var linphoneConfigurationVersion: Int {
var automaticallyStartCallRecording: Bool {
get {
config.getInt(section: "app", key: "config_version", defaultValue: 52005)
config.getBool(section: "app", key: "auto_start_call_record", defaultValue: false)
}
set {
config.setInt(section: "app", key: "config_version", value: newValue)
config.setBool(section: "app", key: "auto_start_call_record", value: newValue)
}
}
var changeMainColorAllowed: Bool {
get {
config.getBool(section: "ui", key: "change_main_color_allowed", defaultValue: false)
}
set {
config.setBool(section: "ui", key: "change_main_color_allowed", value: newValue)
}
}
@ -74,70 +83,6 @@ class CorePreferences {
}
}
var publishPresence: Bool {
get {
config.getBool(section: "app", key: "publish_presence", defaultValue: true)
}
set {
config.setBool(section: "app", key: "publish_presence", value: newValue)
}
}
var keepServiceAlive: Bool {
get {
config.getBool(section: "app", key: "keep_service_alive", defaultValue: false)
}
set {
config.setBool(section: "app", key: "keep_service_alive", value: newValue)
}
}
var deviceName: String {
get {
let raw = config.getString(section: "app", key: "device", defaultString: "").trimmingCharacters(in: .whitespaces)
return safeString(raw, defaultValue: "")
}
set {
config.setString(section: "app", key: "device", value: newValue.trimmingCharacters(in: .whitespaces))
}
}
var routeAudioToSpeakerWhenVideoIsEnabled: Bool {
get {
config.getBool(section: "app", key: "route_audio_to_speaker_when_video_enabled", defaultValue: true)
}
set {
config.setBool(section: "app", key: "route_audio_to_speaker_when_video_enabled", value: newValue)
}
}
var automaticallyStartCallRecording: Bool {
get {
return config.getBool(section: "app", key: "auto_start_call_record", defaultValue: false)
}
set {
config.setBool(section: "app", key: "auto_start_call_record", value: newValue)
}
}
var showDialogWhenCallingDeviceUuidDirectly: Bool {
get {
return config.getBool(section: "app", key: "show_confirmation_dialog_zrtp_trust_call", defaultValue: true)
}
set {
config.setBool(section: "app", key: "show_confirmation_dialog_zrtp_trust_call", value: newValue)
}
}
var markConversationAsReadWhenDismissingMessageNotification: Bool {
get {
config.getBool(section: "app", key: "mark_as_read_notif_dismissal", defaultValue: false)
}
set {
config.setBool(section: "app", key: "mark_as_read_notif_dismissal", value: newValue)
}
}
var contactsFilter: String {
get {
let raw = config.getString(section: "ui", key: "contacts_filter", defaultString: "")
@ -148,42 +93,6 @@ class CorePreferences {
}
}
var disableAddContact: Bool {
get {
config.getBool(section: "ui", key: "disable_add_contact", defaultValue: false)
}
set {
config.setBool(section: "ui", key: "disable_add_contact", value: newValue)
}
}
var showFavoriteContacts: Bool {
get {
config.getBool(section: "ui", key: "show_favorites_contacts", defaultValue: true)
}
set {
config.setBool(section: "ui", key: "show_favorites_contacts", value: newValue)
}
}
var friendListInWhichStoreNewlyCreatedFriends: String {
get {
config.getString(section: "app", key: "friend_list_to_store_newly_created_contacts", defaultString: "Linphone address-book")
}
set {
config.setString(section: "app", key: "friend_list_to_store_newly_created_contacts", value: newValue)
}
}
var voiceRecordingMaxDuration: Int {
get {
config.getInt(section: "app", key: "voice_recording_max_duration", defaultValue: 600000)
}
set {
config.setInt(section: "app", key: "voice_recording_max_duration", value: newValue)
}
}
var darkMode: Int {
get {
if !darkModeAllowed { return 0 }
@ -194,86 +103,12 @@ class CorePreferences {
}
}
var enableSecureMode: Bool {
get {
config.getBool(section: "ui", key: "enable_secure_mode", defaultValue: true)
}
set {
config.setBool(section: "ui", key: "enable_secure_mode", value: newValue)
}
}
var themeMainColor: String {
get {
let raw = config.getString(section: "ui", key: "theme_main_color", defaultString: "orange")
return safeString(raw, defaultValue: "orange")
}
set {
config.setString(section: "ui", key: "theme_main_color", value: newValue)
}
}
var themeAboutPictureUrl: String? {
get {
return config.getString(section: "ui", key: "theme_about_picture_url", defaultString: nil)
}
}
var darkModeAllowed: Bool {
config.getBool(section: "ui", key: "dark_mode_allowed", defaultValue: true)
}
var changeMainColorAllowed: Bool {
config.getBool(section: "ui", key: "change_main_color_allowed", defaultValue: false)
}
var hideSettings: Bool {
config.getBool(section: "ui", key: "hide_settings", defaultValue: false)
}
var maxAccountsCount: Int {
config.getInt(section: "ui", key: "max_account", defaultValue: 0)
}
/*
var configPath: String {
return context.view.window?.rootViewController?.view.frame.origin.x ?? "" + "/.linphonerc"
}
var factoryConfigPath: String {
return context.view.window?.rootViewController?.view.frame.origin.x ?? "" + "/linphonerc"
}
func copyAssetsFromPackage() {
copy(from: "linphonerc_default", to: configPath)
copy(from: "linphonerc_factory", to: factoryConfigPath, overrideIfExists: true)
}
*/
var vfsEnabled: Bool {
get {
config.getBool(section: "app", key: "vfs_enabled", defaultValue: false)
config.getBool(section: "ui", key: "dark_mode_allowed", defaultValue: true)
}
set {
config.setBool(section: "app", key: "vfs_enabled", value: newValue)
}
}
var acceptEarlyMedia: Bool {
get {
config.getBool(section: "sip", key: "incoming_calls_early_media", defaultValue: false)
}
set {
config.setBool(section: "sip", key: "incoming_calls_early_media", value: newValue)
}
}
var allowOutgoingEarlyMedia: Bool {
get {
config.getBool(section: "sip", key: "real_early_media", defaultValue: false)
}
set {
config.setBool(section: "sip", key: "real_early_media", value: newValue)
config.setBool(section: "ui", key: "dark_mode_allowed", value: newValue)
}
}
@ -287,6 +122,43 @@ class CorePreferences {
}
}
var defaultPass: String {
get {
config.getString(section: "app", key: "pass", defaultString: "")
}
set {
config.setString(section: "app", key: "pass", value: newValue)
}
}
var defaultUsername: String {
get {
config.getString(section: "app", key: "user", defaultString: "")
}
set {
config.setString(section: "app", key: "user", value: newValue)
}
}
var deviceName: String {
get {
let raw = config.getString(section: "app", key: "device", defaultString: "").trimmingCharacters(in: .whitespaces)
return safeString(raw, defaultValue: "")
}
set {
config.setString(section: "app", key: "device", value: newValue.trimmingCharacters(in: .whitespaces))
}
}
var disableAddContact: Bool {
get {
config.getBool(section: "ui", key: "disable_add_contact", defaultValue: false)
}
set {
config.setBool(section: "ui", key: "disable_add_contact", value: newValue)
}
}
var disableChatFeature: Bool {
get {
config.getBool(section: "ui", key: "disable_chat_feature", defaultValue: false)
@ -305,6 +177,51 @@ class CorePreferences {
}
}
var earlymediaContentExtCatIdentifier: String {
get {
config.getString(section: "app", key: "extension_category", defaultString: "")
}
set {
config.setString(section: "app", key: "extension_category", value: newValue)
}
}
var enableSecureMode: Bool {
get {
config.getBool(section: "ui", key: "enable_secure_mode", defaultValue: true)
}
set {
config.setBool(section: "ui", key: "enable_secure_mode", value: newValue)
}
}
var firstLaunch: Bool {
get {
config.getBool(section: "app", key: "first_6.0_launch", defaultValue: true)
}
set {
config.setBool(section: "app", key: "first_6.0_launch", value: newValue)
}
}
var friendListInWhichStoreNewlyCreatedFriends: String {
get {
config.getString(section: "app", key: "friend_list_to_store_newly_created_contacts", defaultString: "Linphone address-book")
}
set {
config.setString(section: "app", key: "friend_list_to_store_newly_created_contacts", value: newValue)
}
}
var hideSettings: Bool {
get {
config.getBool(section: "ui", key: "hide_settings", defaultValue: false)
}
set {
config.setBool(section: "ui", key: "hide_settings", value: newValue)
}
}
var hideSipAddresses: Bool {
get {
config.getBool(section: "ui", key: "hide_sip_addresses", defaultValue: false)
@ -314,6 +231,151 @@ class CorePreferences {
}
}
var keepServiceAlive: Bool {
get {
config.getBool(section: "app", key: "keep_service_alive", defaultValue: false)
}
set {
config.setBool(section: "app", key: "keep_service_alive", value: newValue)
}
}
var linphoneConfigurationVersion: Int {
get {
config.getInt(section: "app", key: "config_version", defaultValue: 52005)
}
set {
config.setInt(section: "app", key: "config_version", value: newValue)
}
}
var markConversationAsReadWhenDismissingMessageNotification: Bool {
get {
config.getBool(section: "app", key: "mark_as_read_notif_dismissal", defaultValue: false)
}
set {
config.setBool(section: "app", key: "mark_as_read_notif_dismissal", value: newValue)
}
}
var maxAccountsCount: Int {
get {
config.getInt(section: "ui", key: "max_account", defaultValue: 0)
}
set {
config.setInt(section: "ui", key: "max_account", value: newValue)
}
}
var printLogsInLogcat: Bool {
get {
config.getBool(section: "app", key: "debug", defaultValue: true)
}
set {
config.setBool(section: "app", key: "debug", value: newValue)
}
}
var publishPresence: Bool {
get {
config.getBool(section: "app", key: "publish_presence", defaultValue: true)
}
set {
config.setBool(section: "app", key: "publish_presence", value: newValue)
}
}
var pushNotificationsInterval: Int {
get {
config.getInt(section: "net", key: "pn-call-remote-push-interval", defaultValue: 3)
}
set {
config.setInt(section: "net", key: "pn-call-remote-push-interval", value: newValue)
}
}
var routeAudioToSpeakerWhenVideoIsEnabled: Bool {
get {
config.getBool(section: "app", key: "route_audio_to_speaker_when_video_enabled", defaultValue: true)
}
set {
config.setBool(section: "app", key: "route_audio_to_speaker_when_video_enabled", value: newValue)
}
}
var serveraddress: String {
get {
config.getString(section: "app", key: "server", defaultString: "")
}
set {
config.setString(section: "app", key: "server", value: newValue)
}
}
var showDialogWhenCallingDeviceUuidDirectly: Bool {
get {
config.getBool(section: "app", key: "show_confirmation_dialog_zrtp_trust_call", defaultValue: true)
}
set {
config.setBool(section: "app", key: "show_confirmation_dialog_zrtp_trust_call", value: newValue)
}
}
var showFavoriteContacts: Bool {
get {
config.getBool(section: "ui", key: "show_favorites_contacts", defaultValue: true)
}
set {
config.setBool(section: "ui", key: "show_favorites_contacts", value: newValue)
}
}
var teamID: String {
get {
config.getString(section: "app", key: "team_id", defaultString: "")
}
set {
config.setString(section: "app", key: "team_id", value: newValue)
}
}
var themeAboutPictureUrl: String? {
get {
config.getString(section: "ui", key: "theme_about_picture_url", defaultString: nil)
}
set {
config.setString(section: "ui", key: "theme_about_picture_url", value: newValue)
}
}
var themeMainColor: String {
get {
let raw = config.getString(section: "ui", key: "theme_main_color", defaultString: "orange")
return safeString(raw, defaultValue: "orange")
}
set {
config.setString(section: "ui", key: "theme_main_color", value: newValue)
}
}
var vfsEnabled: Bool {
get {
config.getBool(section: "app", key: "vfs_enabled", defaultValue: false)
}
set {
config.setBool(section: "app", key: "vfs_enabled", value: newValue)
}
}
var voiceRecordingMaxDuration: Int {
get {
config.getInt(section: "app", key: "voice_recording_max_duration", defaultValue: 600000)
}
set {
config.setInt(section: "app", key: "voice_recording_max_duration", value: newValue)
}
}
private func copy(from: String, to: String, overrideIfExists: Bool = false) {
let fileManager = FileManager.default
if fileManager.fileExists(atPath: to), !overrideIfExists {

2
Linphone/GeneratedGit.swift
View file

@ -2,6 +2,6 @@ import Foundation
public enum AppGitInfo {
public static let branch = "master"
public static let commit = "d25c19ff8"
public static let commit = "907211903"
public static let tag = "6.1.0-alpha"
}

2
Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
View file

@ -3593,7 +3593,7 @@ class AudioRecorder: NSObject, ObservableObject {
func startTimer() {
DispatchQueue.main.async {
self.recordingTime = 0
let maxVoiceRecordDuration = CoreContext.shared.voiceRecordingMaxDuration
let maxVoiceRecordDuration = AppServices.corePreferences.voiceRecordingMaxDuration
self.timer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { _ in // More frequent updates
self.recordingTime += 0.1
self.updateSoundPower()

2
Linphone/UI/Main/Help/Fragments/DebugFragment.swift
View file

@ -245,7 +245,7 @@ struct DebugFragment: View {
func showConfigFile() {
Log.info("[DebugFragment][showConfigFile] Dumping & displaying Core's config")
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: CoreContext.appGroupName)?
if let rcDir = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: SharedMainViewModel.appGroupName)?
.appendingPathComponent("Library/Preferences/linphone") {
let rcFileUrl = rcDir.appendingPathComponent("linphonerc")
if FileManager.default.fileExists(atPath: rcFileUrl.path) {

7
Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift
View file

@ -24,6 +24,13 @@ class SharedMainViewModel: ObservableObject {
static let shared = SharedMainViewModel()
static let appGroupName: String = {
Bundle.main.object(forInfoDictionaryKey: "APP_GROUP_NAME") as? String
?? {
fatalError("APP_GROUP_NAME not defined in Info.plist")
}()
}()
@Published var welcomeViewDisplayed = false
@Published var generalTermsAccepted = false
@Published var displayProfileMode = false