From 5fdbc090d64604033b770c62f26ae0526a483239 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 3 Apr 2009 12:30:01 +0000
Subject: [PATCH] Allows the Windows setup to operate in auto-update mode for
 the updatecheck plug-in. However, the updatecheck plugin continues to not
 work on Windows Vista because ProcessBuilder doesn't understand UAC.

---
 .../install/windows/installer-windows.wxs     | 115 +++++++++++++++++-
 resources/install/windows/updater.exe         | Bin 17102 -> 5120 bytes
 .../updatechecker/UpdateCheckActivator.java   | 102 +++++++++-------
 3 files changed, 170 insertions(+), 47 deletions(-)

diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 30a13ebbd..af96f0a1b 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -186,8 +186,35 @@
   </Publish>
 
   <InstallUISequence>
-    <Show Dialog="CExitDialog" OnExit="success" />
-    <Show Dialog="CWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
+    <Show Dialog="CExitDialog" OnExit="success">
+      NOT (IS_AUTOUPDATE = 1)
+    </Show>
+    <Show Dialog="CWelcomeDlg" Before="ProgressDlg">
+      NOT Installed AND NOT (IS_AUTOUPDATE = 1)
+    </Show>
+
+    <Custom Action="SetIS_AUTOUPDATE" After="AppSearch">
+      <![CDATA[NOT Installed AND %SIP_COMMUNICATOR_AUTOUPDATE_INSTALLDIR <> ""]]>
+    </Custom>
+    <Custom Action="SetINSTALLDIR" After="SetIS_AUTOUPDATE" />
+    <Custom Action="SetCREATE_DESKTOP_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_DESKTOP_SHORTCUT]]>
+    </Custom>
+    <Custom Action="UnsetCREATE_DESKTOP_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_DESKTOP_SHORTCUT AND NOT (HAS_DESKTOP_SHORTCUT = "#1")]]>
+    </Custom>
+    <Custom Action="SetCREATE_START_MENU_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_START_MENU_SHORTCUT]]>
+    </Custom>
+    <Custom Action="UnsetCREATE_START_MENU_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_START_MENU_SHORTCUT AND NOT (HAS_START_MENU_SHORTCUT = "#1")]]>
+    </Custom>
+    <Custom Action="SetCREATE_STARTUP_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_STARTUP_SHORTCUT]]>
+    </Custom>
+    <Custom Action="UnsetCREATE_STARTUP_SHORTCUT" After="SetINSTALLDIR">
+      <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_STARTUP_SHORTCUT AND NOT (HAS_STARTUP_SHORTCUT = "#1")]]>
+    </Custom>
 
     <Custom Action="SetWIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" After="AppSearch">
       <![CDATA[JRE_VERSION < "1.5" AND NOT Installed]]>
@@ -195,7 +222,9 @@
   </InstallUISequence>
 
   <AdminUISequence>
-    <Show Dialog="CExitDialog" OnExit="success" />
+    <Show Dialog="CExitDialog" OnExit="success">
+      NOT (IS_AUTOUPDATE = 1)
+    </Show>
   </AdminUISequence>
 </UI>
 
@@ -209,19 +238,98 @@
     BinaryKey="WixCA"
     DllEntry="WixShellExec"
     Impersonate="yes" />
+<CustomAction
+    Id="SetCREATE_DESKTOP_SHORTCUT"
+    Property="CREATE_DESKTOP_SHORTCUT"
+    Value="1" />
+<CustomAction
+    Id="SetCREATE_START_MENU_SHORTCUT"
+    Property="CREATE_START_MENU_SHORTCUT"
+    Value="1" />
+<CustomAction
+    Id="SetCREATE_STARTUP_SHORTCUT"
+    Property="CREATE_STARTUP_SHORTCUT"
+    Value="1" />
+<CustomAction
+    Id="SetINSTALLDIR"
+    Property="INSTALLDIR"
+    Value="[%SIP_COMMUNICATOR_AUTOUPDATE_INSTALLDIR]" />
+<CustomAction
+    Id="SetIS_AUTOUPDATE"
+    Property="IS_AUTOUPDATE"
+    Value="1" />
 <CustomAction
     Id="SetWIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
     Property="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
     Value="Install Java(TM) SE Runtime Environment" />
+<CustomAction
+    Id="UnsetCREATE_DESKTOP_SHORTCUT"
+    Property="CREATE_DESKTOP_SHORTCUT"
+    Value="0" />
+<CustomAction
+    Id="UnsetCREATE_START_MENU_SHORTCUT"
+    Property="CREATE_START_MENU_SHORTCUT"
+    Value="0" />
+<CustomAction
+    Id="UnsetCREATE_STARTUP_SHORTCUT"
+    Property="CREATE_STARTUP_SHORTCUT"
+    Value="0" />
 
 <InstallExecuteSequence>
   <RemoveExistingProducts After="InstallFinalize" />
 
+  <Custom Action="SetIS_AUTOUPDATE" After="AppSearch">
+    <![CDATA[NOT Installed AND %SIP_COMMUNICATOR_AUTOUPDATE_INSTALLDIR <> ""]]>
+  </Custom>
+  <Custom Action="SetINSTALLDIR" After="SetIS_AUTOUPDATE" />
+  <Custom Action="SetCREATE_DESKTOP_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_DESKTOP_SHORTCUT]]>
+  </Custom>
+  <Custom Action="UnsetCREATE_DESKTOP_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_DESKTOP_SHORTCUT AND NOT (HAS_DESKTOP_SHORTCUT = "#1")]]>
+  </Custom>
+  <Custom Action="SetCREATE_START_MENU_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_START_MENU_SHORTCUT]]>
+  </Custom>
+  <Custom Action="UnsetCREATE_START_MENU_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_START_MENU_SHORTCUT AND NOT (HAS_START_MENU_SHORTCUT = "#1")]]>
+  </Custom>
+  <Custom Action="SetCREATE_STARTUP_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND HAS_STARTUP_SHORTCUT]]>
+  </Custom>
+  <Custom Action="UnsetCREATE_STARTUP_SHORTCUT" After="SetINSTALLDIR">
+    <![CDATA[(IS_AUTOUPDATE = 1) AND NOT HAS_STARTUP_SHORTCUT AND NOT (HAS_STARTUP_SHORTCUT = "#1")]]>
+  </Custom>
+
   <Custom Action="SetWIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" After="AppSearch">
     <![CDATA[JRE_VERSION < "1.5" AND NOT Installed]]>
   </Custom>
 </InstallExecuteSequence>
 
+<Property Id="HAS_DESKTOP_SHORTCUT">
+  <RegistrySearch
+      Id="RegistrySearch_HasDesktopShortcut"
+      Key="Software\Microsoft\@APP_NAME@"
+      Name="DesktopShortcut"
+      Root="HKCU"
+      Type="raw" />
+</Property>
+<Property Id="HAS_START_MENU_SHORTCUT">
+  <RegistrySearch
+      Id="RegistrySearch_HasStartMenuShortcut"
+      Key="Software\Microsoft\@APP_NAME@"
+      Name="StartMenuShortcut"
+      Root="HKCU"
+      Type="raw" />
+</Property>
+<Property Id="HAS_STARTUP_SHORTCUT">
+  <RegistrySearch
+      Id="RegistrySearch_HasStartupShortcut"
+      Key="Software\Microsoft\@APP_NAME@"
+      Name="StartupShortcut"
+      Root="HKCU"
+      Type="raw" />
+</Property>
 <Property Id="JRE_VERSION">
   <RegistrySearch
       Id="RegistrySearch_JREVersion"
@@ -237,6 +345,7 @@
 <Property Id="CREATE_FEED_REGISTRY_ENTRIES" Value="1" />
 <Property Id="CREATE_SIP_REGISTRY_ENTRIES" Value="1" />
 <Property Id="CREATE_XMPP_REGISTRY_ENTRIES" Value="1" />
+<Property Id="IS_AUTOUPDATE" Value="0" Hidden="yes" />
 <Property Id="WixShellExecTarget" Value="[#run.exe]" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
 <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch @APP_NAME@" />
diff --git a/resources/install/windows/updater.exe b/resources/install/windows/updater.exe
index 53c7217ba4dca3b39090c2d067e986a66326c1a6..d1669db07816d3265e46b299d403520e6502838a 100644
GIT binary patch
delta 52
zcmX@t%GjVWp-qUDp`78GCj%5bVBlw-IKz@F0mx@zVA#gPxbb!><7P#k1B{DU1OQQx
B42}Q*

literal 17102
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

diff --git a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
index 0a43315bd..ee8c36574 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
+++ b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
@@ -33,13 +33,14 @@
 
 /**
  * Activates the UpdateCheck plugin
+ * 
  * @author Damian Minkov
-**/
+ */
 public class UpdateCheckActivator
     implements BundleActivator
 {
-
-    private static Logger logger = Logger.getLogger(UpdateCheckActivator.class);
+    private static final Logger logger
+        = Logger.getLogger(UpdateCheckActivator.class);
 
     private static BundleContext bundleContext = null;
 
@@ -93,12 +94,12 @@ public void start(BundleContext bundleContext) throws Exception
             Hashtable<String, String> toolsMenuFilter
                 = new Hashtable<String, String>();
             toolsMenuFilter.put( Container.CONTAINER_ID,
-                                 Container.CONTAINER_TOOLS_MENU.getID());
+                                 Container.CONTAINER_HELP_MENU.getID());
 
             bundleContext.registerService(
                 PluginComponent.class.getName(),
                 new UpdateMenuButtonComponent(
-                    Container.CONTAINER_TOOLS_MENU),
+                    Container.CONTAINER_HELP_MENU),
                 toolsMenuFilter);
         }
 
@@ -183,11 +184,10 @@ public void actionPerformed(ActionEvent e)
 
         dialog.pack();
 
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         dialog.setLocation(
-            Toolkit.getDefaultToolkit().getScreenSize().width/2
-                - dialog.getWidth()/2,
-            Toolkit.getDefaultToolkit().getScreenSize().height/2
-                - dialog.getHeight()/2
+            screenSize.width/2 - dialog.getWidth()/2,
+            screenSize.height/2 - dialog.getHeight()/2
         );
 
         dialog.setVisible(true);
@@ -326,7 +326,7 @@ private boolean isNewestVersion()
             logger.warn("Cannot get and compare versions!");
             logger.debug("Error was: ", e);
             // if we get an exception this mean we were unable to compare versions
-            // will retrun that current is newest to prevent opening info dialog
+            // will return that current is newest to prevent opening info dialog
             // about new version
             return true;
         }
@@ -442,7 +442,7 @@ public void actionPerformed(ActionEvent e)
      * 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
+     * - Triggers update (installer) in separate process with the help
      * of update.exe and shutdowns.
      */
     private void windowsUpdate()
@@ -454,45 +454,51 @@ private void windowsUpdate()
             tempF = temp;
 
             URL u = new URL(downloadLink);
-            HttpURLConnection uc = (HttpURLConnection)u.openConnection();
+            URLConnection uc = u.openConnection();
 
-            if(uc.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
+            if (uc instanceof HttpURLConnection)
             {
-                new Thread(new Runnable()
+                int responseCode = ((HttpURLConnection) uc).getResponseCode();
+
+                if(responseCode == HttpURLConnection.HTTP_UNAUTHORIZED)
                 {
-                    public void run()
+                    new Thread(new Runnable()
                     {
-                        ExportedWindow authWindow =
-                            getUIService().getExportedWindow(
-                                ExportedWindow.AUTHENTICATION_WINDOW);
-
-                        UserCredentials cred = new UserCredentials();
-                        authWindow.setParams(new Object[]{cred});
-                        authWindow.setVisible(true);
-
-                        userCredentials = cred;
-
-                        if(cred.getUserName() == null)
+                        public void run()
                         {
-                            userCredentials = null;
+                            ExportedWindow authWindow =
+                                getUIService().getExportedWindow(
+                                    ExportedWindow.AUTHENTICATION_WINDOW);
+
+                            UserCredentials cred = new UserCredentials();
+                            authWindow.setParams(new Object[]{cred});
+                            authWindow.setVisible(true);
+
+                            userCredentials = cred;
+
+                            if(cred.getUserName() == null)
+                            {
+                                userCredentials = null;
+                            }
+                            else
+                                windowsUpdate();
                         }
-                        else
-                            windowsUpdate();
-                    }
-                }).start();
-            }
-            else if(uc.getResponseCode() == HttpURLConnection.HTTP_OK
-                    && userCredentials != null
-                    && userCredentials.getUserName() != null
-                    && userCredentials.isPasswordPersistent())
-            {
-                // if save password is checked save the pass
-                getConfigurationService().setProperty(
+                    }).start();
+                }
+                else if(responseCode == HttpURLConnection.HTTP_OK
+                        && userCredentials != null
+                        && userCredentials.getUserName() != null
+                        && userCredentials.isPasswordPersistent())
+                {
+                    // if save password is checked save the pass
+                    getConfigurationService().setProperty(
                         UPDATE_USERNAME_CONFIG, userCredentials.getUserName());
-                getConfigurationService().setProperty(
+                    getConfigurationService().setProperty(
                         UPDATE_PASSWORD_CONFIG, new String(Base64.encode(
                             userCredentials.getPasswordAsString().getBytes())));
+                }
             }
+
             InputStream in = uc.getInputStream();
 
             // Chain a ProgressMonitorInputStream to the
@@ -536,10 +542,18 @@ public void run()
 
                         // 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();
+                        ProcessBuilder processBuilder
+                            = new ProcessBuilder(
+                                new String[]
+                                {
+                                    workingDir + File.separator + "updater.exe",
+                                    temp.getCanonicalPath()
+                                });
+                        processBuilder.environment().put(
+                            "SIP_COMMUNICATOR_AUTOUPDATE_INSTALLDIR",
+                            workingDir);
+                        processBuilder.start();
+
                         getUIService().beginShutdown();
 
                     } catch (Exception e)