fix merge 9.1.6

NextAlone · Dec 2, 2022 · 9ed1040 · 9ed1040
1 parent b95fa59
commit 9ed1040
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -3,15 +3,15 @@ import cn.hutool.core.util.RuntimeUtil
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
-def verName = "9.0.2-preview01"
+def verName = "9.1.6-preview01"
 def verCode = 670
 
 if (System.getenv("DEBUG_BUILD") == "true") {
     verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1").trim()
 }
 
-def officialVer = "9.0.2"
-def officialCode = 2808
+def officialVer = "9.1.6"
+def officialCode = 2929
 
 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
 

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java
@@ -182,7 +182,7 @@ public void setDisableScroll(boolean b) {
     public boolean useBackgroundTopPadding = true;
     protected int customViewGravity = Gravity.LEFT | Gravity.TOP;
 
-    protected class ContainerView extends LinearLayout implements NestedScrollingParent {
+    protected class ContainerView extends FrameLayout implements NestedScrollingParent {
 
         private VelocityTracker velocityTracker = null;
         private int startedTrackingX;
@@ -1401,7 +1401,7 @@ public void setDelegate(BottomSheetDelegateInterface bottomSheetDelegate) {
         delegate = bottomSheetDelegate;
     }
 
-    public LinearLayout getContainer() {
+    public FrameLayout getContainer() {
         return container;
     }
 

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/INavigationLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/INavigationLayout.java
@@ -258,6 +258,7 @@ default boolean needPresentFragment(INavigationLayout layout, NavigationParams p
         /**
          * @deprecated You should override {@link INavigationLayoutDelegate#needPresentFragment(INavigationLayout, NavigationParams)} for more fields
          */
+        @Deprecated
         default boolean needPresentFragment(BaseFragment fragment, boolean removeLast, boolean forceWithoutAnimation, INavigationLayout layout) {
             return true;
         }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java
@@ -142,7 +142,7 @@ private Bulletin() {
         containerLayout = null;
     }
 
-    private Bulletin(BaseFragment fragment, @NonNull ViewGroup containerLayout, @NonNull Layout layout, int duration) {
+    private Bulletin(BaseFragment fragment, @NonNull FrameLayout containerLayout, @NonNull Layout layout, int duration) {
         this.layout = layout;
         this.parentLayout = new ParentLayout(layout) {
             @Override

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java
@@ -40,7 +40,7 @@ public static BulletinFactory of(BaseFragment fragment) {
         return new BulletinFactory(fragment);
     }
 
-    public static BulletinFactory of(ViewGroup containerLayout, Theme.ResourcesProvider resourcesProvider) {
+    public static BulletinFactory of(FrameLayout containerLayout, Theme.ResourcesProvider resourcesProvider) {
         return new BulletinFactory(containerLayout, resourcesProvider);
     }
 
@@ -133,7 +133,7 @@ private BulletinFactory(BaseFragment fragment) {
         this.resourcesProvider = fragment == null ? null : fragment.getResourceProvider();
     }
 
-    private BulletinFactory(ViewGroup containerLayout, Theme.ResourcesProvider resourcesProvider) {
+    private BulletinFactory(FrameLayout containerLayout, Theme.ResourcesProvider resourcesProvider) {
         this.containerLayout = containerLayout;
         this.fragment = null;
         this.resourcesProvider = resourcesProvider;
@@ -686,7 +686,7 @@ public static Bulletin createCopyLinkBulletin(BaseFragment fragment) {
     }
 
     @CheckResult
-    public static Bulletin createCopyLinkBulletin(ViewGroup containerView) {
+    public static Bulletin createCopyLinkBulletin(FrameLayout containerView) {
         return of(containerView, null).createCopyLinkBulletin();
     }
 

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
@@ -514,7 +514,7 @@ public ChatAttachAlertPhotoLayout(ChatAttachAlert alert, Context context, boolea
         this.forceDarkTheme = forceDarkTheme;
         NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.albumsDidLoad);
         NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.cameraInitied);
-        LinearLayout container = alert.getContainer();
+        FrameLayout container = alert.getContainer();
 
         cameraDrawable = context.getResources().getDrawable(R.drawable.instant_camera).mutate();
 

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Delegates/MemberRequestsDelegate.java b/TMessagesProj/src/main/java/org/telegram/ui/Delegates/MemberRequestsDelegate.java
@@ -89,7 +89,7 @@ public class MemberRequestsDelegate implements MemberRequestCell.OnClickListener
     private final ArrayList<TLRPC.TL_chatInviteImporter> allImporters = new ArrayList<>();
     private final Adapter adapter = new Adapter();
     private final BaseFragment fragment;
-    private final ViewGroup layoutContainer;
+    private final FrameLayout layoutContainer;
     private final MemberRequestsController controller;
     private final long chatId;
     private final int currentAccount;
@@ -114,7 +114,7 @@ public class MemberRequestsDelegate implements MemberRequestCell.OnClickListener
     private boolean isFirstLoading = true;
     private boolean isShowLastItemDivider = true;
 
-    public MemberRequestsDelegate(BaseFragment fragment, ViewGroup layoutContainer, long chatId, boolean showSearchMenu) {
+    public MemberRequestsDelegate(BaseFragment fragment, FrameLayout layoutContainer, long chatId, boolean showSearchMenu) {
         this.fragment = fragment;
         this.layoutContainer = layoutContainer;
         this.chatId = chatId;

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -5942,7 +5942,7 @@ public void onAnimationEnd(Animator animation) {
             if (!mainFragmentsStack.isEmpty()) {
                 int type = (int) args[0];
 
-                LinearLayout container = null;
+                FrameLayout container = null;
                 BaseFragment fragment = null;
                 if (GroupCallActivity.groupCallUiVisible && GroupCallActivity.groupCallInstance != null) {
                     container = GroupCallActivity.groupCallInstance.getContainer();
@@ -6915,7 +6915,7 @@ public boolean needAddFragmentToStack(BaseFragment fragment, INavigationLayout l
                 drawerLayoutContainer.setAllowOpenDrawer(false, true);
 
                 int account = -1;
-                for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; a++) {
+                for (int a : SharedConfig.activeAccounts) {
                     if (UserConfig.getInstance(a).isClientActivated()) {
                         account = a;
                         break;