vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-05-23 04:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4.1.3' into merge/4.1.3

Browse source
This commit is contained in:
vivabelarus 2025-03-24 19:00:45 +03:00
commit 4537659b70
No known key found for this signature in database
GPG key ID: 49D91FD306D1018E
6 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/alpha.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
- name: Save artifact
uses: actions/upload-artifact@master
with:
name: PTelegramAlpha-1585.apk
name: PTelegramAlpha-1586.apk
path: TMessagesProj/build/outputs/apk/afat/alpha/app.apk
- name: Create cleanup request
run: touch delete_request

11
TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscode.java
View file

@ -349,8 +349,15 @@ public class FakePasscode {
private void checkPasswordlessMode() {
passwordDisabled = passwordlessMode;
MediaDataController.getInstance(UserConfig.selectedAccount).buildShortcuts();
NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.didSetPasscode);
if (passwordDisabled) {
SharedConfig.setAppLocked(false);
SharedConfig.isWaitingForPasscodeEnter = false;
SharedConfig.saveConfig();
MediaDataController.getInstance(UserConfig.selectedAccount).buildShortcuts();
AndroidUtilities.runOnUIThread(() -> {
NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.didSetPasscode);
});
}
}
public boolean passcodeEnabled() {

10
TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/FakePasscodeUtils.java
View file

@ -397,13 +397,17 @@ public class FakePasscodeUtils {
}
public static synchronized void tryActivateByTimer() {
tryActivateByTimer(false);
}
public static synchronized void tryActivateByTimer(boolean force) {
try {
if (SharedConfig.lastPauseFakePasscodeTime == 0 || SharedConfig.autoLockIn == 1 && !SharedConfig.isAppLocked()) {
if (SharedConfig.lastPauseFakePasscodeTime == 0) {
return;
}
long uptime = SystemClock.elapsedRealtime() / 1000;
long duration = uptime - SharedConfig.lastPauseFakePasscodeTime;
if (SharedConfig.isAppLocked() && LaunchActivity.isResumed && duration < 30) {
long duration = Math.max(uptime - SharedConfig.lastPauseFakePasscodeTime, force ? 1 : 0);
if (!force && SharedConfig.isAppLocked() && LaunchActivity.isResumed && duration < 30) {
return; // Don't activate if PasscodeView is shown
}
List<FakePasscode> sortedPasscodes = SharedConfig.fakePasscodes.stream()

2
TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
View file

@ -2,5 +2,5 @@ package org.telegram.messenger.partisan;
public class PartisanVersion {
public static final String PARTISAN_VERSION_STRING = "4.1.3";
public static int PARTISAN_BUILD_VERSION = 1585;
public static int PARTISAN_BUILD_VERSION = 1586;
}

11
TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
View file

@ -99,7 +99,7 @@ public class PasscodeView extends FrameLayout implements NotificationCenter.Noti
}
} else if (id == NotificationCenter.fakePasscodeActivated) {
if (FakePasscodeUtils.isFakePasscodeActivated() && !FakePasscodeUtils.getActivatedFakePasscode().passcodeEnabled()) {
appUnlocked();
forceDismiss();
}
}
}
@ -1065,6 +1065,15 @@ public class PasscodeView extends FrameLayout implements NotificationCenter.Noti
va.start();
}
private void forceDismiss() {
if (delegate != null) {
delegate.didAcceptedPassword(this);
}
setVisibility(View.GONE);
onHidden();
setAlpha(0f);
}
private float shownT;
protected void onAnimationUpdate(float open) {

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

@ -6696,6 +6696,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
onResumeStaticCallback = null;
}
if (!SharedConfig.isAppLocked()) {
FakePasscodeUtils.tryActivateByTimer(true);
SharedConfig.lastPauseFakePasscodeTime = 0;
}
if (Theme.selectedAutoNightType == Theme.AUTO_NIGHT_TYPE_SYSTEM) {
@ -6725,7 +6726,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
layersActionBarLayout.onResume();
}
}
} else {
} else if (SharedConfig.isAppLocked()) { // ignore if app locked
actionBarLayout.dismissDialogs();
if (AndroidUtilities.isTablet()) {
if (rightActionBarLayout != null) {