diff --git a/Classes/DialerView.m b/Classes/DialerView.m index ee762c976..8a0606a8b 100644 --- a/Classes/DialerView.m +++ b/Classes/DialerView.m @@ -193,7 +193,6 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)coreUpdateEvent:(NSNotification *)notif { @try { - [[LinphoneManager instance] checkNewVersion]; if (IPAD) { if (linphone_core_video_display_enabled(LC) && linphone_core_video_preview_enabled(LC)) { linphone_core_set_native_preview_window_id(LC, (__bridge void *)(_videoPreview)); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 93b8971e1..08b9a31cd 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1395,7 +1395,6 @@ void linphone_iphone_chatroom_state_changed(LinphoneCore *lc, LinphoneChatRoom * } void linphone_iphone_version_update_check_result_received (LinphoneCore *lc, LinphoneVersionUpdateCheckResult result, const char *version, const char *url) { - LOGD(@"MONCUL"); if (result == LinphoneVersionUpdateCheckUpToDate || result == LinphoneVersionUpdateCheckError) { return; } @@ -1406,41 +1405,15 @@ void linphone_iphone_version_update_check_result_received (LinphoneCore *lc, Lin message:body preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) + NSString *ObjCurl = [NSString stringWithUTF8String:url]; + UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Download", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) { - NSString *ObjCurl = [NSString stringWithUTF8String:url]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:ObjCurl]]; }]; [versVerifView addAction:defaultAction]; [PhoneMainView.instance presentViewController:versVerifView animated:YES completion:nil]; - /* - if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive && - floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_9_x_Max) { - UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init]; - content.title = title; - content.body = body; - content.categoryIdentifier = @"version_verif"; - UNNotificationRequest *req = - [UNNotificationRequest requestWithIdentifier:@"version_verif" content:content trigger:NULL]; - [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:req - withCompletionHandler:^(NSError *_Nullable error) { - // Enable or disable features based on authorization. - if (error) { - LOGD(@"Error while adding notification request :"); - LOGD(error.description); - } - }]; - } else { - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title - message:body - delegate:nil - cancelButtonTitle:nil - otherButtonTitles:nil]; - [alert show]; - } - */ } #pragma mark - Message composition start @@ -2385,6 +2358,8 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { - (void)becomeActive { linphone_core_enter_foreground(LC); + + [self checkNewVersion]; // enable presence if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max || self.connectivity == none) { @@ -3082,25 +3057,8 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { - (void)checkNewVersion { if (theLinphoneCore == nil) return; - //NSString *curVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; - //const char *curVersionCString = [curVersion cStringUsingEncoding:NSUTF8StringEncoding]; - //linphone_core_check_for_update(theLinphoneCore, curVersionCString); - - NSString *title = NSLocalizedString(@"Outdated Version", nil); - NSString *body = NSLocalizedString(@"A new version of your app is available, use the button below to download it.", nil); - - UIAlertController *versVerifView = [UIAlertController alertControllerWithTitle:title - message:body - preferredStyle:UIAlertControllerStyleAlert]; - - UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * action) { - NSString *ObjCurl = @"https://www.google.com/"; - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:ObjCurl]]; - }]; - - [versVerifView addAction:defaultAction]; - [PhoneMainView.instance presentViewController:versVerifView animated:YES completion:nil]; + NSString *curVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; + const char *curVersionCString = [curVersion cStringUsingEncoding:NSUTF8StringEncoding]; + linphone_core_check_for_update(theLinphoneCore, curVersionCString); } @end diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 419bdfcde..6eefe6632 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -45,6 +45,7 @@ tcp_tls_keepalive=30000 history_max_size=-1 enable_basic_to_client_group_chat_room_migration=0 aggregate_imdn=1 +version_check_url_root=https://linphone.org/releases [sound] dtmf_player_amp=0.007