From 9640bbb91dd0dc2e23283972717632e89a9e1632 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Wed, 22 Jul 2015 23:11:31 +0200 Subject: [PATCH] Added dialog title, fine tuned instructions. --- resources/languages/resources.properties | 3 ++- .../communicator/impl/googlecontacts/OAuth2TokenStore.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index 6df135c7e..9641adafa 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -929,7 +929,8 @@ impl.googlecontacts.USERNAME=Account name impl.googlecontacts.PASSWORD=Password impl.googlecontacts.PREFIX=Phone prefix impl.googlecontacts.WRONG_CREDENTIALS=Wrong credentials for Google account {0} -impl.googlecontacts.INSTRUCTIONS=Instructions:

Click the link below to approve Jitsi's access to the account. By clicking the link, a web page will open in your browser. Log in with the requested account and approve access. Once approved, Google will show you a code. Copy this code into the input box below and click 'Save'.

This is a one-time operation. Authorization tokens will be stored for future use.

+impl.googlecontacts.OAUTH_DIALOG_TITLE=Google Contacts authorization +impl.googlecontacts.INSTRUCTIONS=

Click the link below to approve Google Contacts plugin to access the account. By clicking the link, a web page will open in your browser. Log in with the requested account and approve access. Once approved, Google will show you a code. Copy this code into the text field below and click 'Save'.

This is a one-time operation. Authorization tokens will be stored for future use.

impl.googlecontacts.CODE=Code: impl.googlecontacts.HYPERLINK_TEXT=Click here to approve access to {0} diff --git a/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java b/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java index 4776e219b..23c4e0c5d 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java @@ -445,6 +445,11 @@ private static class OAuthApprovalDialog private UserResponseType response = UserResponseType.CANCELLED; + /** + * Construct and initialize the OAuth 2 approval dialog. + * + * @param identity The identity for which approval is requested. + */ public OAuthApprovalDialog(final String identity) { final ResourceManagementService resources = @@ -453,6 +458,8 @@ public OAuthApprovalDialog(final String identity) resources.getI18NString("impl.googlecontacts.INSTRUCTIONS"); // configure dialog + this.setTitle(resources + .getI18NString("impl.googlecontacts.OAUTH_DIALOG_TITLE")); this.setMinimumSize(new Dimension(20, 20)); this.setPreferredSize(new Dimension(650, 200)); this.setBounds(10, 10, this.getWidth() - 20, this.getHeight() - 20);