Issue #599 Initial commit for windows autoupdate.

resources/install/build.xml

@@ -352,6 +352,7 @@
             <entry key="last_version" value="${sip-communicator.version}" />
             <entry key="download_link"
                     value="http://download.sip-communicator.org/nightly/windows/${package.name}-${sip-communicator.version}.exe" />
+            <entry key="changes_html" value="changes.html" />
         </propertyfile>
 
         <!--
@@ -366,6 +367,7 @@
                 <include name="run.bat" />
                 <include name="run.exe" />
                 <include name="sc-logo.ico" />
+                <include name="updater.exe" />
             </fileset>
         </copy>
         <mkdir dir="${light.dir}/lib" />
@@ -450,7 +452,7 @@
         <filter token="WelcomeText1" value="${installer.welcome.wtext1}" />
         <filter token="WelcomeText2" value="${installer.welcome.wtext2}" />
         <filter token="WelcomeText3" value="${installer.welcome.wtext3}" />
-    	<filter token="WINDOWS_JRE_FILE" value="${windows.jre.file}" />
+        <filter token="WINDOWS_JRE_FILE" value="${windows.jre.file}" />
         <filter token="WIX_PRODUCT_ID" value="${wix.product.id}" />
         <filter token="WIX_UPGRADE_CODE" value="${wix.upgrade.code}" />
         <copy
@@ -518,13 +520,13 @@
             <arg value="setup.exe" />
             <arg value="/v" />
             <arg value="200" />
-        	<arg value="/n" />
-        	<arg value="${application.name}" />
-        	<arg value="/o" />
-        	<arg value="INSTALL" />
-        	<arg value="/d" />
+            <arg value="/n" />
+            <arg value="${application.name}" />
+            <arg value="/o" />
+            <arg value="INSTALL" />
+            <arg value="/d" />
             <arg value="setup.msi" />
-        	<arg value="/b" />
+            <arg value="/b" />
             <arg value="setup.msi" />
         </exec>
         <copy
@@ -638,7 +640,7 @@
         <javaproperty name="java.library.path"
                       value="$JAVAROOT/lib/native/mac:${system.DYLD_LIBRARY_PATH}"/>
         <javaproperty name="jna.library.path"
-	                      value="$JAVAROOT/lib/native/mac:${system.DYLD_LIBRARY_PATH}"/>
+                          value="$JAVAROOT/lib/native/mac:${system.DYLD_LIBRARY_PATH}"/>
 
         <javaproperty name="net.java.sip.communicator.SC_HOME_DIR_NAME"
                       value="${application.name}"/>
@@ -715,7 +717,7 @@
             todir="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/lib/native/mac/"/>
 
       <!-- Add the Sparkle properties in the Info.plist file -->
-	  <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
         <replacetoken><![CDATA[<key>CFBundleName</key>]]></replacetoken>
         <replacevalue><![CDATA[<key>SUCheckAtStartup</key>
     <string>false</string>
@@ -846,7 +848,7 @@
         token="_PACKAGE_NAME_"
         value="${package.name}"/>
 
-	<!-- Prepare the rules file -->
+    <!-- Prepare the rules file -->
     <copy file="${inst.resrc}/debian/rules.tmpl"
         tofile="${inst.resrc}/debian/rules"
         overwrite="true"/>

resources/install/windows/updater.c

@@ -0,0 +1,37 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+#include <windows.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    // Local variables
+    PROCESS_INFORMATION pi;
+    STARTUPINFO si;
+
+    // Argument count
+    if (argc != 2)
+        return EXIT_FAILURE;
+
+    // Initialize
+    memset(&si,0,sizeof(STARTUPINFO));
+    si.cb = sizeof(STARTUPINFO);
+
+    // Execute
+    if(!CreateProcess(NULL, argv[1], NULL, NULL, FALSE, 0, NULL,NULL,&si,&pi)) {
+        // Failed
+        //cout << "Could not run the program." << endl;
+        char msg[255];
+        DWORD dwError = GetLastError();
+        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,0,dwError,0,msg,sizeof(msg),0);
+        printf("Could not start installer %s\n", msg);
+        return EXIT_FAILURE;
+    }
+
+    // Finished
+    return EXIT_SUCCESS;
+}

resources/languages/resources.properties

@@ -606,6 +606,11 @@ plugin.updatechecker.DIALOG_MESSAGE=<html>A new version of {0} is available for
 plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1}): <br>
 plugin.updatechecker.BUTTON_DOWNLOAD=Download
 plugin.updatechecker.BUTTON_CLOSE=Close
+plugin.updatechecker.BUTTON_INSTALL=Install
+plugin.updatechecker.UPDATE_MENU_ENTRY=Check For Update
+plugin.updatechecker.DIALOG_WARN=If you continue with update application will be shutdown! Are you sure?
+plugin.updatechecker.DIALOG_NOUPDATE=Your version is up to date.
+plugin.updatechecker.DIALOG_NOUPDATE_TITLE=No new version
 
 # whiteboard
 plugin.whiteboard.TITLE=Whiteboard [Beta]

src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java

@@ -7,18 +7,21 @@
 package net.java.sip.communicator.plugin.updatechecker;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.*;
+import java.io.*;
 import java.net.*;
 import java.util.*;
 
 import javax.swing.*;
 
 import net.java.sip.communicator.service.browserlauncher.*;
+import net.java.sip.communicator.service.contactlist.*;
+import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.service.version.VersionService;
+import net.java.sip.communicator.service.version.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -40,8 +43,11 @@ public class UpdateCheckActivator
 
     private static ResourceManagementService resourcesService;
 
+    private static UIService            uiService             = null;
+
     private String downloadLink = null;
     private String lastVersion = null;
+    private String changesLink = null;
 
     /**
      * Starts this bundle
@@ -54,25 +60,38 @@ public void start(BundleContext bundleContext) throws Exception
         try
         {
             logger.logEntry();
-            this.bundleContext = bundleContext;
+            UpdateCheckActivator.bundleContext = bundleContext;
         }
         finally
         {
             logger.logExit();
         }
 
-        ServiceReference serviceReference = bundleContext
-            .getServiceReference( net.java.sip.communicator.service.version.
-                VersionService.class.getName());
+        String osName = System.getProperty("os.name");
 
-        VersionService verService = (VersionService) bundleContext
-                .getService(serviceReference);
+        if (osName.startsWith("Windows"))
+        {
+            // register update button
+            Hashtable<String, String> toolsMenuFilter
+                = new Hashtable<String, String>();
+            toolsMenuFilter.put( Container.CONTAINER_ID,
+                                 Container.CONTAINER_TOOLS_MENU.getID());
+
+            bundleContext.registerService(
+                PluginComponent.class.getName(),
+                new UpdateMenuButtonComponent(
+                    Container.CONTAINER_TOOLS_MENU),
+                toolsMenuFilter);
+        }
 
-        net.java.sip.communicator.service.version.Version
-            ver = verService.getCurrentVersion();
+        if(isNewestVersion())
+            return;
 
-        if(isNewestVersion(ver.toString()))
+        if (osName.startsWith("Windows"))
+        {
+            windowsUpdaterShow();
             return;
+        }
 
         final JDialog dialog = new SIPCommDialog()
         {
@@ -183,6 +202,26 @@ public static BrowserLauncherService getBrowserLauncher()
         return browserLauncherService;
     }
 
+    /**
+     * Returns a reference to the UIService implementation currently registered
+     * in the bundle context or null if no such implementation was found.
+     *
+     * @return a reference to a UIService implementation currently registered
+     * in the bundle context or null if no such implementation was found.
+     */
+    public static UIService getUIService()
+    {
+        if(uiService == null)
+        {
+            ServiceReference uiServiceReference
+                = bundleContext.getServiceReference(
+                    UIService.class.getName());
+            uiService = (UIService)bundleContext
+                .getService(uiServiceReference);
+        }
+        return uiService;
+    }
+
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
@@ -205,10 +244,20 @@ public static ResourceManagementService getResources()
      * @param currentVersionStr
      * @return
      */
-    private boolean isNewestVersion(String currentVersionStr)
+    private boolean isNewestVersion()
     {
         try
         {
+            ServiceReference serviceReference = bundleContext
+                .getServiceReference( net.java.sip.communicator.service.version.
+                    VersionService.class.getName());
+
+            VersionService verService = (VersionService) bundleContext
+                    .getService(serviceReference);
+
+            net.java.sip.communicator.service.version.Version
+                ver = verService.getCurrentVersion();
+
             String configString = Resources.getConfigString("update_link");
 
             if(configString == null)
@@ -225,7 +274,11 @@ private boolean isNewestVersion(String currentVersionStr)
             lastVersion = props.getProperty("last_version");
             downloadLink = props.getProperty("download_link");
 
-            return lastVersion.compareTo(currentVersionStr) <= 0;
+            changesLink =
+                    configString.substring(0, configString.lastIndexOf("/") + 1) +
+                    props.getProperty("changes_html");
+
+            return lastVersion.compareTo(ver.toString()) <= 0;
         }
         catch (Exception e)
         {
@@ -237,4 +290,277 @@ private boolean isNewestVersion(String currentVersionStr)
             return true;
         }
     }
+
+    /**
+     * Shows dialog informing about new version with button Install
+     * which trigers the update process.
+     */
+    private void windowsUpdaterShow()
+    {
+        final JDialog dialog = new SIPCommDialog()
+        {
+            protected void close(boolean isEscaped)
+            {
+            }
+        };
+
+        dialog.setTitle(
+            getResources().getI18NString("plugin.updatechecker.DIALOG_TITLE"));
+
+        JEditorPane contentMessage = new JEditorPane();
+        contentMessage.setContentType("text/html");
+        contentMessage.setOpaque(false);
+        contentMessage.setEditable(false);
+
+        String dialogMsg =
+            getResources().getI18NString("plugin.updatechecker.DIALOG_MESSAGE",
+            new String[]{getResources()
+                .getSettingsString("service.gui.APPLICATION_NAME")});
+
+        if(lastVersion != null)
+            dialogMsg +=
+                getResources().getI18NString(
+                "plugin.updatechecker.DIALOG_MESSAGE_2",
+                new String[]{
+                    getResources().getSettingsString(
+                        "service.gui.APPLICATION_NAME"),
+                    lastVersion});
+
+        contentMessage.setText(dialogMsg);
+
+        JPanel contentPane = new SIPCommFrame.MainContentPane();
+        contentMessage.setBorder(BorderFactory.createEmptyBorder(10, 0, 20, 0));
+        contentPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        contentPane.add(contentMessage, BorderLayout.NORTH);
+
+        JScrollPane scrollChanges = new JScrollPane();
+        scrollChanges.setPreferredSize(new Dimension(400, 200));
+        JEditorPane changesHtml = new JEditorPane();
+        changesHtml.setContentType("text/html");
+        changesHtml.setEditable(false);
+        changesHtml.setBorder(BorderFactory.createLoweredBevelBorder());
+        scrollChanges.setViewportView(changesHtml);
+        contentPane.add(scrollChanges, BorderLayout.CENTER);
+        try
+        {
+            changesHtml.setPage(new URL(changesLink));
+        } catch (Exception e)
+        {
+            logger.error("Cannot set changes Page", e);
+        }
+
+        JPanel buttonPanel
+            = new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 10, 10));
+        JButton closeButton = new JButton(
+            getResources().getI18NString("plugin.updatechecker.BUTTON_CLOSE"));
+
+        closeButton.addActionListener(new ActionListener() {
+
+            public void actionPerformed(ActionEvent e)
+            {
+                dialog.setVisible(false);
+            }
+        });
+
+        if(downloadLink != null)
+        {
+            JButton installButton = new JButton(getResources().getI18NString(
+                "plugin.updatechecker.BUTTON_INSTALL"));
+
+            installButton.addActionListener(new ActionListener() {
+
+                public void actionPerformed(ActionEvent e)
+                {
+                    dialog.dispose();
+                    windowsUpdate();
+                }
+            });
+
+            buttonPanel.add(installButton);
+        }
+
+        buttonPanel.add(closeButton);
+
+        contentPane.add(buttonPanel, BorderLayout.SOUTH);
+
+        dialog.setContentPane(contentPane);
+
+        dialog.pack();
+
+        dialog.setLocation(
+            Toolkit.getDefaultToolkit().getScreenSize().width/2
+                - dialog.getWidth()/2,
+            Toolkit.getDefaultToolkit().getScreenSize().height/2
+                - dialog.getHeight()/2
+        );
+
+        dialog.setVisible(true);
+    }
+
+    /**
+     * The update process itself.
+     * - Downloads the installer in a temp directory.
+     * - Warns that update will shutdown.
+     * - Trigers update (installer) in separate process with the help
+     * of update.exe and shutdowns.
+     */
+    private void windowsUpdate()
+    {
+        File tempF = null;
+        try
+        {
+            final File temp = File.createTempFile("sc-install", ".exe");
+            tempF = temp;
+
+            URL u = new URL(downloadLink);
+            URLConnection uc = u.openConnection();
+            InputStream in = uc.getInputStream();
+
+            // Chain a ProgressMonitorInputStream to the
+            // URLConnection's InputStream
+            final ProgressMonitorInputStream pin
+             = new ProgressMonitorInputStream(null, u.toString(), in);
+
+            // Set the maximum value of the ProgressMonitor
+            ProgressMonitor pm = pin.getProgressMonitor();
+            pm.setMaximum(uc.getContentLength());
+
+            final BufferedOutputStream out =
+                    new BufferedOutputStream(new FileOutputStream(temp));
+            new Thread(new Runnable()
+            {
+                public void run()
+                {
+                    try
+                    {
+                        int read = -1;
+                        byte[] buff = new byte[1024];
+                        while((read = pin.read(buff)) != -1)
+                        {
+                            out.write(buff, 0, read);
+                        }
+                        pin.close();
+                        out.flush();
+                        out.close();
+
+                        if(getUIService().getPopupDialog().showConfirmPopupDialog(
+                            getResources().getI18NString(
+                                "plugin.updatechecker.DIALOG_WARN"),
+                            getResources().getI18NString(
+                                "plugin.updatechecker.DIALOG_TITLE"),
+                            PopupDialog.YES_NO_OPTION,
+                            PopupDialog.QUESTION_MESSAGE
+                            ) == PopupDialog.CANCEL_OPTION)
+                        {
+                            return;
+                        }
+
+                        // file saved. Now start updater and shutdown.
+                        String workingDir = System.getProperty("user.dir");
+                        new ProcessBuilder(
+                            new String[]{
+                                workingDir + File.separator + "updater.exe",
+                                temp.getCanonicalPath()}).start();
+                        getUIService().beginShutdown();
+
+                    } catch (Exception e)
+                    {
+                        logger.error("Error saving", e);
+                        try
+                        {
+                            pin.close();
+                            out.close();
+                        } catch (Exception e1)
+                        {}
+                    }
+                }
+            }).start();
+
+        } catch (Exception e)
+        {
+            logger.info("Error starting update process!", e);
+            tempF.delete();
+        }
+    }
+
+    /**
+     * Invokes action for checking for updates.
+     */
+    private void checkForUpdate()
+    {
+        if(isNewestVersion())
+        {
+            getUIService().getPopupDialog().showMessagePopupDialog(
+                getResources().getI18NString("plugin.updatechecker.DIALOG_NOUPDATE"),
+                getResources().getI18NString("plugin.updatechecker.DIALOG_NOUPDATE_TITLE"),
+                PopupDialog.INFORMATION_MESSAGE);
+        }
+        else
+            windowsUpdaterShow();
+    }
+
+    /**
+     * The menu entry under tools menu.
+     */
+    private class UpdateMenuButtonComponent
+        implements PluginComponent
+    {
+        private final Container container;
+
+        private final JMenuItem updateMenuItem
+            = new JMenuItem(getResources().
+                getI18NString("plugin.updatechecker.UPDATE_MENU_ENTRY"));
+
+        UpdateMenuButtonComponent(Container c)
+        {
+            this.container = c;
+
+            updateMenuItem.addActionListener(new ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    checkForUpdate();
+                }
+            });
+        }
+
+        public String getName()
+        {
+            return getResources().getI18NString(
+                "plugin.updatechecker.UPDATE_MENU_ENTRY");
+        }
+
+        public Container getContainer()
+        {
+            return this.container;
+        }
+
+        public String getConstraints()
+        {
+            return null;
+        }
+
+        public int getPositionIndex()
+        {
+            return -1;
+        }
+
+        public Object getComponent()
+        {
+            return updateMenuItem;
+        }
+
+        public void setCurrentContact(MetaContact metaContact)
+        {
+        }
+
+        public void setCurrentContactGroup(MetaContactGroup metaGroup)
+        {
+        }
+
+        public boolean isNativeComponent()
+        {
+            return false;
+        }
+    }
 }

src/net/java/sip/communicator/util/swing/SIPCommDialog.java

@@ -159,7 +159,7 @@ private void setSizeAndLocation()
         ConfigurationService configService =
             UtilActivator.getConfigurationService();
 
-        String className = this.getClass().getName();
+        String className = this.getClass().getName().replaceAll("\\$", "_");
         
         String widthString = configService.getString(
             className + ".width");

src/net/java/sip/communicator/util/swing/SIPCommFrame.java

@@ -152,7 +152,7 @@ static void saveSizeAndLocation(Component component)
         throws PropertyVetoException
     {
         ConfigurationService config = UtilActivator.getConfigurationService();
-        String className = component.getClass().getName();
+        String className = component.getClass().getName().replaceAll("\\$", "_");
 
         config.setProperty(className + ".width", component.getWidth());
         config.setProperty(className + ".height", component.getHeight());