Added UI for configuring session inactivity timeout (#527)
This commit is contained in:
parent
b032b32db1
commit
fb3d314ee2
5 changed files with 160 additions and 109 deletions
|
@ -30,37 +30,42 @@ AccordionItem {
|
||||||
Column {
|
Column {
|
||||||
id: activeSessionsItem
|
id: activeSessionsItem
|
||||||
bottomPadding: Theme.paddingMedium
|
bottomPadding: Theme.paddingMedium
|
||||||
property variant activeSessions;
|
property variant activeSessions
|
||||||
property bool loaded : false;
|
property int inactiveSessionsTtlDays
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (!activeSessions) {
|
if (!activeSessions) {
|
||||||
tdLibWrapper.getActiveSessions();
|
tdLibWrapper.getActiveSessions();
|
||||||
} else {
|
|
||||||
activeSessionsItem.loaded = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: tdLibWrapper
|
target: tdLibWrapper
|
||||||
onSessionsReceived: {
|
onSessionsReceived: {
|
||||||
activeSessionsItem.activeSessions = sessions;
|
activeSessionsItem.activeSessions = sessions
|
||||||
activeSessionsItem.loaded = true;
|
activeSessionsItem.inactiveSessionsTtlDays = inactive_session_ttl_days
|
||||||
}
|
}
|
||||||
onOkReceived: {
|
onOkReceived: {
|
||||||
if (request === "terminateSession") {
|
if (request === "terminateSession") {
|
||||||
appNotification.show(qsTr("Session was terminated"));
|
appNotification.show(qsTr("Session was terminated"));
|
||||||
activeSessionsItem.loaded = false;
|
|
||||||
tdLibWrapper.getActiveSessions();
|
tdLibWrapper.getActiveSessions();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
id: sessionInformationLoader
|
|
||||||
active: tdLibWrapper.authorizationState === TelegramAPI.AuthorizationReady
|
active: tdLibWrapper.authorizationState === TelegramAPI.AuthorizationReady
|
||||||
width: parent.width
|
width: parent.width
|
||||||
sourceComponent: Component {
|
sourceComponent: Component {
|
||||||
|
Column {
|
||||||
|
BusyIndicator {
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
running: !activeSessionsListView.count && !activeSessionsItem.inactiveSessionsTtlDays
|
||||||
|
size: BusyIndicatorSize.Medium
|
||||||
|
visible: opacity > 0
|
||||||
|
height: running ? implicitHeight : 0
|
||||||
|
}
|
||||||
|
|
||||||
SilicaListView {
|
SilicaListView {
|
||||||
id: activeSessionsListView
|
id: activeSessionsListView
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
@ -71,6 +76,7 @@ AccordionItem {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
color: Theme.primaryColor
|
color: Theme.primaryColor
|
||||||
horizontalAlignment: Qt.AlignHCenter
|
horizontalAlignment: Qt.AlignHCenter
|
||||||
|
visible: activeSessionsListView.count > 0
|
||||||
}
|
}
|
||||||
delegate: ListItem {
|
delegate: ListItem {
|
||||||
id: activeSessionListItem
|
id: activeSessionListItem
|
||||||
|
@ -111,9 +117,6 @@ AccordionItem {
|
||||||
font.bold: true
|
font.bold: true
|
||||||
visible: modelData.is_current
|
visible: modelData.is_current
|
||||||
color: Theme.highlightColor
|
color: Theme.highlightColor
|
||||||
anchors {
|
|
||||||
horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
|
@ -121,41 +124,28 @@ AccordionItem {
|
||||||
text: modelData.application_name + " " + modelData.application_version
|
text: modelData.application_name + " " + modelData.application_version
|
||||||
font.pixelSize: Theme.fontSizeMedium
|
font.pixelSize: Theme.fontSizeMedium
|
||||||
font.bold: true
|
font.bold: true
|
||||||
color: Theme.primaryColor
|
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
anchors {
|
|
||||||
horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
text: modelData.device_model + ", " + (modelData.platform + " " + modelData.system_version).trim()
|
text: modelData.device_model + ", " + (modelData.platform + " " + modelData.system_version).trim()
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: Theme.primaryColor
|
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
truncationMode: TruncationMode.Fade
|
truncationMode: TruncationMode.Fade
|
||||||
anchors {
|
|
||||||
horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
text: qsTr("Active since: %1, last online: %2").arg(Functions.getDateTimeTimepoint(modelData.log_in_date)).arg(Functions.getDateTimeElapsed(modelData.last_active_date))
|
text: qsTr("Active since: %1, last online: %2").arg(Functions.getDateTimeTimepoint(modelData.log_in_date)).arg(Functions.getDateTimeElapsed(modelData.last_active_date))
|
||||||
font.pixelSize: Theme.fontSizeExtraSmall
|
font.pixelSize: Theme.fontSizeExtraSmall
|
||||||
color: Theme.primaryColor
|
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
truncationMode: TruncationMode.Fade
|
truncationMode: TruncationMode.Fade
|
||||||
anchors {
|
|
||||||
horizontalCenter: parent.horizontalCenter
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Separator {
|
Separator {
|
||||||
id: separator
|
|
||||||
anchors {
|
anchors {
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
}
|
}
|
||||||
|
@ -164,7 +154,58 @@ AccordionItem {
|
||||||
color: Theme.primaryColor
|
color: Theme.primaryColor
|
||||||
horizontalAlignment: Qt.AlignHCenter
|
horizontalAlignment: Qt.AlignHCenter
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ComboBox {
|
||||||
|
readonly property int ttl: activeSessionsItem.inactiveSessionsTtlDays
|
||||||
|
label: qsTr("Terminate old sessions if inactive for")
|
||||||
|
value: (currentItem && currentItem.text) ? currentItem.text : qsTr("%1 day(s)", "", ttl).arg(ttl)
|
||||||
|
visible: ttl > 0
|
||||||
|
menu: ContextMenu {
|
||||||
|
id: ttlMenu
|
||||||
|
MenuItem {
|
||||||
|
readonly property int days: 7
|
||||||
|
text: qsTr("1 week")
|
||||||
|
onClicked: tdLibWrapper.setInactiveSessionTtl(days)
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
readonly property int days: 30
|
||||||
|
text: qsTr("1 month")
|
||||||
|
onClicked: tdLibWrapper.setInactiveSessionTtl(days)
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
readonly property int days: 90
|
||||||
|
text: qsTr("3 months")
|
||||||
|
onClicked: tdLibWrapper.setInactiveSessionTtl(days)
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
readonly property int days: 180
|
||||||
|
text: qsTr("6 months")
|
||||||
|
onClicked: tdLibWrapper.setInactiveSessionTtl(days)
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
readonly property int days: 365
|
||||||
|
text: qsTr("1 year")
|
||||||
|
onClicked: tdLibWrapper.setInactiveSessionTtl(days)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: updateSelection()
|
||||||
|
|
||||||
|
onTtlChanged: updateSelection()
|
||||||
|
|
||||||
|
function updateSelection() {
|
||||||
|
var menuItems = ttlMenu.children
|
||||||
|
var n = menuItems.length
|
||||||
|
for (var i = 0; i < n; i++) {
|
||||||
|
if (menuItems[i].days === ttl) {
|
||||||
|
currentIndex = i
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
currentIndex = -1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -712,8 +712,9 @@ void TDLibReceiver::processUpdateMessageInteractionInfo(const QVariantMap &recei
|
||||||
|
|
||||||
void TDLibReceiver::processSessions(const QVariantMap &receivedInformation)
|
void TDLibReceiver::processSessions(const QVariantMap &receivedInformation)
|
||||||
{
|
{
|
||||||
|
int inactive_session_ttl_days = receivedInformation.value("inactive_session_ttl_days").toInt();
|
||||||
QVariantList sessions = receivedInformation.value("sessions").toList();
|
QVariantList sessions = receivedInformation.value("sessions").toList();
|
||||||
emit sessionsReceived(sessions);
|
emit sessionsReceived(inactive_session_ttl_days, sessions);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TDLibReceiver::processAvailableReactions(const QVariantMap &receivedInformation)
|
void TDLibReceiver::processAvailableReactions(const QVariantMap &receivedInformation)
|
||||||
|
|
|
@ -101,7 +101,7 @@ signals:
|
||||||
void userPrivacySettingRulesUpdated(const QVariantMap &updatedRules);
|
void userPrivacySettingRulesUpdated(const QVariantMap &updatedRules);
|
||||||
void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
|
void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
|
||||||
void okReceived(const QString &request);
|
void okReceived(const QString &request);
|
||||||
void sessionsReceived(const QVariantList &sessions);
|
void sessionsReceived(int inactive_session_ttl_days, const QVariantList &sessions);
|
||||||
void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
|
void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
|
||||||
void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
|
void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
|
||||||
void chatUnreadReactionCountUpdated(qlonglong chatId, int unreadReactionCount);
|
void chatUnreadReactionCountUpdated(qlonglong chatId, int unreadReactionCount);
|
||||||
|
|
|
@ -187,7 +187,7 @@ void TDLibWrapper::initializeTDLibReceiver() {
|
||||||
connect(this->tdLibReceiver, SIGNAL(userPrivacySettingRulesUpdated(QVariantMap)), this, SLOT(handleUpdatedUserPrivacySettingRules(QVariantMap)));
|
connect(this->tdLibReceiver, SIGNAL(userPrivacySettingRulesUpdated(QVariantMap)), this, SLOT(handleUpdatedUserPrivacySettingRules(QVariantMap)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)), this, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)));
|
connect(this->tdLibReceiver, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)), this, SIGNAL(messageInteractionInfoUpdated(qlonglong, qlonglong, QVariantMap)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(okReceived(QString)), this, SIGNAL(okReceived(QString)));
|
connect(this->tdLibReceiver, SIGNAL(okReceived(QString)), this, SIGNAL(okReceived(QString)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(sessionsReceived(QVariantList)), this, SIGNAL(sessionsReceived(QVariantList)));
|
connect(this->tdLibReceiver, SIGNAL(sessionsReceived(int, QVariantList)), this, SIGNAL(sessionsReceived(int, QVariantList)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(availableReactionsReceived(qlonglong, QStringList)), this, SIGNAL(availableReactionsReceived(qlonglong, QStringList)));
|
connect(this->tdLibReceiver, SIGNAL(availableReactionsReceived(qlonglong, QStringList)), this, SIGNAL(availableReactionsReceived(qlonglong, QStringList)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)));
|
connect(this->tdLibReceiver, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)));
|
||||||
connect(this->tdLibReceiver, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)));
|
connect(this->tdLibReceiver, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)), this, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)));
|
||||||
|
@ -1520,6 +1520,14 @@ void TDLibWrapper::setNetworkType(NetworkType networkType)
|
||||||
this->sendRequest(requestObject);
|
this->sendRequest(requestObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TDLibWrapper::setInactiveSessionTtl(int days)
|
||||||
|
{
|
||||||
|
QVariantMap requestObject;
|
||||||
|
requestObject.insert(_TYPE, "setInactiveSessionTtl");
|
||||||
|
requestObject.insert("inactive_session_ttl_days", days);
|
||||||
|
this->sendRequest(requestObject);
|
||||||
|
}
|
||||||
|
|
||||||
void TDLibWrapper::searchEmoji(const QString &queryString)
|
void TDLibWrapper::searchEmoji(const QString &queryString)
|
||||||
{
|
{
|
||||||
LOG("Searching emoji" << queryString);
|
LOG("Searching emoji" << queryString);
|
||||||
|
|
|
@ -251,6 +251,7 @@ public:
|
||||||
Q_INVOKABLE void getPageSource(const QString &address);
|
Q_INVOKABLE void getPageSource(const QString &address);
|
||||||
Q_INVOKABLE void setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
|
Q_INVOKABLE void setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
|
||||||
Q_INVOKABLE void setNetworkType(NetworkType networkType);
|
Q_INVOKABLE void setNetworkType(NetworkType networkType);
|
||||||
|
Q_INVOKABLE void setInactiveSessionTtl(int days);
|
||||||
|
|
||||||
// Others (candidates for extraction ;))
|
// Others (candidates for extraction ;))
|
||||||
Q_INVOKABLE void searchEmoji(const QString &queryString);
|
Q_INVOKABLE void searchEmoji(const QString &queryString);
|
||||||
|
@ -331,7 +332,7 @@ signals:
|
||||||
void userPrivacySettingUpdated(UserPrivacySetting setting, UserPrivacySettingRule rule);
|
void userPrivacySettingUpdated(UserPrivacySetting setting, UserPrivacySettingRule rule);
|
||||||
void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
|
void messageInteractionInfoUpdated(qlonglong chatId, qlonglong messageId, const QVariantMap &updatedInfo);
|
||||||
void okReceived(const QString &request);
|
void okReceived(const QString &request);
|
||||||
void sessionsReceived(const QVariantList &sessions);
|
void sessionsReceived(int inactive_session_ttl_days, const QVariantList &sessions);
|
||||||
void openFileExternally(const QString &filePath);
|
void openFileExternally(const QString &filePath);
|
||||||
void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
|
void availableReactionsReceived(qlonglong messageId, const QStringList &reactions);
|
||||||
void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
|
void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
|
||||||
|
|
Loading…
Reference in a new issue