diff --git a/Telegram/BUILD b/Telegram/BUILD index 4044f3d941..87c389c049 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -118,11 +118,13 @@ swift_library( "//submodules/rlottie:RLottieBinding", "//submodules/AnimatedStickerNode:AnimatedStickerNode", "//submodules/WalletUI:WalletUI", + "//submodules/WebsiteType:WebsiteType", + "//submodules/MtProtoKit:MtProtoKit", ], ) additional_info_plist = telegram_info_plist( - name = "AdditionalInfo.plist", + name = "AdditionalInfoPlist", app_name = "Telegram", url_scheme = "tg", bundle_id_define = "telegram_bundle_id", @@ -130,21 +132,15 @@ additional_info_plist = telegram_info_plist( build_number_define = "telegram_build_number", ) -provisioning_profile = file_from_define( - name = "TelegramProvisioningProfile", - extension = "mobileprovision", - define_name = "telegram_provisioning_profile", -) - ios_application( name = "Telegram", bundle_id = "{telegram_bundle_id}", families = ["iphone", "ipad"], minimum_os_version = "9.0", - provisioning_profile = ":TelegramProvisioningProfile", + provisioning_profile = "//build-input/data/provisioning-profiles:App.mobileprovision", infoplists = [ "Info.plist", - ":AdditionalInfo.plist", + ":AdditionalInfoPlist", ], frameworks = [ #":AsyncDisplayKitFramework", diff --git a/Telegram/telegram_info_plist.bzl b/Telegram/telegram_info_plist.bzl index 11726ee17b..6e38968e65 100644 --- a/Telegram/telegram_info_plist.bzl +++ b/Telegram/telegram_info_plist.bzl @@ -43,7 +43,6 @@ def _telegram_info_plist(ctx): {app_name}.compatibility CFBundleURLSchemes - tg {url_scheme} diff --git a/build-system/copy-provisioning-profiles.sh b/build-system/copy-provisioning-profiles.sh index 8cba857421..237223e678 100755 --- a/build-system/copy-provisioning-profiles.sh +++ b/build-system/copy-provisioning-profiles.sh @@ -12,16 +12,29 @@ touch "build-input/data/BUILD" OUTPUT_DIRECTORY="build-input/data/provisioning-profiles" rm -rf "$OUTPUT_DIRECTORY" mkdir -p "$OUTPUT_DIRECTORY" -touch "$OUTPUT_DIRECTORY/BUILD" + +BUILD_PATH="$OUTPUT_DIRECTORY/BUILD" +touch "$BUILD_PATH" + +echo "exports_files([" >> "$BUILD_PATH" SEARCH_NAMES=($@) +ELEMENT_COUNT=${#SEARCH_NAMES[@]} +REMAINDER=$(($ELEMENT_COUNT % 2)) + +if [ $REMAINDER != 0 ]; then + >&2 echo "Expecting key-value pairs" + exit 1 +fi declare -A FOUND_PROFILES for PROFILE in `find "$PROVISIONING_PROFILE_SEARCH_PATH" -type f -name "*.mobileprovision"`; do PROFILE_DATA=$(security cms -D -i "$PROFILE") PROFILE_NAME=$(/usr/libexec/PlistBuddy -c "Print :Name" /dev/stdin <<< $(echo $PROFILE_DATA)) - for SEARCH_NAME in $SEARCH_NAMES; do + for (( i=1; i<$ELEMENT_COUNT+1; i=i+2 )); do + ID=${SEARCH_NAMES[$i]} + SEARCH_NAME=${SEARCH_NAMES[$(($i + 1))]} if [ "$PROFILE_NAME" = "$SEARCH_NAME" ]; then if [ "${FOUND_PROFILES[\"$SEARCH_NAME\"]}" = "" ]; then FOUND_PROFILES["$SEARCH_NAME"]="$PROFILE" @@ -33,12 +46,17 @@ for PROFILE in `find "$PROVISIONING_PROFILE_SEARCH_PATH" -type f -name "*.mobile done done -for SEARCH_NAME in $SEARCH_NAMES; do +for (( i=1; i<$ELEMENT_COUNT+1; i=i+2 )); do + ID=${SEARCH_NAMES[$i]} + SEARCH_NAME=${SEARCH_NAMES[$(($i + 1))]} FOUND_PROFILE="${FOUND_PROFILES[\"$SEARCH_NAME\"]}" if [ "$FOUND_PROFILE" = "" ]; then >&2 echo "Profile \"$SEARCH_NAME\" not found" exit 1 fi - cp "$FOUND_PROFILE" "$OUTPUT_DIRECTORY/" + cp "$FOUND_PROFILE" "$OUTPUT_DIRECTORY/$ID.mobileprovision" + echo " \"$ID.mobileprovision\"," >> $BUILD_PATH done + +echo "])" >> "$BUILD_PATH" diff --git a/submodules/AlertUI/Sources/AlertUI.h b/submodules/AlertUI/Sources/AlertUI.h deleted file mode 100644 index b188aba6c8..0000000000 --- a/submodules/AlertUI/Sources/AlertUI.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// AlertUI.h -// AlertUI -// -// Created by Peter on 8/10/19. -// Copyright © 2019 Telegram Messenger LLP. All rights reserved. -// - -#import - -//! Project version number for AlertUI. -FOUNDATION_EXPORT double AlertUIVersionNumber; - -//! Project version string for AlertUI. -FOUNDATION_EXPORT const unsigned char AlertUIVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/submodules/MtProtoKit/BUCK b/submodules/MtProtoKit/BUCK index c7c41a5081..215e91f784 100644 --- a/submodules/MtProtoKit/BUCK +++ b/submodules/MtProtoKit/BUCK @@ -3,79 +3,14 @@ load("//Config:buck_rule_macros.bzl", "static_library", "framework", "glob_map", framework( name = "MtProtoKit", srcs = glob([ - "*.m", - "MtProtoKit/*.m", - "thirdparty/AFNetworking/*.m", - "thirdparty/AsyncSocket/*.m", + "Sources/*.m", ]), - headers = merge_maps([ - glob_map(glob([ - "*.h", - "MtProtoKit/*.h", - "thirdparty/AFNetworking/*.h", - "thirdparty/AsyncSocket/*.h", - ])), + headers = glob([ + "Sources/*.h", + ]), + exported_headers = glob([ + "PublicHeaders/**/*.h", ]), - exported_headers = [ - "MtProtoKit/MTTime.h", - "MtProtoKit/MTTimer.h", - "MtProtoKit/MTLogging.h", - "MtProtoKit/MTEncryption.h", - "MtProtoKit/MTInternalId.h", - "MtProtoKit/MTQueue.h", - "MtProtoKit/MTOutputStream.h", - "MtProtoKit/MTInputStream.h", - "MtProtoKit/MTSerialization.h", - "MtProtoKit/MTExportedAuthorizationData.h", - "MtProtoKit/MTRpcError.h", - "MtProtoKit/MTKeychain.h", - "MtProtoKit/MTFileBasedKeychain.h", - "MtProtoKit/MTContext.h", - "MtProtoKit/MTTransportScheme.h", - "MtProtoKit/MTDatacenterTransferAuthAction.h", - "MtProtoKit/MTDatacenterAuthAction.h", - "MtProtoKit/MTDatacenterAuthMessageService.h", - "MtProtoKit/MTDatacenterAddress.h", - "MtProtoKit/MTDatacenterAddressSet.h", - "MtProtoKit/MTDatacenterAuthInfo.h", - "MtProtoKit/MTDatacenterSaltInfo.h", - "MtProtoKit/MTDatacenterAddressListData.h", - "MtProtoKit/MTProto.h", - "MtProtoKit/MTSessionInfo.h", - "MtProtoKit/MTTimeFixContext.h", - "MtProtoKit/MTPreparedMessage.h", - "MtProtoKit/MTOutgoingMessage.h", - "MtProtoKit/MTIncomingMessage.h", - "MtProtoKit/MTMessageEncryptionKey.h", - "MtProtoKit/MTMessageService.h", - "MtProtoKit/MTMessageTransaction.h", - "MtProtoKit/MTTimeSyncMessageService.h", - "MtProtoKit/MTRequestMessageService.h", - "MtProtoKit/MTRequest.h", - "MtProtoKit/MTRequestContext.h", - "MtProtoKit/MTRequestErrorContext.h", - "MtProtoKit/MTDropResponseContext.h", - "MtProtoKit/MTApiEnvironment.h", - "MtProtoKit/MTResendMessageService.h", - "MtProtoKit/MTNetworkAvailability.h", - "MtProtoKit/MTTransport.h", - "MtProtoKit/MTTransportTransaction.h", - "MtProtoKit/MTTcpTransport.h", - "MtProtoKit/MTHttpRequestOperation.h", - "MTAtomic.h", - "MTBag.h", - "MTDisposable.h", - "MTSubscriber.h", - "MTSignal.h", - "MTNetworkUsageCalculationInfo.h", - "MTNetworkUsageManager.h", - "MTBackupAddressSignals.h", - "thirdparty/AFNetworking/AFURLConnectionOperation.h", - "thirdparty/AFNetworking/AFHTTPRequestOperation.h", - "MTProxyConnectivity.h", - "MTGzip.h", - "MTDatacenterVerificationData.h", - ], visibility = ["PUBLIC"], deps = [ "//submodules/EncryptionProvider:EncryptionProvider", diff --git a/submodules/MtProtoKit/BUILD b/submodules/MtProtoKit/BUILD new file mode 100644 index 0000000000..cdc4b42171 --- /dev/null +++ b/submodules/MtProtoKit/BUILD @@ -0,0 +1,27 @@ + +objc_library( + name = "MtProtoKit", + enable_modules = True, + module_name = "MtProtoKit", + srcs = glob([ + "Sources/*.m", + "Sources/*.h", + ]), + hdrs = glob([ + "PublicHeaders/**/*.h", + ]), + includes = [ + "PublicHeaders", + ], + deps = [ + "//submodules/EncryptionProvider:EncryptionProvider", + ], + sdk_frameworks = [ + "Foundation", + "Security", + "SystemConfiguration", + ], + visibility = [ + "//visibility:public", + ], +) diff --git a/submodules/MtProtoKit/MTProtoKit/Info.plist b/submodules/MtProtoKit/MTProtoKit/Info.plist deleted file mode 100644 index d3de8eefb6..0000000000 --- a/submodules/MtProtoKit/MTProtoKit/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/submodules/MtProtoKit/MTProtoKit/MTKeychain.m b/submodules/MtProtoKit/MTProtoKit/MTKeychain.m deleted file mode 100644 index 8beaac734d..0000000000 --- a/submodules/MtProtoKit/MTProtoKit/MTKeychain.m +++ /dev/null @@ -1,3 +0,0 @@ - - -#import "MTKeychain.h" diff --git a/submodules/MtProtoKit/MTProtoKit/MTProtoKit.h b/submodules/MtProtoKit/MTProtoKit/MTProtoKit.h deleted file mode 100644 index a338665c59..0000000000 --- a/submodules/MtProtoKit/MTProtoKit/MTProtoKit.h +++ /dev/null @@ -1,76 +0,0 @@ -// -// MtProtoKit.h -// MtProtoKit -// -// Created by Peter on 13/04/15. -// Copyright (c) 2015 Telegram. All rights reserved. -// - -#import - -//! Project version number for MtProtoKit. -FOUNDATION_EXPORT double MtProtoKitVersionNumber; - -//! Project version string for MtProtoKit. -FOUNDATION_EXPORT const unsigned char MtProtoKitVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m b/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m deleted file mode 100644 index 1c0cea5193..0000000000 --- a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m +++ /dev/null @@ -1,13 +0,0 @@ -// -// MTRequestErrorContext.m -// MtProtoKit -// -// Created by Admin on 18/02/2014. -// Copyright (c) 2014 Telegram. All rights reserved. -// - -#import "MTRequestErrorContext.h" - -@implementation MTRequestErrorContext - -@end diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFHTTPRequestOperation.h similarity index 100% rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFHTTPRequestOperation.h diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFURLConnectionOperation.h similarity index 100% rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFURLConnectionOperation.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTApiEnvironment.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTApiEnvironment.h diff --git a/submodules/MtProtoKit/MTAtomic.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTAtomic.h similarity index 100% rename from submodules/MtProtoKit/MTAtomic.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTAtomic.h diff --git a/submodules/MtProtoKit/MTBackupAddressSignals.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBackupAddressSignals.h similarity index 100% rename from submodules/MtProtoKit/MTBackupAddressSignals.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBackupAddressSignals.h diff --git a/submodules/MtProtoKit/MTBag.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBag.h similarity index 100% rename from submodules/MtProtoKit/MTBag.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBag.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTContext.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTContext.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTContext.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddress.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddress.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressListData.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressListData.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressSet.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressSet.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthAction.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthAction.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthInfo.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthInfo.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthMessageService.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthMessageService.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterSaltInfo.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterSaltInfo.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterTransferAuthAction.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterTransferAuthAction.h diff --git a/submodules/MtProtoKit/MTDatacenterVerificationData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterVerificationData.h similarity index 100% rename from submodules/MtProtoKit/MTDatacenterVerificationData.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterVerificationData.h diff --git a/submodules/MtProtoKit/MTDisposable.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDisposable.h similarity index 100% rename from submodules/MtProtoKit/MTDisposable.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDisposable.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDropResponseContext.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDropResponseContext.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTEncryption.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTEncryption.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTEncryption.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTEncryption.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTExportedAuthorizationData.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTExportedAuthorizationData.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTFileBasedKeychain.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTFileBasedKeychain.h diff --git a/submodules/MtProtoKit/MTGzip.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTGzip.h similarity index 100% rename from submodules/MtProtoKit/MTGzip.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTGzip.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTHttpRequestOperation.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTHttpRequestOperation.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTIncomingMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTIncomingMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTInputStream.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInputStream.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTInputStream.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInputStream.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalId.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInternalId.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTInternalId.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInternalId.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTKeychain.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTKeychain.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTKeychain.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTKeychain.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTLogging.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTLogging.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTLogging.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTLogging.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageEncryptionKey.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageEncryptionKey.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageService.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMessageService.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageService.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageTransaction.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageTransaction.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkAvailability.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkAvailability.h diff --git a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageCalculationInfo.h similarity index 100% rename from submodules/MtProtoKit/MTNetworkUsageCalculationInfo.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageCalculationInfo.h diff --git a/submodules/MtProtoKit/MTNetworkUsageManager.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageManager.h similarity index 100% rename from submodules/MtProtoKit/MTNetworkUsageManager.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageManager.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutgoingMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutgoingMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutputStream.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTOutputStream.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutputStream.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTPreparedMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTPreparedMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTProto.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProto.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTProto.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProto.h diff --git a/submodules/MtProtoKit/MTProxyConnectivity.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProxyConnectivity.h similarity index 100% rename from submodules/MtProtoKit/MTProxyConnectivity.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProxyConnectivity.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTQueue.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTQueue.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTQueue.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTQueue.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequest.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequest.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRequest.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequest.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestContext.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRequestContext.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestContext.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestMessageService.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestMessageService.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTResendMessageService.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTResendMessageService.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTResendMessageService.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcError.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRpcError.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRpcError.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRpcError.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTSerialization.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSerialization.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTSerialization.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSerialization.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTSessionInfo.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h diff --git a/submodules/MtProtoKit/MTSignal.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSignal.h similarity index 100% rename from submodules/MtProtoKit/MTSignal.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSignal.h diff --git a/submodules/MtProtoKit/MTSubscriber.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSubscriber.h similarity index 100% rename from submodules/MtProtoKit/MTSubscriber.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSubscriber.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTcpTransport.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTcpTransport.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTcpTransport.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTime.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTime.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTime.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTime.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeFixContext.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeFixContext.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeSyncMessageService.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeSyncMessageService.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimer.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimer.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTimer.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimer.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransport.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransport.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTransport.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransport.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportScheme.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTransportScheme.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportScheme.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportTransaction.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.h rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportTransaction.h diff --git a/submodules/MtProtoKit/README.md b/submodules/MtProtoKit/README.md deleted file mode 100644 index a1c848fdaf..0000000000 --- a/submodules/MtProtoKit/README.md +++ /dev/null @@ -1,4 +0,0 @@ -MtProtoKit -========== - -Universal MTProto framework for both iOS and OS X diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m b/submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m similarity index 99% rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m rename to submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m index 127b7a4eab..212672ae77 100644 --- a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m +++ b/submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "AFHTTPRequestOperation.h" +#import static NSString * AFStringFromIndexSet(NSIndexSet *indexSet) { NSMutableString *string = [NSMutableString string]; diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m b/submodules/MtProtoKit/Sources/AFURLConnectionOperation.m similarity index 99% rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m rename to submodules/MtProtoKit/Sources/AFURLConnectionOperation.m index 5e630e1352..2627816bfd 100644 --- a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m +++ b/submodules/MtProtoKit/Sources/AFURLConnectionOperation.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "AFURLConnectionOperation.h" +#import //#import "AFImageRequestOperation.h" diff --git a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.h b/submodules/MtProtoKit/Sources/GCDAsyncSocket.h similarity index 100% rename from submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.h rename to submodules/MtProtoKit/Sources/GCDAsyncSocket.h diff --git a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m similarity index 99% rename from submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m rename to submodules/MtProtoKit/Sources/GCDAsyncSocket.m index 59336b8b96..b3668549b3 100755 --- a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m +++ b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m @@ -10,7 +10,7 @@ #import "GCDAsyncSocket.h" -#import "MTLogging.h" +#import #if TARGET_OS_IPHONE #import @@ -30,8 +30,8 @@ #import #import -#import "MTNetworkUsageCalculationInfo.h" -#import "MTNetworkUsageManager.h" +#import +#import #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" diff --git a/submodules/MtProtoKit/MTAes.h b/submodules/MtProtoKit/Sources/MTAes.h similarity index 100% rename from submodules/MtProtoKit/MTAes.h rename to submodules/MtProtoKit/Sources/MTAes.h diff --git a/submodules/MtProtoKit/MTAes.m b/submodules/MtProtoKit/Sources/MTAes.m similarity index 100% rename from submodules/MtProtoKit/MTAes.m rename to submodules/MtProtoKit/Sources/MTAes.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m b/submodules/MtProtoKit/Sources/MTApiEnvironment.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m rename to submodules/MtProtoKit/Sources/MTApiEnvironment.m index 7f700687cb..996f8fa14d 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m +++ b/submodules/MtProtoKit/Sources/MTApiEnvironment.m @@ -1,6 +1,4 @@ - - -#import "MTApiEnvironment.h" +#import #if TARGET_OS_IPHONE # import diff --git a/submodules/MtProtoKit/MTAtomic.m b/submodules/MtProtoKit/Sources/MTAtomic.m similarity index 96% rename from submodules/MtProtoKit/MTAtomic.m rename to submodules/MtProtoKit/Sources/MTAtomic.m index 58ad159e18..72f68f312f 100644 --- a/submodules/MtProtoKit/MTAtomic.m +++ b/submodules/MtProtoKit/Sources/MTAtomic.m @@ -1,4 +1,4 @@ -#import "MTAtomic.h" +#import #import diff --git a/submodules/MtProtoKit/MTBackupAddressSignals.m b/submodules/MtProtoKit/Sources/MTBackupAddressSignals.m similarity index 99% rename from submodules/MtProtoKit/MTBackupAddressSignals.m rename to submodules/MtProtoKit/Sources/MTBackupAddressSignals.m index 6de20c310f..8eead4103e 100644 --- a/submodules/MtProtoKit/MTBackupAddressSignals.m +++ b/submodules/MtProtoKit/Sources/MTBackupAddressSignals.m @@ -1,4 +1,4 @@ -#import "MTBackupAddressSignals.h" +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.h b/submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.h rename to submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.m b/submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.m rename to submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.m diff --git a/submodules/MtProtoKit/MTBag.m b/submodules/MtProtoKit/Sources/MTBag.m similarity index 97% rename from submodules/MtProtoKit/MTBag.m rename to submodules/MtProtoKit/Sources/MTBag.m index 44e6c1f434..a6b38ce600 100644 --- a/submodules/MtProtoKit/MTBag.m +++ b/submodules/MtProtoKit/Sources/MTBag.m @@ -1,4 +1,4 @@ -#import "MTBag.h" +#import @interface MTBag () { diff --git a/submodules/MtProtoKit/MTBindingTempAuthKeyContext.h b/submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.h similarity index 100% rename from submodules/MtProtoKit/MTBindingTempAuthKeyContext.h rename to submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.h diff --git a/submodules/MtProtoKit/MTBindingTempAuthKeyContext.m b/submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.m similarity index 100% rename from submodules/MtProtoKit/MTBindingTempAuthKeyContext.m rename to submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTBuffer.h b/submodules/MtProtoKit/Sources/MTBuffer.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBuffer.h rename to submodules/MtProtoKit/Sources/MTBuffer.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTBuffer.m b/submodules/MtProtoKit/Sources/MTBuffer.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBuffer.m rename to submodules/MtProtoKit/Sources/MTBuffer.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTBufferReader.h b/submodules/MtProtoKit/Sources/MTBufferReader.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBufferReader.h rename to submodules/MtProtoKit/Sources/MTBufferReader.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTBufferReader.m b/submodules/MtProtoKit/Sources/MTBufferReader.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTBufferReader.m rename to submodules/MtProtoKit/Sources/MTBufferReader.m diff --git a/submodules/MtProtoKit/MTConnectionProbing.h b/submodules/MtProtoKit/Sources/MTConnectionProbing.h similarity index 100% rename from submodules/MtProtoKit/MTConnectionProbing.h rename to submodules/MtProtoKit/Sources/MTConnectionProbing.h diff --git a/submodules/MtProtoKit/MTConnectionProbing.m b/submodules/MtProtoKit/Sources/MTConnectionProbing.m similarity index 100% rename from submodules/MtProtoKit/MTConnectionProbing.m rename to submodules/MtProtoKit/Sources/MTConnectionProbing.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.m b/submodules/MtProtoKit/Sources/MTContext.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTContext.m rename to submodules/MtProtoKit/Sources/MTContext.m index 6abb56c6a0..506a954d98 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTContext.m +++ b/submodules/MtProtoKit/Sources/MTContext.m @@ -1,27 +1,26 @@ -#import "MTContext.h" +#import #import -#import "MTLogging.h" -#import "MTTimer.h" -#import "MTQueue.h" -#import "MTKeychain.h" - -#import "MTDatacenterAddressSet.h" -#import "MTDatacenterAddress.h" -#import "MTDatacenterAuthInfo.h" -#import "MTDatacenterSaltInfo.h" -#import "MTSessionInfo.h" -#import "MTApiEnvironment.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTDiscoverDatacenterAddressAction.h" -#import "MTDatacenterAuthAction.h" -#import "MTDatacenterTransferAuthAction.h" +#import +#import -#import "MTTransportScheme.h" -#import "MTTcpTransport.h" +#import +#import -#import "MTApiEnvironment.h" +#import #import diff --git a/submodules/MtProtoKit/MTDNS.h b/submodules/MtProtoKit/Sources/MTDNS.h similarity index 100% rename from submodules/MtProtoKit/MTDNS.h rename to submodules/MtProtoKit/Sources/MTDNS.h diff --git a/submodules/MtProtoKit/MTDNS.m b/submodules/MtProtoKit/Sources/MTDNS.m similarity index 100% rename from submodules/MtProtoKit/MTDNS.m rename to submodules/MtProtoKit/Sources/MTDNS.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m b/submodules/MtProtoKit/Sources/MTDatacenterAddress.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m rename to submodules/MtProtoKit/Sources/MTDatacenterAddress.m index f15a8762db..c6bb2e052b 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAddress.m @@ -1,6 +1,4 @@ - - -#import "MTDatacenterAddress.h" +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m b/submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m similarity index 86% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m rename to submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m index 408323af73..1886aae688 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m @@ -1,4 +1,4 @@ -#import "MTDatacenterAddressListData.h" +#import @implementation MTDatacenterAddressListData diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m b/submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m similarity index 94% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m rename to submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m index f7f21f7bae..4e335c6190 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m @@ -1,8 +1,6 @@ +#import - -#import "MTDatacenterAddressSet.h" - -#import "MTDatacenterAddress.h" +#import @implementation MTDatacenterAddressSet diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m similarity index 92% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m rename to submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m index b6f38a2a58..3896afcd51 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m @@ -1,21 +1,17 @@ -#import "MTDatacenterAuthAction.h" - -#import "MTLogging.h" -#import "MTContext.h" -#import "MTProto.h" -#import "MTRequest.h" -#import "MTDatacenterSaltInfo.h" -#import "MTDatacenterAuthInfo.h" -#import "MTApiEnvironment.h" -#import "MTSerialization.h" -#import "MTDatacenterAddressSet.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import - - -#import "MTDatacenterAuthMessageService.h" -#import "MTRequestMessageService.h" - +#import +#import #import "MTBuffer.h" @interface MTDatacenterAuthAction () diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m rename to submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m index 1429ea8d8c..f9959626a9 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m @@ -1,5 +1,5 @@ -#import "MTDatacenterAuthInfo.h" -#import "MTDatacenterSaltInfo.h" +#import +#import @implementation MTDatacenterAuthKey diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m rename to submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m index bfd7d919b9..a72758f2a0 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m @@ -1,18 +1,18 @@ -#import "MTDatacenterAuthMessageService.h" +#import -#import "MTLogging.h" -#import "MTContext.h" -#import "MTProto.h" -#import "MTSerialization.h" -#import "MTSessionInfo.h" -#import "MTIncomingMessage.h" -#import "MTOutgoingMessage.h" -#import "MTMessageTransaction.h" -#import "MTPreparedMessage.h" -#import "MTDatacenterAuthInfo.h" -#import "MTDatacenterSaltInfo.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTBuffer.h" -#import "MTEncryption.h" +#import #import "MTInternalMessageParser.h" #import "MTServerDhInnerDataMessage.h" diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m b/submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m similarity index 96% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m rename to submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m index 17f2e5d2f8..a67066bc06 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m @@ -1,6 +1,4 @@ - - -#import "MTDatacenterSaltInfo.h" +#import @implementation MTDatacenterSaltInfo diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m b/submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m similarity index 96% rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m rename to submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m index b99e921ff2..9cfccea07d 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m @@ -1,12 +1,12 @@ -#import "MTDatacenterTransferAuthAction.h" +#import -#import "MTContext.h" -#import "MTSerialization.h" -#import "MTProto.h" -#import "MTRequestMessageService.h" -#import "MTRequest.h" +#import +#import +#import +#import +#import #import "MTBuffer.h" @interface MTDatacenterTransferAuthAction () diff --git a/submodules/MtProtoKit/MTDatacenterVerificationData.m b/submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m similarity index 90% rename from submodules/MtProtoKit/MTDatacenterVerificationData.m rename to submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m index 82dbe5326b..bcfc3b0dd4 100644 --- a/submodules/MtProtoKit/MTDatacenterVerificationData.m +++ b/submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m @@ -1,4 +1,4 @@ -#import "MTDatacenterVerificationData.h" +#import @implementation MTDatacenterVerificationData diff --git a/submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.h b/submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.h rename to submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.m b/submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.m rename to submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.m diff --git a/submodules/MtProtoKit/MTDiscoverConnectionSignals.h b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.h similarity index 100% rename from submodules/MtProtoKit/MTDiscoverConnectionSignals.h rename to submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.h diff --git a/submodules/MtProtoKit/MTDiscoverConnectionSignals.m b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m similarity index 96% rename from submodules/MtProtoKit/MTDiscoverConnectionSignals.m rename to submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m index d3c0ae312d..6ad6cc0976 100644 --- a/submodules/MtProtoKit/MTDiscoverConnectionSignals.m +++ b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m @@ -1,19 +1,17 @@ #import "MTDiscoverConnectionSignals.h" #import "MTTcpConnection.h" -#import "MTTransportScheme.h" -#import "MTTcpTransport.h" -#import "MTQueue.h" - -#import "MTDatacenterAddress.h" - -#import "MTDisposable.h" -#import "MTSignal.h" -#import "MTAtomic.h" -#import "MTContext.h" -#import "MTApiEnvironment.h" -#import "MTLogging.h" -#import "MTDatacenterAuthAction.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.h b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.h rename to submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m similarity index 95% rename from submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m rename to submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m index cf238642bc..940d8eb942 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m +++ b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m @@ -1,13 +1,11 @@ - - #import "MTDiscoverDatacenterAddressAction.h" -#import "MTContext.h" -#import "MTSerialization.h" -#import "MTProto.h" -#import "MTDatacenterAddressSet.h" -#import "MTRequestMessageService.h" -#import "MTRequest.h" +#import +#import +#import +#import +#import +#import @interface MTDiscoverDatacenterAddressAction () { diff --git a/submodules/MtProtoKit/MTDisposable.m b/submodules/MtProtoKit/Sources/MTDisposable.m similarity index 99% rename from submodules/MtProtoKit/MTDisposable.m rename to submodules/MtProtoKit/Sources/MTDisposable.m index 356b419a1e..ad89f9e0bd 100644 --- a/submodules/MtProtoKit/MTDisposable.m +++ b/submodules/MtProtoKit/Sources/MTDisposable.m @@ -1,4 +1,4 @@ -#import "MTDisposable.h" +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m b/submodules/MtProtoKit/Sources/MTDropResponseContext.m similarity index 83% rename from submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m rename to submodules/MtProtoKit/Sources/MTDropResponseContext.m index 5acc47f077..dfeafa0801 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m +++ b/submodules/MtProtoKit/Sources/MTDropResponseContext.m @@ -1,6 +1,4 @@ - - -#import "MTDropResponseContext.h" +#import @implementation MTDropResponseContext diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.h b/submodules/MtProtoKit/Sources/MTDropRpcResultMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.h rename to submodules/MtProtoKit/Sources/MTDropRpcResultMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.m b/submodules/MtProtoKit/Sources/MTDropRpcResultMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.m rename to submodules/MtProtoKit/Sources/MTDropRpcResultMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTEncryption.m b/submodules/MtProtoKit/Sources/MTEncryption.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTEncryption.m rename to submodules/MtProtoKit/Sources/MTEncryption.m index 9502616682..1d13506e55 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTEncryption.m +++ b/submodules/MtProtoKit/Sources/MTEncryption.m @@ -1,9 +1,7 @@ +#import - -#import "MTEncryption.h" - -#import "MTLogging.h" -#import "MTKeychain.h" +#import +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m b/submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m similarity index 86% rename from submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m rename to submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m index 939e73b54e..9b4933d791 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m +++ b/submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m @@ -1,4 +1,4 @@ -#import "MTExportedAuthorizationData.h" +#import @implementation MTExportedAuthorizationData diff --git a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m b/submodules/MtProtoKit/Sources/MTFileBasedKeychain.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m rename to submodules/MtProtoKit/Sources/MTFileBasedKeychain.m index e3987a99e8..abe1a51b03 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m +++ b/submodules/MtProtoKit/Sources/MTFileBasedKeychain.m @@ -1,6 +1,6 @@ -#import "MTFileBasedKeychain.h" +#import -#import "MTLogging.h" +#import #import @@ -10,7 +10,7 @@ #define TG_SYNCHRONIZED_END(lock) pthread_mutex_unlock(&_TG_SYNCHRONIZED_##lock); #import -#import "MTEncryption.h" +#import static TG_SYNCHRONIZED_DEFINE(_keychains) = PTHREAD_MUTEX_INITIALIZER; static NSMutableDictionary *keychains() diff --git a/submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.h b/submodules/MtProtoKit/Sources/MTFutureSaltsMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.h rename to submodules/MtProtoKit/Sources/MTFutureSaltsMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.m b/submodules/MtProtoKit/Sources/MTFutureSaltsMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.m rename to submodules/MtProtoKit/Sources/MTFutureSaltsMessage.m diff --git a/submodules/MtProtoKit/MTGzip.m b/submodules/MtProtoKit/Sources/MTGzip.m similarity index 98% rename from submodules/MtProtoKit/MTGzip.m rename to submodules/MtProtoKit/Sources/MTGzip.m index 34737816fa..fa7f1ba182 100644 --- a/submodules/MtProtoKit/MTGzip.m +++ b/submodules/MtProtoKit/Sources/MTGzip.m @@ -1,4 +1,4 @@ -#import "MTGzip.h" +#import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m b/submodules/MtProtoKit/Sources/MTHttpRequestOperation.m similarity index 95% rename from submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m rename to submodules/MtProtoKit/Sources/MTHttpRequestOperation.m index 143907175c..22676343a9 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m +++ b/submodules/MtProtoKit/Sources/MTHttpRequestOperation.m @@ -1,6 +1,6 @@ -#import "MTHttpRequestOperation.h" +#import -#import "../thirdparty/AFNetworking/AFHTTPRequestOperation.h" +#import #import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m b/submodules/MtProtoKit/Sources/MTIncomingMessage.m similarity index 93% rename from submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m rename to submodules/MtProtoKit/Sources/MTIncomingMessage.m index 03107c07fa..45e7df7ffc 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m +++ b/submodules/MtProtoKit/Sources/MTIncomingMessage.m @@ -1,6 +1,4 @@ - - -#import "MTIncomingMessage.h" +#import @implementation MTIncomingMessage diff --git a/submodules/MtProtoKit/MTProtoKit/MTInputStream.m b/submodules/MtProtoKit/Sources/MTInputStream.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTInputStream.m rename to submodules/MtProtoKit/Sources/MTInputStream.m index 0793b43ca0..509427debe 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTInputStream.m +++ b/submodules/MtProtoKit/Sources/MTInputStream.m @@ -1,8 +1,7 @@ - +#import #import -#import "MTLogging.h" -#import "MTInputStream.h" +#import #if TARGET_OS_IPHONE # import diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.h b/submodules/MtProtoKit/Sources/MTInternalMessageParser.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.h rename to submodules/MtProtoKit/Sources/MTInternalMessageParser.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m b/submodules/MtProtoKit/Sources/MTInternalMessageParser.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m rename to submodules/MtProtoKit/Sources/MTInternalMessageParser.m index 57b831f63c..8523a8a6ba 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m +++ b/submodules/MtProtoKit/Sources/MTInternalMessageParser.m @@ -4,7 +4,7 @@ #import "MTResPqMessage.h" #import "MTRpcResultMessage.h" -#import "MTRpcError.h" +#import #import "MTDropRpcResultMessage.h" #import "MTServerDhParamsMessage.h" #import "MTServerDhInnerDataMessage.h" @@ -24,7 +24,7 @@ #import "MTMsgContainerMessage.h" #import "MTFutureSaltsMessage.h" -#import "MTLogging.h" +#import #import diff --git a/submodules/MtProtoKit/Sources/MTKeychain.m b/submodules/MtProtoKit/Sources/MTKeychain.m new file mode 100644 index 0000000000..80660fa86b --- /dev/null +++ b/submodules/MtProtoKit/Sources/MTKeychain.m @@ -0,0 +1 @@ +#import diff --git a/submodules/MtProtoKit/MTProtoKit/MTLogging.m b/submodules/MtProtoKit/Sources/MTLogging.m similarity index 96% rename from submodules/MtProtoKit/MTProtoKit/MTLogging.m rename to submodules/MtProtoKit/Sources/MTLogging.m index 18429455a4..ba0948f776 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTLogging.m +++ b/submodules/MtProtoKit/Sources/MTLogging.m @@ -1,6 +1,4 @@ - - -#import "MTLogging.h" +#import static void (*loggingFunction)(NSString *, va_list args) = NULL; static void (*shortLoggingFunction)(NSString *, va_list args) = NULL; diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessage.h b/submodules/MtProtoKit/Sources/MTMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMessage.h rename to submodules/MtProtoKit/Sources/MTMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessage.m b/submodules/MtProtoKit/Sources/MTMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMessage.m rename to submodules/MtProtoKit/Sources/MTMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m b/submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m rename to submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m index 75c6625d38..2f7caafe6b 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m +++ b/submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m @@ -1,8 +1,6 @@ +#import - -#import "MTMessageEncryptionKey.h" - -#import "MTEncryption.h" +#import @implementation MTMessageEncryptionKey diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m b/submodules/MtProtoKit/Sources/MTMessageTransaction.m similarity index 90% rename from submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m rename to submodules/MtProtoKit/Sources/MTMessageTransaction.m index 6bbcc6a94e..d48a1c539d 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m +++ b/submodules/MtProtoKit/Sources/MTMessageTransaction.m @@ -1,8 +1,6 @@ +#import - -#import "MTMessageTransaction.h" - -#import "MTInternalId.h" +#import MTInternalIdClass(MTMessageTransaction) diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.h rename to submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.m rename to submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.h b/submodules/MtProtoKit/Sources/MTMsgContainerMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.h rename to submodules/MtProtoKit/Sources/MTMsgContainerMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.m b/submodules/MtProtoKit/Sources/MTMsgContainerMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.m rename to submodules/MtProtoKit/Sources/MTMsgContainerMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.h rename to submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.m rename to submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.h b/submodules/MtProtoKit/Sources/MTMsgResendReqMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.h rename to submodules/MtProtoKit/Sources/MTMsgResendReqMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.m b/submodules/MtProtoKit/Sources/MTMsgResendReqMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.m rename to submodules/MtProtoKit/Sources/MTMsgResendReqMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.h b/submodules/MtProtoKit/Sources/MTMsgsAckMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.h rename to submodules/MtProtoKit/Sources/MTMsgsAckMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.m b/submodules/MtProtoKit/Sources/MTMsgsAckMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.m rename to submodules/MtProtoKit/Sources/MTMsgsAckMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.h rename to submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.m rename to submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.h b/submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.h rename to submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.m b/submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.m rename to submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m b/submodules/MtProtoKit/Sources/MTNetworkAvailability.m similarity index 97% rename from submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m rename to submodules/MtProtoKit/Sources/MTNetworkAvailability.m index 0b242aa3ca..8e45f15cf3 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m +++ b/submodules/MtProtoKit/Sources/MTNetworkAvailability.m @@ -1,10 +1,8 @@ +#import - -#import "MTNetworkAvailability.h" - -#import "MTLogging.h" -#import "MTQueue.h" -#import "MTTimer.h" +#import +#import +#import #import #import diff --git a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m b/submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m similarity index 91% rename from submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m rename to submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m index 1650e44970..ae7a4cbef4 100644 --- a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m +++ b/submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m @@ -1,4 +1,4 @@ -#import "MTNetworkUsageCalculationInfo.h" +#import @implementation MTNetworkUsageCalculationInfo diff --git a/submodules/MtProtoKit/MTNetworkUsageManager.m b/submodules/MtProtoKit/Sources/MTNetworkUsageManager.m similarity index 99% rename from submodules/MtProtoKit/MTNetworkUsageManager.m rename to submodules/MtProtoKit/Sources/MTNetworkUsageManager.m index 9c0e81ccd9..657fb44cc8 100644 --- a/submodules/MtProtoKit/MTNetworkUsageManager.m +++ b/submodules/MtProtoKit/Sources/MTNetworkUsageManager.m @@ -1,4 +1,4 @@ -#import "MTNetworkUsageManager.h" +#import #include #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.h b/submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.h rename to submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.m b/submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.m rename to submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m b/submodules/MtProtoKit/Sources/MTOutgoingMessage.m similarity index 97% rename from submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m rename to submodules/MtProtoKit/Sources/MTOutgoingMessage.m index d0ef4631ac..7e0e2dd741 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m +++ b/submodules/MtProtoKit/Sources/MTOutgoingMessage.m @@ -1,6 +1,4 @@ - - -#import "MTOutgoingMessage.h" +#import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.m b/submodules/MtProtoKit/Sources/MTOutputStream.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTOutputStream.m rename to submodules/MtProtoKit/Sources/MTOutputStream.m index 4a5f2698c6..dba14a26b7 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.m +++ b/submodules/MtProtoKit/Sources/MTOutputStream.m @@ -1,6 +1,4 @@ - - -#import "MTOutputStream.h" +#import #if TARGET_OS_IPHONE # import diff --git a/submodules/MtProtoKit/MTProtoKit/MTPingMessage.h b/submodules/MtProtoKit/Sources/MTPingMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTPingMessage.h rename to submodules/MtProtoKit/Sources/MTPingMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTPingMessage.m b/submodules/MtProtoKit/Sources/MTPingMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTPingMessage.m rename to submodules/MtProtoKit/Sources/MTPingMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTPongMessage.h b/submodules/MtProtoKit/Sources/MTPongMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTPongMessage.h rename to submodules/MtProtoKit/Sources/MTPongMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTPongMessage.m b/submodules/MtProtoKit/Sources/MTPongMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTPongMessage.m rename to submodules/MtProtoKit/Sources/MTPongMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m b/submodules/MtProtoKit/Sources/MTPreparedMessage.m similarity index 93% rename from submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m rename to submodules/MtProtoKit/Sources/MTPreparedMessage.m index 4f0757a6da..4be8c60b63 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m +++ b/submodules/MtProtoKit/Sources/MTPreparedMessage.m @@ -1,8 +1,6 @@ +#import - -#import "MTPreparedMessage.h" - -#import "MTInternalId.h" +#import MTInternalIdClass(MTPreparedMessage) diff --git a/submodules/MtProtoKit/MTProtoKit/MTProto.m b/submodules/MtProtoKit/Sources/MTProto.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTProto.m rename to submodules/MtProtoKit/Sources/MTProto.m index 6b4f2ce316..7c96b4930f 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTProto.m +++ b/submodules/MtProtoKit/Sources/MTProto.m @@ -1,42 +1,38 @@ - - -#import "MTProto.h" +#import #import -#import "MTLogging.h" -#import "MTQueue.h" -#import "MTOutputStream.h" -#import "MTInputStream.h" - -#import "MTContext.h" - -#import "MTDatacenterAddress.h" -#import "MTDatacenterAddressSet.h" -#import "MTTransportScheme.h" -#import "MTDatacenterAuthInfo.h" -#import "MTSessionInfo.h" -#import "MTDatacenterSaltInfo.h" -#import "MTTimeFixContext.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTBindingTempAuthKeyContext.h" -#import "MTMessageService.h" -#import "MTMessageTransaction.h" -#import "MTTimeSyncMessageService.h" -#import "MTResendMessageService.h" +#import +#import +#import +#import -#import "MTIncomingMessage.h" -#import "MTOutgoingMessage.h" -#import "MTPreparedMessage.h" -#import "MTMessageEncryptionKey.h" +#import +#import +#import +#import -#import "MTTransport.h" -#import "MTTransportTransaction.h" +#import +#import -#import "MTTcpTransport.h" +#import -#import "MTSerialization.h" -#import "MTEncryption.h" +#import +#import #import "MTBuffer.h" #import "MTInternalMessageParser.h" @@ -48,13 +44,13 @@ #import "MTNewSessionCreatedMessage.h" #import "MTPongMessage.h" #import "MTRpcResultMessage.h" -#import "MTRpcError.h" +#import #import "MTConnectionProbing.h" -#import "MTApiEnvironment.h" +#import -#import "MTTime.h" +#import #import #import diff --git a/submodules/MtProtoKit/MTProxyConnectivity.m b/submodules/MtProtoKit/Sources/MTProxyConnectivity.m similarity index 95% rename from submodules/MtProtoKit/MTProxyConnectivity.m rename to submodules/MtProtoKit/Sources/MTProxyConnectivity.m index dad633abbc..0ac9eb2676 100644 --- a/submodules/MtProtoKit/MTProxyConnectivity.m +++ b/submodules/MtProtoKit/Sources/MTProxyConnectivity.m @@ -1,13 +1,13 @@ -#import "MTProxyConnectivity.h" +#import -#import "MTSignal.h" -#import "MTQueue.h" -#import "MTContext.h" -#import "MTApiEnvironment.h" -#import "MTDatacenterAddressSet.h" -#import "MTDatacenterAddress.h" +#import +#import +#import +#import +#import +#import #import "MTTcpConnection.h" -#import "MTTransportScheme.h" +#import #import "MTDiscoverConnectionSignals.h" @implementation MTProxyConnectivityStatus diff --git a/submodules/MtProtoKit/MTProtoKit/MTQueue.m b/submodules/MtProtoKit/Sources/MTQueue.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTQueue.m rename to submodules/MtProtoKit/Sources/MTQueue.m index cc79357989..89e1915cb4 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTQueue.m +++ b/submodules/MtProtoKit/Sources/MTQueue.m @@ -1,6 +1,4 @@ - - -#import "MTQueue.h" +#import @interface MTQueue () { diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequest.m b/submodules/MtProtoKit/Sources/MTRequest.m similarity index 94% rename from submodules/MtProtoKit/MTProtoKit/MTRequest.m rename to submodules/MtProtoKit/Sources/MTRequest.m index bb7cd2d86e..bef9245c52 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTRequest.m +++ b/submodules/MtProtoKit/Sources/MTRequest.m @@ -1,8 +1,6 @@ +#import - -#import "MTRequest.h" - -#import "MTRpcError.h" +#import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.m b/submodules/MtProtoKit/Sources/MTRequestContext.m similarity index 91% rename from submodules/MtProtoKit/MTProtoKit/MTRequestContext.m rename to submodules/MtProtoKit/Sources/MTRequestContext.m index d3be83d166..16c7da24da 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.m +++ b/submodules/MtProtoKit/Sources/MTRequestContext.m @@ -1,6 +1,4 @@ - - -#import "MTRequestContext.h" +#import @implementation MTRequestContext diff --git a/submodules/MtProtoKit/Sources/MTRequestErrorContext.m b/submodules/MtProtoKit/Sources/MTRequestErrorContext.m new file mode 100644 index 0000000000..3196930668 --- /dev/null +++ b/submodules/MtProtoKit/Sources/MTRequestErrorContext.m @@ -0,0 +1,5 @@ +#import + +@implementation MTRequestErrorContext + +@end diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m b/submodules/MtProtoKit/Sources/MTRequestMessageService.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m rename to submodules/MtProtoKit/Sources/MTRequestMessageService.m index 0720adc1cc..a3cf893d06 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m +++ b/submodules/MtProtoKit/Sources/MTRequestMessageService.m @@ -1,29 +1,27 @@ +#import - -#import "MTRequestMessageService.h" - -#import "MTLogging.h" -#import "MTTime.h" -#import "MTTimer.h" -#import "MTContext.h" -#import "MTSerialization.h" -#import "MTProto.h" -#import "MTQueue.h" -#import "MTMessageTransaction.h" -#import "MTIncomingMessage.h" -#import "MTOutgoingMessage.h" -#import "MTPreparedMessage.h" -#import "MTRequest.h" -#import "MTRequestContext.h" -#import "MTRequestErrorContext.h" -#import "MTDropResponseContext.h" -#import "MTApiEnvironment.h" -#import "MTDatacenterAuthInfo.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTBuffer.h" #import "MTInternalMessageParser.h" #import "MTRpcResultMessage.h" -#import "MTRpcError.h" +#import #import "MTDropRpcResultMessage.h" @interface MTRequestMessageService () diff --git a/submodules/MtProtoKit/MTProtoKit/MTResPqMessage.h b/submodules/MtProtoKit/Sources/MTResPqMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTResPqMessage.h rename to submodules/MtProtoKit/Sources/MTResPqMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTResPqMessage.m b/submodules/MtProtoKit/Sources/MTResPqMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTResPqMessage.m rename to submodules/MtProtoKit/Sources/MTResPqMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m b/submodules/MtProtoKit/Sources/MTResendMessageService.m similarity index 93% rename from submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m rename to submodules/MtProtoKit/Sources/MTResendMessageService.m index b876b8caa0..4e515ba39f 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m +++ b/submodules/MtProtoKit/Sources/MTResendMessageService.m @@ -1,16 +1,14 @@ - +#import #import -#import "MTLogging.h" -#import "MTResendMessageService.h" - -#import "MTProto.h" -#import "MTContext.h" -#import "MTSerialization.h" -#import "MTMessageTransaction.h" -#import "MTOutgoingMessage.h" -#import "MTPreparedMessage.h" -#import "MTIncomingMessage.h" +#import +#import +#import +#import +#import +#import +#import +#import #import "MTBuffer.h" #import "MTMsgsStateInfoMessage.h" diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcError.m b/submodules/MtProtoKit/Sources/MTRpcError.m similarity index 92% rename from submodules/MtProtoKit/MTProtoKit/MTRpcError.m rename to submodules/MtProtoKit/Sources/MTRpcError.m index 05f3548cd1..8ac0ea02ed 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTRpcError.m +++ b/submodules/MtProtoKit/Sources/MTRpcError.m @@ -1,4 +1,4 @@ -#import "MTRpcError.h" +#import @implementation MTRpcError diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.h b/submodules/MtProtoKit/Sources/MTRpcResultMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.h rename to submodules/MtProtoKit/Sources/MTRpcResultMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.m b/submodules/MtProtoKit/Sources/MTRpcResultMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.m rename to submodules/MtProtoKit/Sources/MTRpcResultMessage.m diff --git a/submodules/MtProtoKit/MTRsa.h b/submodules/MtProtoKit/Sources/MTRsa.h similarity index 100% rename from submodules/MtProtoKit/MTRsa.h rename to submodules/MtProtoKit/Sources/MTRsa.h diff --git a/submodules/MtProtoKit/MTRsa.m b/submodules/MtProtoKit/Sources/MTRsa.m similarity index 100% rename from submodules/MtProtoKit/MTRsa.m rename to submodules/MtProtoKit/Sources/MTRsa.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.h b/submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.h rename to submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.m b/submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.m rename to submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.h b/submodules/MtProtoKit/Sources/MTServerDhParamsMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.h rename to submodules/MtProtoKit/Sources/MTServerDhParamsMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.m b/submodules/MtProtoKit/Sources/MTServerDhParamsMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.m rename to submodules/MtProtoKit/Sources/MTServerDhParamsMessage.m diff --git a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m b/submodules/MtProtoKit/Sources/MTSessionInfo.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m rename to submodules/MtProtoKit/Sources/MTSessionInfo.m index 8c21f04b21..1691592fa0 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m +++ b/submodules/MtProtoKit/Sources/MTSessionInfo.m @@ -1,9 +1,7 @@ +#import - -#import "MTSessionInfo.h" - -#import "MTLogging.h" -#import "MTContext.h" +#import +#import @interface MTScheduledMessageConfirmation : NSObject diff --git a/submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.h b/submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.h rename to submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.m b/submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.m similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.m rename to submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.m diff --git a/submodules/MtProtoKit/MTSignal.m b/submodules/MtProtoKit/Sources/MTSignal.m similarity index 99% rename from submodules/MtProtoKit/MTSignal.m rename to submodules/MtProtoKit/Sources/MTSignal.m index 3f273bf34b..42937568b0 100644 --- a/submodules/MtProtoKit/MTSignal.m +++ b/submodules/MtProtoKit/Sources/MTSignal.m @@ -1,10 +1,10 @@ -#import "MTSignal.h" +#import #import -#import "MTTimer.h" -#import "MTQueue.h" -#import "MTAtomic.h" -#import "MTBag.h" +#import +#import +#import +#import @interface MTSubscriberDisposable : NSObject { diff --git a/submodules/MtProtoKit/MTSubscriber.m b/submodules/MtProtoKit/Sources/MTSubscriber.m similarity index 98% rename from submodules/MtProtoKit/MTSubscriber.m rename to submodules/MtProtoKit/Sources/MTSubscriber.m index 8f0de8b1f0..a32d7956f8 100644 --- a/submodules/MtProtoKit/MTSubscriber.m +++ b/submodules/MtProtoKit/Sources/MTSubscriber.m @@ -1,4 +1,4 @@ -#import "MTSubscriber.h" +#import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.h b/submodules/MtProtoKit/Sources/MTTcpConnection.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnection.h rename to submodules/MtProtoKit/Sources/MTTcpConnection.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m b/submodules/MtProtoKit/Sources/MTTcpConnection.m similarity index 99% rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m rename to submodules/MtProtoKit/Sources/MTTcpConnection.m index f173b9660d..51b303dbb9 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m +++ b/submodules/MtProtoKit/Sources/MTTcpConnection.m @@ -1,8 +1,8 @@ #import "MTTcpConnection.h" -#import "MTLogging.h" -#import "MTQueue.h" -#import "MTTimer.h" +#import +#import +#import #import "GCDAsyncSocket.h" #import @@ -11,16 +11,16 @@ #import #import -#import "MTInternalId.h" +#import -#import "MTContext.h" -#import "MTApiEnvironment.h" -#import "MTDatacenterAddress.h" -#import "MTTransportScheme.h" +#import +#import +#import +#import #import "MTAes.h" -#import "MTEncryption.h" -#import "MTSignal.h" +#import +#import #import "MTDNS.h" #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.h b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.h similarity index 100% rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.h rename to submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.h diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m similarity index 97% rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m rename to submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m index bb86531eea..e975d4c836 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m +++ b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m @@ -1,11 +1,9 @@ - - #import #import "MTTcpConnectionBehaviour.h" -#import "MTTimer.h" -#import "MTQueue.h" +#import +#import @interface MTTcpConnectionBehaviour () { diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m b/submodules/MtProtoKit/Sources/MTTcpTransport.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m rename to submodules/MtProtoKit/Sources/MTTcpTransport.m index eed908931b..6b4cc265f1 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m +++ b/submodules/MtProtoKit/Sources/MTTcpTransport.m @@ -1,30 +1,26 @@ +#import - -#import "MTTcpTransport.h" - -#import "MTLogging.h" -#import "MTQueue.h" -#import "MTTimer.h" -#import "MTTime.h" - -#import "MTTransportScheme.h" -#import "MTDatacenterAddressSet.h" - -#import "MTTransportTransaction.h" -#import "MTOutgoingMessage.h" -#import "MTIncomingMessage.h" -#import "MTMessageTransaction.h" -#import "MTPreparedMessage.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTTcpConnection.h" #import "MTTcpConnectionBehaviour.h" -#import "MTSerialization.h" +#import #import "MTBuffer.h" #import "MTPongMessage.h" -#import "MTContext.h" -#import "MTApiEnvironment.h" +#import +#import static const NSTimeInterval MTTcpTransportSleepWatchdogTimeout = 60.0; diff --git a/submodules/MtProtoKit/MTProtoKit/MTTime.m b/submodules/MtProtoKit/Sources/MTTime.m similarity index 91% rename from submodules/MtProtoKit/MTProtoKit/MTTime.m rename to submodules/MtProtoKit/Sources/MTTime.m index dfdcd92d33..4483d8a392 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTime.m +++ b/submodules/MtProtoKit/Sources/MTTime.m @@ -1,6 +1,4 @@ - - -#import "MTTime.h" +#import #import diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m b/submodules/MtProtoKit/Sources/MTTimeFixContext.m similarity index 92% rename from submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m rename to submodules/MtProtoKit/Sources/MTTimeFixContext.m index 71f66fcb52..ba5b1afb34 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m +++ b/submodules/MtProtoKit/Sources/MTTimeFixContext.m @@ -1,4 +1,4 @@ -#import "MTTimeFixContext.h" +#import @implementation MTTimeFixContext diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m b/submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m similarity index 94% rename from submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m rename to submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m index f78e824f2f..6d8919c176 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m +++ b/submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m @@ -1,16 +1,14 @@ +#import - -#import "MTTimeSyncMessageService.h" - -#import "MTTime.h" -#import "MTContext.h" -#import "MTProto.h" -#import "MTSerialization.h" -#import "MTOutgoingMessage.h" -#import "MTIncomingMessage.h" -#import "MTPreparedMessage.h" -#import "MTMessageTransaction.h" -#import "MTDatacenterSaltInfo.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import #import "MTBuffer.h" #import "MTFutureSaltsMessage.h" diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimer.m b/submodules/MtProtoKit/Sources/MTTimer.m similarity index 98% rename from submodules/MtProtoKit/MTProtoKit/MTTimer.m rename to submodules/MtProtoKit/Sources/MTTimer.m index 04e1f3e799..d0ce759f68 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTimer.m +++ b/submodules/MtProtoKit/Sources/MTTimer.m @@ -1,6 +1,4 @@ - - -#import "MTTimer.h" +#import @interface MTTimer () diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransport.m b/submodules/MtProtoKit/Sources/MTTransport.m similarity index 96% rename from submodules/MtProtoKit/MTProtoKit/MTTransport.m rename to submodules/MtProtoKit/Sources/MTTransport.m index dc6e318815..9752eb6537 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTransport.m +++ b/submodules/MtProtoKit/Sources/MTTransport.m @@ -1,9 +1,7 @@ +#import - -#import "MTTransport.h" - -#import "MTContext.h" -#import "MTNetworkAvailability.h" +#import +#import @interface MTTransport () { diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m b/submodules/MtProtoKit/Sources/MTTransportScheme.m similarity index 89% rename from submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m rename to submodules/MtProtoKit/Sources/MTTransportScheme.m index b52ba2559b..c5ee46126c 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m +++ b/submodules/MtProtoKit/Sources/MTTransportScheme.m @@ -1,12 +1,10 @@ -#import "MTTransportScheme.h" +#import -#import "MTTransport.h" -#import "MTDatacenterAddress.h" - -#import "MTTcpTransport.h" - -#import "MTContext.h" -#import "MTApiEnvironment.h" +#import +#import +#import +#import +#import @interface MTTransportScheme () { diff --git a/submodules/MtProtoKit/MTTransportSchemeStats.h b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.h similarity index 100% rename from submodules/MtProtoKit/MTTransportSchemeStats.h rename to submodules/MtProtoKit/Sources/MTTransportSchemeStats.h diff --git a/submodules/MtProtoKit/MTTransportSchemeStats.m b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.m similarity index 98% rename from submodules/MtProtoKit/MTTransportSchemeStats.m rename to submodules/MtProtoKit/Sources/MTTransportSchemeStats.m index caa89af580..b2d10b46d9 100644 --- a/submodules/MtProtoKit/MTTransportSchemeStats.m +++ b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.m @@ -1,6 +1,6 @@ #import "MTTransportSchemeStats.h" -#import "MTDatacenterAddress.h" +#import @implementation MTTransportSchemeStats diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m b/submodules/MtProtoKit/Sources/MTTransportTransaction.m similarity index 93% rename from submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m rename to submodules/MtProtoKit/Sources/MTTransportTransaction.m index 93be090960..68ccb67ce0 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m +++ b/submodules/MtProtoKit/Sources/MTTransportTransaction.m @@ -1,6 +1,4 @@ - - -#import "MTTransportTransaction.h" +#import @implementation MTTransportTransaction diff --git a/submodules/MtProtoKit/PingFoundation.h b/submodules/MtProtoKit/Sources/PingFoundation.h similarity index 100% rename from submodules/MtProtoKit/PingFoundation.h rename to submodules/MtProtoKit/Sources/PingFoundation.h diff --git a/submodules/MtProtoKit/PingFoundation.m b/submodules/MtProtoKit/Sources/PingFoundation.m similarity index 100% rename from submodules/MtProtoKit/PingFoundation.m rename to submodules/MtProtoKit/Sources/PingFoundation.m diff --git a/submodules/WebsiteType/BUILD b/submodules/WebsiteType/BUILD new file mode 100644 index 0000000000..ba2a658eb1 --- /dev/null +++ b/submodules/WebsiteType/BUILD @@ -0,0 +1,14 @@ +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") + +swift_library( + name = "WebsiteType", + module_name = "WebsiteType", + srcs = glob([ + "Sources/**/*.swift", + ]), + deps = [ + ], + visibility = [ + "//visibility:public", + ], +) diff --git a/submodules/WebsiteType/Info.plist b/submodules/WebsiteType/Info.plist deleted file mode 100644 index e1fe4cfb7b..0000000000 --- a/submodules/WebsiteType/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - -