fix: crash for ChatActivity

Signed-off-by: qwq233 <[email protected]>
qwq233 · Jun 28, 2024 · 935cccc · 935cccc
1 parent 45518ca
commit 935cccc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/TMessagesProj/proguard-rules.pro b/TMessagesProj/proguard-rules.pro
@@ -23,7 +23,6 @@
 -keep class com.google.android.exoplayer2.ext.** { *; }
 -keep class com.google.android.exoplayer2.extractor.FlacStreamMetadata { *; }
 -keep class com.google.android.exoplayer2.metadata.flac.PictureFrame { *; }
--keep class com.google.android.exoplayer2.decoder.SimpleOutputBuffer { *; }
 -keep class com.google.android.exoplayer2.decoder.SimpleDecoderOutputBuffer { *; }
 -keep class org.telegram.ui.Stories.recorder.FfmpegAudioWaveformLoader { *; }
 
@@ -123,8 +122,7 @@
 -keepclassmembernames class top.qwq2333.nullgram.activity.DatacenterActivity$DatacenterCell { <fields>; }
 -keepclassmembernames class top.qwq2333.nullgram.activity.DatacenterActivity$DatacenterHeaderCell { <fields>; }
 -keepclassmembernames class top.qwq2333.nullgram.activity.MessageDetailsActivity$TextDetailSimpleCell { <fields>; }
--keepclassmembernames class top.qwq2333.nullgram.activity.PasscodeSettingActivity$AccountCell {
-<fields>; }
+-keepclassmembernames class top.qwq2333.nullgram.activity.PasscodeSettingActivity$AccountCell { <fields>; }
 -keepclassmembernames class top.qwq2333.nullgram.activityChatSettingsActivity$StickerSizeCell { <fields>; }
 
 -keepclassmembernames class androidx.core.widget.NestedScrollView {
@@ -144,6 +142,10 @@
     public static *** d(...);
 }
 
+-assumenosideeffects class top.qwq2333.nullgram.utils.Log {
+    public static *** d(...);
+}
+
 -dontwarn org.slf4j.impl.StaticMDCBinder
 -keep class io.ktor.client.** { *; }
 -keep class io.ktor.serialization.** { *; }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -6631,6 +6631,7 @@ protected void onDraw(Canvas canvas) {
         emojiStatusSpamHint = null;
         topViewSeparator1 = null;
         topViewSeparator2 = null;
+        topViewSeparator3 = null;
         addToContactsButton = null;
         restartTopicButton = null;
         closeReportSpam = null;
@@ -9387,6 +9388,11 @@ protected void dispatchDraw(Canvas canvas) {
         topViewSeparator2.setVisibility(View.GONE);
         topViewSeparator2.setBackgroundColor(getThemedColor(Theme.key_divider));
         topChatPanelView.addView(topViewSeparator2, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 1f / AndroidUtilities.density, Gravity.LEFT | Gravity.TOP, 10, 48, 10, 1));
+        topViewSeparator3 = new View(getContext());
+        topViewSeparator3.setVisibility(View.GONE);
+        topViewSeparator3.setBackgroundColor(getThemedColor(Theme.key_divider));
+        topChatPanelView.addView(topViewSeparator3, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 1f / AndroidUtilities.density, Gravity.LEFT | Gravity.BOTTOM, 0, 0, 0, 38));
+
 
         addToContactsButton = new TextView(getContext());
         addToContactsButton.setTextColor(getThemedColor(Theme.key_chat_addContact));

diff --git a/TMessagesProj/src/main/java/top/qwq2333/nullgram/translate/providers/BaiduTranslator.kt b/TMessagesProj/src/main/java/top/qwq2333/nullgram/translate/providers/BaiduTranslator.kt
@@ -42,19 +42,19 @@ object BaiduTranslator : BaseTranslator()  {
         }
         return String(buf)
     }
-    private val targetLanguages: List<String> = mutableListOf(
+    private val targetLanguages: List<String> = listOf(
         "zh", "en", "ja", "ko", "fr", "es", "th", "ar",
         "ru", "pt", "de", "it", "el", "nl", "pl", "bg",
         "et", "da", "fi", "cs", "ro", "sl", "sv", "hu",
         "zh-TW", "vi"
     )
-    private val baiduLanguages: List<String> = mutableListOf(
+    private val baiduLanguages: List<String> = listOf(
         "zh", "en", "jp", "kor", "fra", "spa", "th", "ara",
         "ru", "pt", "de", "it", "el", "nl", "pl", "bul",
         "est", "dan", "fin", "cs", "rom", "slo", "swe", "hu",
         "cht", "vie"
     )
-    private val cuid = UUID.randomUUID().toString().uppercase(Locale.getDefault()).replace("-", "") + "|" + randomString()
+    private val cuid = UUID.randomUUID().toString().uppercase(Locale.US).replace("-", "") + "|" + randomString()
 
     override fun convertLanguageCode(code: String, reverse: Boolean): String {
         val index = if (reverse) baiduLanguages.indexOf(code) else targetLanguages.indexOf(code)
@@ -66,8 +66,8 @@ object BaiduTranslator : BaseTranslator()  {
 
     override fun convertLanguageCode(language: String, country: String?): String {
         val languageLowerCase = language.lowercase(Locale.getDefault())
-        val code = if (!TextUtils.isEmpty(country)) {
-            val countryUpperCase = country!!.uppercase(Locale.getDefault())
+        val code = if (!country.isNullOrEmpty()) {
+            val countryUpperCase = country.uppercase(Locale.getDefault())
             if (targetLanguages.contains("$languageLowerCase-$countryUpperCase")) {
                 "$languageLowerCase-$countryUpperCase"
             } else if (languageLowerCase == "zh") {
@@ -96,7 +96,7 @@ object BaiduTranslator : BaseTranslator()  {
             if (TextUtils.isEmpty(it.bodyAsText())) {
                 return RequestResult(from,null,it.status)
             } else {
-                val json: JSONObject = JSONObject(it.bodyAsText())
+                val json = JSONObject(it.bodyAsText())
                 val array = json.getJSONArray("fanyi_list")
                 buildString {
                     for (i in 0 until array.length()) {