diff --git a/.gitmodules b/.gitmodules index e69de29bb2..f5ad8ccdfa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/rlottie/rlottie"] + path = submodules/rlottie/rlottie +url=https://github.com/peter-iakovlev/rlottie.git diff --git a/submodules/MtProtoKit/TON/TON.mm b/submodules/MtProtoKit/TON/TON.mm index 63752ed54e..a3bb533eea 100644 --- a/submodules/MtProtoKit/TON/TON.mm +++ b/submodules/MtProtoKit/TON/TON.mm @@ -37,6 +37,14 @@ static NSString * _Nullable readString(std::string &string) { } } +static NSData * _Nullable readSecureString(td::SecureString &string) { + if (string.size() == 0) { + return [NSData data]; + } else { + return [[NSData alloc] initWithBytes:string.data() length:string.size()]; + } +} + static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::object_ptr &message) { if (message == nullptr) { return nil; diff --git a/submodules/rlottie/BUCK b/submodules/rlottie/BUCK index 1860b982c9..74ee15a9df 100644 --- a/submodules/rlottie/BUCK +++ b/submodules/rlottie/BUCK @@ -20,7 +20,8 @@ static_library( ], exclude = [ "rlottie/src/lottie/rapidjson/msinttypes/**/*", ]) + [ - "LottieInstance.h" + "LottieInstance.h", + "config.h", ], exported_headers = [ "LottieInstance.h" diff --git a/submodules/rlottie/config.h b/submodules/rlottie/config.h new file mode 100755 index 0000000000..cac85658ea --- /dev/null +++ b/submodules/rlottie/config.h @@ -0,0 +1,19 @@ +#ifndef CONFIG_H +#define CONFIG_H + +// enable threading +#define LOTTIE_THREAD_SUPPORT + +//enable logging +//#define LOTTIE_LOGGING_SUPPORT + +//enable module building of image loader +//#define LOTTIE_IMAGE_MODULE_SUPPORT + +//enable lottie model caching +//#define LOTTIE_CACHE_SUPPORT + +// disable image loader +#define LOTTIE_IMAGE_MODULE_DISABLED + +#endif // CONFIG_H \ No newline at end of file diff --git a/submodules/rlottie/rlottie b/submodules/rlottie/rlottie new file mode 160000 index 0000000000..0f3d107391 --- /dev/null +++ b/submodules/rlottie/rlottie @@ -0,0 +1 @@ +Subproject commit 0f3d10739148ce430aca5db41ee97d05b3d0898c