ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-03 19:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Ilya Laktyushin
2018-12-20 00:08:47 +04:00
parent a0bd50a0f6
commit eb759a42cc
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram-iOS/AppDelegate.swift
View File

@@ -1429,11 +1429,11 @@ private enum QueuedWakeup: Int32 {
private func registerForNotifications(replyString: String, messagePlaceholderString: String, hiddenContentString: String, includeNames: Bool, authorize: Bool = true, completion: @escaping (Bool) -> Void = { _ in }) {
if #available(iOS 10.0, *) {
let notificationCenter = UNUserNotificationCenter.current()
notificationCenter.getNotificationSettings(completionHandler: { settings in
switch (settings.authorizationStatus, authorize) {
case (.authorized, _), (.notDetermined, true):
notificationCenter.requestAuthorization(options: [.badge, .sound, .alert], completionHandler: { result, _ in
completion(result)
if result {
Queue.mainQueue().async {
let reply = UNTextInputNotificationAction(identifier: "reply", title: replyString, options: [], textInputButtonTitle: replyString, textInputPlaceholder: messagePlaceholderString)

26
Telegram-iOS/ApplicationContext.swift
View File

@@ -801,6 +801,8 @@ final class AuthorizedApplicationContext {
}))
if #available(iOS 10.0, *) {
let alwaysModal = true
let permissionsPosition = ValuePromise(0, ignoreRepeated: true)
self.permissionsDisposable.set((combineLatest(requiredPermissions(account: account), permissionUISplitTest(postbox: account.postbox), permissionsPosition.get(), account.postbox.combinedView(keys: [.noticeEntry(ApplicationSpecificNotice.contactsPermissionWarningKey()), .noticeEntry(ApplicationSpecificNotice.notificationsPermissionWarningKey())]))
|> deliverOnMainQueue).start(next: { [weak self] contactsAndNotifications, splitTest, position, combined in
@@ -811,10 +813,10 @@ final class AuthorizedApplicationContext {
let contactsTimestamp = (combined.views[.noticeEntry(ApplicationSpecificNotice.contactsPermissionWarningKey())] as? NoticeEntryView)?.value.flatMap({ ApplicationSpecificNotice.getTimestampValue($0) })
let notificationsTimestamp = (combined.views[.noticeEntry(ApplicationSpecificNotice.notificationsPermissionWarningKey())] as? NoticeEntryView)?.value.flatMap({ ApplicationSpecificNotice.getTimestampValue($0) })
if contactsTimestamp == nil, case .requestable = contactsAndNotifications.0.status {
ApplicationSpecificNotice.setContactsPermissionWarning(postbox: account.postbox, value: -1)
ApplicationSpecificNotice.setContactsPermissionWarning(postbox: account.postbox, value: 1)
}
if notificationsTimestamp == nil, case .requestable = contactsAndNotifications.1.status {
ApplicationSpecificNotice.setNotificationsPermissionWarning(postbox: account.postbox, value: -1)
ApplicationSpecificNotice.setNotificationsPermissionWarning(postbox: account.postbox, value: 1)
}
let config = splitTest.configuration
@@ -831,15 +833,15 @@ final class AuthorizedApplicationContext {
if case .modal = config.contacts {
modal = true
}
if case .requestable = contactsAndNotifications.0.status {
requestedPermissions.append((contactsAndNotifications.0, modal))
if case .requestable = contactsAndNotifications.0.status, contactsTimestamp != 0 {
requestedPermissions.append((contactsAndNotifications.0, modal || alwaysModal))
}
case .notifications:
if case .modal = config.notifications {
modal = true
}
if case .requestable = contactsAndNotifications.1.status {
requestedPermissions.append((contactsAndNotifications.1, modal))
if case .requestable = contactsAndNotifications.1.status, notificationsTimestamp != 0 {
requestedPermissions.append((contactsAndNotifications.1, modal || alwaysModal))
}
default:
break
@@ -860,7 +862,7 @@ final class AuthorizedApplicationContext {
}
controller.setState(state, animated: didAppear)
controller.proceed = {
controller.proceed = { resolved in
permissionsPosition.set(position + 1)
switch state {
case .contacts:
@@ -881,7 +883,7 @@ final class AuthorizedApplicationContext {
switch state {
case .contacts:
splitTest.addEvent(.ContactsRequest)
DeviceAccess.authorizeAccess(to: .contacts) { result in
DeviceAccess.authorizeAccess(to: .contacts, account: account) { result in
if result {
splitTest.addEvent(.ContactsAllowed)
} else {
@@ -892,7 +894,7 @@ final class AuthorizedApplicationContext {
}
case .notifications:
splitTest.addEvent(.NotificationsRequest)
DeviceAccess.authorizeAccess(to: .notifications) { result in
DeviceAccess.authorizeAccess(to: .notifications, account: account) { result in
if result {
splitTest.addEvent(.NotificationsAllowed)
} else {
@@ -907,10 +909,8 @@ final class AuthorizedApplicationContext {
}
} else {
if let controller = strongSelf.currentPermissionsController {
controller.dismiss(completion: { [weak self] in
if let strongSelf = self {
strongSelf.currentPermissionsController = nil
}
strongSelf.currentPermissionsController = nil
controller.dismiss(completion: {
})
}
}

1
Telegram-iOS/en.lproj/Localizable.strings
View File

@@ -3595,6 +3595,7 @@ Unused sets are archived when you add more.";
"Notifications.PermissionsTitle" = "Turn ON Notifications";
"Notifications.PermissionsText" = "Don't miss important messages from your friends and coworkers.";
"Notifications.PermissionsUnreachableTitle" = "Check Notification Settings";
"Notifications.PermissionsUnreachableText" = "Please note that you partly disabled message notifications in your Settings.";
"Notifications.PermissionsAllow" = "Turn Notifications ON";
"Notifications.PermissionsAllowInSettings" = "Turn ON in Settings";

2
submodules/LegacyComponents

Submodule submodules/LegacyComponents updated: 834e3a865d...ccfa2e2f83

2
submodules/MtProtoKit

Submodule submodules/MtProtoKit updated: cc97fc2fa2...a7e2581217

2
submodules/TelegramCore

Submodule submodules/TelegramCore updated: 99e75d0f2d...98767051c5

2
submodules/TelegramUI

Submodule submodules/TelegramUI updated: f8bee27599...9961c6212d