();
+
+ /**
+ * Login.
+ */
+ private final String login;
+
+ /**
+ * Password.
+ */
+ private final String password;
+
+ /**
+ * Google Contacts connection.
+ */
+ private GoogleContactsConnection cnx = null;
+
+ /**
+ * Constructor.
+ *
+ * @param login login
+ * @param password password
+ */
+ public GoogleContactsSourceService(String login, String password)
+ {
+ super();
+ this.login = login;
+ this.password = password;
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param cnx connection
+ */
+ public GoogleContactsSourceService(GoogleContactsConnection cnx)
+ {
+ super();
+ this.cnx = cnx;
+ this.login = cnx.getLogin();
+ this.password = cnx.getPassword();
+ }
+
+ /**
+ * Queries this search source for the given searchPattern.
+ *
+ * @param queryPattern the pattern to search for
+ * @return the created query
+ */
+ public ContactQuery queryContactSource(Pattern queryPattern)
+ {
+ return queryContactSource(queryPattern,
+ GoogleContactsQuery.GOOGLECONTACTS_MAX_RESULTS);
+ }
+
+ /**
+ * Queries this search source for the given searchPattern.
+ *
+ * @param queryPattern the pattern to search for
+ * @param count maximum number of contact returned
+ * @return the created query
+ */
+ public ContactQuery queryContactSource(Pattern queryPattern, int count)
+ {
+ GoogleContactsQuery query = new GoogleContactsQuery(this, queryPattern,
+ count);
+
+ synchronized (queries)
+ {
+ queries.add(query);
+ }
+
+ boolean hasStarted = false;
+
+ try
+ {
+ query.start();
+ hasStarted = true;
+ }
+ finally
+ {
+ if (!hasStarted)
+ {
+ synchronized (queries)
+ {
+ if (queries.remove(query))
+ queries.notify();
+ }
+ }
+ }
+
+ return query;
+ }
+
+ /**
+ * Returns the Google Contacts connection.
+ *
+ * @return Google Contacts connection
+ */
+ public GoogleContactsConnectionImpl getConnection()
+ {
+ int s = login.indexOf('@');
+ boolean isGoogleAppsOrGmail = false;
+
+ if(s == -1)
+ {
+ return null;
+ }
+
+ String domain = login.substring((s + 1));
+
+ try
+ {
+ SRVRecord srvRecords[] =
+ NetworkUtils.getSRVRecords("xmpp-client", "tcp", domain);
+
+ if(srvRecords == null)
+ {
+ return null;
+ }
+
+ for(SRVRecord srv : srvRecords)
+ {
+ if(srv.getTarget().endsWith("google.com") ||
+ srv.getTarget().endsWith("google.com."))
+ {
+ isGoogleAppsOrGmail = true;
+ break;
+ }
+ }
+
+ if(isGoogleAppsOrGmail)
+ {
+ if(cnx == null)
+ {
+ cnx = new GoogleContactsConnectionImpl(login, password);
+ }
+ }
+ else
+ {
+ cnx = null;
+ }
+ }
+ catch(Exception e)
+ {
+ logger.info("GoogleContacts connection error", e);
+ return null;
+ }
+
+ return (GoogleContactsConnectionImpl)cnx;
+ }
+
+ /**
+ * Returns a user-friendly string that identifies this contact source.
+ * @return the display name of this contact source
+ */
+ public String getDisplayName()
+ {
+ return login;
+ }
+
+ /**
+ * Returns the identifier of this contact source. Some of the common
+ * identifiers are defined here (For example the CALL_HISTORY identifier
+ * should be returned by all call history implementations of this interface)
+ * @return the identifier of this contact source
+ */
+ public String getIdentifier()
+ {
+ return "GoogleContacts";
+ }
+
+ /**
+ * Queries this search source for the given queryString.
+ * @param query the string to search for
+ * @return the created query
+ */
+ public ContactQuery queryContactSource(String query)
+ {
+ return queryContactSource(
+ Pattern.compile(query),
+ GoogleContactsQuery.GOOGLECONTACTS_MAX_RESULTS);
+ }
+
+ /**
+ * Queries this search source for the given queryString.
+ *
+ * @param query the string to search for
+ * @param contactCount the maximum count of result contacts
+ * @return the created query
+ */
+ public ContactQuery queryContactSource(String query, int contactCount)
+ {
+ return queryContactSource(Pattern.compile(query), contactCount);
+ }
+
+ /**
+ * Stops this ContactSourceService implementation and prepares it
+ * for garbage collection.
+ *
+ * @see AsyncContactSourceService#stop()
+ */
+ public void stop()
+ {
+ boolean interrupted = false;
+
+ synchronized (queries)
+ {
+ while (!queries.isEmpty())
+ {
+ queries.get(0).cancel();
+ try
+ {
+ queries.wait();
+ }
+ catch (InterruptedException iex)
+ {
+ interrupted = true;
+ }
+ }
+ }
+ if (interrupted)
+ Thread.currentThread().interrupt();
+ }
+
+ /**
+ * Notifies this GoogleContactsSourceService that a specific
+ * GoogleContactsQuery has stopped.
+ *
+ * @param query the GoogleContactsQuery which has stopped
+ */
+ void stopped(GoogleContactsQuery query)
+ {
+ synchronized (queries)
+ {
+ if (queries.remove(query))
+ queries.notify();
+ }
+ }
+}
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java
new file mode 100644
index 000000000..8cc961ab4
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/AccountSettingsForm.java
@@ -0,0 +1,282 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.googlecontacts.configform;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.impl.googlecontacts.*;
+import net.java.sip.communicator.service.googlecontacts.*;
+
+/**
+ * The page with hostname/port/encryption fields
+ *
+ * @author Sebastien Mazy
+ * @author Sebastien Vincent
+ */
+public class AccountSettingsForm
+ extends SIPCommDialog
+ implements ActionListener
+{
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * component holding the name
+ */
+ private JTextField nameField;
+
+ /**
+ * the component holding the password
+ */
+ private JPasswordField passwordField;
+
+ /**
+ * Save button.
+ */
+ private JButton saveBtn = new JButton(
+ Resources.getString("impl.googlecontacts.SAVE"));
+
+ /**
+ * Cancel button.
+ */
+ private JButton cancelBtn = new JButton(
+ Resources.getString("impl.googlecontacts.CANCEL"));
+
+ /**
+ * Return code.
+ */
+ private int retCode = 0;
+
+ /**
+ * The Google Contacts connection.
+ */
+ private GoogleContactsConnection cnx = null;
+
+ /**
+ * Constructor.
+ */
+ public AccountSettingsForm()
+ {
+ this.setTitle(Resources.getString(
+ "impl.googlecontacts.CONFIG_FORM_TITLE"));
+ getContentPane().add(getContentPanel());
+ setMinimumSize(new Dimension(400, 200));
+ setSize(new Dimension(400, 400));
+ setPreferredSize(new Dimension(400, 200));
+ pack();
+ }
+
+ /**
+ * the panel to display in the card layout of the wizard
+ *
+ * @return this page's panel
+ */
+ public JPanel getContentPanel()
+ {
+ JPanel contentPanel = new TransparentPanel(new BorderLayout());
+ JPanel mainPanel = new TransparentPanel();
+ JPanel basePanel = new TransparentPanel(new GridBagLayout());
+ JPanel btnPanel = new TransparentPanel(new FlowLayout(
+ FlowLayout.RIGHT));
+ BoxLayout boxLayout = new BoxLayout(mainPanel, BoxLayout.Y_AXIS);
+
+ GridBagConstraints c = new GridBagConstraints();
+
+ /* name text field */
+ JLabel nameLabel = new JLabel(
+ Resources.getString("impl.googlecontacts.ACCOUNT_NAME"));
+ this.nameField = new JTextField();
+ nameLabel.setLabelFor(nameField);
+ c.gridx = 0;
+ c.gridy = 0;
+ c.weightx = 0;
+ c.weighty = 0;
+ c.gridwidth = 1;
+ c.insets = new Insets(2, 50, 0, 5);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.LINE_START;
+ basePanel.add(nameLabel, c);
+ c.gridx = 1;
+ c.gridy = 0;
+ c.weightx = 1;
+ c.weighty = 0;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.insets = new Insets(2, 5, 0, 50);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.LINE_END;
+ basePanel.add(nameField, c);
+ JLabel nameExampleLabel = new JLabel("myaccount@gmail.com");
+ nameExampleLabel.setForeground(Color.GRAY);
+ nameExampleLabel.setFont(nameExampleLabel.getFont().deriveFont(8));
+ c.gridx = 1;
+ c.gridy = 1;
+ c.weightx = 1;
+ c.weighty = 0;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.insets = new Insets(0, 13, 2, 0);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.LINE_START;
+ basePanel.add(nameExampleLabel, c);
+
+ JLabel passwordLabel = new JLabel(
+ Resources.getString("impl.googlecontacts.PASSWORD"));
+ this.passwordField = new JPasswordField();
+ nameLabel.setLabelFor(passwordField);
+ c.gridx = 0;
+ c.gridy = 2;
+ c.weightx = 0;
+ c.weighty = 0;
+ c.gridwidth = 1;
+ c.insets = new Insets(2, 50, 0, 5);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.LINE_START;
+ basePanel.add(passwordLabel, c);
+ c.gridx = 1;
+ c.gridy = 2;
+ c.weightx = 1;
+ c.weighty = 0;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.insets = new Insets(2, 5, 0, 50);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.LINE_END;
+ basePanel.add(passwordField, c);
+
+ mainPanel.setLayout(boxLayout);
+ mainPanel.add(basePanel);
+
+ /* listeners */
+ this.nameField.addActionListener(this);
+ this.passwordField.addActionListener(this);
+ this.saveBtn.addActionListener(this);
+ this.cancelBtn.addActionListener(this);
+
+ btnPanel.add(saveBtn);
+ btnPanel.add(cancelBtn);
+
+ contentPanel.add(mainPanel, BorderLayout.CENTER);
+ contentPanel.add(btnPanel, BorderLayout.SOUTH);
+
+ return contentPanel;
+ }
+
+ /**
+ * Loads the information.
+ *
+ * @param cnx connection
+ */
+ public void loadData(GoogleContactsConnection cnx)
+ {
+ if(cnx != null)
+ {
+ this.nameField.setText(cnx.getLogin());
+ this.passwordField.setText(cnx.getPassword());
+ }
+ else
+ {
+ this.nameField.setText("");
+ this.passwordField.setText("");
+ }
+ }
+
+ /**
+ * Implementation of actionPerformed.
+ *
+ * @param e the ActionEvent triggered
+ */
+ public void actionPerformed(ActionEvent e)
+ {
+ Object src = e.getSource();
+
+ if(src == saveBtn)
+ {
+ String login = nameField.getText();
+ String password = new String(passwordField.getPassword());
+
+ cnx = GoogleContactsActivator.getGoogleContactsService().
+ getConnection(login, password);
+
+ if(cnx == null)
+ {
+ JOptionPane.showMessageDialog(
+ this,
+ Resources.getString(
+ "impl.googlecontacts.WRONG_CREDENTIALS",
+ new String[]{login}),
+ Resources.getString(
+ "impl.googlecontacts.WRONG_CREDENTIALS",
+ new String[]{login}),
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+
+ retCode = 1;
+ dispose();
+ }
+ else if(src == cancelBtn)
+ {
+ retCode = 0;
+ dispose();
+ }
+ }
+
+ /**
+ * Get the connection.
+ *
+ * @return GoogleContactsConnection
+ */
+ public GoogleContactsConnection getConnection()
+ {
+ return cnx;
+ }
+
+ /**
+ * All functions implemented in this method will be invoked when user
+ * presses the Escape key.
+ *
+ * @param escaped true if this dialog has been closed by pressing
+ * the Esc key; otherwise, false
+ */
+ protected void close(boolean escaped)
+ {
+ cancelBtn.doClick();
+ }
+
+ /**
+ * Show the dialog and returns if the user has modified something (create
+ * or modify entry).
+ *
+ * @return true if the user has modified something (create
+ * or modify entry), false otherwise.
+ */
+ public int showDialog()
+ {
+ retCode = 0;
+
+ cnx = null;
+ setVisible(true);
+
+ // this will block until user click on save/cancel/press escape/close
+ // the window
+ setVisible(false);
+ return retCode;
+ }
+
+ /**
+ * Set the name field enable or not
+ *
+ * @param enable parameter to set
+ */
+ public void setNameFieldEnabled(boolean enable)
+ {
+ this.nameField.setEnabled(enable);
+ }
+}
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java
new file mode 100644
index 000000000..60ad2701c
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsConfigForm.java
@@ -0,0 +1,394 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.googlecontacts.configform;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+import javax.swing.event.*;
+
+import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.impl.googlecontacts.*;
+import net.java.sip.communicator.service.configuration.*;
+import net.java.sip.communicator.service.credentialsstorage.*;
+import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.googlecontacts.*;
+
+/**
+ * This ConfigurationForm shows the list of Google Contacts account and allow
+ * users to manage them.
+ *
+ * @author Sebastien Mazy
+ * @author Sebastien Vincent
+ */
+public class GoogleContactsConfigForm
+ extends TransparentPanel
+ implements ConfigurationForm,
+ ActionListener,
+ ListSelectionListener
+
+{
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * The logger for this class.
+ */
+ private static Logger logger = Logger.getLogger(
+ GoogleContactsConfigForm.class);
+
+ /**
+ * Opens the new directory registration wizard
+ */
+ private JButton newButton = new JButton("+");
+
+ /**
+ * Opens a directory modification dialog
+ */
+ private JButton modifyButton = new JButton(
+ Resources.getString("impl.googlecontacts.EDIT"));
+
+ /**
+ * Pops a directory deletion confirmation dialog
+ */
+ private JButton removeButton = new JButton("-");
+
+ /**
+ * Displays the registered Google Contacts account.
+ */
+ private JTable accountTable = new JTable();
+
+ /**
+ * Contains the new/modify/remove buttons
+ */
+ private TransparentPanel buttonsPanel
+ = new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
+
+ /**
+ * Contains the directoryTable
+ */
+ private JScrollPane scrollPane = new JScrollPane();
+
+ /**
+ * Contains the buttonsPanel,
+ */
+ private JPanel rightPanel = new TransparentPanel(new BorderLayout());
+
+ /**
+ * Contains listPanel and rightPanel
+ */
+ private JPanel mainPanel = this;
+
+ /**
+ * Model for the directoryTable
+ */
+ private GoogleContactsTableModel tableModel =
+ new GoogleContactsTableModel();
+
+ /**
+ * Settings form.
+ */
+ private final AccountSettingsForm settingsForm =
+ new AccountSettingsForm();
+
+ /**
+ * Path where to store the account settings
+ */
+ private final static String CONFIGURATION_PATH =
+ "net.java.sip.communicator.impl.googlecontacts";
+
+ /**
+ * Constructor
+ */
+ public GoogleContactsConfigForm()
+ {
+ super(new BorderLayout());
+ logger.trace("GoogleContacts configuration form.");
+ initComponents();
+ }
+
+ /**
+ * Remove a connection.
+ *
+ * @param cnx connection to save
+ */
+ private void removeConfig(GoogleContactsConnection cnx)
+ {
+ ConfigurationService configService =
+ GoogleContactsActivator.getConfigService();
+ configService.removeProperty(CONFIGURATION_PATH + ".acc" +
+ Math.abs(cnx.getLogin().hashCode()));
+ }
+
+ /**
+ * Save configuration.
+ *
+ * @param cnx connection to save
+ */
+ private void saveConfig(GoogleContactsConnection cnx)
+ {
+ ConfigurationService configService =
+ GoogleContactsActivator.getConfigService();
+ CredentialsStorageService credentialsService =
+ GoogleContactsActivator.getCredentialsService();
+ String login = cnx.getLogin();
+ String path = CONFIGURATION_PATH + ".acc" + Math.abs(login.hashCode());
+
+ configService.setProperty(
+ path,
+ login);
+ configService.setProperty(
+ path + ".account",
+ login);
+ configService.setProperty(
+ path + ".enabled",
+ ((GoogleContactsConnectionImpl)cnx).isEnabled());
+ credentialsService.storePassword(path, cnx.getPassword());
+ }
+
+ /**
+ * Inits the swing components
+ */
+ private void initComponents()
+ {
+ modifyButton.setEnabled(false);
+ removeButton.setEnabled(false);
+
+ newButton.setSize(newButton.getMinimumSize());
+ modifyButton.setSize(modifyButton.getMinimumSize());
+ removeButton.setSize(removeButton.getMinimumSize());
+
+ accountTable.setRowHeight(22);
+ accountTable.setSelectionMode(
+ ListSelectionModel.SINGLE_SELECTION);
+
+ accountTable.setShowHorizontalLines(false);
+ accountTable.setShowVerticalLines(false);
+ accountTable.setModel(tableModel);
+ accountTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+ accountTable.addMouseListener(new MouseAdapter()
+ {
+ @Override
+ public void mouseClicked(MouseEvent e)
+ {
+ if(e.getClickCount() > 1)
+ {
+ }
+ }
+ });
+
+ settingsForm.setModal(true);
+
+ /* consistency with the accounts config form */
+ rightPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
+ rightPanel.add(buttonsPanel, BorderLayout.NORTH);
+
+ scrollPane.getViewport().add(accountTable);
+ mainPanel.add(scrollPane, BorderLayout.CENTER);
+ mainPanel.add(rightPanel, BorderLayout.SOUTH);
+
+ mainPanel.setPreferredSize(new Dimension(500, 400));
+
+ buttonsPanel.add(newButton);
+ buttonsPanel.add(removeButton);
+ buttonsPanel.add(modifyButton);
+
+ accountTable.getSelectionModel().addListSelectionListener(this);
+
+ newButton.setActionCommand("new");
+ newButton.addActionListener(this);
+ modifyButton.addActionListener(this);
+ modifyButton.setActionCommand("modify");
+ removeButton.addActionListener(this);
+ removeButton.setActionCommand("remove");
+ }
+
+ /**
+ * @see net.java.sip.communicator.service.gui.ConfigurationForm#getTitle
+ */
+ public String getTitle()
+ {
+ return Resources.getString("impl.googlecontacts.CONFIG_FORM_TITLE");
+ }
+
+ /**
+ * @see net.java.sip.communicator.service.gui.ConfigurationForm#getIcon
+ */
+ public byte[] getIcon()
+ {
+ return Resources.getImageInBytes(
+ "GOOGLECONTACTS_CONFIG_FORM_ICON");
+ }
+
+ /**
+ * @see net.java.sip.communicator.service.gui.ConfigurationForm#getForm
+ */
+ public Object getForm()
+ {
+ return this;
+ }
+
+ /**
+ * Required by ConfirgurationForm interface
+ *
+ * Returns the index of this configuration form in the configuration window.
+ * This index is used to put configuration forms in the desired order.
+ *
+ * 0 is the first position
+ * -1 means that the form will be put at the end
+ *
+ * @return the index of this configuration form in the configuration window.
+ *
+ * @see net.java.sip.communicator.service.gui.ConfigurationForm#getIndex
+ */
+ public int getIndex()
+ {
+ return -1;
+ }
+
+ /**
+ * Processes buttons events (new, modify, remove)
+ *
+ * @see java.awt.event.ActionListener#actionPerformed
+ */
+ public void actionPerformed(ActionEvent e)
+ {
+ int row = accountTable.getSelectedRow();
+
+ if (e.getActionCommand().equals("new"))
+ {
+ settingsForm.setNameFieldEnabled(true);
+ settingsForm.loadData(null);
+ int ret = settingsForm.showDialog();
+
+ if(ret == 1)
+ {
+ GoogleContactsConnection cnx = settingsForm.getConnection();
+ tableModel.addAccount(cnx, true);
+ new RefreshContactSourceThread(null, cnx).start();
+ saveConfig(cnx);
+ refresh();
+ }
+ }
+
+ if (e.getActionCommand().equals("modify") && row != -1)
+ {
+ settingsForm.setNameFieldEnabled(false);
+ GoogleContactsConnection cnx = tableModel.getAccountAt(row);
+ settingsForm.loadData(cnx);
+
+ int ret = settingsForm.showDialog();
+
+ if(ret == 1)
+ {
+ refresh();
+ }
+ }
+
+ if (e.getActionCommand().equals("remove") && row != -1)
+ {
+ GoogleContactsConnection cnx = tableModel.getAccountAt(row);
+ tableModel.removeAccount(cnx.getLogin());
+ removeConfig(cnx);
+ new RefreshContactSourceThread(cnx, null).start();
+ refresh();
+ }
+ }
+
+ /**
+ * Required by ListSelectionListener. Enables the "modify"
+ * button when a server is selected in the table
+ *
+ * @param e event triggered
+ */
+ public void valueChanged(ListSelectionEvent e)
+ {
+ if(accountTable.getSelectedRow() == -1)
+ {
+ modifyButton.setEnabled(false);
+ removeButton.setEnabled(false);
+ return;
+ }
+ else if(!e.getValueIsAdjusting())
+ {
+ modifyButton.setEnabled(true);
+ removeButton.setEnabled(true);
+ saveConfig(tableModel.getAccountAt(accountTable.getSelectedRow()));
+ }
+ }
+
+ /**
+ * refreshes the table display
+ */
+ private void refresh()
+ {
+ tableModel.fireTableStructureChanged();
+ }
+
+ /**
+ * Indicates if this is an advanced configuration form.
+ * @return true if this is an advanced configuration form,
+ * otherwise it returns false
+ */
+ public boolean isAdvanced()
+ {
+ return true;
+ }
+
+ /**
+ * Thread that will perform refresh of contact sources.
+ */
+ public static class RefreshContactSourceThread
+ extends Thread
+ {
+ /**
+ * Old connection.
+ */
+ private GoogleContactsConnection oldCnx = null;
+
+ /**
+ * New connection.
+ */
+ private GoogleContactsConnection newCnx = null;
+
+ /**
+ * Constructor.
+ *
+ * @param oldCnx old connection.
+ * @param newCnx new connection.
+ */
+ RefreshContactSourceThread(GoogleContactsConnection oldCnx,
+ GoogleContactsConnection newCnx)
+ {
+ this.oldCnx = oldCnx;
+ this.newCnx = newCnx;
+ }
+
+ /**
+ * Thread entry point.
+ */
+ public void run()
+ {
+ if(oldCnx != null)
+ {
+ GoogleContactsActivator.getGoogleContactsService().
+ removeContactSource(oldCnx);
+ }
+
+ if(newCnx != null)
+ {
+ GoogleContactsActivator.getGoogleContactsService().
+ addContactSource(newCnx);
+ }
+ }
+ }
+}
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java
new file mode 100644
index 000000000..bc51bbc0f
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/GoogleContactsTableModel.java
@@ -0,0 +1,217 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.googlecontacts.configform;
+
+import java.util.*;
+
+import javax.swing.table.*;
+
+import net.java.sip.communicator.service.googlecontacts.*;
+import net.java.sip.communicator.impl.googlecontacts.*;
+
+
+/**
+ * A table model suitable for the directories list in
+ * the configuration form. Takes its data in an LdapDirectorySet.
+ *
+ * @author Sebastien Mazy
+ * @author Sebastien Vincent
+ */
+public class GoogleContactsTableModel
+ extends AbstractTableModel
+{
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Google Contacts service reference.
+ */
+ private final GoogleContactsServiceImpl googleService =
+ GoogleContactsActivator.getGoogleContactsService();
+
+ /**
+ * Add account from table.
+ *
+ * @param cnx account
+ * @param enabled if the account should be enabled
+ */
+ public void addAccount(GoogleContactsConnection cnx, boolean enabled)
+ {
+ if(cnx != null)
+ {
+ ((GoogleContactsConnectionImpl)cnx).setEnabled(enabled);
+ googleService.getAccounts().add((GoogleContactsConnectionImpl)cnx);
+ }
+ }
+
+ /**
+ * Remove account from table.
+ *
+ * @param login account login to remove
+ */
+ public void removeAccount(String login)
+ {
+ Iterator it =
+ googleService.getAccounts().iterator();
+
+ while(it.hasNext())
+ {
+ GoogleContactsConnection cnx = it.next();
+ if(cnx.getLogin().equals(login))
+ {
+ it.remove();
+ return;
+ }
+ }
+ }
+
+ /**
+ * Returns the title for this column
+ *
+ * @param column the column
+ *
+ * @return the title for this column
+ *
+ * @see javax.swing.table.AbstractTableModel#getColumnName
+ */
+ public String getColumnName(int column)
+ {
+ switch(column)
+ {
+ case 0:
+ return Resources.getString("impl.googlecontacts.ENABLED");
+ case 1:
+ return Resources.getString("impl.googlecontacts.ACCOUNT_NAME");
+ default:
+ throw new IllegalArgumentException("column not found");
+ }
+ }
+
+ /**
+ * Returns the number of rows in the table
+ *
+ * @return the number of rows in the table
+ * @see javax.swing.table.AbstractTableModel#getRowCount
+ */
+ public int getRowCount()
+ {
+ return googleService.getAccounts().size();
+ }
+
+ /**
+ * Returns the number of column in the table
+ *
+ * @return the number of columns in the table
+ *
+ * @see javax.swing.table.AbstractTableModel#getColumnCount
+ */
+ public int getColumnCount()
+ {
+ // 2 columns: "enable" and "account name"
+ return 2;
+ }
+
+ /**
+ * Returns the text for the given cell of the table
+ *
+ * @param row cell row
+ * @param column cell column
+ *
+ * @see javax.swing.table.AbstractTableModel#getValueAt
+ */
+ public Object getValueAt(int row, int column)
+ {
+ switch(column)
+ {
+ case 0:
+ return new Boolean(getAccountAt(row).isEnabled());
+ case 1:
+ return getAccountAt(row).getLogin();
+ default:
+ throw new IllegalArgumentException("column not found");
+ }
+ }
+
+ /**
+ * Returns the account credentials at the row 'row'
+ *
+ * @param row the row
+ *
+ * @return the login/password for the account
+ */
+ public GoogleContactsConnectionImpl getAccountAt(int row)
+ {
+ if(row < 0 || row >= googleService.getAccounts().size())
+ {
+ throw new IllegalArgumentException("row not found");
+ }
+ else
+ {
+ return googleService.getAccounts().get(row);
+ }
+ }
+
+ /**
+ * Returns whether a cell is editable. Only "enable" column (checkboxes)
+ * is editable
+ *
+ * @param row row of the cell
+ * @param col column of the cell
+ *
+ * @return whether the cell is editable
+ */
+ public boolean isCellEditable(int row, int col)
+ {
+ if(col == 0)
+ return true;
+ else
+ return false;
+ }
+
+ /**
+ * Overrides a method that always returned Object.class
+ * Now it will return Boolean.class for the first method,
+ * letting the DefaultTableCellRenderer create checkboxes.
+ *
+ * @param columnIndex index of the column
+ * @return Column class
+ */
+ public Class getColumnClass(int columnIndex)
+ {
+ return getValueAt(0, columnIndex).getClass();
+ }
+
+ /**
+ * Sets a value in an editable cell, that is to say
+ * an enable/disable chekbox in colum 0
+ */
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex)
+ {
+ if(columnIndex != 0)
+ throw new IllegalArgumentException("non editable column!");
+
+ GoogleContactsConfigForm.RefreshContactSourceThread th = null;
+ GoogleContactsConnectionImpl cnx = getAccountAt(rowIndex);
+
+ if(cnx.isEnabled())
+ {
+ th = new GoogleContactsConfigForm.RefreshContactSourceThread(cnx,
+ null);
+ }
+ else
+ {
+ th = new GoogleContactsConfigForm.RefreshContactSourceThread(null,
+ cnx);
+ }
+
+ cnx.setEnabled(!cnx.isEnabled());
+
+ th.start();
+ }
+}
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/configform/Resources.java b/src/net/java/sip/communicator/impl/googlecontacts/configform/Resources.java
new file mode 100644
index 000000000..2e01fc4cb
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/googlecontacts/configform/Resources.java
@@ -0,0 +1,68 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.googlecontacts.configform;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.impl.googlecontacts.*;
+
+/**
+ * The Resources class manages the access to the internationalization
+ * properties files and the image resources used in this plugin.
+ *
+ * @author Yana Stamcheva
+ */
+public class Resources
+{
+ /**
+ * Returns an internationalized string corresponding to the given key.
+ *
+ * @param key The key of the string.
+ * @return An internationalized string corresponding to the given key.
+ */
+ public static String getString(String key)
+ {
+ return GoogleContactsActivator.getResourceManagementService()
+ .getI18NString(key);
+ }
+
+ /**
+ * Returns an internationalized string corresponding to the given key.
+ *
+ * @param key The key of the string.
+ * @param params additionnal parameters
+ * @return An internationalized string corresponding to the given key.
+ */
+ public static String getString(String key, String[] params)
+ {
+ return GoogleContactsActivator.getResourceManagementService()
+ .getI18NString(key, params);
+ }
+
+ /**
+ * Loads an image from a given image identifier.
+ *
+ * @param imageID The identifier of the image.
+ * @return The image for the given identifier.
+ */
+ public static ImageIcon getImage(String imageID)
+ {
+ return GoogleContactsActivator.getResourceManagementService().getImage(imageID);
+ }
+
+ /**
+ * Loads an image from a given image identifier.
+ *
+ * @param imageID The identifier of the image.
+ * @return The image for the given identifier.
+ */
+ public static byte[] getImageInBytes(String imageID)
+ {
+ return GoogleContactsActivator.getResourceManagementService().
+ getImageInBytes(imageID);
+ }
+}
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
new file mode 100644
index 000000000..04c9fbaf2
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -0,0 +1,26 @@
+Bundle-Activator: net.java.sip.communicator.impl.googlecontacts.GoogleContactsActivator
+Bundle-Name: Google Contacts Service Implementation
+Bundle-Description: A bundle that offers access to Google Contacts
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Import-Package: org.osgi.framework,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.credentialsstorage,
+ net.java.sip.communicator.service.contactsource,
+ net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.resources,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.util.swing,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ javax.xml.parsers,
+ javax.xml,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.event,
+ javax.swing.table,
+ javax.swing.tree,
+ javax.swing.text,
+Export-Package: net.java.sip.communicator.service.googlecontacts
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/ldap/LdapActivator.java b/src/net/java/sip/communicator/impl/ldap/LdapActivator.java
index 12428a01a..d3b435519 100644
--- a/src/net/java/sip/communicator/impl/ldap/LdapActivator.java
+++ b/src/net/java/sip/communicator/impl/ldap/LdapActivator.java
@@ -44,7 +44,7 @@ public static LdapService getLdapService()
* Starts the LDAP service
*
* @param bundleContext BundleContext
- * @throws Exception
+ * @throws Exception if something goes wrong when starting service
*/
public void start(BundleContext bundleContext)
throws Exception
@@ -72,6 +72,9 @@ public void start(BundleContext bundleContext)
/**
* Stops the LDAP service
+ *
+ * @param bundleContext BundleContext
+ * @throws Exception if something goes wrong when stopping service
*/
public void stop(BundleContext bundleContext)
throws Exception
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java
index 9cb4c1ede..71bf547c9 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java
@@ -1119,7 +1119,7 @@ public ScreenDevice getScreenForPoint(Point p)
return null;
}
-
+
/**
* Get origin for desktop streaming device.
*
@@ -1130,7 +1130,7 @@ public Point getOriginForDesktopStreamingDevice(MediaDevice mediaDevice)
MediaDeviceImpl dev = (MediaDeviceImpl)mediaDevice;
CaptureDeviceInfo devInfo = dev.getCaptureDeviceInfo();
MediaLocator locator = devInfo.getLocator();
-
+
if(!locator.getProtocol().
equals(ImageStreamingAuto.LOCATOR_PROTOCOL))
{
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JabberActivator.java b/src/net/java/sip/communicator/impl/protocol/jabber/JabberActivator.java
index 552c8be32..c40c1ce0c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JabberActivator.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JabberActivator.java
@@ -16,8 +16,10 @@
import net.java.sip.communicator.service.packetlogging.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.service.googlecontacts.*;
import net.java.sip.communicator.util.*;
+import org.jivesoftware.smack.util.StringUtils;
import org.osgi.framework.*;
/**
@@ -84,7 +86,17 @@ public class JabberActivator
*/
private static HIDService hidService = null;
- private static PacketLoggingService packetLoggingService = null;
+ /**
+ * A reference to the currently valid PacketLoggingService
+ * instance.
+ */
+ private static PacketLoggingService packetLoggingService = null;
+
+ /**
+ * A reference to the currently valid GoogleContactsService
+ * instance.
+ */
+ private static GoogleContactsService googleService = null;
/**
* Called when this bundle is started so the Framework can perform the
@@ -323,4 +335,24 @@ public static PacketLoggingService getPacketLogging()
}
return packetLoggingService;
}
+
+ /**
+ * Returns a reference to the GoogleContactsService implementation
+ * currently registered in the bundle context or null if no such
+ * implementation was found.
+ *
+ * @return a reference to a GoogleContactsService implementation
+ * currently registered in the bundle context or null if no such
+ * implementation was found.
+ */
+ public static GoogleContactsService getGoogleService()
+ {
+ if (googleService == null)
+ {
+ googleService
+ = ServiceUtils.getService(
+ bundleContext, GoogleContactsService.class);
+ }
+ return googleService;
+ }
}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
index adf88e042..ab74f5e4f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
@@ -158,7 +158,10 @@ public void modifyAccount( ProtocolProviderService protocolProvider,
try
{
if(protocolProvider.isRegistered())
+ {
protocolProvider.unregister();
+ protocolProvider.shutdown();
+ }
} catch (Throwable e)
{
// we don't care for this, cause we are modifying and
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index 7cd11b24a..7521866f9 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -22,6 +22,7 @@
import net.java.sip.communicator.impl.protocol.jabber.extensions.inputevt.*;
import net.java.sip.communicator.impl.protocol.jabber.sasl.*;
import net.java.sip.communicator.service.certificate.*;
+import net.java.sip.communicator.service.googlecontacts.*;
import org.jivesoftware.smack.*;
import org.jivesoftware.smack.packet.*;
@@ -927,7 +928,6 @@ private void disconnectAndCleanConnection()
} catch (Exception e)
{}
-
connectionListener = null;
connection = null;
// make it null as it also holds a reference to the old connection
@@ -1258,6 +1258,9 @@ protected void initialize(String screenname,
OperationSetGenericNotifications.class,
new OperationSetGenericNotificationsJabberImpl(this));
+ /* add Google Contacts as contact source if enabled */
+ registerGoogleContactsSource();
+
isInitialized = true;
}
}
@@ -1274,6 +1277,8 @@ public void shutdown()
if (logger.isTraceEnabled())
logger.trace("Killing the Jabber Protocol Provider.");
+ unregisterGoogleContactsSource();
+
//kill all active calls
OperationSetBasicTelephonyJabberImpl telephony
= (OperationSetBasicTelephonyJabberImpl)getOperationSet(
@@ -1897,6 +1902,56 @@ public SmackServiceNode getJingleNodesServiceNode()
return jingleNodesServiceNode;
}
+ /**
+ * Register Google Contacts as contact source if user has enable it.
+ */
+ private void registerGoogleContactsSource()
+ {
+ if(accountID.getAccountPropertyBoolean(
+ "GOOGLE_CONTACTS_ENABLED",
+ false))
+ {
+ logger.info("Register Google Contacts service as contact source");
+ GoogleContactsService googleService =
+ JabberActivator.getGoogleService();
+
+ if(googleService != null)
+ {
+ googleService.addContactSource(
+ org.jivesoftware.smack.util.StringUtils.parseName(
+ getOurJID()) + "@" +
+ StringUtils.parseServer(getAccountID().getUserID()),
+ JabberActivator.
+ getProtocolProviderFactory().loadPassword(
+ getAccountID()));
+ }
+ }
+ }
+
+ /**
+ * Unregister Google Contacts as contact source.
+ */
+ private void unregisterGoogleContactsSource()
+ {
+ if(accountID.getAccountPropertyBoolean(
+ "GOOGLE_CONTACTS_ENABLED",
+ false))
+ {
+ logger.info("Unregister Google Contacts service as contact source");
+
+ GoogleContactsService googleService =
+ JabberActivator.getGoogleService();
+
+ if(googleService != null)
+ {
+ googleService.removeContactSource(
+ org.jivesoftware.smack.util.StringUtils.parseName(
+ getOurJID()) + "@" +
+ StringUtils.parseServer(getAccountID().getUserID()));
+ }
+ }
+ }
+
/**
* Logs a specific message and associated Throwable cause as an
* error using the current Logger and then throws a new
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
index 47839ae29..730b6711f 100755
--- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
@@ -48,6 +48,7 @@ Import-Package: org.osgi.framework,
net.java.sip.communicator.service.argdelegation,
net.java.sip.communicator.service.certificate,
net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.googlecontacts,
org.xmlpull.v1,
org.xmlpull.mxp1,
javax.xml.parsers,
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/ConnectionPanel.java
index 6ba34140d..bbbd93a0b 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/ConnectionPanel.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/ConnectionPanel.java
@@ -14,13 +14,18 @@
import net.java.sip.communicator.util.swing.*;
/**
- *
+ *
* @author Yana Stamcheva
*/
public class ConnectionPanel
extends TransparentPanel
implements ValidatingPanel
{
+ /**
+ * Serial version UID.
+ */
+ private final static long serialVersionUID = 0L;
+
private final TransparentPanel mainPanel = new TransparentPanel();
private final JPanel advancedOpPanel
@@ -39,6 +44,10 @@ public class ConnectionPanel
Resources.getString(
"plugin.jabberaccregwizz.ENABLE_GMAIL_NOTIFICATIONS"));
+ private final JCheckBox googleContactsBox = new SIPCommCheckBox(
+ Resources.getString(
+ "plugin.jabberaccregwizz.ENABLE_GOOGLE_CONTACTS_SOURCE"));
+
private final JLabel resourceLabel
= new JLabel(Resources.getString("plugin.jabberaccregwizz.RESOURCE"));
@@ -126,6 +135,7 @@ public void removeUpdate(DocumentEvent evt)
= new TransparentPanel(new GridLayout(0, 1, 10, 10));
checkBoxesPanel.add(sendKeepAliveBox);
checkBoxesPanel.add(gmailNotificationsBox);
+ checkBoxesPanel.add(googleContactsBox);
advancedOpPanel.add(checkBoxesPanel, BorderLayout.NORTH);
advancedOpPanel.add(labelsAdvOpPanel, BorderLayout.WEST);
@@ -256,6 +266,28 @@ void setGmailNotificationsEnabled(boolean isEnabled)
gmailNotificationsBox.setSelected(isEnabled);
}
+ /**
+ * Returns true if the "Google contacts" check box is selected,
+ * otherwise returns false.
+ * @return true if the "Google contacts" check box is selected,
+ * otherwise returns false
+ */
+ boolean isGoogleContactsEnabled()
+ {
+ return googleContactsBox.isSelected();
+ }
+
+ /**
+ * Selects/unselects the "Google contacts" check box according to the
+ * given isEnabled property.
+ * @param isEnabled indicates if the "Google contacts"
+ * check box should be selected or not
+ */
+ void setGoogleContactsEnabled(boolean isEnabled)
+ {
+ googleContactsBox.setSelected(isEnabled);
+ }
+
/**
* Disables Next Button if Port field value is incorrect
*/
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
index 69a96c4dd..7c71148d9 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
@@ -28,6 +28,9 @@ public class FirstWizardPage
*/
private static final long serialVersionUID = 0L;
+ /**
+ * Identifier of the first page.
+ */
public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier";
private Object nextPageIdentifier = WizardPage.SUMMARY_PAGE_IDENTIFIER;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
index f3b54892e..7606f691f 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
@@ -88,6 +88,11 @@ public class JabberAccountRegistration
*/
private boolean enableGmailNotification = false;
+ /**
+ * Indicates if Google Contacts should be enabled.
+ */
+ private boolean enableGoogleContacts = false;
+
/**
* Indicates if ICE should be used.
*/
@@ -232,6 +237,18 @@ public boolean isGmailNotificationEnabled()
return enableGmailNotification;
}
+ /**
+ * Determines whether SIP Communicator should use Google Contacts as
+ * ContactSource
+ *
+ * @return true if we are to enable Google Contacts and
+ * false otherwise.
+ */
+ public boolean isGoogleContactsEnabled()
+ {
+ return enableGoogleContacts;
+ }
+
/**
* Sets the User ID of the jabber registration account.
*
@@ -316,6 +333,18 @@ public void setGmailNotificationEnabled(boolean enabled)
this.enableGmailNotification = enabled;
}
+ /**
+ * Specifies whether SIP Communicator should use Google Contacts as
+ * ContactSource.
+ *
+ * @param enabled true if we are to enable Google Contacts and
+ * false otherwise.
+ */
+ public void setGoogleContactsEnabled(boolean enabled)
+ {
+ this.enableGoogleContacts = enabled;
+ }
+
/**
* Returns the resource.
* @return the resource
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java
index dfdb7edae..70acc2df0 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java
@@ -17,6 +17,11 @@
public class JabberAccountRegistrationForm
extends TransparentPanel
{
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 0L;
+
private final AccountPanel accountPanel;
private final ConnectionPanel connectionPanel;
@@ -125,7 +130,7 @@ void reValidateInput()
}
/**
- * Adds panel to the list of panels with values which need validation.
+ * Adds panel to the list of panels with values which need validation.
* @param panel ValidatingPanel.
*/
public void addValidatingPanel(ValidatingPanel panel)
@@ -163,7 +168,7 @@ String getServerAddress()
/**
* Indicates if this wizard is modifying an existing account or is creating
* a new one.
- *
+ *
* @return true to indicate that this wizard is currently in
* modification mode, false - otherwise.
*/
@@ -193,6 +198,8 @@ public boolean commitPage(JabberAccountRegistration registration)
registration.setSendKeepAlive(connectionPanel.isSendKeepAlive());
registration.setGmailNotificationEnabled(
connectionPanel.isGmailNotificationsEnabled());
+ registration.setGoogleContactsEnabled(
+ connectionPanel.isGoogleContactsEnabled());
registration.setResource(connectionPanel.getResource());
String serverPort = connectionPanel.getServerPort();
@@ -280,6 +287,12 @@ public void loadAccount(AccountID accountID)
connectionPanel.setGmailNotificationsEnabled(gmailNotificationEnabled);
+ boolean googleContactsEnabled
+ = Boolean.parseBoolean(
+ accountProperties.get("GOOGLE_CONTACTS_ENABLED"));
+
+ connectionPanel.setGoogleContactsEnabled(googleContactsEnabled);
+
String resource
= accountProperties.get(ProtocolProviderFactory.RESOURCE);
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index 5b3b10cd6..ee46655de 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -295,6 +295,8 @@ protected ProtocolProviderService installAccount(
accountProperties.put("GMAIL_NOTIFICATIONS_ENABLED",
String.valueOf(registration.isGmailNotificationEnabled()));
+ accountProperties.put("GOOGLE_CONTACTS_ENABLED",
+ String.valueOf(registration.isGoogleContactsEnabled()));
String serverName = null;
if (registration.getServerAddress() != null)
diff --git a/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsConnection.java b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsConnection.java
new file mode 100644
index 000000000..9d0ee3808
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsConnection.java
@@ -0,0 +1,29 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.googlecontacts;
+
+/**
+ * Interface that define a Google Contacts connection.
+ *
+ * @author Sebastien Vincent
+ */
+public interface GoogleContactsConnection
+{
+ /**
+ * Get login.
+ *
+ * @return login to connect to the service
+ */
+ public String getLogin();
+
+ /**
+ * get password.
+ *
+ * @return password to connect to the service
+ */
+ public String getPassword();
+}
diff --git a/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsEntry.java b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsEntry.java
new file mode 100644
index 000000000..fd1fba7df
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsEntry.java
@@ -0,0 +1,185 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.googlecontacts;
+
+import java.util.*;
+
+/**
+ * Entry of Google Contacts directory.
+ *
+ * @author Sebastien Vincent
+ */
+public interface GoogleContactsEntry
+{
+ /**
+ * The supported IM protocol
+ */
+ public enum IMProtocol
+ {
+ /**
+ * Google Talk protocol.
+ */
+ GOOGLETALK,
+
+ /**
+ * Yahoo protocol.
+ */
+ YAHOO,
+
+ /**
+ * AIM protocol.
+ */
+ AIM,
+
+ /**
+ * MSN protocol.
+ */
+ MSN,
+
+ /**
+ * ICQ protocol.
+ */
+ ICQ,
+
+ /**
+ * Jabber protocol.
+ */
+ JABBER,
+
+ /**
+ * Other protocol (i.e. not supported).
+ */
+ OTHER,
+ }
+
+ /**
+ * Get the full name.
+ *
+ * @return full name
+ */
+ public String getFullName();
+
+ /**
+ * Get the family name.
+ *
+ * @return family name
+ */
+ public String getFamilyName();
+
+ /**
+ * Get the given name.
+ *
+ * @return given name
+ */
+ public String getGivenName();
+
+ /**
+ * Returns mails.
+ *
+ * @return mails
+ */
+ public List getAllMails();
+
+ /**
+ * Adds a home mail address.
+ *
+ * @param mail the mail address
+ */
+ public void addHomeMail(String mail);
+
+ /**
+ * Returns home mail addresses.
+ *
+ * @return home mail addresses
+ */
+ public List getHomeMails();
+
+ /**
+ * Adds a work mail address.
+ *
+ * @param mail the mail address
+ */
+ public void addWorkMails(String mail);
+
+ /**
+ * Returns work mail addresses.
+ *
+ * @return work mail addresses
+ */
+ public List getWorkMails();
+
+ /**
+ * Returns telephone numbers.
+ *
+ * @return telephone numbers
+ */
+ public List getAllPhones();
+
+ /**
+ * Adds a work telephone number.
+ *
+ * @param telephoneNumber the work telephone number
+ */
+ public void addWorkPhone(String telephoneNumber);
+
+ /**
+ * Returns work telephone numbers.
+ *
+ * @return work telephone numbers
+ */
+ public List getWorkPhones();
+
+ /**
+ * Adds a mobile telephone numbers.
+ *
+ * @param telephoneNumber the mobile telephone number
+ */
+ public void addMobilePhone(String telephoneNumber);
+
+ /**
+ * Returns mobile telephone numbers.
+ *
+ * @return mobile telephone numbers
+ */
+ public List getMobilePhones();
+
+ /**
+ * Adds a home telephone numbers.
+ *
+ * @param telephoneNumber the home telephone number
+ */
+ public void addHomePhone(String telephoneNumber);
+
+ /**
+ * Returns home telephone numbers.
+ *
+ * @return home telephone numbers
+ */
+ public List getHomePhones();
+
+ /**
+ * Get the photo full URI.
+ *
+ * @return the photo URI or null if there isn't
+ */
+ public String getPhoto();
+
+ /**
+ * Returns IM addresses.
+ *
+ * @return Map where key is IM address and value is IM protocol (MSN, ...)
+ */
+ public Map getIMAddresses();
+
+ /**
+ * Adds an IM address.
+ *
+ * @param imAddress IM address
+ * @param protocol IM protocol
+ */
+ public void addIMAddress(String imAddress, IMProtocol protocol);
+}
diff --git a/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsService.java b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsService.java
new file mode 100644
index 000000000..421710bba
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/GoogleContactsService.java
@@ -0,0 +1,80 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.googlecontacts;
+
+import java.util.*;
+
+/**
+ * Google Contacts service.
+ *
+ * @author Sebastien Vincent
+ */
+public interface GoogleContactsService
+{
+ /**
+ * Perform a search for a contact using regular expression.
+ *
+ * @param cnx GoogleContactsConnection to perform the query
+ * @param query Google query
+ * @param count maximum number of matched contacts
+ * @param callback object that will be notified for each new
+ * GoogleContactsEntry found
+ * @return list of GoogleContactsEntry
+ */
+ public List searchContact(GoogleContactsConnection cnx,
+ GoogleQuery query, int count, GoogleEntryCallback callback);
+
+ /**
+ * Get a GoogleContactsConnection.
+ *
+ * @param login login to connect to the service
+ * @param password password to connect to the service
+ * @return GoogleContactsConnection.
+ */
+ public GoogleContactsConnection getConnection(String login,
+ String password);
+
+ /**
+ * Get the full contacts list.
+ *
+ * @return list of GoogleContactsEntry
+ */
+ public List getContacts();
+
+ /**
+ * Add a contact source service with the specified
+ * GoogleContactsConnection.
+ *
+ * @param login login
+ * @param password password
+ */
+ public void addContactSource(String login, String password);
+
+ /**
+ * Add a contact source service with the specified
+ * GoogleContactsConnection.
+ *
+ * @param cnx GoogleContactsConnection.
+ */
+ public void addContactSource(GoogleContactsConnection cnx);
+
+ /**
+ * Remove a contact source service with the specified
+ * GoogleContactsConnection.
+ *
+ * @param cnx GoogleContactsConnection.
+ */
+ public void removeContactSource(GoogleContactsConnection cnx);
+
+ /**
+ * Remove a contact source service with the specified
+ * GoogleContactsConnection.
+ *
+ * @param login login
+ */
+ public void removeContactSource(String login);
+}
diff --git a/src/net/java/sip/communicator/service/googlecontacts/GoogleEntryCallback.java b/src/net/java/sip/communicator/service/googlecontacts/GoogleEntryCallback.java
new file mode 100644
index 000000000..fde0a991d
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/GoogleEntryCallback.java
@@ -0,0 +1,23 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.googlecontacts;
+
+/**
+ * Defines the interface for a callback function which is called by the
+ * GoogleContactsService when a new GoogleContactsEntry has
+ * been found during a search.
+ */
+public interface GoogleEntryCallback
+{
+ /**
+ * Notifies this GoogleEntryCallback when a new
+ * GoogleContactsEntry has been found.
+ *
+ * @param entry the GoogleContactsEntry found
+ */
+ void callback(GoogleContactsEntry entry);
+}
diff --git a/src/net/java/sip/communicator/service/googlecontacts/GoogleQuery.java b/src/net/java/sip/communicator/service/googlecontacts/GoogleQuery.java
new file mode 100644
index 000000000..d8f614893
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/GoogleQuery.java
@@ -0,0 +1,65 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.service.googlecontacts;
+
+import java.util.regex.*;
+
+/**
+ * Describes a Google query.
+ *
+ * @author Sebastien Vincent
+ */
+public class GoogleQuery
+{
+ /**
+ * If the query is cancelled.
+ */
+ private boolean cancelled = false;
+
+ /**
+ * The query pattern.
+ */
+ private Pattern query = null;
+
+ /**
+ * Constructor.
+ *
+ * @param query query string
+ */
+ public GoogleQuery(Pattern query)
+ {
+ this.query = query;
+ }
+
+ /**
+ * Get the query pattern.
+ *
+ * @return query pattern
+ */
+ public Pattern getQueryPattern()
+ {
+ return query;
+ }
+
+ /**
+ * Cancel the query.
+ */
+ public void cancel()
+ {
+ cancelled = true;
+ }
+
+ /**
+ * If the query has been cancelled.
+ *
+ * @return true If the query has been cancelled, false otherwise
+ */
+ public boolean isCancelled()
+ {
+ return cancelled;
+ }
+}