mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 11:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

interim update

Browse Source
This commit is contained in:
Karl Mortensen 2015-05-27 16:59:43 -04:00
parent 1475574ace
commit df2f8cea7f
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -76,7 +76,8 @@ public class Case implements SleuthkitCase.ErrorObserver, SleuthkitCase.Sleuthki
private static final String autopsyVer = Version.getVersion(); // current version of autopsy. Change it when the version is changed
private static final String EVENT_CHANNEL_NAME = "%s-Case-Events";
private static String appName = null;
private static boolean firstTime=true;
/**
* Name for the property that determines whether to show the dialog at
* startup
@ -229,7 +230,11 @@ public class Case implements SleuthkitCase.ErrorObserver, SleuthkitCase.Sleuthki
*/
private void init() {
db.addErrorObserver(this);
db.addSleuthkitCaseErrorObserver(this);
if(firstTime)
{
firstTime=false;
db.addSleuthkitCaseErrorObserver(this);
}
}
/**

2
Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
View File

@ -49,7 +49,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
caseNameTextField.getDocument().addDocumentListener(this);
caseParentDirTextField.getDocument().addDocumentListener(this);
CaseDbConnectionInfo info = UserPreferences.getDatabaseConnectionInfo();
if (info.getDbType() == DbType.UNKNOWN) {
if (info.getDbType() == DbType.SQLITE) {
rbSingleUserCase.setSelected(true);
rbSingleUserCase.setEnabled(false);
rbMultiUserCase.setEnabled(false);

2
Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
View File

@ -99,7 +99,7 @@ import org.sleuthkit.datamodel.TskData.DbType;
//TODO fix for local
CaseType currentCaseType = CaseType.fromString(ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, ModuleSettings.CURRENT_CASE_TYPE));
CaseDbConnectionInfo info = UserPreferences.getDatabaseConnectionInfo();
if ((currentCaseType==CaseType.SINGLE_USER_CASE) || ((info.getDbType() != DbType.UNKNOWN) && info.settingsValid())) {
if ((currentCaseType==CaseType.SINGLE_USER_CASE) || ((info.getDbType() != DbType.SQLITE) && info.settingsValid())) {
AddImageAction addImageAction = SystemAction.get(AddImageAction.class);
addImageAction.actionPerformed(null);
} else {

2
Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
View File

@ -111,7 +111,7 @@ public final class UserPreferences {
try {
dbType = DbType.valueOf(preferences.get(EXTERNAL_DATABASE_TYPE, "UNKOWN"));
} catch (Exception ex) {
dbType = DbType.UNKNOWN;
dbType = DbType.SQLITE;
}
return new CaseDbConnectionInfo(
preferences.get(EXTERNAL_DATABASE_HOSTNAME_OR_IP, ""),

4
Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
View File

@ -398,7 +398,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
tbIndexingServerPort.setText(indexingServerPort);
}
if (dbInfo.getDbType() == DbType.UNKNOWN) {
if (dbInfo.getDbType() == DbType.SQLITE) {
cbEnableMultiUser.setSelected(false);
} else {
cbEnableMultiUser.setSelected(true);
@ -420,7 +420,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
void store() {
DbType dbType = DbType.UNKNOWN;
DbType dbType = DbType.SQLITE;
if (cbEnableMultiUser.isSelected()) {
dbType = DbType.POSTGRESQL;