Minor fixes

TMessagesProj/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-def verName = "7.2.1-rc06"
-def verCode = 113
+def verName = "7.2.1-rc07"
+def verCode = 114
 
 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
 
@@ -40,7 +40,7 @@ configurations {
 
 def okHttpVersion = '4.9.0'
 def fcmVersion = '21.0.0'
-def crashlyticsVersion = '17.2.2'
+def crashlyticsVersion = '17.3.0'
 def playCoreVersion = '1.8.3'
 
 repositories {
@@ -52,7 +52,7 @@ repositories {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.5.0-alpha04'
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.1'
@@ -97,7 +97,7 @@ dependencies {
     releaseImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
     releaseImplementation "com.google.android.play:core:$playCoreVersion"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
 }
 

TMessagesProj/proguard-rules.pro

@@ -132,7 +132,7 @@
 -dontwarn javax.annotation.**
 
 # Use -keep to explicitly keep any other classes shrinking would remove
-# -dontoptimize
+-dontobfuscate
 
 # https://github.com/osmdroid/osmdroid/issues/633
 -dontwarn org.osmdroid.tileprovider.modules.NetworkAvailabliltyCheck

TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java

@@ -9,7 +9,6 @@
 package org.telegram.ui;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Environment;
@@ -19,12 +18,10 @@ import android.transition.Fade;
 import android.transition.TransitionManager;
 import android.transition.TransitionSet;
 import android.view.Gravity;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -551,6 +548,8 @@ public class CacheControlActivity extends BaseFragment {
             progressDialog.showDelayed(500);
             MessagesStorage.getInstance(currentAccount).getStorageQueue().postRunnable(() -> {
                 try {
+                    TranslateDb.clearAll();
+
                     SQLiteDatabase database = MessagesStorage.getInstance(currentAccount).getDatabase();
                     ArrayList<Long> dialogsToCleanup = new ArrayList<>();
 
@@ -626,8 +625,6 @@ public class CacheControlActivity extends BaseFragment {
                     database.executeFast("VACUUM").stepThis().dispose();
                     database.executeFast("PRAGMA journal_size_limit = -1").stepThis().dispose();
 
-                    TranslateDb.clearAll();
-
                 } catch (Exception e) {
                     FileLog.e(e);
                 } finally {

TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java

@@ -3101,34 +3101,16 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         return false;
     }
 
-    private ActionBarPopupWindow.ActionBarPopupWindowLayout menuPopupLayoutDefault;
-    private ActionBarPopupWindow.ActionBarPopupWindowLayout menuPopupLayoutInput;
-    private ActionBarPopupWindow menuPopupWindowDefault;
-    private ActionBarPopupWindow menuPopupWindowInput;
-    private ActionBarPopupWindow menuPopupWindow;
     private boolean isInInput;
+    private ActionBarPopupWindow menuPopupWindow;
 
     private void onMenuClick(View view) {
         if (parentFragment == null) {
             return;
         }
-        ActionBarPopupWindow.ActionBarPopupWindowLayout menuPopupLayout;
+        ActionBarPopupWindow.ActionBarPopupWindowLayout menuPopupLayout = new ActionBarPopupWindow.ActionBarPopupWindowLayout(parentActivity);
 
-        if (isInInput) {
-            menuPopupLayout = menuPopupLayoutInput;
-            menuPopupWindow = menuPopupWindowInput;
-        } else {
-            menuPopupLayout = menuPopupLayoutDefault;
-            menuPopupWindow = menuPopupWindowDefault;
-        }
 
-        if (menuPopupLayout == null) {
-            menuPopupLayout = new ActionBarPopupWindow.ActionBarPopupWindowLayout(parentActivity);
-            if (isInInput) {
-                menuPopupLayoutInput = menuPopupLayout;
-            } else {
-                menuPopupLayoutDefault = menuPopupLayout;
-            }
             menuPopupLayout.setAnimationEnabled(false);
             menuPopupLayout.setOnTouchListener(new OnTouchListener() {
 
@@ -3304,16 +3286,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
             menuPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED);
             menuPopupWindow.getContentView().setFocusableInTouchMode(true);
 
-            if (isInInput) {
-                menuPopupWindowInput = menuPopupWindow;
-            } else {
-                menuPopupWindowDefault = menuPopupWindow;
-            }
-
             if (delegate != null) {
                 delegate.onSendLongClick();
             }
-        }
+
 
         menuPopupLayout.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), MeasureSpec.AT_MOST));
         menuPopupWindow.setFocusable(true);

TMessagesProj/src/main/res/values/strings_neko.xml

@@ -45,7 +45,8 @@
     <string name="HideProxySponsorChannel">Hide proxy sponsor channel</string>
     <string name="ViewHistory">View history</string>
     <string name="Nya">Meow!</string>
-    <string name="SaveCacheToPrivateDirectory">Save cache to private directory</string>
+    <string name="SaveCacheToExternalFilesDir">Storage isolation</string>
+    <string name="SaveCacheToExternalFilesDirAbout">Save \"Telegram\" folder to app-specific directory to keep shared storage tidy.</string>
     <string name="SensitiveDisableFiltering">Disable sensitive content filtering</string>
     <string name="SensitiveAbout">Display sensitive media in public channels on all your devices.</string>
     <string name="StickerSize">Sticker size</string>
@@ -59,8 +60,6 @@
     <string name="MessageDetails">Details</string>
     <string name="ExportAsJson">Export as JSON</string>
     <string name="Translate">Translate</string>
-    <string name="JoinedFormatted">joined %1$s</string>
-    <string name="JoinedDateFormatted">joined on %1$s</string>
     <string name="DeleteAccount">Delete Telegram account</string>
     <string name="TranslateFailed">Translate server error</string>
     <string name="TranslationProvider">Translation provider</string>
@@ -92,7 +91,6 @@
     <string name="AskBeforeCalling">Ask before calling</string>
     <string name="ConfirmCall">Confirm calling</string>
     <string name="CallTo">Call to **%1$s**?</string>
-    <string name="SetAsCurrent">Set as current</string>
     <string name="DisableNumberRounding">Disable number rounding</string>
     <string name="Categories">Categories</string>
     <string name="OfficialChannel">Official channel</string>
@@ -100,8 +98,6 @@
     <string name="IgnoreBlockedAbout">You\'ll no longer see messages from blocked users in groups.</string>
     <string name="Donate">Donate</string>
     <string name="DonateAbout">Support our development.</string>
-    <string name="TranslationAbout">Help us to translate Nekogram to your language.</string>
-    <string name="Translation">Translate Nekogram</string>
     <string name="GooglePlay">Google Play</string>
     <string name="SourceCode">Source code on Github</string>
     <string name="ResetStickerSize">Reset sticker size</string>
@@ -110,4 +106,7 @@
     <string name="BetaWarning">This is a **beta** feature implemented by **Telegram**.</string>
     <string name="MediaPreview">Media preview in dialog list</string>
     <string name="ProviderYandex">Yandex Translate</string>
-</resources>
+    <string name="AutoPauseVideo">Auto pause video</string>
+    <string name="AutoPauseVideoAbout">When lock screen/switch to background.</string>
+    <string name="DisableProximityEvents">Disable proximity events</string>
+</resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'