From ad8c636dcc0bfc7cd88c98a246453a550a9b26d5 Mon Sep 17 00:00:00 2001
From: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Fri, 17 Jul 2015 22:16:43 +0200
Subject: [PATCH] Added browser launcher to hyperlink. Now opens the approval
 URL upon clicking the hyperlink.

---
 build.xml                                     |  2 +-
 .../GoogleContactsActivator.java              | 22 +++++++++++++++++++
 .../impl/googlecontacts/OAuth2TokenStore.java | 14 ++++++------
 .../googlecontacts/googlecontacts.manifest.mf |  1 +
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 7aecbfd31..90df5a102 100644
--- a/build.xml
+++ b/build.xml
@@ -1379,7 +1379,7 @@
     </target>
 
     <!--BUNDLE-GOOGLECONTACTS-->
-    <target name="bundle-googlecontacts" depends="bundle-httputil">
+    <target name="bundle-googlecontacts" depends="bundle-httputil,bundle-browserlauncher">
         <jar compress="false" destfile="${bundles.dest}/googlecontacts.jar"
             manifest="${src}/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts"
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
index 75c6f142c..a0ffdcdd7 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
@@ -8,6 +8,7 @@
 
 import java.util.*;
 
+import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.googlecontacts.*;
@@ -65,6 +66,11 @@ public class GoogleContactsActivator implements BundleActivator
      */
     private static GoogleContactsServiceImpl googleContactsService;
 
+    /**
+     * Browser launcher service.
+     */
+    private static BrowserLauncherService browserLauncherService;
+
     /**
      * List of contact source service registrations.
      */
@@ -143,6 +149,22 @@ public static ResourceManagementService getResourceManagementService()
         return resourceService;
     }
 
+    /**
+     * Return reference to a browser launcher service implementation.
+     *
+     * @return Returns the browser launcher service instance.
+     */
+    public static BrowserLauncherService getBrowserLauncherService()
+    {
+        if (browserLauncherService == null)
+        {
+            browserLauncherService =
+                ServiceUtils.getService(bundleContext,
+                    BrowserLauncherService.class);
+        }
+        return browserLauncherService;
+    }
+
     /**
      * Starts the Google Contacts service
      *
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java b/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java
index 3dfaaeae8..8f1a61980 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/OAuth2TokenStore.java
@@ -146,7 +146,7 @@ public class OAuth2TokenStore
      * @throws FailedAcquireCredentialException 
      * @throws MalformedURLException In case requesting authn token failed.
      */
-    public Credential get(final String identity)
+    public synchronized Credential get(final String identity)
         throws FailedAcquireCredentialException
     {
         if (this.store.get() == null)
@@ -239,7 +239,7 @@ private static void saveRefreshToken(final TokenData token,
      * @throws FailedTokenRefreshException In case of failed token refresh
      *             operation.
      */
-    public void refresh() throws IOException, FailedTokenRefreshException
+    public synchronized void refresh() throws IOException, FailedTokenRefreshException
     {
         final Credential credential = this.store.get();
         if (credential == null)
@@ -412,17 +412,17 @@ public OAuthApprovalDialog(final String identity)
         {
             this.setModal(true);
             this.label =
-                new SIPCommLinkButton(
-                    "Click here to approve. Make sure you log in as "
-                        + identity);
+                new SIPCommLinkButton("Approve Jitsi's access to " + identity);
             this.label.addActionListener(new ActionListener()
             {
 
                 @Override
                 public void actionPerformed(ActionEvent e)
                 {
-                    LOGGER.info("Request user for approval via web page: " + APPROVAL_URL);
-                    // FIXME open browser
+                    LOGGER.info("Request user for approval via web page: "
+                        + APPROVAL_URL);
+                    GoogleContactsActivator.getBrowserLauncherService()
+                        .openURL(APPROVAL_URL);
                 }
             });
             this.setLayout(new BorderLayout());
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
index 4fd9387a7..a385df764 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -15,6 +15,7 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.util,
  net.java.sip.communicator.plugin.desktoputil,
+ net.java.sip.communicator.service.browserlauncher,
  org.xml.sax,
  org.xml.sax.helpers,
  javax.xml.parsers,