rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor database elements

Browse Source
This commit is contained in:
J-Jamet
2019-03-15 10:58:04 +01:00
parent 1bfdae53c6
commit dad3edee5e
113 changed files with 294 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java
View File

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.tests;
import junit.framework.TestCase;
import com.kunzisoft.keepass.database.PwDate;
import com.kunzisoft.keepass.database.element.PwDate;
public class PwDateTest extends TestCase {
public void testDate() {

2
app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java
View File

@@ -27,7 +27,7 @@ import java.util.Calendar;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.tests.database.TestData;
public class PwEntryTestV3 extends AndroidTestCase {

8
app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java
View File

@@ -20,10 +20,10 @@
package com.kunzisoft.keepass.tests;
import com.kunzisoft.keepass.database.AutoType;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.PwGroupV4;
import com.kunzisoft.keepass.database.PwIconCustom;
import com.kunzisoft.keepass.database.PwIconStandard;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwGroupV4;
import com.kunzisoft.keepass.database.element.PwIconCustom;
import com.kunzisoft.keepass.database.element.PwIconStandard;
import com.kunzisoft.keepass.database.security.ProtectedBinary;
import com.kunzisoft.keepass.database.security.ProtectedString;

2
app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java
View File

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.tests;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.PwGroupV3;
import com.kunzisoft.keepass.database.element.PwGroupV3;
import com.kunzisoft.keepass.tests.database.TestData;
public class PwGroupTest extends AndroidTestCase {

2
app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java
View File

@@ -28,7 +28,7 @@ import java.util.UUID;
import junit.framework.TestCase;
import com.kunzisoft.keepass.database.PwDate;
import com.kunzisoft.keepass.database.element.PwDate;
import com.kunzisoft.keepass.stream.LEDataInputStream;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import com.kunzisoft.keepass.utils.Types;

12
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java
View File

@@ -22,12 +22,12 @@ package com.kunzisoft.keepass.tests.database;
import android.content.Context;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.action.node.DeleteGroupRunnable;
import com.kunzisoft.keepass.database.search.SearchDbHelper;

4
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java
View File

@@ -19,8 +19,8 @@
*/
package com.kunzisoft.keepass.tests.database;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import junit.framework.TestCase;

4
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java
View File

@@ -25,8 +25,8 @@ import android.content.Context;
import android.content.res.AssetManager;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.load.ImporterV3;
public class Kdb3Twofish extends AndroidTestCase {

48
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java
View File

@@ -19,27 +19,17 @@
*/
package com.kunzisoft.keepass.tests.database;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import android.content.Context;
import android.content.res.AssetManager;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.exception.InvalidDBException;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import com.kunzisoft.keepass.database.load.Importer;
import com.kunzisoft.keepass.database.load.ImporterFactory;
import com.kunzisoft.keepass.database.load.ImporterV4;
import com.kunzisoft.keepass.database.save.PwDbOutput;
import com.kunzisoft.keepass.database.save.PwDbV4Output;
import com.kunzisoft.keepass.stream.CopyInputStream;
import com.kunzisoft.keepass.tests.TestUtil;
import java.io.IOException;
import java.io.InputStream;
public class Kdb4 extends AndroidTestCase {
public void testDetection() throws IOException, InvalidDBException {
@@ -48,11 +38,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
Importer importer = ImporterFactory.createImporter(is);
assertTrue(importer instanceof ImporterV4);
is.close();
*/
}
public void testParsing() throws IOException, InvalidDBException {
@@ -61,12 +53,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
importer.openDatabase(is, "12345", null);
is.close();
*/
}
public void testSavingKDBXV3() throws IOException, InvalidDBException, PwDbOutputException {
@@ -83,6 +76,8 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open(inputFile, AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
PwDatabaseV4 db = importer.openDatabase(is, password, null);
is.close();
@@ -103,7 +98,7 @@ public class Kdb4 extends AndroidTestCase {
bis.close();
fos.close();
*/
}
@Override
@@ -120,10 +115,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("keyfile.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
is.close();
*/
}
@@ -133,11 +131,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("keyfile-binary.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx,TestUtil.getSdPath("key-binary")));
is.close();
*/
}
public void testKeyfile() throws IOException, InvalidDBException {
@@ -145,13 +145,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("key-only.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
importer.openDatabase(is, "", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
is.close();
*/
}
public void testNoGzip() throws IOException, InvalidDBException {
@@ -159,13 +159,13 @@ public class Kdb4 extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("no-encrypt.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
importer.openDatabase(is, "12345", null);
is.close();
*/
}
}

9
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java
View File

@@ -23,10 +23,6 @@ import android.content.Context;
import android.content.res.AssetManager;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.crypto.engine.AesEngine;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.load.ImporterV4;
import java.io.InputStream;
public class Kdb4Header extends AndroidTestCase {
@@ -35,7 +31,9 @@ public class Kdb4Header extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
PwDatabaseV4 db = importer.openDatabase(is, "12345", null);
@@ -45,6 +43,7 @@ public class Kdb4Header extends AndroidTestCase {
assertTrue(db.getDataCipher().equals(AesEngine.CIPHER_UUID));
is.close();
*/
}
}

21
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java
View File

@@ -19,21 +19,21 @@
*/
package com.kunzisoft.keepass.tests.database;
import java.io.InputStream;
import java.util.UUID;
import android.content.Context;
import android.content.res.AssetManager;
import android.test.AndroidTestCase;
import biz.source_code.base64Coder.Base64Coder;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.load.ImporterV4;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.utils.SprEngineV4;
import com.kunzisoft.keepass.utils.Types;
import java.io.InputStream;
import java.util.UUID;
import biz.source_code.base64Coder.Base64Coder;
public class SprEngineTest extends AndroidTestCase {
private PwDatabaseV4 db;
private SprEngineV4 spr;
@@ -46,13 +46,16 @@ public class SprEngineTest extends AndroidTestCase {
AssetManager am = ctx.getAssets();
InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
/*
TODO Test
ImporterV4 importer = new ImporterV4();
db = importer.openDatabase(is, "12345", null);
is.close();
spr = new SprEngineV4();
*/
}
private final String REF = "{REF:P@I:2B1D56590D961F48A8CE8C392CE6CD35}";

4
app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java
View File

@@ -25,8 +25,8 @@ import android.content.Context;
import android.content.res.AssetManager;
import android.net.Uri;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.load.Importer;
import com.kunzisoft.keepass.tests.TestUtil;

6
app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java
View File

@@ -32,9 +32,9 @@ import java.security.NoSuchAlgorithmException;
import android.content.res.AssetManager;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.PwDbHeader;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.element.PwDbHeader;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import com.kunzisoft.keepass.database.save.PwDbHeaderOutputV3;
import com.kunzisoft.keepass.database.save.PwDbV3Output;

4
app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java
View File

@@ -25,8 +25,8 @@ import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.test.AndroidTestCase;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.tests.database.TestData;
public class SearchTest extends AndroidTestCase {

6
app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
View File

@@ -42,10 +42,10 @@ import com.getkeepsafe.taptargetview.TapTarget;
import com.getkeepsafe.taptargetview.TapTargetView;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.ExtraFields;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.security.ProtectedString;
import com.kunzisoft.keepass.activities.lock.LockingHideActivity;
import com.kunzisoft.keepass.notifications.NotificationCopyingService;

14
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
View File

@@ -42,13 +42,13 @@ import com.getkeepsafe.taptargetview.TapTargetView;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.activities.lock.LockingHideActivity;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwDate;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.PwGroupId;
import com.kunzisoft.keepass.database.PwIconStandard;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDate;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.element.PwGroupId;
import com.kunzisoft.keepass.database.element.PwIconStandard;
import com.kunzisoft.keepass.tasks.ActionRunnable;
import com.kunzisoft.keepass.database.action.node.ActionNodeValues;
import com.kunzisoft.keepass.database.action.node.AddEntryRunnable;

18
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
View File

@@ -59,15 +59,15 @@ import com.kunzisoft.keepass.adapters.NodeAdapter;
import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.autofill.AutofillHelper;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.PwGroupId;
import com.kunzisoft.keepass.database.PwGroupV4;
import com.kunzisoft.keepass.database.PwIcon;
import com.kunzisoft.keepass.database.PwIconStandard;
import com.kunzisoft.keepass.database.PwNode;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.element.PwGroupId;
import com.kunzisoft.keepass.database.element.PwGroupV4;
import com.kunzisoft.keepass.database.element.PwIcon;
import com.kunzisoft.keepass.database.element.PwIconStandard;
import com.kunzisoft.keepass.database.element.PwNode;
import com.kunzisoft.keepass.database.SortNodeEnum;
import com.kunzisoft.keepass.database.action.AssignPasswordInDatabaseRunnable;
import com.kunzisoft.keepass.database.action.ProgressDialogRunnable;

6
app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java
View File

@@ -20,9 +20,9 @@ import android.view.ViewGroup;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.adapters.NodeAdapter;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.PwNode;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.element.PwNode;
import com.kunzisoft.keepass.database.SortNodeEnum;
import com.kunzisoft.keepass.dialogs.SortDialogFragment;
import com.kunzisoft.keepass.settings.PreferencesUtil;

9
app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java
View File

@@ -27,7 +27,6 @@ import android.support.v7.util.SortedList;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.util.SortedListAdapterCallback;
import android.util.Log;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuInflater;
@@ -38,10 +37,10 @@ import android.widget.Toast;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.PwNode;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.element.PwNode;
import com.kunzisoft.keepass.database.SortNodeEnum;
import com.kunzisoft.keepass.settings.PreferencesUtil;
import com.kunzisoft.keepass.utils.Util;

8
app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java
View File

@@ -31,10 +31,10 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwIcon;
import com.kunzisoft.keepass.database.PwIconFactory;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwIcon;
import com.kunzisoft.keepass.database.element.PwIconFactory;
import com.kunzisoft.keepass.database.cursor.EntryCursor;
import com.kunzisoft.keepass.settings.PreferencesUtil;

2
app/src/main/java/com/kunzisoft/keepass/app/App.java
View File

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.app;
import android.support.multidex.MultiDexApplication;
import com.kunzisoft.keepass.compat.PRNGFixes;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.fileselect.RecentFileHistory;
import com.kunzisoft.keepass.stylish.Stylish;

2
app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
View File

@@ -33,7 +33,7 @@ import android.view.autofill.AutofillValue
import android.widget.RemoteViews
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.EntrySelectionHelper
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.element.PwEntry
import java.util.*

2
app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.java
View File

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.crypto.engine;
import com.kunzisoft.keepass.crypto.CipherFactory;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.utils.Types;
import java.security.InvalidAlgorithmParameterException;

2
app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.crypto.engine;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.utils.Types;
import org.spongycastle.jce.provider.BouncyCastleProvider;

2
app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.crypto.engine;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;

2
app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.java
View File

@@ -20,7 +20,7 @@
package com.kunzisoft.keepass.crypto.engine;
import com.kunzisoft.keepass.crypto.CipherFactory;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.utils.Types;
import java.security.InvalidAlgorithmParameterException;

2
app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java
View File

@@ -19,6 +19,8 @@
*/
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwGroupV4;
import com.kunzisoft.keepass.database.security.ProtectedBinary;
import java.util.Collection;

2
app/src/main/java/com/kunzisoft/keepass/database/EntryHandler.java
View File

@@ -19,6 +19,8 @@
*/
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwEntry;
/** "Delegate" class for operating on each entry when traversing all of
* them
* @author bpellin

10
app/src/main/java/com/kunzisoft/keepass/database/ExtraFields.java
View File

@@ -29,11 +29,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import static com.kunzisoft.keepass.database.PwEntryV4.STR_NOTES;
import static com.kunzisoft.keepass.database.PwEntryV4.STR_PASSWORD;
import static com.kunzisoft.keepass.database.PwEntryV4.STR_TITLE;
import static com.kunzisoft.keepass.database.PwEntryV4.STR_URL;
import static com.kunzisoft.keepass.database.PwEntryV4.STR_USERNAME;
import static com.kunzisoft.keepass.database.element.PwEntryV4.STR_NOTES;
import static com.kunzisoft.keepass.database.element.PwEntryV4.STR_PASSWORD;
import static com.kunzisoft.keepass.database.element.PwEntryV4.STR_TITLE;
import static com.kunzisoft.keepass.database.element.PwEntryV4.STR_URL;
import static com.kunzisoft.keepass.database.element.PwEntryV4.STR_USERNAME;
public class ExtraFields implements Parcelable, Cloneable {

2
app/src/main/java/com/kunzisoft/keepass/database/ISmallTimeLogger.java
View File

@@ -19,6 +19,8 @@
*/
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwDate;
public interface ISmallTimeLogger {
PwDate getLastModificationTime();

2
app/src/main/java/com/kunzisoft/keepass/database/ITimeLogger.java
View File

@@ -19,6 +19,8 @@
*/
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwDate;
public interface ITimeLogger extends ISmallTimeLogger {
long getUsageCount();

2
app/src/main/java/com/kunzisoft/keepass/database/MemoryProtectionConfig.java
View File

@@ -19,6 +19,8 @@
*/
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwDefsV4;
public class MemoryProtectionConfig {
public boolean protectTitle = false;

4
app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java
View File

@@ -20,6 +20,10 @@
package com.kunzisoft.keepass.database;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.database.element.PwNode;
import java.util.Comparator;
public enum SortNodeEnum {

2
app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDatabaseRunnable.kt
View File

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.action
import android.content.Context
import android.net.Uri
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.exception.InvalidKeyFileException
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.utils.UriUtil

4
app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
View File

@@ -20,8 +20,8 @@
package com.kunzisoft.keepass.database.action
import com.kunzisoft.keepass.app.App
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwDatabase
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwDatabase
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.utils.UriUtil

2
app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
View File

@@ -26,7 +26,7 @@ import android.support.annotation.StringRes
import android.util.Log
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.app.App
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.exception.*
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.tasks.ProgressTaskUpdater

2
app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseProgressDialogRunnable.kt
View File

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.action
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment
import com.kunzisoft.keepass.tasks.ProgressTaskUpdater

2
app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
View File

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.action
import android.content.Context
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.exception.PwDbOutputException
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.timeout.TimeoutHelper

2
app/src/main/java/com/kunzisoft/keepass/database/action/node/ActionNodeDatabaseRunnable.kt
View File

@@ -1,7 +1,7 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.action.SaveDatabaseProgressDialogRunnable
abstract class ActionNodeDatabaseRunnable(

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/AddEntryRunnable.kt
View File

@@ -20,8 +20,8 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwEntry
class AddEntryRunnable constructor(
context: FragmentActivity,

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/AddGroupRunnable.kt
View File

@@ -20,8 +20,8 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwGroup
class AddGroupRunnable constructor(
context: FragmentActivity,

2
app/src/main/java/com/kunzisoft/keepass/database/action/node/AfterActionNodeFinishRunnable.kt
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.action.node
import com.kunzisoft.keepass.database.PwNode
import com.kunzisoft.keepass.database.element.PwNode
/**
* Callback method who return the node(s) modified after an action

6
app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyEntryRunnable.kt
View File

@@ -21,9 +21,9 @@ package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import android.util.Log
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwEntry
import com.kunzisoft.keepass.database.element.PwGroup
class CopyEntryRunnable constructor(
context: FragmentActivity,

6
app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteEntryRunnable.kt
View File

@@ -20,9 +20,9 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwEntry
import com.kunzisoft.keepass.database.element.PwGroup
class DeleteEntryRunnable constructor(
context: FragmentActivity,

6
app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteGroupRunnable.java
View File

@@ -21,9 +21,9 @@ package com.kunzisoft.keepass.database.action.node;
import android.support.v4.app.FragmentActivity;
import com.kunzisoft.keepass.database.Database;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.element.Database;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwGroup;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

6
app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveEntryRunnable.kt
View File

@@ -21,9 +21,9 @@ package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import android.util.Log
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwEntry
import com.kunzisoft.keepass.database.element.PwGroup
class MoveEntryRunnable constructor(
context: FragmentActivity,

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveGroupRunnable.kt
View File

@@ -22,8 +22,8 @@ package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import android.util.Log
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwGroup
class MoveGroupRunnable constructor(
context: FragmentActivity,

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateEntryRunnable.kt
View File

@@ -20,8 +20,8 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwEntry
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwEntry
class UpdateEntryRunnable constructor(
context: FragmentActivity,

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateGroupRunnable.kt
View File

@@ -20,8 +20,8 @@
package com.kunzisoft.keepass.database.action.node
import android.support.v4.app.FragmentActivity
import com.kunzisoft.keepass.database.Database
import com.kunzisoft.keepass.database.PwGroup
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.element.PwGroup
class UpdateGroupRunnable constructor(
context: FragmentActivity,

14
app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java
View File

@@ -3,13 +3,13 @@ package com.kunzisoft.keepass.database.cursor;
import android.database.MatrixCursor;
import android.provider.BaseColumns;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.PwIconCustom;
import com.kunzisoft.keepass.database.PwIconFactory;
import com.kunzisoft.keepass.database.PwIconStandard;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwIconCustom;
import com.kunzisoft.keepass.database.element.PwIconFactory;
import com.kunzisoft.keepass.database.element.PwIconStandard;
import java.util.UUID;

2
app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.java
View File

@@ -3,7 +3,7 @@ package com.kunzisoft.keepass.database.cursor;
import android.database.MatrixCursor;
import android.provider.BaseColumns;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.security.ProtectedString;
public class ExtraFieldCursor extends MatrixCursor {

2
app/src/main/java/com/kunzisoft/keepass/database/Database.java → app/src/main/java/com/kunzisoft/keepass/database/element/Database.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.content.Context;
import android.content.res.Resources;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
import com.kunzisoft.keepass.database.exception.KeyFileEmptyException;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3.java
View File

@@ -43,7 +43,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import com.kunzisoft.keepass.crypto.finalkey.FinalKey;
import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3Debug.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV3Debug.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
public class PwDatabaseV3Debug extends PwDatabaseV3 {

5
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.util.Log;
import android.webkit.URLUtil;
@@ -29,6 +29,9 @@ import com.kunzisoft.keepass.crypto.engine.CipherEngine;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters;
import com.kunzisoft.keepass.database.BinaryPool;
import com.kunzisoft.keepass.database.MemoryProtectionConfig;
import com.kunzisoft.keepass.database.PwCompressionAlgorithm;
import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
import com.kunzisoft.keepass.database.exception.UnknownKDF;
import com.kunzisoft.keepass.utils.EmptyUtils;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4XML.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabaseV4XML.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import java.text.SimpleDateFormat;
import java.util.TimeZone;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDate.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDate.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import android.os.Parcelable;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDbHeader.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDbHeader.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
public abstract class PwDbHeader {

2
app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderFactory.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDbHeaderFactory.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
public class PwDbHeaderFactory {
public static PwDbHeader getInstance(PwDatabase db) {

2
app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV3.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDbHeaderV3.java
View File

@@ -44,7 +44,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import com.kunzisoft.keepass.stream.LEDataInputStream;

6
app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDbHeaderV4.java
View File

@@ -17,11 +17,15 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters;
import com.kunzisoft.keepass.database.CrsAlgorithm;
import com.kunzisoft.keepass.database.EntryHandler;
import com.kunzisoft.keepass.database.GroupHandler;
import com.kunzisoft.keepass.database.PwCompressionAlgorithm;
import com.kunzisoft.keepass.database.exception.InvalidDBVersionException;
import com.kunzisoft.keepass.stream.CopyInputStream;
import com.kunzisoft.keepass.stream.HmacBlockStream;

2
app/src/main/java/com/kunzisoft/keepass/database/PwDefsV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDefsV4.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
public class PwDefsV4 {

2
app/src/main/java/com/kunzisoft/keepass/database/PwDeletedObject.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwDeletedObject.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import java.util.Date;
import java.util.UUID;

3
app/src/main/java/com/kunzisoft/keepass/database/PwEncryptionAlgorithm.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwEncryptionAlgorithm.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.content.res.Resources;
@@ -26,6 +26,7 @@ import com.kunzisoft.keepass.crypto.engine.AesEngine;
import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine;
import com.kunzisoft.keepass.crypto.engine.CipherEngine;
import com.kunzisoft.keepass.crypto.engine.TwofishEngine;
import com.kunzisoft.keepass.database.ObjectNameResource;
import java.util.UUID;

3
app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwEntry.java
View File

@@ -17,10 +17,11 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import com.kunzisoft.keepass.database.ExtraFields;
import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator;
import com.kunzisoft.keepass.database.security.ProtectedString;
import com.kunzisoft.keepass.model.Entry;

2
app/src/main/java/com/kunzisoft/keepass/database/PwEntryV3.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV3.java
View File

@@ -40,7 +40,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

5
app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV4.java
View File

@@ -17,10 +17,13 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import com.kunzisoft.keepass.database.AutoType;
import com.kunzisoft.keepass.database.ExtraFields;
import com.kunzisoft.keepass.database.ITimeLogger;
import com.kunzisoft.keepass.database.security.ProtectedBinary;
import com.kunzisoft.keepass.database.security.ProtectedString;
import com.kunzisoft.keepass.utils.MemUtil;

7
app/src/main/java/com/kunzisoft/keepass/database/PwGroup.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroup.java
View File

@@ -17,10 +17,13 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import com.kunzisoft.keepass.database.EntryHandler;
import com.kunzisoft.keepass.database.GroupHandler;
import java.util.ArrayList;
import java.util.List;
@@ -155,7 +158,7 @@ public abstract class PwGroup<GroupG extends PwGroup, EntryE extends PwEntry>
}
public boolean preOrderTraverseTree(GroupHandler<GroupG> groupHandler,
EntryHandler<EntryE> entryHandler) {
EntryHandler<EntryE> entryHandler) {
if (entryHandler != null) {
for (EntryE entry : childEntries) {
if (!entryHandler.operate(entry)) return false;

2
app/src/main/java/com/kunzisoft/keepass/database/PwGroupId.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupId.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import android.os.Parcelable;

2
app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV3.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupIdV3.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

2
app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupIdV4.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

2
app/src/main/java/com/kunzisoft/keepass/database/PwGroupV3.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV3.java
View File

@@ -18,7 +18,7 @@
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

4
app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV4.java
View File

@@ -17,11 +17,11 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import com.kunzisoft.keepass.utils.MemUtil;
import com.kunzisoft.keepass.database.ITimeLogger;
import java.util.HashMap;
import java.util.Map;

2
app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwIcon.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import android.os.Parcelable;

2
app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwIconCustom.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

2
app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwIconFactory.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;

2
app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwIconStandard.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;

3
app/src/main/java/com/kunzisoft/keepass/database/PwNode.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwNode.java
View File

@@ -18,12 +18,13 @@
*
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
import android.os.Parcel;
import android.os.Parcelable;
import com.kunzisoft.keepass.app.App;
import com.kunzisoft.keepass.database.ISmallTimeLogger;
import org.joda.time.LocalDate;

2
app/src/main/java/com/kunzisoft/keepass/database/PwVersion.java → app/src/main/java/com/kunzisoft/keepass/database/element/PwVersion.java
View File

@@ -17,7 +17,7 @@
* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.kunzisoft.keepass.database;
package com.kunzisoft.keepass.database.element;
public enum PwVersion {
V3, V4;

6
app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java
View File

@@ -19,9 +19,9 @@
*/
package com.kunzisoft.keepass.database.iterator;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.search.SearchParameters;
import com.kunzisoft.keepass.database.search.SearchParametersV4;

2
app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.iterator;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.search.SearchParameters;
import java.util.NoSuchElementException;

2
app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.iterator;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.search.SearchParametersV4;
import com.kunzisoft.keepass.database.security.ProtectedString;

2
app/src/main/java/com/kunzisoft/keepass/database/load/Importer.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.load;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.exception.InvalidDBException;
import com.kunzisoft.keepass.tasks.ProgressTaskUpdater;

4
app/src/main/java/com/kunzisoft/keepass/database/load/ImporterFactory.java
View File

@@ -19,8 +19,8 @@
*/
package com.kunzisoft.keepass.database.load;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.PwDbHeaderV4;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwDbHeaderV4;
import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException;
import com.kunzisoft.keepass.stream.LEDataInputStream;

14
app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java
View File

@@ -49,13 +49,13 @@ import android.util.Log;
import com.kunzisoft.keepass.R;
import com.kunzisoft.keepass.crypto.CipherFactory;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwDate;
import com.kunzisoft.keepass.database.PwDbHeader;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.PwGroupV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwDate;
import com.kunzisoft.keepass.database.element.PwDbHeader;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwGroupV3;
import com.kunzisoft.keepass.database.exception.InvalidAlgorithmException;
import com.kunzisoft.keepass.database.exception.InvalidDBException;
import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException;

2
app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3Debug.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.load;
import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.exception.InvalidDBException;
import com.kunzisoft.keepass.tasks.ProgressTaskUpdater;

18
app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java
View File

@@ -25,15 +25,15 @@ import com.kunzisoft.keepass.crypto.PwStreamCipherFactory;
import com.kunzisoft.keepass.crypto.engine.CipherEngine;
import com.kunzisoft.keepass.database.ITimeLogger;
import com.kunzisoft.keepass.database.PwCompressionAlgorithm;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwDatabaseV4XML;
import com.kunzisoft.keepass.database.PwDate;
import com.kunzisoft.keepass.database.PwDbHeaderV4;
import com.kunzisoft.keepass.database.PwDeletedObject;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.PwGroupV4;
import com.kunzisoft.keepass.database.PwIconCustom;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwDatabaseV4XML;
import com.kunzisoft.keepass.database.element.PwDate;
import com.kunzisoft.keepass.database.element.PwDbHeaderV4;
import com.kunzisoft.keepass.database.element.PwDeletedObject;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwGroupV4;
import com.kunzisoft.keepass.database.element.PwIconCustom;
import com.kunzisoft.keepass.database.exception.ArcFourException;
import com.kunzisoft.keepass.database.exception.InvalidDBException;
import com.kunzisoft.keepass.database.exception.InvalidPasswordException;

2
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV3.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import java.io.IOException;

6
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV4.java
View File

@@ -21,9 +21,9 @@ package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.collections.VariantDictionary;
import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwDbHeader;
import com.kunzisoft.keepass.database.PwDbHeaderV4;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwDbHeader;
import com.kunzisoft.keepass.database.element.PwDbHeaderV4;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import com.kunzisoft.keepass.stream.HmacBlockStream;
import com.kunzisoft.keepass.stream.LEDataOutputStream;

4
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbInnerHeaderOutputV4.java
View File

@@ -19,8 +19,8 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwDbHeaderV4;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwDbHeaderV4;
import com.kunzisoft.keepass.database.security.ProtectedBinary;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import com.kunzisoft.keepass.utils.MemUtil;

8
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbOutput.java
View File

@@ -19,10 +19,10 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwDatabase;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwDbHeader;
import com.kunzisoft.keepass.database.element.PwDatabase;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwDbHeader;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import java.io.OutputStream;

12
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3Output.java
View File

@@ -20,12 +20,12 @@
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.crypto.CipherFactory;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwDbHeader;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.PwGroupV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwDbHeader;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwGroupV3;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import com.kunzisoft.keepass.stream.NullOutputStream;

6
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3OutputDebug.java
View File

@@ -19,9 +19,9 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwDatabaseV3;
import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.PwDbHeaderV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import java.io.OutputStream;

16
app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java
View File

@@ -34,14 +34,14 @@ import com.kunzisoft.keepass.database.GroupHandler;
import com.kunzisoft.keepass.database.ITimeLogger;
import com.kunzisoft.keepass.database.MemoryProtectionConfig;
import com.kunzisoft.keepass.database.PwCompressionAlgorithm;
import com.kunzisoft.keepass.database.PwDatabaseV4;
import com.kunzisoft.keepass.database.PwDatabaseV4XML;
import com.kunzisoft.keepass.database.PwDbHeaderV4;
import com.kunzisoft.keepass.database.PwDefsV4;
import com.kunzisoft.keepass.database.PwDeletedObject;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.PwGroupV4;
import com.kunzisoft.keepass.database.PwIconCustom;
import com.kunzisoft.keepass.database.element.PwDatabaseV4;
import com.kunzisoft.keepass.database.element.PwDatabaseV4XML;
import com.kunzisoft.keepass.database.element.PwDbHeaderV4;
import com.kunzisoft.keepass.database.element.PwDefsV4;
import com.kunzisoft.keepass.database.element.PwDeletedObject;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwGroupV4;
import com.kunzisoft.keepass.database.element.PwIconCustom;
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
import com.kunzisoft.keepass.database.exception.UnknownKDF;
import com.kunzisoft.keepass.database.security.ProtectedBinary;

2
app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwEntryV3;
import com.kunzisoft.keepass.database.element.PwEntryV3;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import com.kunzisoft.keepass.utils.Types;

2
app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java
View File

@@ -19,7 +19,7 @@
*/
package com.kunzisoft.keepass.database.save;
import com.kunzisoft.keepass.database.PwGroupV3;
import com.kunzisoft.keepass.database.element.PwGroupV3;
import com.kunzisoft.keepass.stream.LEDataOutputStream;
import com.kunzisoft.keepass.utils.Types;

2
app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandler.java
View File

@@ -20,7 +20,7 @@
package com.kunzisoft.keepass.database.search;
import com.kunzisoft.keepass.database.EntryHandler;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator;
import java.util.Date;

2
app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerAll.java
View File

@@ -20,7 +20,7 @@
package com.kunzisoft.keepass.database.search;
import com.kunzisoft.keepass.database.EntryHandler;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntry;
import java.util.Date;
import java.util.List;

6
app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerV4.java
View File

@@ -19,9 +19,9 @@
*/
package com.kunzisoft.keepass.database.search;
import com.kunzisoft.keepass.database.PwEntry;
import com.kunzisoft.keepass.database.PwEntryV4;
import com.kunzisoft.keepass.database.PwGroup;
import com.kunzisoft.keepass.database.element.PwEntry;
import com.kunzisoft.keepass.database.element.PwEntryV4;
import com.kunzisoft.keepass.database.element.PwGroup;
import com.kunzisoft.keepass.utils.StrUtil;
import com.kunzisoft.keepass.utils.UuidUtil;

Some files were not shown because too many files have changed in this diff Show More