adium/adium

Make sure Adium automatically connects after the user has entered their code.
GoogleOAuth2
2015-04-01, Thijs Alkemade
1ff2b33ca0c1
Parents 3f702fda2d11
Children c4923ddd82bf
Make sure Adium automatically connects after the user has entered their code.
2 files changed, 6 insertions(+), 1 deletions(-)
  • +1 -0
    Plugins/Purple Service/AIPurpleGTalkAccount.h
  • +5 -1
    Plugins/Purple Service/AIPurpleGTalkAccount.m
    • --- a/Plugins/Purple Service/AIPurpleGTalkAccount.h Wed Apr 01 19:41:18 2015 +0200
    +++ b/Plugins/Purple Service/AIPurpleGTalkAccount.h Wed Apr 01 20:30:40 2015 +0200
    @@ -17,6 +17,7 @@
    #import "ESPurpleJabberAccount.h"
    #define KEY_GTALK_CODE @"GTalk:Code"
    +#define KEY_GTALK_UPGRADED_OAUTH2 @"GTalk:OAuth2 Upgraded"
    #define ADIUM_GTALK_CLIENT_ID @"853036734951.apps.googleusercontent.com"
    #define ADIUM_GTALK_SECRET @"TSXNUaq34k_0YU7DZT4HbmQd"
    --- a/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 19:41:18 2015 +0200
    +++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 20:30:40 2015 +0200
    @@ -135,7 +135,8 @@
    if (refresh_token && refresh_token.length) {
    [self useRefreshToken:refresh_token];
    } else {
    - if ([self preferenceForKey:KEY_GTALK_CODE group:GROUP_ACCOUNT_STATUS]) {
    + if ([self preferenceForKey:KEY_GTALK_CODE group:GROUP_ACCOUNT_STATUS] ||
    + [[self preferenceForKey:KEY_GTALK_UPGRADED_OAUTH2 group:GROUP_ACCOUNT_STATUS] boolValue]) {
    [self requestAccessToken];
    } else {
    [adium.interfaceController displayQuestion:AILocalizedString(@"Upgrade Google Talk account", nil)
    @@ -260,6 +261,9 @@
    return;
    }
    + [self setPreference:nil forKey:KEY_GTALK_CODE group:GROUP_ACCOUNT_STATUS];
    + [self setPreference:@(YES) forKey:KEY_GTALK_UPGRADED_OAUTH2 group:GROUP_ACCOUNT_STATUS];
    +
    if ([responseDict objectForKey:@"refresh_token"]) {
    [[AIKeychain defaultKeychain_error:NULL] deleteGenericPasswordForService:self.service.serviceID
    account:self.UID