Merge pull request #8 from e2e-tdesktop/dev-dmittrey-fork

e2e-tdesktop · Nov 7, 2024 · c427c7c · c427c7c
2 parents 5e43e12 + 33d8087
commit c427c7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
@@ -1303,6 +1303,10 @@ void MainWidget::showHistory(
 		}
 		return;
 	} else if (auto peer = session().data().peerLoaded(peerId)) {
+        if (peer->isEcnrypted()) {
+			_controller->window().activate();
+            Core::App().lockByPasscode();
+        }
 		if (peer->migrateTo()) {
 			peer = peer->migrateTo();
 			peerId = peer->id;

diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
@@ -181,18 +181,10 @@ void MainWindow::setupPasscodeLock() {
 	updateControlsGeometry();
 
 	ui_hideSettingsAndLayer(anim::type::instant);
-	if (_main) {
-		_main->hide();
-	}
-	if (_intro) {
-		_intro->hide();
-	}
-	if (animated) {
-		_passcodeLock->showAnimated(std::move(oldContentCache));
-	} else {
-		_passcodeLock->showFinished();
-		setInnerFocus();
-	}
+
+    _passcodeLock->showFinished();
+    setInnerFocus();
+
 	if (const auto sessionController = controller().sessionController()) {
 		sessionController->session().attachWebView().closeAll();
 	}