Skip to content

Handle all exceptions while accessing secure storage #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2024
Merged

Handle all exceptions while accessing secure storage #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/GitCredentialsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.abapgit.adt.ui.internal.util;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -16,7 +15,6 @@
import org.eclipse.equinox.security.storage.EncodingUtils;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.eclipse.equinox.security.storage.StorageException;
import org.eclipse.equinox.security.storage.provider.IProviderHints;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
Expand Down Expand Up @@ -145,7 +143,7 @@ public static void storeCredentialsInSecureStorage(IExternalRepositoryInfoReques
node.put("password", repositoryCredentials.getPassword(), true); //$NON-NLS-1$
}
}
} catch (IOException | StorageException e) {
} catch (Exception e) {
AbapGitUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, AbapGitUIPlugin.PLUGIN_ID, e.getMessage(), e));
MessageDialog.openWarning(shell, "Eclipse secure storage error", getErrorMessage(e)); //$NON-NLS-1$
GitCredentialsService.deleteCredentialsFromSecureStorage(repositoryURL); // if anything stored in the secure storage
Expand Down
3 changes: 1 addition & 2 deletions ...ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageRepositoryAndCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.eclipse.equinox.security.storage.StorageException;
import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
Expand Down Expand Up @@ -367,7 +366,7 @@ private static IExternalRepositoryInfoRequest getRepoCredentialsFromSecureStorag
try {
credentials.setUser(node.get("user", null)); //$NON-NLS-1$
credentials.setPassword(node.get("password", null)); //$NON-NLS-1$
} catch (StorageException e) {
} catch (Exception e) {
AbapGitUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, AbapGitUIPlugin.PLUGIN_ID, e.getMessage(), e));
return null;
}
Expand Down