Bug 237891 Internal Error while Comparing with Latest from HEAD

5 files changed, 3 insertions, 53 deletions

diff --git a/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
index 818f161d4..d4b30276f 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.win32.x86/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName
 Bundle-SymbolicName: org.eclipse.equinox.security.win32.x86;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-Localization: fragment
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
 Export-Package: org.eclipse.equinox.internal.security.win32;x-internal:=true
-Require-Bundle: org.eclipse.swt;bundle-version="[3.4.0,4.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCrypto.java b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCrypto.java
index 397a090f8..a16da0a22 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCrypto.java
+++ b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCrypto.java
@@ -62,22 +62,7 @@ public class WinCrypto extends PasswordProvider {
 			} else {
 				StorageException e = new StorageException(StorageException.ENCRYPTION_ERROR, WinCryptoMessages.decryptPasswordFailed);
 				AuthPlugin.getDefault().logError(WinCryptoMessages.decryptPasswordFailed, e);
-
-				if (container.hasOption(IProviderHints.PROMPT_USER)) {
-					Object promptHint = container.getOption(IProviderHints.PROMPT_USER);
-					if (promptHint instanceof Boolean) {
-						boolean canPrompt = ((Boolean) promptHint).booleanValue();
-						if (!canPrompt)
-							return null;
-					}
-				}
-				try {
-					if (!WinCryptoUI.canRecreatePassword())
-						return null;
-				} catch (NoClassDefFoundError exception) {
-					return null;
-				}
-				// follow down with new password generation
+				return null;
 			}
 		}
 
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCryptoUI.java b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCryptoUI.java
deleted file mode 100644
index c2b5e5134..000000000
--- a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/WinCryptoUI.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.security.win32;
-
-import org.eclipse.equinox.internal.security.win32.nls.WinCryptoMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Isolates optional UI functionality
- */
-public class WinCryptoUI {
-
-	public static boolean canRecreatePassword() {
-		MessageBox dialog = new MessageBox(new Shell(), SWT.ICON_ERROR | SWT.YES | SWT.NO);
-		dialog.setText(WinCryptoMessages.newPasswordTitle);
-		dialog.setMessage(WinCryptoMessages.newPasswordMessage);
-		int result = dialog.open();
-		return (result == SWT.YES);
-	}
-}
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/WinCryptoMessages.java b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/WinCryptoMessages.java
index d14c2a436..1567ffe85 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/WinCryptoMessages.java
+++ b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/WinCryptoMessages.java
@@ -19,8 +19,6 @@ public class WinCryptoMessages extends NLS {
 	// Windows module
 	public static String encryptPasswordFailed;
 	public static String decryptPasswordFailed;
-	public static String newPasswordTitle;
-	public static String newPasswordMessage; 
 	public static String newPasswordGenerated;
 
 	static {
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/messages.properties b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/messages.properties
index 1f204f214..302ec6176 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/messages.properties
+++ b/bundles/org.eclipse.equinox.security.win32.x86/src/org/eclipse/equinox/internal/security/win32/nls/messages.properties
@@ -11,7 +11,5 @@
 
 ## Windows module
 encryptPasswordFailed = Unable to encrypt master password for storage.
-decryptPasswordFailed = Unable to decrypt master password.
-newPasswordTitle = Keyring password
-newPasswordMessage = Unable to retrieve keyring password. Would you like to generate new keyring password?
+decryptPasswordFailed = Secure storage was unable to retrieve the master password. If secure storage was created using a different Windows account, you'll have to switch back to that account. Alternatively, you can use the password recovery, or delete and re-create secure storage.
 newPasswordGenerated = New keyring password generated.