From 2c4b5c04fa3de4beb683b6d69186f310f30f953e Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 14 Jun 2019 11:04:38 +0200 Subject: [PATCH] simplify log of migrateImportantFiles --- Classes/LinphoneManager.h | 2 +- Classes/LinphoneManager.m | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 0f5d590e0..4fc4ffef2 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -157,7 +157,7 @@ typedef struct _LinphoneManagerSounds { - (void)configureVbrCodecs; -+ (BOOL)copyFile:(NSString*)src destination:(NSString*)dst override:(BOOL)override; ++ (BOOL)copyFile:(NSString*)src destination:(NSString*)dst override:(BOOL)override ignore:(BOOL)ignore; + (PHFetchResult *)getPHAssets:(NSString *)key; + (NSString*)bundleFile:(NSString*)file; + (NSString *)preferenceFile:(NSString *)file; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 1650f34c5..756c591cc 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -2520,22 +2520,22 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { } - (void)migrateImportantFiles { - if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"linphonerc"] destination:[LinphoneManager preferenceFile:@"linphonerc"] override:TRUE]) + if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"linphonerc"] destination:[LinphoneManager preferenceFile:@"linphonerc"] override:TRUE ignore:TRUE]) [NSFileManager.defaultManager removeItemAtPath:[LinphoneManager documentFile:@"linphonerc"] error:nil]; - if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"linphone_chats.db"] destination:[LinphoneManager dataFile:@"linphone_chats.db"] override:TRUE]) + if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"linphone_chats.db"] destination:[LinphoneManager dataFile:@"linphone_chats.db"] override:TRUE ignore:TRUE]) [NSFileManager.defaultManager removeItemAtPath:[LinphoneManager documentFile:@"linphone_chats.db"] error:nil]; - if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"zrtp_secrets"] destination:[LinphoneManager dataFile:@"zrtp_secrets"] override:TRUE]) + if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"zrtp_secrets"] destination:[LinphoneManager dataFile:@"zrtp_secrets"] override:TRUE ignore:TRUE]) [NSFileManager.defaultManager removeItemAtPath:[LinphoneManager documentFile:@"zrtp_secrets"] error:nil]; - if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"zrtp_secrets.bkp"] destination:[LinphoneManager dataFile:@"zrtp_secrets.bkp"] override:TRUE]) + if ([LinphoneManager copyFile:[LinphoneManager documentFile:@"zrtp_secrets.bkp"] destination:[LinphoneManager dataFile:@"zrtp_secrets.bkp"] override:TRUE ignore:TRUE]) [NSFileManager.defaultManager removeItemAtPath:[LinphoneManager documentFile:@"zrtp_secrets.bkp"] error:nil]; @@ -2568,7 +2568,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { src = srcIpad; } NSString *dst = [LinphoneManager preferenceFile:@"linphonerc"]; - [LinphoneManager copyFile:src destination:dst override:FALSE]; + [LinphoneManager copyFile:src destination:dst override:FALSE ignore:FALSE]; } - (void)overrideDefaultSettings { @@ -2985,11 +2985,12 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { return count; } -+ (BOOL)copyFile:(NSString *)src destination:(NSString *)dst override:(BOOL)override { ++ (BOOL)copyFile:(NSString *)src destination:(NSString *)dst override:(BOOL)override ignore:(BOOL)ignore { NSFileManager *fileManager = NSFileManager.defaultManager; NSError *error = nil; if ([fileManager fileExistsAtPath:src] == NO) { - LOGE(@"Can't find \"%@\": %@", src, [error localizedDescription]); + if (!ignore) + LOGE(@"Can't find \"%@\": %@", src, [error localizedDescription]); return FALSE; } if ([fileManager fileExistsAtPath:dst] == YES) {