From 5f2ce1b36d497a5ac2fe72dd1a1c75d7243a17c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Thu, 17 Dec 2020 00:36:50 +0800
Subject: [PATCH] Fix crash

---
 .../telegram/ui/Components/ChatActivityEnterView.java  | 10 +++++++---
 build.gradle                                           |  4 ++--
 openpgp-api/build.gradle                               |  2 +-
 ss-rust/build.gradle.kts                               |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
index e77b457b9..3e6e3b64d 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
@@ -3453,11 +3453,15 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
 
             ((LaunchActivity) parentActivity).callbacks.put(115, result -> {
 
-                long keyId = result == null ? 0L : result.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0L);
+                if (result != null) {
 
-                if (save && keyId != 0L) NekoConfig.setOpenPGPKeyId(keyId);
+                    long keyId = result.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0L);
 
-                signComment(result, save);
+                    if (save) NekoConfig.setOpenPGPKeyId(keyId);
+
+                    signComment(result, save);
+
+                }
 
             });
 
diff --git a/build.gradle b/build.gradle
index b6e0d685e..2d284825d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
         classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'
         classpath 'com.github.triplet.gradle:play-publisher:3.0.0'
     }
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 0fcad802d..304a1510f 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -13,5 +13,5 @@ android {
     lintOptions {
         abortOnError false
     }
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
 }
\ No newline at end of file
diff --git a/ss-rust/build.gradle.kts b/ss-rust/build.gradle.kts
index 6312e112b..27d951ff7 100644
--- a/ss-rust/build.gradle.kts
+++ b/ss-rust/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         minSdkVersion(21)
         targetSdkVersion(30)
     }
-    buildToolsVersion = "30.0.2"
+    buildToolsVersion = "30.0.3"
 
 }