This commit is contained in:
Ali 2020-11-06 02:58:28 +04:00
parent 8ddb4088d8
commit 518480564c
4 changed files with 20 additions and 10 deletions

View File

@ -59,7 +59,6 @@ BAZEL_COMMON_FLAGS=\
--features=swift.use_global_module_cache \ --features=swift.use_global_module_cache \
--features=swift.split_derived_files_generation \ --features=swift.split_derived_files_generation \
--features=swift.skip_function_bodies_for_derived_files \ --features=swift.skip_function_bodies_for_derived_files \
--apple_bitcode=watchos=embedded \
--jobs=${CORE_COUNT} --jobs=${CORE_COUNT}
BAZEL_DEBUG_FLAGS=\ BAZEL_DEBUG_FLAGS=\
@ -75,6 +74,7 @@ BAZEL_OPT_FLAGS=\
--swiftcopt='-num-threads' --swiftcopt='0' \ --swiftcopt='-num-threads' --swiftcopt='0' \
--features=dead_strip \ --features=dead_strip \
--objc_enable_binary_stripping \ --objc_enable_binary_stripping \
--apple_bitcode=watchos=embedded \
build_arm64: check_env build_arm64: check_env

View File

@ -294,7 +294,7 @@ telegram_entitlements_template = """
<key>application-identifier</key> <key>application-identifier</key>
<string>{telegram_team_id}.{telegram_bundle_id}</string> <string>{telegram_team_id}.{telegram_bundle_id}</string>
<key>com.apple.developer.icloud-container-environment</key> <key>com.apple.developer.icloud-container-environment</key>
<string>Production</string> <string>{telegram_icloud_environment}</string>
""" + apple_pay_merchants_fragment + unrestricted_voip_fragment """ + apple_pay_merchants_fragment + unrestricted_voip_fragment
plist_fragment( plist_fragment(
@ -304,6 +304,7 @@ plist_fragment(
telegram_bundle_id = telegram_bundle_id, telegram_bundle_id = telegram_bundle_id,
telegram_team_id = telegram_team_id, telegram_team_id = telegram_team_id,
telegram_aps_environment = telegram_aps_environment, telegram_aps_environment = telegram_aps_environment,
telegram_icloud_environment = "Production" if telegram_aps_environment == "production" else "Development",
) )
) )
@ -1527,13 +1528,13 @@ ios_application(
":AppStringResources", ":AppStringResources",
], ],
extensions = [ extensions = [
":ShareExtension", #":ShareExtension",
":NotificationContentExtension", #":NotificationContentExtension",
":NotificationServiceExtension", #":NotificationServiceExtension",
":IntentsExtension", #":IntentsExtension",
":WidgetExtension", #":WidgetExtension",
], ],
watch_application = ":TelegramWatchApp", #watch_application = ":TelegramWatchApp",
deps = [ deps = [
":Main", ":Main",
":Lib", ":Lib",

View File

@ -1285,6 +1285,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
if hasFilters { if hasFilters {
text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipNonEmptyFolders text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipNonEmptyFolders
let _ = markChatListFeaturedFiltersAsSeen(postbox: strongSelf.context.account.postbox).start() let _ = markChatListFeaturedFiltersAsSeen(postbox: strongSelf.context.account.postbox).start()
return
} else { } else {
text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipEmptyFolders text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipEmptyFolders
} }

View File

@ -22,9 +22,17 @@ private func getAdjacentEntryGroupInfo(_ entry: IntermediateMessageHistoryEntry?
if let entry = entry { if let entry = entry {
if let groupingKey = entry.message.groupingKey { if let groupingKey = entry.message.groupingKey {
if groupingKey == key { if groupingKey == key {
return (entry, .sameGroup(entry.message.groupInfo!)) if let groupInfo = entry.message.groupInfo {
return (entry, .sameGroup(groupInfo))
} else {
return (entry, .none)
}
} else { } else {
return (entry, .otherGroup(entry.message.groupInfo!)) if let groupInfo = entry.message.groupInfo {
return (entry, .otherGroup(groupInfo))
} else {
return (entry, .none)
}
} }
} else { } else {
return (entry, .none) return (entry, .none)