OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

update to 9.4.8

Browse source
This commit is contained in:
xaxtix 2023-02-27 14:35:15 +04:00
parent 7554c9b726
commit 8bb3438f62
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View file

@ -24,8 +24,8 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29; public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
public static int BUILD_VERSION = 3160; public static int BUILD_VERSION = 3161;
public static String BUILD_VERSION_STRING = "9.4.7"; public static String BUILD_VERSION_STRING = "9.4.8";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

14
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
View file

@ -1503,7 +1503,7 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
return false; return false;
} }
fragment.setParentLayout(this); fragment.setParentLayout(this);
if (position == -1) { if (position == -1 || position == INavigationLayout.FORCE_NOT_ATTACH_VIEW) {
if (!fragmentsStack.isEmpty()) { if (!fragmentsStack.isEmpty()) {
BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1);
previousFragment.onPause(); previousFragment.onPause();
@ -1522,11 +1522,13 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
} }
} }
fragmentsStack.add(fragment); fragmentsStack.add(fragment);
attachView(fragment); if (position != INavigationLayout.FORCE_NOT_ATTACH_VIEW) {
fragment.onResume(); attachView(fragment);
fragment.onTransitionAnimationEnd(false, true); fragment.onResume();
fragment.onTransitionAnimationEnd(true, true); fragment.onTransitionAnimationEnd(false, true);
fragment.onBecomeFullyVisible(); fragment.onTransitionAnimationEnd(true, true);
fragment.onBecomeFullyVisible();
}
onFragmentStackChanged("addFragmentToStack " + position); onFragmentStackChanged("addFragmentToStack " + position);
} else { } else {
fragmentsStack.add(position, fragment); fragmentsStack.add(position, fragment);

2
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/INavigationLayout.java
View file

@ -20,6 +20,8 @@ import java.util.List;
public interface INavigationLayout { public interface INavigationLayout {
int REBUILD_FLAG_REBUILD_LAST = 1, REBUILD_FLAG_REBUILD_ONLY_LAST = 2; int REBUILD_FLAG_REBUILD_LAST = 1, REBUILD_FLAG_REBUILD_ONLY_LAST = 2;
int FORCE_NOT_ATTACH_VIEW = -2;
boolean presentFragment(NavigationParams params); boolean presentFragment(NavigationParams params);
boolean checkTransitionAnimation(); boolean checkTransitionAnimation();
boolean addFragmentToStack(BaseFragment fragment, int position); boolean addFragmentToStack(BaseFragment fragment, int position);

12
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file

@ -2947,7 +2947,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (AndroidUtilities.isTablet()) { if (AndroidUtilities.isTablet()) {
if (!UserConfig.getInstance(currentAccount).isClientActivated()) { if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
if (layersActionBarLayout.getFragmentStack().isEmpty()) { if (layersActionBarLayout.getFragmentStack().isEmpty()) {
layersActionBarLayout.addFragmentToStack(getClientNotActivatedFragment()); layersActionBarLayout.addFragmentToStack(getClientNotActivatedFragment(), INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(false, false); drawerLayoutContainer.setAllowOpenDrawer(false, false);
} }
} else { } else {
@ -2957,14 +2957,14 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (searchQuery != null) { if (searchQuery != null) {
dialogsActivity.setInitialSearchString(searchQuery); dialogsActivity.setInitialSearchString(searchQuery);
} }
actionBarLayout.addFragmentToStack(dialogsActivity); actionBarLayout.addFragmentToStack(dialogsActivity, INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(true, false); drawerLayoutContainer.setAllowOpenDrawer(true, false);
} }
} }
} else { } else {
if (actionBarLayout.getFragmentStack().isEmpty()) { if (actionBarLayout.getFragmentStack().isEmpty()) {
if (!UserConfig.getInstance(currentAccount).isClientActivated()) { if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
actionBarLayout.addFragmentToStack(getClientNotActivatedFragment()); actionBarLayout.addFragmentToStack(getClientNotActivatedFragment(), INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(false, false); drawerLayoutContainer.setAllowOpenDrawer(false, false);
} else { } else {
DialogsActivity dialogsActivity = new DialogsActivity(null); DialogsActivity dialogsActivity = new DialogsActivity(null);
@ -2972,14 +2972,12 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (searchQuery != null) { if (searchQuery != null) {
dialogsActivity.setInitialSearchString(searchQuery); dialogsActivity.setInitialSearchString(searchQuery);
} }
actionBarLayout.addFragmentToStack(dialogsActivity); actionBarLayout.addFragmentToStack(dialogsActivity, INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(true, false); drawerLayoutContainer.setAllowOpenDrawer(true, false);
} }
} }
} }
if (SharedConfig.useLNavigation) { actionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
actionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
}
if (AndroidUtilities.isTablet()) { if (AndroidUtilities.isTablet()) {
layersActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST); layersActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
rightActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST); rightActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);

4
gradle.properties
View file

@ -13,8 +13,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
#Sat Mar 12 05:53:50 MSK 2016 #Sat Mar 12 05:53:50 MSK 2016
APP_VERSION_NAME=9.4.7 APP_VERSION_NAME=9.4.8
APP_VERSION_CODE=3160 APP_VERSION_CODE=3161
APP_PACKAGE=org.telegram.messenger APP_PACKAGE=org.telegram.messenger
RELEASE_KEY_PASSWORD=android RELEASE_KEY_PASSWORD=android
RELEASE_KEY_ALIAS=androidkey RELEASE_KEY_ALIAS=androidkey