Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
e34bb8fb
Commit
e34bb8fb
authored
7 months ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
nheko: backport newer release to improve matrix support on aramo.
parent
ff9bd1d5
No related branches found
Branches containing commit
No related tags found
1 merge request
!1452
nheko: backport newer release to improve matrix support on aramo.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/nheko/001_hidde_sso_promotion_with_main_stream_services.patch
+66
-0
66 additions, 0 deletions
...o/001_hidde_sso_promotion_with_main_stream_services.patch
helpers/make-nheko
+30
-0
30 additions, 0 deletions
helpers/make-nheko
with
96 additions
and
0 deletions
helpers/DATA/nheko/001_hidde_sso_promotion_with_main_stream_services.patch
0 → 100644
+
66
−
0
View file @
e34bb8fb
diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp_
index 6c7e49fd..001c9f99 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp_
@@ -207,33 +207,34 @@
LoginPage::checkHomeserverVersion()
bool ssoSupported = false;
bool passwordSupported = false;
for (const auto &flow : flows.flows) {
- if (flow.type == mtx::user_interactive::auth_types::sso) {
- ssoSupported = true;
-
- for (const auto &idp : flow.identity_providers) {
- SSOProvider prov;
- if (idp.brand == "apple")
- prov.name_ = tr("Sign in with Apple");
- else if (idp.brand == "facebook")
- prov.name_ = tr("Continue with Facebook");
- else if (idp.brand == "google")
- prov.name_ = tr("Sign in with Google");
- else if (idp.brand == "twitter")
- prov.name_ = tr("Sign in with Twitter");
- else
- prov.name_ = tr("Login using %1").arg(QString::fromStdString(idp.name));
-
- prov.avatarUrl_ = QString::fromStdString(idp.icon);
- prov.id_ = QString::fromStdString(idp.id);
- idps.push_back(QVariant::fromValue(prov));
- }
-
- if (flow.identity_providers.empty()) {
- SSOProvider prov;
- prov.name_ = tr("SSO LOGIN");
- idps.push_back(QVariant::fromValue(prov));
- }
- } else if (flow.type == mtx::user_interactive::auth_types::password) {
+// if (flow.type == mtx::user_interactive::auth_types::sso) {
+// ssoSupported = true;
+//
+// for (const auto &idp : flow.identity_providers) {
+// SSOProvider prov;
+// if (idp.brand == "apple")
+// prov.name_ = tr("Sign in with Apple");
+// else if (idp.brand == "facebook")
+// prov.name_ = tr("Continue with Facebook");
+// else if (idp.brand == "google")
+// prov.name_ = tr("Sign in with Google");
+// else if (idp.brand == "twitter")
+// prov.name_ = tr("Sign in with Twitter");
+// else
+// prov.name_ = tr("Login using %1").arg(QString::fromStdString(idp.name));
+//
+// prov.avatarUrl_ = QString::fromStdString(idp.icon);
+// prov.id_ = QString::fromStdString(idp.id);
+// idps.push_back(QVariant::fromValue(prov));
+// }
+//
+// if (flow.identity_providers.empty()) {
+// SSOProvider prov;
+// prov.name_ = tr("SSO LOGIN");
+// idps.push_back(QVariant::fromValue(prov));
+// }
+// } else if (flow.type == mtx::user_interactive::auth_types::password) {
+ if (flow.type == mtx::user_interactive::auth_types::password) {
passwordSupported = true;
}
}
This diff is collapsed.
Click to expand it.
helpers/make-nheko
0 → 100644
+
30
−
0
View file @
e34bb8fb
#!/bin/sh
#
# Copyright (C) 2024 Luis Guzman <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION
=
1
EXTERNAL
=
'deb-src http://archive.ubuntu.com/ubuntu noble universe'
BACKPORT
=
true
.
./config
patch_p1
$DATA
/001_hidde_sso_promotion_with_main_stream_services.patch
changelog
"Backported from noble to improve matrix support on Aramo and hide promotion of privacy conflicting SSO services."
package
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment