diff --git a/Dockerfile b/Dockerfile index b6adf7d0d..58fb99ac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM gradle:7.0.2-jdk11 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip -ENV ANDROID_API_LEVEL android-31 -ENV ANDROID_BUILD_TOOLS_VERSION 31.0.0 +ENV ANDROID_API_LEVEL android-33 +ENV ANDROID_BUILD_TOOLS_VERSION 33.0.0 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV ANDROID_NDK_VERSION 21.4.7075529 -ENV ANDROID_VERSION 31 +ENV ANDROID_VERSION 33 ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}/ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools @@ -22,8 +22,8 @@ RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME "build-t "platforms;android-${ANDROID_VERSION}" \ "platform-tools" \ "ndk;$ANDROID_NDK_VERSION" -RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/31.0.0/dx -RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar +RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/33.0.0/dx +RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/33.0.0/lib/dx.jar ENV PATH ${ANDROID_NDK_HOME}:$PATH ENV PATH ${ANDROID_NDK_HOME}/prebuilt/linux-x86_64/bin/:$PATH diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java index 252e404dc..550415842 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java @@ -24,8 +24,8 @@ public class BuildVars { public static boolean USE_CLOUD_STRINGS = true; public static boolean CHECK_UPDATES = true; public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29; - public static int BUILD_VERSION = 2927; - public static String BUILD_VERSION_STRING = "9.1.4"; + public static int BUILD_VERSION = 2928; + public static String BUILD_VERSION_STRING = "9.1.5"; public static int APP_ID = 4; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TopicsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/TopicsController.java index 635d80159..3d9ddc8c0 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/TopicsController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/TopicsController.java @@ -81,10 +81,7 @@ public class TopicsController extends BaseController { topicsIsLoading.put(chatId, 0); processTopics(chatId, topics, null, fromCache, loadType, -1); - - if (!endIsReached(chatId)) { - endIsReached.put(chatId, getUserConfig().getPreferences().getBoolean("topics_end_reached_" + chatId, false) ? 1 : 0); - } + sortTopics(chatId); }); }); return; @@ -121,7 +118,7 @@ public class TopicsController extends BaseController { topicsIsLoading.put(chatId, 0); processTopics(chatId, topics.topics, messagesMap, false, loadType, ((TLRPC.TL_messages_forumTopics) response).count); getMessagesStorage().putMessages(topics.messages, false, true, false, 0, false, 0); - + sortTopics(chatId); getMessagesStorage().saveTopics(-chatId, topicsByChatId.get(chatId), true, true); if (!topics.topics.isEmpty() && loadType == LOAD_TYPE_LOAD_NEXT) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java index 6b87c86a4..befff3683 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java @@ -54,7 +54,6 @@ import org.telegram.messenger.NotificationsController; import org.telegram.messenger.R; import org.telegram.messenger.SharedConfig; import org.telegram.messenger.TopicsController; -import org.telegram.messenger.UserConfig; import org.telegram.messenger.Utilities; import org.telegram.tgnet.ConnectionsManager; import org.telegram.tgnet.TLObject; @@ -71,10 +70,7 @@ import org.telegram.ui.ActionBar.Theme; import org.telegram.ui.ActionBar.ThemeDescription; import org.telegram.ui.Adapters.FiltersView; import org.telegram.ui.Cells.DialogCell; -import org.telegram.ui.Cells.DrawerProfileCell; import org.telegram.ui.Cells.GraySectionCell; -import org.telegram.ui.Cells.HeaderCell; -import org.telegram.ui.Cells.HintDialogCell; import org.telegram.ui.Cells.ProfileSearchCell; import org.telegram.ui.Cells.TopicSearchCell; import org.telegram.ui.Cells.UserCell; @@ -88,7 +84,6 @@ import org.telegram.ui.Components.ChatNotificationsPopupWrapper; import org.telegram.ui.Components.ColoredImageSpan; import org.telegram.ui.Components.CombinedDrawable; import org.telegram.ui.Components.CubicBezierInterpolator; -import org.telegram.ui.Components.EditTextBoldCursor; import org.telegram.ui.Components.FlickerLoadingView; import org.telegram.ui.Components.Forum.ForumUtilities; import org.telegram.ui.Components.FragmentContextView; @@ -213,6 +208,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N private FrameLayout topView; private RLottieImageView floatingButton; + private boolean canShowProgress; public TopicsFragment(Bundle bundle) { super(bundle); @@ -220,6 +216,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N opnendForSelect = arguments.getBoolean("for_select", false); openedForForward = arguments.getBoolean("forward_to", false); topicsController = getMessagesController().getTopicsController(); + canShowProgress = !getUserConfig().getPreferences().getBoolean("topics_end_reached_" + chatId, false); } public static void prepareToSwitchAnimation(ChatActivity chatActivity) { @@ -1643,7 +1640,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N } if (forumTopics.size() == 1 && forumTopics.get(0).topic.id == 1) { forumTopics.clear(); - } else if (!forumTopics.isEmpty() && !topicsController.endIsReached(chatId)) { + } else if (!forumTopics.isEmpty() && !topicsController.endIsReached(chatId) && canShowProgress) { forumTopics.add(new Item(VIEW_TYPE_LOADING_CELL, null)); } diff --git a/gradle.properties b/gradle.properties index 550457674..286e082e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sat Mar 12 05:53:50 MSK 2016 -APP_VERSION_NAME=9.1.4 -APP_VERSION_CODE=2927 +APP_VERSION_NAME=9.1.5 +APP_VERSION_CODE=2928 APP_PACKAGE=org.telegram.messenger RELEASE_KEY_PASSWORD=TelegramAndroidPswd RELEASE_KEY_ALIAS=tmessages