merge official 8.9.3

TODO:
1. Fix FCM
2. Fix OSM
3. Add Google Maps into release

TMessagesProj/jni/lottie.cpp

@@ -42,7 +42,6 @@ typedef struct LottieInfo {
     uint32_t fileFrame = 0;
     bool nextFrameIsCacheFrame = false;
 
-    FILE *precacheFile = nullptr;
     char *compressBuffer = nullptr;
     const char *buffer = nullptr;
     bool firstFrame = false;
@@ -164,18 +163,6 @@ JNIEXPORT jlong Java_org_telegram_ui_Components_RLottieDrawable_create(JNIEnv *e
     return (jlong) (intptr_t) info;
 }
 
-JNIEXPORT jstring Java_org_telegram_ui_Components_RLottieDrawable_getCacheFile(JNIEnv *env, jclass clazz, jlong ptr) {
-    if (!ptr) {
-        return NULL;
-    }
-    auto info = (LottieInfo *) (intptr_t) ptr;
-    if (info->precache) {
-        return env->NewStringUTF(info->cacheFile.c_str());
-    }
-    return NULL;
-}
-
-
 JNIEXPORT jlong Java_org_telegram_ui_Components_RLottieDrawable_createWithJson(JNIEnv *env, jclass clazz, jstring json, jstring name, jintArray data, jintArray colorReplacement) {
     std::map<int32_t, int32_t> *colors = nullptr;
     if (colorReplacement != nullptr) {
@@ -255,200 +242,23 @@ JNIEXPORT void Java_org_telegram_ui_Components_RLottieDrawable_replaceColors(JNI
     }
 }
 
-bool cacheWriteThreadCreated{false};
-LottieInfo *cacheWriteThreadTask{nullptr};
-bool cacheWriteThreadDone{false};
-std::thread worker;
-std::mutex cacheMutex;
-std::condition_variable cacheCv;
-
-std::mutex cacheDoneMutex;
-std::condition_variable cacheDoneCv;
-std::atomic<bool> frameReady{false};
-
-void CacheWriteThreadProc() {
-    while (!cacheWriteThreadDone) {
-        std::unique_lock<std::mutex> lk(cacheMutex);
-        cacheCv.wait(lk, [] { return frameReady.load(); });
-        std::lock_guard<std::mutex> lg(cacheDoneMutex);
-        LottieInfo *task;
-        if (cacheWriteThreadTask != nullptr) {
-            task = cacheWriteThreadTask;
-            cacheWriteThreadTask = nullptr;
-        } else {
-            task = nullptr;
-        }
-        lk.unlock();
-
-        if (task != nullptr) {
-            auto size = (uint32_t) LZ4_compress_default(task->buffer, task->compressBuffer, task->bufferSize, task->compressBound);
-            if (task->firstFrame) {
-                task->firstFrameSize = size;
-                task->fileOffset = 9 + sizeof(uint32_t) + task->firstFrameSize;
-                task->fileFrame = 1;
-            }
-            task->maxFrameSize = MAX(task->maxFrameSize, size);
-            fwrite(&size, sizeof(uint32_t), 1, task->precacheFile);
-            fwrite(task->compressBuffer, sizeof(uint8_t), size, task->precacheFile);
-
-            fflush(task->precacheFile);
-            fsync(fileno(task->precacheFile));
-            task->framesAvailableInCache++;
-        }
-        frameReady = false;
-        cacheDoneCv.notify_one();
-    }
-}
-
-JNIEXPORT void Java_org_telegram_ui_Components_RLottieDrawable_createCache(JNIEnv *env, jclass clazz, jlong ptr, jint w, jint h) {
-    if (ptr == NULL) {
-        return;
-    }
-    auto info = (LottieInfo *) (intptr_t) ptr;
-
-    FILE *cacheFile = fopen(info->cacheFile.c_str(), "r+");
-    if (cacheFile != nullptr) {
-        uint8_t temp;
-        size_t read = fread(&temp, sizeof(uint8_t), 1, cacheFile);
-        fclose(cacheFile);
-        if (read == 1 && temp != 0) {
-            return;
-        }
-    }
-
-    if (!cacheWriteThreadCreated) {
-        cacheWriteThreadCreated = true;
-        worker = std::thread(CacheWriteThreadProc);
-    }
-
-    if (info->nextFrameIsCacheFrame && info->createCache && info->frameCount != 0) {
-        info->precacheFile = fopen(info->cacheFile.c_str(), "w+");
-        if (info->precacheFile != nullptr) {
-            fseek(info->precacheFile, info->fileOffset = 9, SEEK_SET);
-            info->fileFrame = 0;
-            info->maxFrameSize = 0;
-            info->bufferSize = w * h * 4;
-            info->imageSize = (uint32_t) w * h * 4;
-            info->compressBound = LZ4_compressBound(info->bufferSize);
-            info->compressBuffer = new char[info->compressBound];
-            auto firstBuffer = new uint8_t[info->bufferSize];
-            auto secondBuffer = new uint8_t[info->bufferSize];
-            //long time = ConnectionsManager::getInstance(0).getCurrentTimeMonotonicMillis();
-
-            Surface surface1((uint32_t *) firstBuffer, (size_t) w, (size_t) h, (size_t) w * 4);
-            Surface surface2((uint32_t *) secondBuffer, (size_t) w, (size_t) h, (size_t) w * 4);
-            int framesPerUpdate = !info->limitFps || info->fps < 60 ? 1 : 2;
-            int num = 0;
-            for (size_t a = 0; a < info->frameCount; a += framesPerUpdate) {
-                Surface &surfaceToRender = num % 2 == 0 ? surface1 : surface2;
-                num++;
-                info->animation->renderSync(a, surfaceToRender, true);
-                if (a != 0) {
-                    std::unique_lock<std::mutex> lk(cacheDoneMutex);
-                    cacheDoneCv.wait(lk, [] { return !frameReady.load(); });
-                }
-
-                std::lock_guard<std::mutex> lg(cacheMutex);
-                cacheWriteThreadTask = info;
-                info->firstFrame = a == 0;
-                info->buffer = (const char *) surfaceToRender.buffer();
-                frameReady = true;
-                cacheCv.notify_one();
-            }
-            std::unique_lock<std::mutex> lk(cacheDoneMutex);
-            cacheDoneCv.wait(lk, [] { return !frameReady.load(); });
-
-            //DEBUG_D("sticker time = %d", (int) (ConnectionsManager::getInstance(0).getCurrentTimeMonotonicMillis() - time));
-            delete[] info->compressBuffer;
-            delete[] firstBuffer;
-            delete[] secondBuffer;
-            fseek(info->precacheFile, 0, SEEK_SET);
-            uint8_t byte = 1;
-            fwrite(&byte, sizeof(uint8_t), 1, info->precacheFile);
-            uint32_t maxFrameSize = info->maxFrameSize;
-            fwrite(&maxFrameSize, sizeof(uint32_t), 1, info->precacheFile);
-            fwrite(&info->imageSize, sizeof(uint32_t), 1, info->precacheFile);
-            fflush(info->precacheFile);
-            fsync(fileno(info->precacheFile));
-            info->createCache = false;
-            fclose(info->precacheFile);
-        }
-    }
-}
 
 JNIEXPORT jint Java_org_telegram_ui_Components_RLottieDrawable_getFrame(JNIEnv *env, jclass clazz, jlong ptr, jint frame, jobject bitmap, jint w, jint h, jint stride, jboolean clear) {
     if (!ptr || bitmap == nullptr) {
         return 0;
     }
     auto info = (LottieInfo *) (intptr_t) ptr;
 
-    int framesPerUpdate = !info->limitFps || info->fps < 60 ? 1 : 2;
-    int framesAvailableInCache = info->framesAvailableInCache;
-
-    if (info->createCache && info->precache && frame > 0) {
-        if (frame / framesPerUpdate >= framesAvailableInCache) {
-            return -1;
-        }
-    }
-
     void *pixels;
+    bool result = false;
     if (AndroidBitmap_lockPixels(env, bitmap, &pixels) >= 0) {
-        bool loadedFromCache = false;
-        uint32_t maxFrameSize = info->maxFrameSize;
-        if (info->precache && (!info->createCache || frame > 0) && w * 4 == stride && maxFrameSize <= w * h * 4 && info->imageSize == w * h * 4) {
-            FILE *precacheFile = fopen(info->cacheFile.c_str(), "r");
-            if (precacheFile != nullptr) {
-                if (info->decompressBuffer != nullptr && info->decompressBufferSize < maxFrameSize) {
-                    delete[] info->decompressBuffer;
-                    info->decompressBuffer = nullptr;
-                }
-                if (info->decompressBuffer == nullptr) {
-                    info->decompressBufferSize = maxFrameSize;
-                    if (info->createCache) {
-                        info->decompressBufferSize += 10000;
-                    }
-                    info->decompressBuffer = new uint8_t[info->decompressBufferSize];
-                }
-                int currentFrame = frame / framesPerUpdate;
-                if (info->fileFrame != frame) {
-                    info->fileOffset = 9;
-                    info->fileFrame = 0;
-                    while (info->fileFrame != currentFrame) {
-                        fseek(precacheFile, info->fileOffset, SEEK_SET);
-                        uint32_t frameSize;
-                        fread(&frameSize, sizeof(uint32_t), 1, precacheFile);
-                        info->fileOffset += 4 + frameSize;
-                        info->fileFrame++;
-                    }
-                }
-                fseek(precacheFile, info->fileOffset, SEEK_SET);
-                uint32_t frameSize;
-                fread(&frameSize, sizeof(uint32_t), 1, precacheFile);
-                if (frameSize > 0 && frameSize <= info->decompressBufferSize) {
-                    fread(info->decompressBuffer, sizeof(uint8_t), frameSize, precacheFile);
-                    info->fileOffset += 4 + frameSize;
-                    info->fileFrame = currentFrame + 1;
-                    LZ4_decompress_safe((const char *) info->decompressBuffer, (char *) pixels, frameSize, w * h * 4);
-                    loadedFromCache = true;
-                }
-                fclose(precacheFile);
-                if (frame + framesPerUpdate >= info->frameCount) {
-                    info->fileOffset = 9;
-                    info->fileFrame = 0;
-                }
-            }
-        }
-
-        if (!loadedFromCache) {
-            if (!info->nextFrameIsCacheFrame || !info->precache) {
-                Surface surface((uint32_t *) pixels, (size_t) w, (size_t) h, (size_t) stride);
-                info->animation->renderSync((size_t) frame, surface, clear);
-                info->nextFrameIsCacheFrame = true;
-            }
-        }
-
+        Surface surface((uint32_t *) pixels, (size_t) w, (size_t) h, (size_t) stride);
+        info->animation->renderSync((size_t) frame, surface, clear, &result);
         AndroidBitmap_unlockPixels(env, bitmap);
     }
+    if (!result) {
+        return -5;
+    }
     return frame;
 }
 }

TMessagesProj/jni/rlottie/inc/rlottie.h

@@ -354,7 +354,7 @@ class LOT_EXPORT Animation {
      *
      *  @internal
      */
-    void              renderSync(size_t frameNo, Surface &surface, bool clear);
+    void              renderSync(size_t frameNo, Surface &surface, bool clear, bool* result);
 
     /**
      *  @brief Returns root layer of the composition updated with

TMessagesProj/jni/rlottie/src/lottie/lottieanimation.cpp

@@ -44,7 +44,7 @@ class AnimationImpl {
     double  frameRate() const { return mModel->frameRate(); }
     size_t  totalFrame() const { return mModel->totalFrame(); }
     size_t  frameAtPos(double pos) const { return mModel->frameAtPos(pos); }
-    Surface render(size_t frameNo, const Surface &surface, bool clear);
+    Surface render(size_t frameNo, const Surface &surface, bool clear, bool* result);
     const LOTLayerNode * renderTree(size_t frameNo, const VSize &size);
 
     const LayerInfoList &layerInfoList() const
@@ -93,11 +93,12 @@ bool AnimationImpl::update(size_t frameNo, const VSize &size)
     return mCompItem->update(frameNo);
 }
 
-Surface AnimationImpl::render(size_t frameNo, const Surface &surface, bool clear)
+Surface AnimationImpl::render(size_t frameNo, const Surface &surface, bool clear, bool* result)
 {
     bool renderInProgress = mRenderInProgress.load();
     if (renderInProgress) {
         vCritical << "Already Rendering Scheduled for this Animation";
+        *result = false;
         return surface;
     }
 
@@ -106,6 +107,7 @@ Surface AnimationImpl::render(size_t frameNo, const Surface &surface, bool clear
            VSize(surface.drawRegionWidth(), surface.drawRegionHeight()));
     mCompItem->render(surface, clear);
     mRenderInProgress.store(false);
+    *result = true;
 
     return surface;
 }
@@ -198,9 +200,9 @@ const LOTLayerNode *Animation::renderTree(size_t frameNo, size_t width,
     return d->renderTree(frameNo, VSize(width, height));
 }
 
-void Animation::renderSync(size_t frameNo, Surface &surface, bool clear)
+void Animation::renderSync(size_t frameNo, Surface &surface, bool clear, bool* res)
 {
-    d->render(frameNo, surface, clear);
+    d->render(frameNo, surface, clear, res);
 }
 
 const LayerInfoList &Animation::layers() const

TMessagesProj/proguard-rules.pro

@@ -135,6 +135,11 @@
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
 }
 
+# Huawei Services
+-keep class com.huawei.hianalytics.**{ *; }
+-keep class com.huawei.updatesdk.**{ *; }
+-keep class com.huawei.hms.**{ *; }
+
 # Don't warn about checkerframework and Kotlin annotations
 -dontwarn org.checkerframework.**
 -dontwarn javax.annotation.**