mirror of
https://github.com/TakeV-Lambda/Tooth.git
synced 2024-09-27 21:23:15 +00:00
Refactor
This commit is contained in:
parent
fffde86a9b
commit
1c604d9221
|
@ -30,7 +30,7 @@ public class Tootle.AccountManager : Object{
|
|||
pars += "&client_id=" +client_id;
|
||||
|
||||
try {
|
||||
AppInfo.launch_default_for_uri (Tootle.settings.instance_url + "/oauth/authorize" + pars, null);
|
||||
AppInfo.launch_default_for_uri ("%s/oauth/authorize%s".printf (Tootle.settings.instance_url, pars), null);
|
||||
}
|
||||
catch (GLib.Error e){
|
||||
warning (e.message);
|
||||
|
@ -43,7 +43,7 @@ public class Tootle.AccountManager : Object{
|
|||
pars += "&website=https://github.com/bleakgrey/tootle";
|
||||
pars += "&scopes=read%20write%20follow";
|
||||
|
||||
var msg = new Soup.Message("POST", Tootle.settings.instance_url + "/api/v1/apps" + pars);
|
||||
var msg = new Soup.Message("POST", "%s/api/v1/apps%s".printf (Tootle.settings.instance_url, pars));
|
||||
Tootle.network.queue(msg, (sess, mess) => {
|
||||
try{
|
||||
var root = Tootle.network.parse (mess);
|
||||
|
@ -70,14 +70,14 @@ public class Tootle.AccountManager : Object{
|
|||
pars += "&grant_type=authorization_code";
|
||||
pars += "&code=" + code;
|
||||
|
||||
var msg = new Soup.Message("POST", Tootle.settings.instance_url + "/oauth/token" + pars);
|
||||
var msg = new Soup.Message("POST", "%s/oauth/token%s".printf (Tootle.settings.instance_url, pars));
|
||||
Tootle.network.queue(msg, (sess, mess) => {
|
||||
try{
|
||||
var root = Tootle.network.parse (mess);
|
||||
var access_token = root.get_string_member ("access_token");
|
||||
Tootle.settings.access_token = access_token;
|
||||
debug ("Got access token");
|
||||
update_current ();
|
||||
request_current ();
|
||||
}
|
||||
catch (GLib.Error e) {
|
||||
warning ("Can't get access token");
|
||||
|
@ -87,8 +87,8 @@ public class Tootle.AccountManager : Object{
|
|||
return msg;
|
||||
}
|
||||
|
||||
public Soup.Message update_current (){
|
||||
var msg = new Soup.Message("GET", Tootle.settings.instance_url + "/api/v1/accounts/verify_credentials");
|
||||
public Soup.Message request_current (){
|
||||
var msg = new Soup.Message("GET", "%s/api/v1/accounts/verify_credentials".printf (Tootle.settings.instance_url));
|
||||
Tootle.network.queue(msg, (sess, mess) => {
|
||||
try{
|
||||
var root = Tootle.network.parse (mess);
|
||||
|
@ -111,7 +111,7 @@ public class Tootle.AccountManager : Object{
|
|||
|
||||
public void init (){
|
||||
if(has_access_token())
|
||||
update_current ();
|
||||
request_current ();
|
||||
else
|
||||
switched (null);
|
||||
}
|
||||
|
|
|
@ -40,10 +40,8 @@ namespace Tootle{
|
|||
}
|
||||
|
||||
protected override void activate () {
|
||||
if (window != null) {
|
||||
if (window != null)
|
||||
window.present ();
|
||||
Tootle.accounts.init ();
|
||||
}
|
||||
else {
|
||||
window = new MainWindow (this);
|
||||
window.present ();
|
||||
|
|
|
@ -54,6 +54,7 @@ public class Tootle.MainWindow: Gtk.Window {
|
|||
Tootle.accounts.switched.connect(on_account_switched);
|
||||
Tootle.app.error.connect (on_error);
|
||||
Tootle.app.toast.connect (on_toast);
|
||||
Tootle.accounts.init ();
|
||||
}
|
||||
|
||||
private void on_account_switched(Account? account){
|
||||
|
|
|
@ -13,15 +13,14 @@ public class Tootle.NetManager : GLib.Object {
|
|||
|
||||
construct {
|
||||
session = new Soup.Session ();
|
||||
session.ssl_strict = true;
|
||||
session.ssl_use_system_ca_file = true;
|
||||
session.timeout = 20;
|
||||
session.request_unqueued.connect (() => {
|
||||
requests_processing--;
|
||||
if(requests_processing <= 0)
|
||||
finished ();
|
||||
});
|
||||
|
||||
session.ssl_strict = true;
|
||||
session.ssl_use_system_ca_file = true;
|
||||
session.timeout = 25;
|
||||
}
|
||||
|
||||
public NetManager() {
|
||||
|
|
Loading…
Reference in a new issue