Mastodon
/
tootle-linux-client
mirror of https://gitlab.gnome.org/World/tootle
1
0
Fork 0
Code Issues Releases Wiki Activity

Add error dialog

This commit is contained in:
bleakgrey 2018-04-29 19:04:26 +03:00
parent 8533d87e96
commit 132b81ff24
3 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Application.vala
View File

@ -14,7 +14,7 @@ namespace Tootle{
public class Application : Granite.Application {
public abstract signal void toast(string title);
public abstract signal void error(string error);
public abstract signal void error(string title, string text);
construct {
application_id = "com.github.bleakgrey.tootle";

27
src/MainWindow.vala
View File

@ -3,6 +3,8 @@ using Gtk;
public class Tootle.MainWindow: Gtk.Window {
Tootle.HeaderBar header;
Gtk.Overlay overlay;
Granite.Widgets.Toast toast;
public Stack primary_stack;
public Stack secondary_stack;
@ -16,18 +18,23 @@ public class Tootle.MainWindow: Gtk.Window {
provider.load_from_resource ("/com/github/bleakgrey/tootle/Application.css");
StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
overlay = new Gtk.Overlay ();
overlay.set_size_request (400, 500);
toast = new Granite.Widgets.Toast ("");
secondary_stack = new Stack();
secondary_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
secondary_stack.show ();
secondary_stack.set_size_request (400, 500);
primary_stack = new Stack();
primary_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
primary_stack.show ();
primary_stack.add_named (secondary_stack, "0");
primary_stack.set_size_request (400, 500);
header = new Tootle.HeaderBar ();
add (primary_stack);
//add (overlay);
//overlay.add_overlay (primary_stack);
//overlay.add_overlay (toast);
show_all ();
}
@ -41,6 +48,8 @@ public class Tootle.MainWindow: Gtk.Window {
window_position = WindowPosition.CENTER;
Tootle.accounts.switched.connect(on_account_switched);
Tootle.app.error.connect (on_error);
Tootle.app.toast.connect (on_toast);
}
private void on_account_switched(Account? account){
@ -89,5 +98,17 @@ public class Tootle.MainWindow: Gtk.Window {
primary_stack.set_visible_child_name (i.to_string ());
header.update (false);
}
private void on_toast (string msg){
toast.title = msg;
toast.send_notification ();
}
private void on_error (string title, string msg){
var message_dialog = new Granite.MessageDialog.with_image_from_icon_name (title, msg, "dialog-warning");
message_dialog.transient_for = this;
message_dialog.run ();
message_dialog.destroy ();
}
}

23
src/NetManager.vala
View File

@ -17,6 +17,10 @@ public class Tootle.NetManager : GLib.Object{
if(requests_processing <= 0)
finished ();
});
session.ssl_strict = true;
session.ssl_use_system_ca_file = true;
session.timeout = 15;
}
public NetManager(){
@ -31,7 +35,24 @@ public class Tootle.NetManager : GLib.Object{
if(token != "null")
msg.request_headers.append ("Authorization", "Bearer " + token);
session.queue_message (msg, cb);
session.queue_message (msg, (sess, mess) => {
switch (mess.tls_errors){
case GLib.TlsCertificateFlags.UNKNOWN_CA:
case GLib.TlsCertificateFlags.BAD_IDENTITY:
case GLib.TlsCertificateFlags.NOT_ACTIVATED:
case GLib.TlsCertificateFlags.EXPIRED:
case GLib.TlsCertificateFlags.REVOKED:
case GLib.TlsCertificateFlags.INSECURE:
case GLib.TlsCertificateFlags.GENERIC_ERROR:
var err = mess.tls_errors.to_string ();
warning ("TLS error: "+err);
Tootle.app.error (_("TLS Error"), _("Can't ensure secure connection: ")+err);
return;
default:
break;
}
cb (sess, mess);
});
return msg;
}