diff --git a/app/build.gradle b/app/build.gradle index d8db80b03..7cf29969b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion = 27 - buildToolsVersion = "27.0.3" + buildToolsVersion = '27.0.3' defaultConfig { applicationId "com.kunzisoft.keepass" @@ -12,7 +12,7 @@ android { versionName = "2.5.0.0beta8" multiDexEnabled true - testApplicationId = "com.keepassdroid.tests" + testApplicationId = "com.kunzisoft.keepass.tests" testInstrumentationRunner = "android.test.InstrumentationTestRunner" ndk { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/.gitignore b/app/src/androidTest/java/com/kunzisoft/keepass/tests/.gitignore similarity index 100% rename from app/src/androidTest/java/com/keepassdroid/tests/.gitignore rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/.gitignore diff --git a/app/src/androidTest/java/com/keepassdroid/tests/AccentTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AccentTest.java similarity index 93% rename from app/src/androidTest/java/com/keepassdroid/tests/AccentTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/AccentTest.java index c124b1b79..7aed9ad77 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/AccentTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AccentTest.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import android.test.AndroidTestCase; -import com.keepassdroid.tests.database.TestData; +import com.kunzisoft.keepass.tests.database.TestData; public class AccentTest extends AndroidTestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/AllTests.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AllTests.java similarity index 96% rename from app/src/androidTest/java/com/keepassdroid/tests/AllTests.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/AllTests.java index 1900d5a2d..434cf5011 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/AllTests.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AllTests.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/OutputTests.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/OutputTests.java similarity index 91% rename from app/src/androidTest/java/com/keepassdroid/tests/OutputTests.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/OutputTests.java index 188260eed..bf93721fc 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/OutputTests.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/OutputTests.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import junit.framework.Test; import junit.framework.TestSuite; @@ -29,7 +29,7 @@ public class OutputTests extends TestSuite { public static Test suite() { return new TestSuiteBuilder(AllTests.class) - .includePackages("com.keepassdroid.tests.output") + .includePackages("com.kunzisoft.keepass.tests.output") .build(); } } diff --git a/app/src/androidTest/java/com/keepassdroid/tests/PwDateTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java similarity index 93% rename from app/src/androidTest/java/com/keepassdroid/tests/PwDateTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java index 61897c220..c398b062b 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/PwDateTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import junit.framework.TestCase; -import com.keepassdroid.database.PwDate; +import com.kunzisoft.keepass.database.PwDate; public class PwDateTest extends TestCase { public void testDate() { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV3.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java similarity index 92% rename from app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV3.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java index 7e2973040..f5b8e2b14 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV3.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import static org.junit.Assert.assertArrayEquals; @@ -27,8 +27,8 @@ import java.util.Calendar; import android.test.AndroidTestCase; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.tests.database.TestData; +import com.kunzisoft.keepass.database.PwEntryV3; +import com.kunzisoft.keepass.tests.database.TestData; public class PwEntryTestV3 extends AndroidTestCase { PwEntryV3 mPE; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV4.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java similarity index 82% rename from app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV4.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java index 5f939ce67..15d26127a 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV4.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; -import com.keepassdroid.database.AutoType; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.PwGroupV4; -import com.keepassdroid.database.PwIconCustom; -import com.keepassdroid.database.PwIconStandard; -import com.keepassdroid.database.security.ProtectedBinary; -import com.keepassdroid.database.security.ProtectedString; +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.security.ProtectedBinary; +import com.kunzisoft.keepass.database.security.ProtectedString; import junit.framework.TestCase; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/PwGroupTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java similarity index 89% rename from app/src/androidTest/java/com/keepassdroid/tests/PwGroupTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java index 8cecce717..3473d0ac2 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/PwGroupTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import android.test.AndroidTestCase; -import com.keepassdroid.database.PwGroupV3; -import com.keepassdroid.tests.database.TestData; +import com.kunzisoft.keepass.database.PwGroupV3; +import com.kunzisoft.keepass.tests.database.TestData; public class PwGroupTest extends AndroidTestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/TestUtil.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TestUtil.java similarity index 93% rename from app/src/androidTest/java/com/keepassdroid/tests/TestUtil.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/TestUtil.java index 7c1ce5370..c7dd69151 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/TestUtil.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TestUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import java.io.File; import java.io.FileNotFoundException; @@ -29,8 +29,8 @@ import android.content.res.AssetManager; import android.net.Uri; import android.os.Environment; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.UriUtil; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.UriUtil; public class TestUtil { private static final File sdcard = Environment.getExternalStorageDirectory(); diff --git a/app/src/androidTest/java/com/keepassdroid/tests/TypesTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java similarity index 95% rename from app/src/androidTest/java/com/keepassdroid/tests/TypesTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java index fe2b01c2e..38b1a0fa1 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/TypesTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests; +package com.kunzisoft.keepass.tests; import static org.junit.Assert.assertArrayEquals; @@ -28,10 +28,10 @@ import java.util.UUID; import junit.framework.TestCase; -import com.keepassdroid.database.PwDate; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.database.PwDate; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.utils.Types; public class TypesTest extends TestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/crypto/AESTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.java similarity index 96% rename from app/src/androidTest/java/com/keepassdroid/tests/crypto/AESTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.java index e2fd9942e..db147ee45 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/AESTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.java @@ -17,9 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.crypto; +package com.kunzisoft.keepass.tests.crypto; -import static org.junit.Assert.assertArrayEquals; +import com.kunzisoft.keepass.crypto.CipherFactory; + +import junit.framework.TestCase; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -33,9 +35,7 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import junit.framework.TestCase; - -import com.keepassdroid.crypto.CipherFactory; +import static org.junit.Assert.assertArrayEquals; public class AESTest extends TestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/crypto/CipherTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.java similarity index 91% rename from app/src/androidTest/java/com/keepassdroid/tests/crypto/CipherTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.java index 3813f255c..4adbdbcdc 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/CipherTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.crypto; +package com.kunzisoft.keepass.tests.crypto; import static org.junit.Assert.assertArrayEquals; @@ -37,11 +37,11 @@ import javax.crypto.NoSuchPaddingException; import junit.framework.TestCase; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.crypto.engine.AesEngine; -import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.stream.BetterCipherInputStream; -import com.keepassdroid.stream.LEDataInputStream; +import com.kunzisoft.keepass.crypto.CipherFactory; +import com.kunzisoft.keepass.crypto.engine.AesEngine; +import com.kunzisoft.keepass.crypto.engine.CipherEngine; +import com.kunzisoft.keepass.stream.BetterCipherInputStream; +import com.kunzisoft.keepass.stream.LEDataInputStream; public class CipherTest extends TestCase { private Random rand = new Random(); diff --git a/app/src/androidTest/java/com/keepassdroid/tests/crypto/FinalKeyTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.java similarity index 91% rename from app/src/androidTest/java/com/keepassdroid/tests/crypto/FinalKeyTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.java index b52c11c76..ba9bc8da4 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/FinalKeyTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.crypto; +package com.kunzisoft.keepass.tests.crypto; import static org.junit.Assert.assertArrayEquals; @@ -26,8 +26,8 @@ import java.util.Random; import junit.framework.TestCase; -import com.keepassdroid.crypto.finalkey.AndroidFinalKey; -import com.keepassdroid.crypto.finalkey.NativeFinalKey; +import com.kunzisoft.keepass.crypto.finalkey.AndroidFinalKey; +import com.kunzisoft.keepass.crypto.finalkey.NativeFinalKey; public class FinalKeyTest extends TestCase { private Random mRand; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java similarity index 78% rename from app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java index 0c5ee7116..99f615a2a 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java @@ -17,20 +17,21 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import java.util.List; import android.content.Context; import android.test.AndroidTestCase; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.edit.DeleteGroup; -import com.keepassdroid.search.SearchDbHelper; +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.edit.DeleteGroup; +import com.kunzisoft.keepass.search.SearchDbHelper; public class DeleteEntry extends AndroidTestCase { private static final String GROUP1_NAME = "Group1"; @@ -54,7 +55,7 @@ public class DeleteEntry extends AndroidTestCase { return; } - PwDatabaseV3 pm = (PwDatabaseV3) db.pm; + PwDatabaseV3 pm = (PwDatabaseV3) db.getPwDatabase(); PwGroup group1 = getGroup(pm, GROUP1_NAME); assertNotNull("Could not find group1", group1); @@ -71,8 +72,8 @@ public class DeleteEntry extends AndroidTestCase { // Verify the entries were removed from the search index SearchDbHelper dbHelp = new SearchDbHelper(ctx); - PwGroup results1 = dbHelp.search(db, ENTRY1_NAME); - PwGroup results2 = dbHelp.search(db, ENTRY2_NAME); + PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME); + PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME); assertEquals("Entry1 was not removed from the search results", 0, results1.numbersOfChildEntries()); assertEquals("Entry2 was not removed from the search results", 0, results2.numbersOfChildEntries()); @@ -83,10 +84,10 @@ public class DeleteEntry extends AndroidTestCase { } - private PwEntry getEntry(PwDatabaseV3 pm, String name) { - List entries = pm.getEntries(); + private PwEntryV3 getEntry(PwDatabaseV3 pm, String name) { + List entries = pm.getEntries(); for ( int i = 0; i < entries.size(); i++ ) { - PwEntry entry = entries.get(i); + PwEntryV3 entry = entries.get(i); if ( entry.getTitle().equals(name) ) { return entry; } diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/EntryV4.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java similarity index 90% rename from app/src/androidTest/java/com/keepassdroid/tests/database/EntryV4.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java index 01d2da59a..c4a7f4cea 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/EntryV4.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import junit.framework.TestCase; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.PwEntryV4; public class EntryV4 extends TestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3.java similarity index 90% rename from app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3.java index 782cd991e..25c574ccb 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import android.content.Context; import android.content.res.AssetManager; @@ -25,9 +25,9 @@ import android.net.Uri; import android.os.Environment; import android.test.AndroidTestCase; -import com.keepassdroid.database.load.ImporterV3; -import com.keepassdroid.tests.TestUtil; -import com.keepassdroid.utils.UriUtil; +import com.kunzisoft.keepass.database.load.ImporterV3; +import com.kunzisoft.keepass.tests.TestUtil; +import com.kunzisoft.keepass.utils.UriUtil; import java.io.InputStream; import java.io.File; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3Twofish.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java similarity index 86% rename from app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3Twofish.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java index 90e7aadc2..f04027487 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3Twofish.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import java.io.InputStream; @@ -25,9 +25,9 @@ import android.content.Context; import android.content.res.AssetManager; import android.test.AndroidTestCase; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.database.load.ImporterV3; +import com.kunzisoft.keepass.database.PwDatabaseV3; +import com.kunzisoft.keepass.database.PwEncryptionAlgorithm; +import com.kunzisoft.keepass.database.load.ImporterV3; public class Kdb3Twofish extends AndroidTestCase { public void testReadTwofish() throws Exception { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java similarity index 89% rename from app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java index 60c4a2180..e09591a1c 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,16 +29,16 @@ import android.content.Context; import android.content.res.AssetManager; import android.test.AndroidTestCase; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.exception.InvalidDBException; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.database.load.Importer; -import com.keepassdroid.database.load.ImporterFactory; -import com.keepassdroid.database.load.ImporterV4; -import com.keepassdroid.database.save.PwDbOutput; -import com.keepassdroid.database.save.PwDbV4Output; -import com.keepassdroid.stream.CopyInputStream; -import com.keepassdroid.tests.TestUtil; +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; public class Kdb4 extends AndroidTestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4Header.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java similarity index 87% rename from app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4Header.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java index 7aceb5536..a29790227 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4Header.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import android.content.Context; import android.content.res.AssetManager; import android.test.AndroidTestCase; -import com.keepassdroid.crypto.engine.AesEngine; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.load.ImporterV4; +import com.kunzisoft.keepass.crypto.engine.AesEngine; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.load.ImporterV4; import java.io.InputStream; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java similarity index 85% rename from app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java index 1b15b4a30..62a171608 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import java.io.InputStream; import java.util.UUID; @@ -27,12 +27,12 @@ import android.content.res.AssetManager; import android.test.AndroidTestCase; import biz.source_code.base64Coder.Base64Coder; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.load.ImporterV4; -import com.keepassdroid.utils.SprEngineV4; -import com.keepassdroid.utils.Types; +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.utils.SprEngineV4; +import com.kunzisoft.keepass.utils.Types; public class SprEngineTest extends AndroidTestCase { private PwDatabaseV4 db; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java similarity index 89% rename from app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java index 7f8cb74b2..dcf7ce5d4 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.database; +package com.kunzisoft.keepass.tests.database; import java.io.InputStream; @@ -25,10 +25,10 @@ import android.content.Context; import android.content.res.AssetManager; import android.net.Uri; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabaseV3Debug; -import com.keepassdroid.database.load.Importer; -import com.keepassdroid.tests.TestUtil; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwDatabaseV3Debug; +import com.kunzisoft.keepass.database.load.Importer; +import com.kunzisoft.keepass.tests.TestUtil; public class TestData { private static final String TEST1_KEYFILE = ""; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/output/PwManagerOutputTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java similarity index 89% rename from app/src/androidTest/java/com/keepassdroid/tests/output/PwManagerOutputTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java index 9ea32d87d..46b414d25 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/output/PwManagerOutputTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.output; +package com.kunzisoft.keepass.tests.output; import static org.junit.Assert.assertArrayEquals; @@ -32,16 +32,16 @@ import java.security.NoSuchAlgorithmException; import android.content.res.AssetManager; import android.test.AndroidTestCase; -import com.keepassdroid.database.PwDatabaseV3Debug; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.database.save.PwDbHeaderOutputV3; -import com.keepassdroid.database.save.PwDbV3Output; -import com.keepassdroid.database.save.PwDbV3OutputDebug; -import com.keepassdroid.stream.NullOutputStream; -import com.keepassdroid.tests.TestUtil; -import com.keepassdroid.tests.database.TestData; +import com.kunzisoft.keepass.database.PwDatabaseV3Debug; +import com.kunzisoft.keepass.database.PwDbHeader; +import com.kunzisoft.keepass.database.PwDbHeaderV3; +import com.kunzisoft.keepass.database.exception.PwDbOutputException; +import com.kunzisoft.keepass.database.save.PwDbHeaderOutputV3; +import com.kunzisoft.keepass.database.save.PwDbV3Output; +import com.kunzisoft.keepass.database.save.PwDbV3OutputDebug; +import com.kunzisoft.keepass.stream.NullOutputStream; +import com.kunzisoft.keepass.tests.TestUtil; +import com.kunzisoft.keepass.tests.database.TestData; public class PwManagerOutputTest extends AndroidTestCase { PwDatabaseV3Debug mPM; diff --git a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java similarity index 91% rename from app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java index bb6a1dd7f..949ba6ca2 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.search; +package com.kunzisoft.keepass.tests.search; import android.content.Context; @@ -25,9 +25,9 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.test.AndroidTestCase; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.tests.database.TestData; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwGroup; +import com.kunzisoft.keepass.tests.database.TestData; public class SearchTest extends AndroidTestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/stream/HashedBlock.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.java similarity index 94% rename from app/src/androidTest/java/com/keepassdroid/tests/stream/HashedBlock.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.java index 579ba6a16..6b6bc7f01 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/stream/HashedBlock.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.stream; +package com.kunzisoft.keepass.tests.stream; import static org.junit.Assert.assertArrayEquals; @@ -30,8 +30,8 @@ import java.util.zip.GZIPOutputStream; import junit.framework.TestCase; -import com.keepassdroid.stream.HashedBlockInputStream; -import com.keepassdroid.stream.HashedBlockOutputStream; +import com.kunzisoft.keepass.stream.HashedBlockInputStream; +import com.kunzisoft.keepass.stream.HashedBlockOutputStream; public class HashedBlock extends TestCase { diff --git a/app/src/androidTest/java/com/keepassdroid/tests/utils/StrUtilTest.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StrUtilTest.java similarity index 95% rename from app/src/androidTest/java/com/keepassdroid/tests/utils/StrUtilTest.java rename to app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StrUtilTest.java index 14e7802a0..c6b22ad5f 100644 --- a/app/src/androidTest/java/com/keepassdroid/tests/utils/StrUtilTest.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StrUtilTest.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tests.utils; +package com.kunzisoft.keepass.tests.utils; import java.util.Locale; -import com.keepassdroid.utils.StrUtil; +import com.kunzisoft.keepass.utils.StrUtil; import junit.framework.TestCase; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9ce08e3d3..16651f600 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,10 +16,10 @@ android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" - android:name="com.keepassdroid.app.App" + android:name="com.kunzisoft.keepass.app.App" android:allowBackup="true" android:fullBackupContent="@xml/backup" - android:backupAgent="com.keepassdroid.backup.SettingsBackupAgent" + android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent" android:theme="@style/KeepassDXStyle.Light" tools:replace="android:theme"> @@ -38,7 +38,7 @@ android:resource="@xml/nnf_provider_paths" /> @@ -54,16 +54,16 @@ @@ -103,24 +103,24 @@ @@ -130,18 +130,18 @@ android:name="android.app.searchable" android:resource="@xml/searchable" /> - - + - + - + . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; @@ -27,8 +27,8 @@ import android.util.Log; import android.view.MenuItem; import android.widget.TextView; -import com.keepassdroid.stylish.StylishActivity; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.stylish.StylishActivity; import org.joda.time.DateTime; diff --git a/app/src/main/java/com/keepassdroid/activities/EntryActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java similarity index 93% rename from app/src/main/java/com/keepassdroid/activities/EntryActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java index 9229df27b..39c05172d 100644 --- a/app/src/main/java/com/keepassdroid/activities/EntryActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java @@ -18,7 +18,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -35,28 +35,28 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.ExtraFields; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.notifications.NotificationCopyingService; -import com.keepassdroid.notifications.NotificationField; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.timeout.ClipboardHelper; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.MenuUtil; -import com.keepassdroid.utils.Types; -import com.keepassdroid.utils.Util; -import com.keepassdroid.view.EntryContentsView; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.ExtraFields; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.notifications.NotificationCopyingService; +import com.kunzisoft.keepass.notifications.NotificationField; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.timeout.ClipboardHelper; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.MenuUtil; +import com.kunzisoft.keepass.utils.Types; +import com.kunzisoft.keepass.utils.Util; +import com.kunzisoft.keepass.view.EntryContentsView; import java.util.ArrayList; import java.util.Date; import java.util.UUID; -import static com.keepassdroid.settings.PreferencesUtil.isClipboardNotificationsEnable; +import static com.kunzisoft.keepass.settings.PreferencesUtil.isClipboardNotificationsEnable; public class EntryActivity extends LockingHideActivity { private final static String TAG = EntryActivity.class.getName(); diff --git a/app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java similarity index 92% rename from app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java index 346a27699..03f67afa3 100644 --- a/app/src/main/java/com/keepassdroid/activities/EntryEditActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.app.Activity; import android.content.Intent; @@ -36,29 +36,29 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.Toast; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDate; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.PwGroupId; -import com.keepassdroid.database.PwIconStandard; -import com.keepassdroid.database.edit.AddEntry; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.database.edit.RunnableOnFinish; -import com.keepassdroid.database.edit.UpdateEntry; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.dialogs.GeneratePasswordDialogFragment; -import com.keepassdroid.dialogs.IconPickerDialogFragment; -import com.keepassdroid.icons.Icons; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.tasks.ProgressTask; -import com.keepassdroid.utils.MenuUtil; -import com.keepassdroid.utils.Types; -import com.keepassdroid.utils.Util; -import com.keepassdroid.view.EntryEditCustomField; import com.kunzisoft.keepass.R; +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.edit.AddEntry; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.database.edit.RunnableOnFinish; +import com.kunzisoft.keepass.database.edit.UpdateEntry; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.dialogs.GeneratePasswordDialogFragment; +import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment; +import com.kunzisoft.keepass.icons.Icons; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.tasks.ProgressTask; +import com.kunzisoft.keepass.utils.MenuUtil; +import com.kunzisoft.keepass.utils.Types; +import com.kunzisoft.keepass.utils.Util; +import com.kunzisoft.keepass.view.EntryEditCustomField; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java similarity index 92% rename from app/src/main/java/com/keepassdroid/activities/GroupActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java index f4a268004..c5a6cdb77 100644 --- a/app/src/main/java/com/keepassdroid/activities/GroupActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.app.Activity; import android.app.Dialog; @@ -41,26 +41,26 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.widget.ImageView; -import com.keepassdroid.adapters.NodeAdapter; -import com.keepassdroid.app.App; -import com.keepassdroid.autofill.AutofillHelper; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.PwGroupId; -import com.keepassdroid.database.PwNode; -import com.keepassdroid.database.SortNodeEnum; -import com.keepassdroid.database.edit.AddGroup; -import com.keepassdroid.database.edit.DeleteEntry; -import com.keepassdroid.database.edit.DeleteGroup; -import com.keepassdroid.dialogs.AssignMasterKeyDialogFragment; -import com.keepassdroid.dialogs.GroupEditDialogFragment; -import com.keepassdroid.dialogs.IconPickerDialogFragment; -import com.keepassdroid.dialogs.ReadOnlyDialog; -import com.keepassdroid.search.SearchResultsActivity; -import com.keepassdroid.tasks.ProgressTask; -import com.keepassdroid.view.AddNodeButtonView; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.adapters.NodeAdapter; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.autofill.AutofillHelper; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwGroup; +import com.kunzisoft.keepass.database.PwGroupId; +import com.kunzisoft.keepass.database.PwNode; +import com.kunzisoft.keepass.database.SortNodeEnum; +import com.kunzisoft.keepass.database.edit.AddGroup; +import com.kunzisoft.keepass.database.edit.DeleteEntry; +import com.kunzisoft.keepass.database.edit.DeleteGroup; +import com.kunzisoft.keepass.dialogs.AssignMasterKeyDialogFragment; +import com.kunzisoft.keepass.dialogs.GroupEditDialogFragment; +import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment; +import com.kunzisoft.keepass.dialogs.ReadOnlyDialog; +import com.kunzisoft.keepass.search.SearchResultsActivity; +import com.kunzisoft.keepass.tasks.ProgressTask; +import com.kunzisoft.keepass.view.AddNodeButtonView; public class GroupActivity extends ListNodesActivity implements GroupEditDialogFragment.EditGroupListener, IconPickerDialogFragment.IconPickerListener { @@ -82,12 +82,12 @@ public class GroupActivity extends ListNodesActivity private static final String TAG = "Group Activity:"; public static void launch(Activity act) { - LockingActivity.recordFirstTimeBeforeLaunch(act); + recordFirstTimeBeforeLaunch(act); launch(act, (PwGroup) null); } public static void launch(Activity act, PwGroup group) { - if (LockingActivity.checkTimeIsAllowedOrFinish(act)) { + if (checkTimeIsAllowedOrFinish(act)) { Intent intent = new Intent(act, GroupActivity.class); if (group != null) { intent.putExtra(GROUP_ID_KEY, group.getId()); @@ -99,7 +99,7 @@ public class GroupActivity extends ListNodesActivity @RequiresApi(api = Build.VERSION_CODES.O) public static void launch(Activity act, AssistStructure assistStructure) { if ( assistStructure != null ) { - LockingActivity.recordFirstTimeBeforeLaunch(act); + recordFirstTimeBeforeLaunch(act); launch(act, null, assistStructure); } else { launch(act); @@ -109,7 +109,7 @@ public class GroupActivity extends ListNodesActivity @RequiresApi(api = Build.VERSION_CODES.O) public static void launch(Activity act, PwGroup group, AssistStructure assistStructure) { if ( assistStructure != null ) { - if (LockingActivity.checkTimeIsAllowedOrFinish(act)) { + if (checkTimeIsAllowedOrFinish(act)) { Intent intent = new Intent(act, GroupActivity.class); if (group != null) { intent.putExtra(GROUP_ID_KEY, group.getId()); diff --git a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java similarity index 91% rename from app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java index 67a33b7be..5bd6a9564 100644 --- a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.annotation.SuppressLint; import android.app.assist.AssistStructure; @@ -38,29 +38,29 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import com.keepassdroid.adapters.NodeAdapter; -import com.keepassdroid.app.App; -import com.keepassdroid.autofill.AutofillHelper; -import com.keepassdroid.compat.EditorCompat; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.PwNode; -import com.keepassdroid.database.edit.AfterAddNodeOnFinish; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.dialogs.AssignMasterKeyDialogFragment; -import com.keepassdroid.dialogs.SortDialogFragment; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.tasks.UIToastTask; -import com.keepassdroid.utils.MenuUtil; -import com.keepassdroid.database.SortNodeEnum; -import com.keepassdroid.password.AssignPasswordHelper; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.adapters.NodeAdapter; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.autofill.AutofillHelper; +import com.kunzisoft.keepass.compat.EditorCompat; +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.PwNode; +import com.kunzisoft.keepass.database.SortNodeEnum; +import com.kunzisoft.keepass.database.edit.AfterAddNodeOnFinish; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.dialogs.AssignMasterKeyDialogFragment; +import com.kunzisoft.keepass.dialogs.SortDialogFragment; +import com.kunzisoft.keepass.password.AssignPasswordHelper; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.tasks.UIToastTask; +import com.kunzisoft.keepass.utils.MenuUtil; public abstract class ListNodesActivity extends LockingActivity implements AssignMasterKeyDialogFragment.AssignPasswordDialogListener, - NodeAdapter.OnNodeClickCallback, + NodeAdapter.OnNodeClickCallback, SortDialogFragment.SortSelectionListener { protected PwGroup mCurrentGroup; diff --git a/app/src/main/java/com/keepassdroid/activities/LockingActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/LockingActivity.java similarity index 94% rename from app/src/main/java/com/keepassdroid/activities/LockingActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/LockingActivity.java index e4ee2a289..ee7d91a22 100644 --- a/app/src/main/java/com/keepassdroid/activities/LockingActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/LockingActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.app.Activity; import android.content.BroadcastReceiver; @@ -28,10 +28,10 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.util.Log; -import com.keepassdroid.app.App; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.stylish.StylishActivity; -import com.keepassdroid.timeout.TimeoutHelper; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.stylish.StylishActivity; +import com.kunzisoft.keepass.timeout.TimeoutHelper; public abstract class LockingActivity extends StylishActivity { diff --git a/app/src/main/java/com/keepassdroid/activities/LockingHideActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/LockingHideActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/activities/LockingHideActivity.java rename to app/src/main/java/com/kunzisoft/keepass/activities/LockingHideActivity.java index 30d34b5b6..04fd70183 100644 --- a/app/src/main/java/com/keepassdroid/activities/LockingHideActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/LockingHideActivity.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.activities; +package com.kunzisoft.keepass.activities; import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Bundle; import android.view.WindowManager; -import com.keepassdroid.compat.BuildCompat; +import com.kunzisoft.keepass.compat.BuildCompat; /** * Locking Hide Activity that sets FLAG_SECURE to prevent screenshots, and from diff --git a/app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java b/app/src/main/java/com/kunzisoft/keepass/adapters/BasicViewHolder.java similarity index 96% rename from app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java rename to app/src/main/java/com/kunzisoft/keepass/adapters/BasicViewHolder.java index c89132048..05b232661 100644 --- a/app/src/main/java/com/keepassdroid/adapters/BasicViewHolder.java +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BasicViewHolder.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.adapters; +package com.kunzisoft.keepass.adapters; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryViewHolder.java similarity index 96% rename from app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java rename to app/src/main/java/com/kunzisoft/keepass/adapters/EntryViewHolder.java index 9f218d0e9..79fbd23ed 100644 --- a/app/src/main/java/com/keepassdroid/adapters/EntryViewHolder.java +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryViewHolder.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.adapters; +package com.kunzisoft.keepass.adapters; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java b/app/src/main/java/com/kunzisoft/keepass/adapters/GroupViewHolder.java similarity index 96% rename from app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java rename to app/src/main/java/com/kunzisoft/keepass/adapters/GroupViewHolder.java index 5dfe27d25..8722835b6 100644 --- a/app/src/main/java/com/keepassdroid/adapters/GroupViewHolder.java +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/GroupViewHolder.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.adapters; +package com.kunzisoft.keepass.adapters; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java similarity index 97% rename from app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java rename to app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java index 9a625d2ad..8d5a86e2c 100644 --- a/app/src/main/java/com/keepassdroid/adapters/NodeAdapter.java +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.adapters; +package com.kunzisoft.keepass.adapters; import android.content.Context; import android.support.v7.util.SortedList; @@ -31,12 +31,12 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.keepassdroid.app.App; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.PwNode; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.database.SortNodeEnum; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.PwGroup; +import com.kunzisoft.keepass.database.PwNode; +import com.kunzisoft.keepass.database.SortNodeEnum; +import com.kunzisoft.keepass.settings.PreferencesUtil; public class NodeAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/keepassdroid/app/App.java b/app/src/main/java/com/kunzisoft/keepass/app/App.java similarity index 90% rename from app/src/main/java/com/keepassdroid/app/App.java rename to app/src/main/java/com/kunzisoft/keepass/app/App.java index 08da77651..5544f7ae4 100644 --- a/app/src/main/java/com/keepassdroid/app/App.java +++ b/app/src/main/java/com/kunzisoft/keepass/app/App.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.app; +package com.kunzisoft.keepass.app; import android.support.multidex.MultiDexApplication; -import com.keepassdroid.compat.PRNGFixes; -import com.keepassdroid.database.Database; -import com.keepassdroid.fileselect.RecentFileHistory; -import com.keepassdroid.stylish.Stylish; +import com.kunzisoft.keepass.compat.PRNGFixes; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.fileselect.RecentFileHistory; +import com.kunzisoft.keepass.stylish.Stylish; import java.util.Calendar; diff --git a/app/src/main/java/com/keepassdroid/autofill/AutoFillAuthActivity.java b/app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillAuthActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/autofill/AutoFillAuthActivity.java rename to app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillAuthActivity.java index 0ca101557..7f13e0a8a 100644 --- a/app/src/main/java/com/keepassdroid/autofill/AutoFillAuthActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillAuthActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.autofill; +package com.kunzisoft.keepass.autofill; import android.app.PendingIntent; import android.app.assist.AssistStructure; @@ -29,8 +29,8 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; -import com.keepassdroid.fileselect.FileSelectActivity; import com.kunzisoft.keepass.KeePass; +import com.kunzisoft.keepass.fileselect.FileSelectActivity; @RequiresApi(api = Build.VERSION_CODES.O) public class AutoFillAuthActivity extends KeePass { diff --git a/app/src/main/java/com/keepassdroid/autofill/AutofillHelper.java b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.java similarity index 98% rename from app/src/main/java/com/keepassdroid/autofill/AutofillHelper.java rename to app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.java index 26741da1e..85b574afe 100644 --- a/app/src/main/java/com/keepassdroid/autofill/AutofillHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.autofill; +package com.kunzisoft.keepass.autofill; import android.app.Activity; import android.app.assist.AssistStructure; @@ -34,8 +34,8 @@ import android.view.autofill.AutofillManager; import android.view.autofill.AutofillValue; import android.widget.RemoteViews; -import com.keepassdroid.database.PwEntry; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.PwEntry; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/autofill/KeeAutofillService.java b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.java similarity index 98% rename from app/src/main/java/com/keepassdroid/autofill/KeeAutofillService.java rename to app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.java index ca2aad6da..3929bec47 100644 --- a/app/src/main/java/com/keepassdroid/autofill/KeeAutofillService.java +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.autofill; +package com.kunzisoft.keepass.autofill; import android.app.assist.AssistStructure; import android.content.IntentSender; diff --git a/app/src/main/java/com/keepassdroid/autofill/StructureParser.java b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.java similarity index 99% rename from app/src/main/java/com/keepassdroid/autofill/StructureParser.java rename to app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.java index b03616bfc..e3af9fbcc 100644 --- a/app/src/main/java/com/keepassdroid/autofill/StructureParser.java +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.autofill; +package com.kunzisoft.keepass.autofill; import android.app.assist.AssistStructure; import android.os.Build; diff --git a/app/src/main/java/com/keepassdroid/backup/SettingsBackupAgent.java b/app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.java similarity index 97% rename from app/src/main/java/com/keepassdroid/backup/SettingsBackupAgent.java rename to app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.java index 0fa63a8d9..156936444 100644 --- a/app/src/main/java/com/keepassdroid/backup/SettingsBackupAgent.java +++ b/app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.backup; +package com.kunzisoft.keepass.backup; import android.annotation.SuppressLint; import android.app.backup.BackupAgentHelper; diff --git a/app/src/main/java/com/keepassdroid/collections/VariantDictionary.java b/app/src/main/java/com/kunzisoft/keepass/collections/VariantDictionary.java similarity index 98% rename from app/src/main/java/com/keepassdroid/collections/VariantDictionary.java rename to app/src/main/java/com/kunzisoft/keepass/collections/VariantDictionary.java index 41b4e708b..e3db44c36 100644 --- a/app/src/main/java/com/keepassdroid/collections/VariantDictionary.java +++ b/app/src/main/java/com/kunzisoft/keepass/collections/VariantDictionary.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.collections; +package com.kunzisoft.keepass.collections; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.stream.LEDataOutputStream; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/app/src/main/java/com/keepassdroid/compat/BackupManagerCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/BackupManagerCompat.java similarity index 98% rename from app/src/main/java/com/keepassdroid/compat/BackupManagerCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/BackupManagerCompat.java index c3b8ae337..00c1c8df3 100644 --- a/app/src/main/java/com/keepassdroid/compat/BackupManagerCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/BackupManagerCompat.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; +package com.kunzisoft.keepass.compat; + +import android.content.Context; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import android.content.Context; - @SuppressWarnings({"unchecked", "rawtypes"}) public class BackupManagerCompat { diff --git a/app/src/main/java/com/keepassdroid/compat/BitmapDrawableCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/BitmapDrawableCompat.java similarity index 97% rename from app/src/main/java/com/keepassdroid/compat/BitmapDrawableCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/BitmapDrawableCompat.java index a80829f15..6bb757d55 100644 --- a/app/src/main/java/com/keepassdroid/compat/BitmapDrawableCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/BitmapDrawableCompat.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; - -import java.lang.reflect.Constructor; +package com.kunzisoft.keepass.compat; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; +import java.lang.reflect.Constructor; + // This compatiblity hack can go away when support for Android 1.5 api level 3 is dropped public class BitmapDrawableCompat { private static Constructor constResBitmap; diff --git a/app/src/main/java/com/keepassdroid/compat/BuildCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/BuildCompat.java similarity index 98% rename from app/src/main/java/com/keepassdroid/compat/BuildCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/BuildCompat.java index 7a6a1c5f6..4e5f7d375 100644 --- a/app/src/main/java/com/keepassdroid/compat/BuildCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/BuildCompat.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; - -import java.lang.reflect.Field; +package com.kunzisoft.keepass.compat; import android.os.Build; +import java.lang.reflect.Field; + public class BuildCompat { private static Field manufacturer; private static String manuText; diff --git a/app/src/main/java/com/keepassdroid/compat/ClipDataCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/ClipDataCompat.java similarity index 98% rename from app/src/main/java/com/keepassdroid/compat/ClipDataCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/ClipDataCompat.java index 005cd574e..3bd4321bc 100644 --- a/app/src/main/java/com/keepassdroid/compat/ClipDataCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/ClipDataCompat.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; +package com.kunzisoft.keepass.compat; import android.content.Intent; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/compat/ContentResolverCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/ContentResolverCompat.java similarity index 97% rename from app/src/main/java/com/keepassdroid/compat/ContentResolverCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/ContentResolverCompat.java index 1c208a259..0d81b6700 100644 --- a/app/src/main/java/com/keepassdroid/compat/ContentResolverCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/ContentResolverCompat.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; +package com.kunzisoft.keepass.compat; import android.content.ContentResolver; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/compat/EditorCompat.java b/app/src/main/java/com/kunzisoft/keepass/compat/EditorCompat.java similarity index 97% rename from app/src/main/java/com/keepassdroid/compat/EditorCompat.java rename to app/src/main/java/com/kunzisoft/keepass/compat/EditorCompat.java index dad3ebab4..7e77274c6 100644 --- a/app/src/main/java/com/keepassdroid/compat/EditorCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/EditorCompat.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; - -import java.lang.reflect.Method; +package com.kunzisoft.keepass.compat; import android.app.Activity; import android.content.SharedPreferences; +import java.lang.reflect.Method; + public class EditorCompat { private static Method apply; diff --git a/app/src/main/java/com/keepassdroid/compat/PRNGFixes.java b/app/src/main/java/com/kunzisoft/keepass/compat/PRNGFixes.java similarity index 99% rename from app/src/main/java/com/keepassdroid/compat/PRNGFixes.java rename to app/src/main/java/com/kunzisoft/keepass/compat/PRNGFixes.java index 281093ea1..bfbdc9ad6 100644 --- a/app/src/main/java/com/keepassdroid/compat/PRNGFixes.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/PRNGFixes.java @@ -1,4 +1,4 @@ -package com.keepassdroid.compat; +package com.kunzisoft.keepass.compat; /* * This software is provided 'as-is', without any express or implied @@ -10,6 +10,11 @@ package com.keepassdroid.compat; * freely, as long as the origin is not misrepresented. */ +import android.os.Build; +import android.os.Process; + +import com.kunzisoft.keepass.utils.StrUtil; + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -28,11 +33,6 @@ import java.security.SecureRandomSpi; import java.security.Security; import java.util.Locale; -import com.keepassdroid.utils.StrUtil; - -import android.os.Process; -import android.os.Build; - /** * Fixes for the output of the default PRNG having low entropy. * diff --git a/app/src/main/java/com/keepassdroid/compat/StorageAF.java b/app/src/main/java/com/kunzisoft/keepass/compat/StorageAF.java similarity index 97% rename from app/src/main/java/com/keepassdroid/compat/StorageAF.java rename to app/src/main/java/com/kunzisoft/keepass/compat/StorageAF.java index 65eb34c6d..2fb445f6c 100644 --- a/app/src/main/java/com/keepassdroid/compat/StorageAF.java +++ b/app/src/main/java/com/kunzisoft/keepass/compat/StorageAF.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.compat; +package com.kunzisoft.keepass.compat; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/keepassdroid/crypto/AESProvider.java b/app/src/main/java/com/kunzisoft/keepass/crypto/AESProvider.java similarity index 89% rename from app/src/main/java/com/keepassdroid/crypto/AESProvider.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/AESProvider.java index 622d32a15..97b1af712 100644 --- a/app/src/main/java/com/keepassdroid/crypto/AESProvider.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/AESProvider.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; import java.security.Provider; @@ -30,7 +30,7 @@ public final class AESProvider extends Provider { public AESProvider() { super("AESProvider", 1.0, ""); - put("Cipher.AES",com.keepassdroid.crypto.NativeAESCipherSpi.class.getName()); + put("Cipher.AES",NativeAESCipherSpi.class.getName()); } } diff --git a/app/src/main/java/com/keepassdroid/crypto/CipherFactory.java b/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.java similarity index 89% rename from app/src/main/java/com/keepassdroid/crypto/CipherFactory.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.java index 51dc9d405..40e82d867 100644 --- a/app/src/main/java/com/keepassdroid/crypto/CipherFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.java @@ -17,7 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; + +import android.os.Build; + +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 org.spongycastle.jce.provider.BouncyCastleProvider; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -27,18 +36,6 @@ import java.util.UUID; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; - -import android.os.Build; - -import com.keepassdroid.crypto.engine.AesEngine; -import com.keepassdroid.crypto.engine.ChaCha20Engine; -import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.crypto.engine.TwofishEngine; -import com.keepassdroid.utils.Types; - -import org.spongycastle.jce.provider.BouncyCastleProvider; public class CipherFactory { private static boolean blacklistInit = false; diff --git a/app/src/main/java/com/keepassdroid/crypto/CryptoUtil.java b/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.java similarity index 95% rename from app/src/main/java/com/keepassdroid/crypto/CryptoUtil.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.java index 1947a5f6f..d28bbb9d9 100644 --- a/app/src/main/java/com/keepassdroid/crypto/CryptoUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.stream.NullOutputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.stream.NullOutputStream; import java.io.IOException; import java.security.DigestOutputStream; diff --git a/app/src/main/java/com/keepassdroid/crypto/NativeAESCipherSpi.java b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java similarity index 97% rename from app/src/main/java/com/keepassdroid/crypto/NativeAESCipherSpi.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java index bdfc64514..14d12bae1 100644 --- a/app/src/main/java/com/keepassdroid/crypto/NativeAESCipherSpi.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java @@ -17,7 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; + +import android.util.Log; import java.lang.ref.PhantomReference; import java.lang.ref.Reference; @@ -40,10 +42,10 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.ShortBufferException; import javax.crypto.spec.IvParameterSpec; -import android.util.Log; - public class NativeAESCipherSpi extends CipherSpi { - + + private static final String TAG = NativeAESCipherSpi.class.getName(); + private static boolean mIsStaticInit = false; private static HashMap, Long> mCleanup = new HashMap, Long>(); private static ReferenceQueue mQueue = new ReferenceQueue(); @@ -65,7 +67,7 @@ public class NativeAESCipherSpi extends CipherSpi { } private static void addToCleanupQueue(NativeAESCipherSpi ref, long ptr) { - Log.d("KeepassDroid", "queued cipher context: " + ptr); + Log.d(TAG, "queued cipher context: " + ptr); mCleanup.put(new PhantomReference(ref, mQueue), ptr); } @@ -83,7 +85,7 @@ public class NativeAESCipherSpi extends CipherSpi { long ctx = mCleanup.remove(ref); nCleanup(ctx); - Log.d("KeePassDroid", "Cleaned up cipher context: " + ctx); + Log.d(TAG, "Cleaned up cipher context: " + ctx); } catch (InterruptedException e) { // Do nothing, but resume looping if mQueue.remove is interrupted diff --git a/app/src/main/java/com/keepassdroid/crypto/NativeLib.java b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeLib.java similarity index 96% rename from app/src/main/java/com/keepassdroid/crypto/NativeLib.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/NativeLib.java index 7f497d30f..3f1b3f5ea 100644 --- a/app/src/main/java/com/keepassdroid/crypto/NativeLib.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeLib.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; public class NativeLib { private static boolean isLoaded = false; diff --git a/app/src/main/java/com/keepassdroid/crypto/PwStreamCipherFactory.java b/app/src/main/java/com/kunzisoft/keepass/crypto/PwStreamCipherFactory.java similarity index 96% rename from app/src/main/java/com/keepassdroid/crypto/PwStreamCipherFactory.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/PwStreamCipherFactory.java index 89a9d68e0..98d369858 100644 --- a/app/src/main/java/com/keepassdroid/crypto/PwStreamCipherFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/PwStreamCipherFactory.java @@ -17,7 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto; +package com.kunzisoft.keepass.crypto; + +import com.kunzisoft.keepass.database.CrsAlgorithm; import org.spongycastle.crypto.StreamCipher; import org.spongycastle.crypto.engines.ChaCha7539Engine; @@ -25,8 +27,6 @@ import org.spongycastle.crypto.engines.Salsa20Engine; import org.spongycastle.crypto.params.KeyParameter; import org.spongycastle.crypto.params.ParametersWithIV; -import com.keepassdroid.database.CrsAlgorithm; - public class PwStreamCipherFactory { public static StreamCipher getInstance(CrsAlgorithm alg, byte[] key) { if ( alg == CrsAlgorithm.Salsa20 ) { diff --git a/app/src/main/java/com/keepassdroid/crypto/engine/AesEngine.java b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.java similarity index 90% rename from app/src/main/java/com/keepassdroid/crypto/engine/AesEngine.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.java index 24621c61b..cccbf51cf 100644 --- a/app/src/main/java/com/keepassdroid/crypto/engine/AesEngine.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.engine; +package com.kunzisoft.keepass.crypto.engine; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.CipherFactory; +import com.kunzisoft.keepass.database.PwEncryptionAlgorithm; +import com.kunzisoft.keepass.utils.Types; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/app/src/main/java/com/keepassdroid/crypto/engine/ChaCha20Engine.java b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.java similarity index 93% rename from app/src/main/java/com/keepassdroid/crypto/engine/ChaCha20Engine.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.java index 178e40cb4..27d6ae852 100644 --- a/app/src/main/java/com/keepassdroid/crypto/engine/ChaCha20Engine.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.engine; +package com.kunzisoft.keepass.crypto.engine; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.database.PwEncryptionAlgorithm; +import com.kunzisoft.keepass.utils.Types; import org.spongycastle.jce.provider.BouncyCastleProvider; diff --git a/app/src/main/java/com/keepassdroid/crypto/engine/CipherEngine.java b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.java similarity index 93% rename from app/src/main/java/com/keepassdroid/crypto/engine/CipherEngine.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.java index 64e6a79c0..713e2e81d 100644 --- a/app/src/main/java/com/keepassdroid/crypto/engine/CipherEngine.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.engine; +package com.kunzisoft.keepass.crypto.engine; -import com.keepassdroid.database.PwEncryptionAlgorithm; +import com.kunzisoft.keepass.database.PwEncryptionAlgorithm; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/app/src/main/java/com/keepassdroid/crypto/engine/TwofishEngine.java b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.java similarity index 91% rename from app/src/main/java/com/keepassdroid/crypto/engine/TwofishEngine.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.java index 19565a964..4cb9736b7 100644 --- a/app/src/main/java/com/keepassdroid/crypto/engine/TwofishEngine.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.engine; +package com.kunzisoft.keepass.crypto.engine; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.CipherFactory; +import com.kunzisoft.keepass.database.PwEncryptionAlgorithm; +import com.kunzisoft.keepass.utils.Types; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/app/src/main/java/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidFinalKey.java similarity index 98% rename from app/src/main/java/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidFinalKey.java index c2cf93c2f..27b536379 100644 --- a/app/src/main/java/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidFinalKey.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.finalkey; +package com.kunzisoft.keepass.crypto.finalkey; import java.io.IOException; import java.security.InvalidKeyException; diff --git a/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKey.java b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKey.java similarity index 95% rename from app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKey.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKey.java index dbdbaa2df..cded04667 100644 --- a/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKey.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKey.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.finalkey; +package com.kunzisoft.keepass.crypto.finalkey; import java.io.IOException; diff --git a/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKeyFactory.java similarity index 92% rename from app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKeyFactory.java index 0c65f5637..429dd21e1 100644 --- a/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKeyFactory.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.finalkey; +package com.kunzisoft.keepass.crypto.finalkey; -import com.keepassdroid.crypto.CipherFactory; +import com.kunzisoft.keepass.crypto.CipherFactory; public class FinalKeyFactory { public static FinalKey createFinalKey() { diff --git a/app/src/main/java/com/keepassdroid/crypto/finalkey/NativeFinalKey.java b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/NativeFinalKey.java similarity index 93% rename from app/src/main/java/com/keepassdroid/crypto/finalkey/NativeFinalKey.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/NativeFinalKey.java index 47fdacbcf..5e0900d92 100644 --- a/app/src/main/java/com/keepassdroid/crypto/finalkey/NativeFinalKey.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/NativeFinalKey.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.finalkey; +package com.kunzisoft.keepass.crypto.finalkey; + +import com.kunzisoft.keepass.crypto.NativeLib; import java.io.IOException; -import com.keepassdroid.crypto.NativeLib; - public class NativeFinalKey extends FinalKey { diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/AesKdf.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.java similarity index 91% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/AesKdf.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.java index c4740f10e..51ade4257 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/AesKdf.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; -import com.keepassdroid.crypto.CryptoUtil; -import com.keepassdroid.crypto.finalkey.FinalKey; -import com.keepassdroid.crypto.finalkey.FinalKeyFactory; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.CryptoUtil; +import com.kunzisoft.keepass.crypto.finalkey.FinalKey; +import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.security.SecureRandom; diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Kdf.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Kdf.java similarity index 97% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Kdf.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Kdf.java index e5c168ca3..5b6353fc9 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Kdf.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Kdf.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.security.SecureRandom; diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Native.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java similarity index 94% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Native.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java index 0d9b394a7..bd3da3b1a 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/Argon2Native.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; -import com.keepassdroid.crypto.NativeLib; +import com.kunzisoft.keepass.crypto.NativeLib; import java.io.IOException; diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfEngine.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfEngine.java similarity index 96% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfEngine.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfEngine.java index 965584620..52f52f910 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfEngine.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfEngine.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; import java.io.IOException; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfFactory.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfFactory.java similarity index 96% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfFactory.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfFactory.java index 99bf98533..a09c5fdd6 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfFactory.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfParameters.java b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfParameters.java similarity index 88% rename from app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfParameters.java rename to app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfParameters.java index 5c562e897..ab21ba9fe 100644 --- a/app/src/main/java/com/keepassdroid/crypto/keyDerivation/KdfParameters.java +++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfParameters.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.crypto.keyDerivation; +package com.kunzisoft.keepass.crypto.keyDerivation; -import com.keepassdroid.collections.VariantDictionary; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.collections.VariantDictionary; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.utils.Types; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/keepassdroid/database/AutoType.java b/app/src/main/java/com/kunzisoft/keepass/database/AutoType.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/AutoType.java rename to app/src/main/java/com/kunzisoft/keepass/database/AutoType.java index 761e46b96..dbdb97707 100644 --- a/app/src/main/java/com/keepassdroid/database/AutoType.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/AutoType.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.io.Serializable; import java.util.HashMap; diff --git a/app/src/main/java/com/keepassdroid/database/BinaryPool.java b/app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/BinaryPool.java rename to app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java index 03bc97fa9..84fed9719 100644 --- a/app/src/main/java/com/keepassdroid/database/BinaryPool.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java @@ -17,7 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; + +import com.kunzisoft.keepass.database.security.ProtectedBinary; import java.util.Collection; import java.util.HashMap; @@ -25,8 +27,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.keepassdroid.database.security.ProtectedBinary; - public class BinaryPool { private HashMap pool = new HashMap<>(); diff --git a/app/src/main/java/com/keepassdroid/database/CrsAlgorithm.java b/app/src/main/java/com/kunzisoft/keepass/database/CrsAlgorithm.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/CrsAlgorithm.java rename to app/src/main/java/com/kunzisoft/keepass/database/CrsAlgorithm.java index 498caf3cc..81da5be75 100644 --- a/app/src/main/java/com/keepassdroid/database/CrsAlgorithm.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/CrsAlgorithm.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public enum CrsAlgorithm { diff --git a/app/src/main/java/com/keepassdroid/database/Database.java b/app/src/main/java/com/kunzisoft/keepass/database/Database.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/Database.java rename to app/src/main/java/com/kunzisoft/keepass/database/Database.java index 52a429608..74d24aabf 100644 --- a/app/src/main/java/com/keepassdroid/database/Database.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/Database.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import android.content.Context; import android.content.SharedPreferences; @@ -26,18 +26,18 @@ import android.net.Uri; import android.preference.PreferenceManager; import android.util.Log; -import com.keepassdroid.database.exception.ContentFileNotFoundException; -import com.keepassdroid.database.exception.InvalidDBException; -import com.keepassdroid.database.exception.InvalidPasswordException; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.database.load.Importer; -import com.keepassdroid.database.load.ImporterFactory; -import com.keepassdroid.database.save.PwDbOutput; -import com.keepassdroid.icons.DrawableFactory; -import com.keepassdroid.search.SearchDbHelper; -import com.keepassdroid.tasks.UpdateStatus; -import com.keepassdroid.utils.UriUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.exception.ContentFileNotFoundException; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.database.exception.InvalidPasswordException; +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.save.PwDbOutput; +import com.kunzisoft.keepass.icons.DrawableFactory; +import com.kunzisoft.keepass.search.SearchDbHelper; +import com.kunzisoft.keepass.tasks.UpdateStatus; +import com.kunzisoft.keepass.utils.UriUtil; import java.io.BufferedInputStream; import java.io.File; diff --git a/app/src/main/java/com/keepassdroid/database/EntryHandler.java b/app/src/main/java/com/kunzisoft/keepass/database/EntryHandler.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/EntryHandler.java rename to app/src/main/java/com/kunzisoft/keepass/database/EntryHandler.java index 70bd5d463..5db793118 100644 --- a/app/src/main/java/com/keepassdroid/database/EntryHandler.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/EntryHandler.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; /** "Delegate" class for operating on each entry when traversing all of * them diff --git a/app/src/main/java/com/keepassdroid/database/EntrySearchHandler.java b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/EntrySearchHandler.java rename to app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java index 739d91534..24bed9df9 100644 --- a/app/src/main/java/com/keepassdroid/database/EntrySearchHandler.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.database.iterator.EntrySearchStringIterator; +import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/database/EntrySearchHandlerAll.java b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/EntrySearchHandlerAll.java rename to app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java index 1180328c7..87e5f175d 100644 --- a/app/src/main/java/com/keepassdroid/database/EntrySearchHandlerAll.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/database/EntrySearchHandlerV4.java b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java similarity index 94% rename from app/src/main/java/com/keepassdroid/database/EntrySearchHandlerV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java index 2ab04b293..b6dd0a1ce 100644 --- a/app/src/main/java/com/keepassdroid/database/EntrySearchHandlerV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.utils.StrUtil; -import com.keepassdroid.utils.UuidUtil; +import com.kunzisoft.keepass.utils.StrUtil; +import com.kunzisoft.keepass.utils.UuidUtil; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/com/keepassdroid/database/EntrySearchV4.java b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/EntrySearchV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java index ff05cd669..25a4a67f4 100644 --- a/app/src/main/java/com/keepassdroid/database/EntrySearchV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.utils.StrUtil; +import com.kunzisoft.keepass.utils.StrUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/keepassdroid/database/ExtraFields.java b/app/src/main/java/com/kunzisoft/keepass/database/ExtraFields.java similarity index 90% rename from app/src/main/java/com/keepassdroid/database/ExtraFields.java rename to app/src/main/java/com/kunzisoft/keepass/database/ExtraFields.java index da137e302..93f5bb993 100644 --- a/app/src/main/java/com/keepassdroid/database/ExtraFields.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/ExtraFields.java @@ -17,20 +17,20 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.database.security.ProtectedString; +import com.kunzisoft.keepass.database.security.ProtectedString; import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import static com.keepassdroid.database.PwEntryV4.STR_NOTES; -import static com.keepassdroid.database.PwEntryV4.STR_PASSWORD; -import static com.keepassdroid.database.PwEntryV4.STR_TITLE; -import static com.keepassdroid.database.PwEntryV4.STR_URL; -import static com.keepassdroid.database.PwEntryV4.STR_USERNAME; +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; public class ExtraFields implements Serializable, Cloneable { diff --git a/app/src/main/java/com/keepassdroid/database/GroupHandler.java b/app/src/main/java/com/kunzisoft/keepass/database/GroupHandler.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/GroupHandler.java rename to app/src/main/java/com/kunzisoft/keepass/database/GroupHandler.java index 9d0ad50de..3b23e22a8 100644 --- a/app/src/main/java/com/keepassdroid/database/GroupHandler.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/GroupHandler.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; /** "Delegate" class for operating on each group when traversing all of diff --git a/app/src/main/java/com/keepassdroid/database/ISmallTimeLogger.java b/app/src/main/java/com/kunzisoft/keepass/database/ISmallTimeLogger.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/ISmallTimeLogger.java rename to app/src/main/java/com/kunzisoft/keepass/database/ISmallTimeLogger.java index fd0d19f0b..c7c8c84ec 100644 --- a/app/src/main/java/com/keepassdroid/database/ISmallTimeLogger.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/ISmallTimeLogger.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public interface ISmallTimeLogger { diff --git a/app/src/main/java/com/keepassdroid/database/ITimeLogger.java b/app/src/main/java/com/kunzisoft/keepass/database/ITimeLogger.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/ITimeLogger.java rename to app/src/main/java/com/kunzisoft/keepass/database/ITimeLogger.java index b90454ef0..09326a20f 100644 --- a/app/src/main/java/com/keepassdroid/database/ITimeLogger.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/ITimeLogger.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public interface ITimeLogger extends ISmallTimeLogger { diff --git a/app/src/main/java/com/keepassdroid/database/MemoryProtectionConfig.java b/app/src/main/java/com/kunzisoft/keepass/database/MemoryProtectionConfig.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/MemoryProtectionConfig.java rename to app/src/main/java/com/kunzisoft/keepass/database/MemoryProtectionConfig.java index f70841fea..bc3f05aa5 100644 --- a/app/src/main/java/com/keepassdroid/database/MemoryProtectionConfig.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/MemoryProtectionConfig.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class MemoryProtectionConfig { diff --git a/app/src/main/java/com/keepassdroid/database/PwCompressionAlgorithm.java b/app/src/main/java/com/kunzisoft/keepass/database/PwCompressionAlgorithm.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwCompressionAlgorithm.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwCompressionAlgorithm.java index 036e5495b..d12f15cc9 100644 --- a/app/src/main/java/com/keepassdroid/database/PwCompressionAlgorithm.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwCompressionAlgorithm.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public enum PwCompressionAlgorithm { diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabase.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwDatabase.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java index e05ce5397..5407260ea 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDatabase.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.crypto.finalkey.FinalKey; -import com.keepassdroid.crypto.finalkey.FinalKeyFactory; -import com.keepassdroid.database.exception.InvalidKeyFileException; -import com.keepassdroid.database.exception.KeyFileEmptyException; -import com.keepassdroid.stream.NullOutputStream; -import com.keepassdroid.utils.Util; +import com.kunzisoft.keepass.crypto.finalkey.FinalKey; +import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory; +import com.kunzisoft.keepass.database.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.database.exception.KeyFileEmptyException; +import com.kunzisoft.keepass.stream.NullOutputStream; +import com.kunzisoft.keepass.utils.Util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java similarity index 98% rename from app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java index 11f575930..3751abdee 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java @@ -43,11 +43,11 @@ 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.keepassdroid.database; +package com.kunzisoft.keepass.database; // Java -import com.keepassdroid.crypto.keyDerivation.AesKdf; -import com.keepassdroid.database.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf; +import com.kunzisoft.keepass.database.exception.InvalidKeyFileException; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3Debug.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3Debug.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwDatabaseV3Debug.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3Debug.java index e08caf1bb..528094435 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV3Debug.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3Debug.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class PwDatabaseV3Debug extends PwDatabaseV3 { diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java index b3a42c684..0a40250b1 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java @@ -17,20 +17,20 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import android.webkit.URLUtil; -import com.keepassdroid.collections.VariantDictionary; -import com.keepassdroid.crypto.CryptoUtil; -import com.keepassdroid.crypto.engine.AesEngine; -import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.crypto.keyDerivation.AesKdf; -import com.keepassdroid.crypto.keyDerivation.KdfEngine; -import com.keepassdroid.crypto.keyDerivation.KdfFactory; -import com.keepassdroid.crypto.keyDerivation.KdfParameters; -import com.keepassdroid.database.exception.InvalidKeyFileException; -import com.keepassdroid.utils.EmptyUtils; +import com.kunzisoft.keepass.collections.VariantDictionary; +import com.kunzisoft.keepass.crypto.CryptoUtil; +import com.kunzisoft.keepass.crypto.engine.AesEngine; +import com.kunzisoft.keepass.crypto.engine.CipherEngine; +import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf; +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.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.utils.EmptyUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4XML.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4XML.java similarity index 99% rename from app/src/main/java/com/keepassdroid/database/PwDatabaseV4XML.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4XML.java index 4c8b76c5a..51b1e9f89 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4XML.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4XML.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.text.SimpleDateFormat; import java.util.TimeZone; diff --git a/app/src/main/java/com/keepassdroid/database/PwDate.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDate.java similarity index 98% rename from app/src/main/java/com/keepassdroid/database/PwDate.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDate.java index 456443500..06ad1aa40 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDate.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDate.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.app.App; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.utils.Types; import java.io.Serializable; import java.util.Arrays; diff --git a/app/src/main/java/com/keepassdroid/database/PwDbHeader.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeader.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwDbHeader.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDbHeader.java index 55ce7bfd3..3681d65f8 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDbHeader.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeader.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public abstract class PwDbHeader { diff --git a/app/src/main/java/com/keepassdroid/database/PwDbHeaderFactory.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderFactory.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwDbHeaderFactory.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderFactory.java index 524d45f28..22a99f99b 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDbHeaderFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderFactory.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class PwDbHeaderFactory { public static PwDbHeader getInstance(PwDatabase db) { diff --git a/app/src/main/java/com/keepassdroid/database/PwDbHeaderV3.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV3.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwDbHeaderV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV3.java index efd2bf696..4befe3671 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDbHeaderV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV3.java @@ -44,12 +44,12 @@ 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.keepassdroid.database; +package com.kunzisoft.keepass.database; + +import com.kunzisoft.keepass.stream.LEDataInputStream; import java.io.IOException; -import com.keepassdroid.stream.LEDataInputStream; - public class PwDbHeaderV3 extends PwDbHeader { // DB sig from KeePass 1.03 diff --git a/app/src/main/java/com/keepassdroid/database/PwDbHeaderV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/PwDbHeaderV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java index 307a13c10..7719b8175 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDbHeaderV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.crypto.keyDerivation.AesKdf; -import com.keepassdroid.crypto.keyDerivation.KdfParameters; -import com.keepassdroid.database.exception.InvalidDBVersionException; -import com.keepassdroid.stream.CopyInputStream; -import com.keepassdroid.stream.HmacBlockStream; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf; +import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters; +import com.kunzisoft.keepass.database.exception.InvalidDBVersionException; +import com.kunzisoft.keepass.stream.CopyInputStream; +import com.kunzisoft.keepass.stream.HmacBlockStream; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.utils.Types; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/com/keepassdroid/database/PwDefsV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDefsV4.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwDefsV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDefsV4.java index 0a79159d1..eaaf67da4 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDefsV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDefsV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class PwDefsV4 { diff --git a/app/src/main/java/com/keepassdroid/database/PwDeletedObject.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDeletedObject.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwDeletedObject.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwDeletedObject.java index 954fc4ebd..276122b56 100644 --- a/app/src/main/java/com/keepassdroid/database/PwDeletedObject.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDeletedObject.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.Date; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/database/PwEncryptionAlgorithm.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEncryptionAlgorithm.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwEncryptionAlgorithm.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwEncryptionAlgorithm.java index 4c2751893..d75b49c29 100644 --- a/app/src/main/java/com/keepassdroid/database/PwEncryptionAlgorithm.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEncryptionAlgorithm.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import android.content.res.Resources; diff --git a/app/src/main/java/com/keepassdroid/database/PwEntry.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwEntry.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java index f45abe5c2..ebe31f3d8 100644 --- a/app/src/main/java/com/keepassdroid/database/PwEntry.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.database.iterator.EntrySearchStringIterator; -import com.keepassdroid.database.security.ProtectedString; +import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator; +import com.kunzisoft.keepass.database.security.ProtectedString; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/database/PwEntryV3.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV3.java similarity index 99% rename from app/src/main/java/com/keepassdroid/database/PwEntryV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwEntryV3.java index e48b7e3fd..e370659ef 100644 --- a/app/src/main/java/com/keepassdroid/database/PwEntryV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV3.java @@ -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.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.io.UnsupportedEncodingException; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/database/PwEntryV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java similarity index 98% rename from app/src/main/java/com/keepassdroid/database/PwEntryV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java index e871a8fc9..211e006e2 100644 --- a/app/src/main/java/com/keepassdroid/database/PwEntryV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; -import com.keepassdroid.database.security.ProtectedBinary; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.utils.SprEngineV4; +import com.kunzisoft.keepass.database.security.ProtectedBinary; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.utils.SprEngineV4; import java.util.ArrayList; import java.util.Date; diff --git a/app/src/main/java/com/keepassdroid/database/PwGroup.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroup.java similarity index 99% rename from app/src/main/java/com/keepassdroid/database/PwGroup.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroup.java index 7440bba08..d8cdec744 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroup.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroup.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/database/PwGroupId.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupId.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/PwGroupId.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroupId.java index 5f90338ac..5e8f6013d 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroupId.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupId.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.io.Serializable; diff --git a/app/src/main/java/com/keepassdroid/database/PwGroupIdV3.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV3.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwGroupIdV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV3.java index 5d5f33a42..1a12baa46 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroupIdV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV3.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class PwGroupIdV3 extends PwGroupId { diff --git a/app/src/main/java/com/keepassdroid/database/PwGroupIdV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV4.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwGroupIdV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV4.java index 616040f5e..abc158f56 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroupIdV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/database/PwGroupV3.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV3.java similarity index 98% rename from app/src/main/java/com/keepassdroid/database/PwGroupV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroupV3.java index 2bd54c765..0b94ce4a6 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroupV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV3.java @@ -18,7 +18,7 @@ * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; /** * @author Brian Pellin diff --git a/app/src/main/java/com/keepassdroid/database/PwGroupV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java similarity index 99% rename from app/src/main/java/com/keepassdroid/database/PwGroupV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java index def8800fd..4c3a0a449 100644 --- a/app/src/main/java/com/keepassdroid/database/PwGroupV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/keepassdroid/database/PwIcon.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/PwIcon.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java index f688d8e64..65beb86db 100644 --- a/app/src/main/java/com/keepassdroid/database/PwIcon.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.io.Serializable; diff --git a/app/src/main/java/com/keepassdroid/database/PwIconCustom.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwIconCustom.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java index a3f42639d..cb1a8fb39 100644 --- a/app/src/main/java/com/keepassdroid/database/PwIconCustom.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/database/PwIconFactory.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java similarity index 98% rename from app/src/main/java/com/keepassdroid/database/PwIconFactory.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java index 046103a8c..090231d4b 100644 --- a/app/src/main/java/com/keepassdroid/database/PwIconFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; - -import java.util.UUID; +package com.kunzisoft.keepass.database; import org.apache.commons.collections.map.AbstractReferenceMap; import org.apache.commons.collections.map.ReferenceMap; +import java.util.UUID; + public class PwIconFactory { /** customIconMap * Cache for icon drawable. diff --git a/app/src/main/java/com/keepassdroid/database/PwIconStandard.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/PwIconStandard.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java index 2af3758e0..00e47dd53 100644 --- a/app/src/main/java/com/keepassdroid/database/PwIconStandard.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class PwIconStandard extends PwIcon { public final int iconId; diff --git a/app/src/main/java/com/keepassdroid/database/PwNode.java b/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java similarity index 92% rename from app/src/main/java/com/keepassdroid/database/PwNode.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwNode.java index 536e957c2..9d332014c 100644 --- a/app/src/main/java/com/keepassdroid/database/PwNode.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java @@ -18,18 +18,11 @@ * * */ -package com.keepassdroid.database; - -import android.util.Log; +package com.kunzisoft.keepass.database; import org.joda.time.LocalDate; import java.io.Serializable; -import java.sql.Date; -import java.time.temporal.ChronoUnit; - -import static com.keepassdroid.database.PwDate.NEVER_EXPIRE; -import static com.keepassdroid.database.PwDate.PW_NEVER_EXPIRE; /** * Abstract class who manage Groups and Entries @@ -43,7 +36,7 @@ public abstract class PwNode implements ISmallTimeLogger protected PwDate creation = new PwDate(); protected PwDate lastMod = new PwDate(); protected PwDate lastAccess = new PwDate(); - protected PwDate expireDate = PW_NEVER_EXPIRE; + protected PwDate expireDate = PwDate.PW_NEVER_EXPIRE; protected void construct(Parent parent) { this.parent = parent; @@ -152,13 +145,13 @@ public abstract class PwNode implements ISmallTimeLogger public void setExpires(boolean expires) { if (!expires) { - expireDate = PW_NEVER_EXPIRE; + expireDate = PwDate.PW_NEVER_EXPIRE; } } public boolean isExpires() { // If expireDate is before NEVER_EXPIRE date less 1 month (to be sure) - return expireDate.getDate().before(LocalDate.fromDateFields(NEVER_EXPIRE).minusMonths(1).toDate()); + return expireDate.getDate().before(LocalDate.fromDateFields(PwDate.NEVER_EXPIRE).minusMonths(1).toDate()); } /** diff --git a/app/src/main/java/com/keepassdroid/database/PwVersion.java b/app/src/main/java/com/kunzisoft/keepass/database/PwVersion.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/PwVersion.java rename to app/src/main/java/com/kunzisoft/keepass/database/PwVersion.java index 6c806ae5a..48b337ff9 100644 --- a/app/src/main/java/com/keepassdroid/database/PwVersion.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwVersion.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public enum PwVersion { V3, V4; diff --git a/app/src/main/java/com/keepassdroid/database/SearchParameters.java b/app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/SearchParameters.java rename to app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java index 4cb99c461..af87198bf 100644 --- a/app/src/main/java/com/keepassdroid/database/SearchParameters.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; /** * @author bpellin diff --git a/app/src/main/java/com/keepassdroid/database/SearchParametersV4.java b/app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/SearchParametersV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java index c3f57d283..f02c251b7 100644 --- a/app/src/main/java/com/keepassdroid/database/SearchParametersV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; public class SearchParametersV4 extends SearchParameters implements Cloneable { public static SearchParametersV4 DEFAULT = new SearchParametersV4(); diff --git a/app/src/main/java/com/keepassdroid/database/SortNodeEnum.java b/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java similarity index 99% rename from app/src/main/java/com/keepassdroid/database/SortNodeEnum.java rename to app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java index 5931fbd52..a62fe4560 100644 --- a/app/src/main/java/com/keepassdroid/database/SortNodeEnum.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java @@ -18,7 +18,7 @@ * */ -package com.keepassdroid.database; +package com.kunzisoft.keepass.database; import java.util.Comparator; diff --git a/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/AddEntry.java similarity index 91% rename from app/src/main/java/com/keepassdroid/database/edit/AddEntry.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/AddEntry.java index 426560ff7..353cc42e4 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/AddEntry.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/AddEntry.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwEntry; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwEntry; public class AddEntry extends RunnableOnFinish { diff --git a/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/AddGroup.java similarity index 92% rename from app/src/main/java/com/keepassdroid/database/edit/AddGroup.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/AddGroup.java index 63251bd93..e43c5d35b 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/AddGroup.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/AddGroup.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwGroup; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.PwGroup; public class AddGroup extends RunnableOnFinish { diff --git a/app/src/main/java/com/keepassdroid/database/edit/AfterAddNodeOnFinish.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/AfterAddNodeOnFinish.java similarity index 91% rename from app/src/main/java/com/keepassdroid/database/edit/AfterAddNodeOnFinish.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/AfterAddNodeOnFinish.java index 54445ec78..cb31d7807 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/AfterAddNodeOnFinish.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/AfterAddNodeOnFinish.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.os.Handler; -import com.keepassdroid.database.PwNode; +import com.kunzisoft.keepass.database.PwNode; public abstract class AfterAddNodeOnFinish extends OnFinish { public AfterAddNodeOnFinish(Handler handler) { diff --git a/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/CreateDB.java similarity index 87% rename from app/src/main/java/com/keepassdroid/database/edit/CreateDB.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/CreateDB.java index 3883ae8f5..8c9328f70 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/CreateDB.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/CreateDB.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.database.Database; -import com.keepassdroid.app.App; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.utils.UriUtil; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.utils.UriUtil; public class CreateDB extends RunnableOnFinish { diff --git a/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteEntry.java similarity index 92% rename from app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteEntry.java index c853b6042..832da0b2d 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/DeleteEntry.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteEntry.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwGroup; /** Task to delete entries * @author bpellin diff --git a/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteGroup.java similarity index 94% rename from app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteGroup.java index d15adb052..552d8691e 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/DeleteGroup.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/DeleteGroup.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwGroup; +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 java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/database/edit/FileOnFinish.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/FileOnFinish.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/edit/FileOnFinish.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/FileOnFinish.java index b6a19ad06..beca8c727 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/FileOnFinish.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/FileOnFinish.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/LoadDB.java similarity index 82% rename from app/src/main/java/com/keepassdroid/database/edit/LoadDB.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/LoadDB.java index d61f6967a..f9d42fb6d 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/LoadDB.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/LoadDB.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; import android.content.SharedPreferences; @@ -25,17 +25,17 @@ import android.net.Uri; import android.preference.PreferenceManager; import com.kunzisoft.keepass.R; -import com.keepassdroid.database.Database; -import com.keepassdroid.app.App; -import com.keepassdroid.database.exception.ArcFourException; -import com.keepassdroid.database.exception.ContentFileNotFoundException; -import com.keepassdroid.database.exception.InvalidAlgorithmException; -import com.keepassdroid.database.exception.InvalidDBException; -import com.keepassdroid.database.exception.InvalidDBSignatureException; -import com.keepassdroid.database.exception.InvalidDBVersionException; -import com.keepassdroid.database.exception.InvalidKeyFileException; -import com.keepassdroid.database.exception.InvalidPasswordException; -import com.keepassdroid.database.exception.KeyFileEmptyException; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.exception.ArcFourException; +import com.kunzisoft.keepass.database.exception.ContentFileNotFoundException; +import com.kunzisoft.keepass.database.exception.InvalidAlgorithmException; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException; +import com.kunzisoft.keepass.database.exception.InvalidDBVersionException; +import com.kunzisoft.keepass.database.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.database.exception.InvalidPasswordException; +import com.kunzisoft.keepass.database.exception.KeyFileEmptyException; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/app/src/main/java/com/keepassdroid/database/edit/OnFinish.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/OnFinish.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/edit/OnFinish.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/OnFinish.java index ba64c7496..030820063 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/OnFinish.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/OnFinish.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/RunnableOnFinish.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/RunnableOnFinish.java index 2557feba0..d2802279f 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/RunnableOnFinish.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/RunnableOnFinish.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; -import com.keepassdroid.tasks.UpdateStatus; +import com.kunzisoft.keepass.tasks.UpdateStatus; public abstract class RunnableOnFinish implements Runnable { diff --git a/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/SaveDB.java similarity index 90% rename from app/src/main/java/com/keepassdroid/database/edit/SaveDB.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/SaveDB.java index dede1f055..a60b89068 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/SaveDB.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/SaveDB.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import java.io.IOException; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.exception.PwDbOutputException; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.exception.PwDbOutputException; +import java.io.IOException; public class SaveDB extends RunnableOnFinish { private Database mDb; diff --git a/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/SetPassword.java similarity index 90% rename from app/src/main/java/com/keepassdroid/database/edit/SetPassword.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/SetPassword.java index 01fd63518..9f2cf70f8 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/SetPassword.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/SetPassword.java @@ -17,17 +17,17 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; import android.content.DialogInterface; import android.net.Uri; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.exception.InvalidKeyFileException; -import com.keepassdroid.dialogs.PasswordEncodingDialogHelper; -import com.keepassdroid.utils.UriUtil; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.dialogs.PasswordEncodingDialogHelper; +import com.kunzisoft.keepass.utils.UriUtil; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java b/app/src/main/java/com/kunzisoft/keepass/database/edit/UpdateEntry.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java rename to app/src/main/java/com/kunzisoft/keepass/database/edit/UpdateEntry.java index f05a42d1c..aef5a4170 100644 --- a/app/src/main/java/com/keepassdroid/database/edit/UpdateEntry.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/edit/UpdateEntry.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.edit; +package com.kunzisoft.keepass.database.edit; import android.content.Context; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwEntry; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwEntry; public class UpdateEntry extends RunnableOnFinish { diff --git a/app/src/main/java/com/keepassdroid/database/exception/ArcFourException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/ArcFourException.java similarity index 94% rename from app/src/main/java/com/keepassdroid/database/exception/ArcFourException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/ArcFourException.java index 283359c21..ddc89a682 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/ArcFourException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/ArcFourException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class ArcFourException extends InvalidDBException { diff --git a/app/src/main/java/com/keepassdroid/database/exception/ContentFileNotFoundException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/ContentFileNotFoundException.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/exception/ContentFileNotFoundException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/ContentFileNotFoundException.java index aa8536cfd..1c297218b 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/ContentFileNotFoundException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/ContentFileNotFoundException.java @@ -17,11 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; import android.net.Uri; -import com.keepassdroid.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.EmptyUtils; import java.io.FileNotFoundException; diff --git a/app/src/main/java/com/keepassdroid/database/exception/InconsistentDBException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InconsistentDBException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InconsistentDBException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InconsistentDBException.java index 96865f2b2..317f9f803 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InconsistentDBException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InconsistentDBException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InconsistentDBException extends Exception { diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidAlgorithmException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidAlgorithmException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidAlgorithmException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidAlgorithmException.java index 3ee9545d5..bf389ab0f 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidAlgorithmException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidAlgorithmException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InvalidAlgorithmException extends InvalidDBException { /** diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidDBException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBException.java index 6a88fe2ca..3e42b7167 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InvalidDBException extends Exception { diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBSignatureException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBSignatureException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidDBSignatureException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBSignatureException.java index 97459688d..6b65c7bf6 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBSignatureException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBSignatureException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InvalidDBSignatureException extends InvalidDBException { /** diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBVersionException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBVersionException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidDBVersionException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBVersionException.java index 4ee80bf57..8f9f2f04b 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidDBVersionException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidDBVersionException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InvalidDBVersionException extends InvalidDBException { /** diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidKeyFileException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidKeyFileException.java similarity index 94% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidKeyFileException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidKeyFileException.java index 1774b40fc..88c5db652 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidKeyFileException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidKeyFileException.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with KeePass DX. If not, see . * - */package com.keepassdroid.database.exception; + */package com.kunzisoft.keepass.database.exception; public class InvalidKeyFileException extends InvalidDBException { /** diff --git a/app/src/main/java/com/keepassdroid/database/exception/InvalidPasswordException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidPasswordException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/InvalidPasswordException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidPasswordException.java index d4f9ca27c..0b5f475c9 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/InvalidPasswordException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/InvalidPasswordException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class InvalidPasswordException extends InvalidDBException { diff --git a/app/src/main/java/com/keepassdroid/database/exception/KeyFileEmptyException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/KeyFileEmptyException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/KeyFileEmptyException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/KeyFileEmptyException.java index 16c850438..1926f6ca0 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/KeyFileEmptyException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/KeyFileEmptyException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class KeyFileEmptyException extends InvalidKeyFileException { /** diff --git a/app/src/main/java/com/keepassdroid/database/exception/PwDbOutputException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/PwDbOutputException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/PwDbOutputException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/PwDbOutputException.java index 699fa00c0..e82c6fdfa 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/PwDbOutputException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/PwDbOutputException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class PwDbOutputException extends Exception { public PwDbOutputException(String string) { diff --git a/app/src/main/java/com/keepassdroid/database/exception/SamsungClipboardException.java b/app/src/main/java/com/kunzisoft/keepass/database/exception/SamsungClipboardException.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/exception/SamsungClipboardException.java rename to app/src/main/java/com/kunzisoft/keepass/database/exception/SamsungClipboardException.java index 1c27d44ba..0bf93fe3f 100644 --- a/app/src/main/java/com/keepassdroid/database/exception/SamsungClipboardException.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/exception/SamsungClipboardException.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.exception; +package com.kunzisoft.keepass.database.exception; public class SamsungClipboardException extends Exception { diff --git a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIterator.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java similarity index 85% rename from app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIterator.java rename to app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java index dd6fbf123..36ae095a4 100644 --- a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIterator.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java @@ -17,16 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.iterator; +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.SearchParameters; +import com.kunzisoft.keepass.database.SearchParametersV4; import java.util.Iterator; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.SearchParameters; -import com.keepassdroid.database.SearchParametersV4; - public abstract class EntrySearchStringIterator implements Iterator { public static EntrySearchStringIterator getInstance(PwEntry e) { diff --git a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV3.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java index 4b87ba34f..acfbfc5cc 100644 --- a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java @@ -17,16 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.iterator; +package com.kunzisoft.keepass.database.iterator; + +import com.kunzisoft.keepass.database.PwEntryV3; +import com.kunzisoft.keepass.database.SearchParameters; import java.util.NoSuchElementException; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.database.SearchParameters; - public class EntrySearchStringIteratorV3 extends EntrySearchStringIterator { - private PwEntryV3 entry; + private PwEntryV3 entry; private SearchParameters sp; public EntrySearchStringIteratorV3(PwEntryV3 entry) { diff --git a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV4.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java similarity index 91% rename from app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java index 3be4b5c3a..a73e69dc8 100644 --- a/app/src/main/java/com/keepassdroid/database/iterator/EntrySearchStringIteratorV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java @@ -17,16 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.iterator; +package com.kunzisoft.keepass.database.iterator; + +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.SearchParametersV4; +import com.kunzisoft.keepass.database.security.ProtectedString; import java.util.Iterator; import java.util.Map.Entry; import java.util.NoSuchElementException; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.SearchParametersV4; -import com.keepassdroid.database.security.ProtectedString; - public class EntrySearchStringIteratorV4 extends EntrySearchStringIterator { private String current; diff --git a/app/src/main/java/com/keepassdroid/database/load/Importer.java b/app/src/main/java/com/kunzisoft/keepass/database/load/Importer.java similarity index 68% rename from app/src/main/java/com/keepassdroid/database/load/Importer.java rename to app/src/main/java/com/kunzisoft/keepass/database/load/Importer.java index f135ce609..2fe04613c 100644 --- a/app/src/main/java/com/keepassdroid/database/load/Importer.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/load/Importer.java @@ -17,23 +17,23 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.load; +package com.kunzisoft.keepass.database.load; + +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.tasks.UpdateStatus; import java.io.IOException; import java.io.InputStream; -import com.keepassdroid.tasks.UpdateStatus; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.exception.InvalidDBException; - public abstract class Importer { public static final boolean DEBUG = true; - public abstract PwDatabase openDatabase( InputStream inStream, String password, InputStream keyInputStream) + public abstract PwDatabase openDatabase(InputStream inStream, String password, InputStream keyInputStream) throws IOException, InvalidDBException; - public abstract PwDatabase openDatabase( InputStream inStream, String password, InputStream keyInputStream, UpdateStatus status, long roundsFix) + public abstract PwDatabase openDatabase(InputStream inStream, String password, InputStream keyInputStream, UpdateStatus status, long roundsFix) throws IOException, InvalidDBException; diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterFactory.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterFactory.java similarity index 84% rename from app/src/main/java/com/keepassdroid/database/load/ImporterFactory.java rename to app/src/main/java/com/kunzisoft/keepass/database/load/ImporterFactory.java index 40381dc96..adfe548f6 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterFactory.java @@ -17,16 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.load; +package com.kunzisoft.keepass.database.load; + +import com.kunzisoft.keepass.database.PwDbHeaderV3; +import com.kunzisoft.keepass.database.PwDbHeaderV4; +import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException; +import com.kunzisoft.keepass.stream.LEDataInputStream; import java.io.IOException; import java.io.InputStream; -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.database.PwDbHeaderV4; -import com.keepassdroid.database.exception.InvalidDBSignatureException; -import com.keepassdroid.stream.LEDataInputStream; - public class ImporterFactory { public static Importer createImporter(InputStream is) throws InvalidDBSignatureException, IOException { diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java similarity index 89% rename from app/src/main/java/com/keepassdroid/database/load/ImporterV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java index e89f39345..d842b268d 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java @@ -43,7 +43,30 @@ 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.keepassdroid.database.load; +package com.kunzisoft.keepass.database.load; + +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.exception.InvalidAlgorithmException; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException; +import com.kunzisoft.keepass.database.exception.InvalidDBVersionException; +import com.kunzisoft.keepass.database.exception.InvalidKeyFileException; +import com.kunzisoft.keepass.database.exception.InvalidPasswordException; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.stream.NullOutputStream; +import com.kunzisoft.keepass.tasks.UpdateStatus; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.InputStream; @@ -63,29 +86,6 @@ import javax.crypto.ShortBufferException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import android.util.Log; - -import com.kunzisoft.keepass.R; -import com.keepassdroid.tasks.UpdateStatus; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwDate; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.database.PwGroupV3; -import com.keepassdroid.database.exception.InvalidAlgorithmException; -import com.keepassdroid.database.exception.InvalidDBException; -import com.keepassdroid.database.exception.InvalidDBSignatureException; -import com.keepassdroid.database.exception.InvalidDBVersionException; -import com.keepassdroid.database.exception.InvalidKeyFileException; -import com.keepassdroid.database.exception.InvalidPasswordException; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.stream.NullOutputStream; -import com.keepassdroid.utils.Types; - /** * Load a v3 database file. * @@ -94,6 +94,8 @@ import com.keepassdroid.utils.Types; */ public class ImporterV3 extends Importer { + private static final String TAG = ImporterV3.class.getName(); + public ImporterV3() { super(); } @@ -110,11 +112,11 @@ public class ImporterV3 extends Importer { * @return new PwDatabaseV3 container. * * @throws IOException on any file error. - * @throws InvalidKeyFileException - * @throws InvalidPasswordException + * @throws InvalidKeyFileException + * @throws InvalidPasswordException * @throws InvalidPasswordException on a decryption error, or possible internal bug. - * @throws InvalidDBSignatureException - * @throws InvalidDBVersionException + * @throws InvalidDBSignatureException + * @throws InvalidDBVersionException * @throws IllegalBlockSizeException on a decryption error, or possible internal bug. * @throws BadPaddingException on a decryption error, or possible internal bug. * @throws NoSuchAlgorithmException on a decryption error, or possible internal bug. @@ -232,7 +234,7 @@ public class ImporterV3 extends Importer { if( ! Arrays.equals(hash, hdr.contentsHash) ) { - Log.w("KeePassDroid","Database file did not decrypt correctly. (checksum code is broken)"); + Log.w(TAG,"Database file did not decrypt correctly. (checksum code is broken)"); throw new InvalidPasswordException(); } diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3Debug.java similarity index 75% rename from app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java rename to app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3Debug.java index dc79bc8b2..df7a4609b 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV3Debug.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3Debug.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.load; +package com.kunzisoft.keepass.database.load; + +import com.kunzisoft.keepass.database.PwDatabaseV3Debug; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.tasks.UpdateStatus; import java.io.IOException; import java.io.InputStream; -import com.keepassdroid.tasks.UpdateStatus; -import com.keepassdroid.database.PwDatabaseV3Debug; -import com.keepassdroid.database.exception.InvalidDBException; - public class ImporterV3Debug extends ImporterV3 { @Override @@ -35,8 +35,8 @@ public class ImporterV3Debug extends ImporterV3 { @Override public PwDatabaseV3Debug openDatabase(InputStream inStream, String password, - InputStream keyInputStream, UpdateStatus status, long roundsFix) throws IOException, - InvalidDBException { + InputStream keyInputStream, UpdateStatus status, long roundsFix) throws IOException, + InvalidDBException { return (PwDatabaseV3Debug) super.openDatabase(inStream, password, keyInputStream, status, roundsFix); } diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java similarity index 66% rename from app/src/main/java/com/keepassdroid/database/load/ImporterV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java index dbbe6be91..5d98c2a46 100644 --- a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java @@ -17,36 +17,36 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.load; +package com.kunzisoft.keepass.database.load; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.crypto.PwStreamCipherFactory; -import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.database.ITimeLogger; -import com.keepassdroid.database.PwCompressionAlgorithm; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwDatabaseV4XML; -import com.keepassdroid.database.PwDate; -import com.keepassdroid.database.PwDbHeaderV4; -import com.keepassdroid.database.PwDeletedObject; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.PwGroupV4; -import com.keepassdroid.database.PwIconCustom; -import com.keepassdroid.database.exception.ArcFourException; -import com.keepassdroid.database.exception.InvalidDBException; -import com.keepassdroid.database.exception.InvalidPasswordException; -import com.keepassdroid.database.security.ProtectedBinary; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.stream.BetterCipherInputStream; -import com.keepassdroid.stream.HashedBlockInputStream; -import com.keepassdroid.stream.HmacBlockInputStream; -import com.keepassdroid.stream.LEDataInputStream; -import com.keepassdroid.tasks.UpdateStatus; -import com.keepassdroid.utils.DateUtil; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.MemUtil; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.CipherFactory; +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.exception.ArcFourException; +import com.kunzisoft.keepass.database.exception.InvalidDBException; +import com.kunzisoft.keepass.database.exception.InvalidPasswordException; +import com.kunzisoft.keepass.database.security.ProtectedBinary; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.stream.BetterCipherInputStream; +import com.kunzisoft.keepass.stream.HashedBlockInputStream; +import com.kunzisoft.keepass.stream.HmacBlockInputStream; +import com.kunzisoft.keepass.stream.LEDataInputStream; +import com.kunzisoft.keepass.tasks.UpdateStatus; +import com.kunzisoft.keepass.utils.DateUtil; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.MemUtil; +import com.kunzisoft.keepass.utils.Types; import org.spongycastle.crypto.StreamCipher; import org.xmlpull.v1.XmlPullParser; @@ -73,92 +73,6 @@ import javax.crypto.NoSuchPaddingException; import biz.source_code.base64Coder.Base64Coder; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrCompressed; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrId; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrProtected; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrRef; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoType; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeDefaultSeq; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeEnabled; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeObfuscation; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBgColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBinaries; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBinary; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCreationTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomData; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconID; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItemData; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItemID; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIcons; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDefaultUser; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDefaultUserChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDesc; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDescChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChangeForce; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChangeForceOnce; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChangeRec; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbMntncHistoryDays; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbNameChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletedObject; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletedObjects; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletionTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDocNode; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEnableAutoType; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEnableSearching; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntry; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntryTemplatesGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntryTemplatesGroupChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemExpires; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemExpiryTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemFgColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGenerator; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGroupDefaultAutoTypeSeq; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHeaderHash; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistory; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistoryMaxItems; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistoryMaxSize; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemIcon; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemIsExpanded; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemKey; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemKeystrokeSequence; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastAccessTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastModTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastSelectedGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastTopVisibleEntry; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastTopVisibleGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLocationChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemMemoryProt; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemMeta; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemNotes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemOverrideUrl; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtAutoHide; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtNotes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtPassword; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtTitle; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtURL; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtUserName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinEnabled; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinUuid; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRoot; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemSettingsChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemString; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemStringDictExItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemTags; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemTimes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemUsageCount; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemUuid; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemValue; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemWindow; -import static com.keepassdroid.database.PwDatabaseV4XML.ValTrue; - public class ImporterV4 extends Importer { private StreamCipher randomStream; @@ -465,15 +379,15 @@ public class ImporterV4 extends Importer { String name = xpp.getName(); switch (ctx) { case Null: - if ( name.equalsIgnoreCase(ElemDocNode) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDocNode) ) { return SwitchContext(ctx, KdbContext.KeePassFile, xpp); } else ReadUnknown(xpp); break; case KeePassFile: - if ( name.equalsIgnoreCase(ElemMeta) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemMeta) ) { return SwitchContext(ctx, KdbContext.Meta, xpp); - } else if ( name.equalsIgnoreCase(ElemRoot) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemRoot) ) { return SwitchContext(ctx, KdbContext.Root, xpp); } else { ReadUnknown(xpp); @@ -481,9 +395,9 @@ public class ImporterV4 extends Importer { break; case Meta: - if ( name.equalsIgnoreCase(ElemGenerator) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemGenerator) ) { ReadString(xpp); // Ignore - } else if ( name.equalsIgnoreCase(ElemHeaderHash) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemHeaderHash) ) { String encodedHash = ReadString(xpp); if (!EmptyUtils.isNullOrEmpty(encodedHash) && (hashOfHeader != null)) { byte[] hash = Base64Coder.decode(encodedHash); @@ -491,74 +405,74 @@ public class ImporterV4 extends Importer { throw new InvalidDBException(); } } - } else if (name.equalsIgnoreCase(ElemSettingsChanged)) { + } else if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemSettingsChanged)) { db.setSettingsChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbName) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbName) ) { db.setName(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbNameChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbNameChanged) ) { db.setNameChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbDesc) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbDesc) ) { db.setDescription(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbDescChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbDescChanged) ) { db.setDescriptionChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbDefaultUser) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbDefaultUser) ) { db.setDefaultUserName(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbDefaultUserChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbDefaultUserChanged) ) { db.setDefaultUserNameChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbColor)) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbColor)) { // TODO: Add support to interpret the color if we want to allow changing the database color db.setColor(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbMntncHistoryDays) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbMntncHistoryDays) ) { db.setMaintenanceHistoryDays(ReadUInt(xpp, DEFAULT_HISTORY_DAYS)); - } else if ( name.equalsIgnoreCase(ElemDbKeyChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbKeyChanged) ) { db.setKeyLastChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemDbKeyChangeRec) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbKeyChangeRec) ) { db.setKeyChangeRecDays(ReadLong(xpp, -1)); - } else if ( name.equalsIgnoreCase(ElemDbKeyChangeForce) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbKeyChangeForce) ) { db.setKeyChangeForceDays(ReadLong(xpp, -1)); - } else if ( name.equalsIgnoreCase(ElemDbKeyChangeForceOnce) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDbKeyChangeForceOnce) ) { db.setKeyChangeForceOnce(ReadBool(xpp, false)); - } else if ( name.equalsIgnoreCase(ElemMemoryProt) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemMemoryProt) ) { return SwitchContext(ctx, KdbContext.MemoryProtection, xpp); - } else if ( name.equalsIgnoreCase(ElemCustomIcons) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIcons) ) { return SwitchContext(ctx, KdbContext.CustomIcons, xpp); - } else if ( name.equalsIgnoreCase(ElemRecycleBinEnabled) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemRecycleBinEnabled) ) { db.setRecycleBinEnabled(ReadBool(xpp, true)); - } else if ( name.equalsIgnoreCase(ElemRecycleBinUuid) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemRecycleBinUuid) ) { db.setRecycleBinUUID(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemRecycleBinChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemRecycleBinChanged) ) { db.setRecycleBinChanged(ReadTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemEntryTemplatesGroup) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEntryTemplatesGroup) ) { db.setEntryTemplatesGroup(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemEntryTemplatesGroupChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEntryTemplatesGroupChanged) ) { db.setEntryTemplatesGroupChanged(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemHistoryMaxItems) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemHistoryMaxItems) ) { db.setHistoryMaxItems(ReadInt(xpp, -1)); - } else if ( name.equalsIgnoreCase(ElemHistoryMaxSize) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemHistoryMaxSize) ) { db.setHistoryMaxSize(ReadLong(xpp, -1)); - } else if ( name.equalsIgnoreCase(ElemLastSelectedGroup) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLastSelectedGroup) ) { db.setLastSelectedGroup(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemLastTopVisibleGroup) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLastTopVisibleGroup) ) { db.setLastTopVisibleGroup(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemBinaries) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemBinaries) ) { return SwitchContext(ctx, KdbContext.Binaries, xpp); - } else if ( name.equalsIgnoreCase(ElemCustomData) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData) ) { return SwitchContext(ctx, KdbContext.CustomData, xpp); } break; case MemoryProtection: - if ( name.equalsIgnoreCase(ElemProtTitle) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtTitle) ) { db.getMemoryProtection().protectTitle = ReadBool(xpp, false); - } else if ( name.equalsIgnoreCase(ElemProtUserName) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtUserName) ) { db.getMemoryProtection().protectUserName = ReadBool(xpp, false); - } else if ( name.equalsIgnoreCase(ElemProtPassword) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtPassword) ) { db.getMemoryProtection().protectPassword = ReadBool(xpp, false); - } else if ( name.equalsIgnoreCase(ElemProtURL) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtURL) ) { db.getMemoryProtection().protectUrl = ReadBool(xpp, false); - } else if ( name.equalsIgnoreCase(ElemProtNotes) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtNotes) ) { db.getMemoryProtection().protectNotes = ReadBool(xpp, false); - } else if ( name.equalsIgnoreCase(ElemProtAutoHide) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemProtAutoHide) ) { db.getMemoryProtection().autoEnableVisualHiding = ReadBool(xpp, false); } else { ReadUnknown(xpp); @@ -566,7 +480,7 @@ public class ImporterV4 extends Importer { break; case CustomIcons: - if ( name.equalsIgnoreCase(ElemCustomIconItem) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconItem) ) { return SwitchContext(ctx, KdbContext.CustomIcon, xpp); } else { ReadUnknown(xpp); @@ -574,9 +488,9 @@ public class ImporterV4 extends Importer { break; case CustomIcon: - if ( name.equalsIgnoreCase(ElemCustomIconItemID) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconItemID) ) { customIconID = ReadUuid(xpp); - } else if ( name.equalsIgnoreCase(ElemCustomIconItemData) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconItemData) ) { String strData = ReadString(xpp); if ( strData != null && strData.length() > 0 ) { customIconData = Base64Coder.decode(strData); @@ -589,8 +503,8 @@ public class ImporterV4 extends Importer { break; case Binaries: - if ( name.equalsIgnoreCase(ElemBinary) ) { - String key = xpp.getAttributeValue(null, AttrId); + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemBinary) ) { + String key = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrId); if ( key != null ) { ProtectedBinary pbData = ReadProtectedBinary(xpp); int id = Integer.parseInt(key); @@ -605,7 +519,7 @@ public class ImporterV4 extends Importer { break; case CustomData: - if ( name.equalsIgnoreCase(ElemStringDictExItem) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem) ) { return SwitchContext(ctx, KdbContext.CustomDataItem, xpp); } else { ReadUnknown(xpp); @@ -613,9 +527,9 @@ public class ImporterV4 extends Importer { break; case CustomDataItem: - if ( name.equalsIgnoreCase(ElemKey) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemKey) ) { customDataKey = ReadString(xpp); - } else if ( name.equalsIgnoreCase(ElemValue) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemValue) ) { customDataValue = ReadString(xpp); } else { ReadUnknown(xpp); @@ -623,7 +537,7 @@ public class ImporterV4 extends Importer { break; case Root: - if ( name.equalsIgnoreCase(ElemGroup) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemGroup) ) { assert(ctxGroups.size() == 0); if ( ctxGroups.size() != 0 ) throw new IOException("Group list should be empty."); @@ -632,7 +546,7 @@ public class ImporterV4 extends Importer { ctxGroup = ctxGroups.peek(); return SwitchContext(ctx, KdbContext.Group, xpp); - } else if ( name.equalsIgnoreCase(ElemDeletedObjects) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDeletedObjects) ) { return SwitchContext(ctx, KdbContext.RootDeletedObjects, xpp); } else { ReadUnknown(xpp); @@ -640,37 +554,37 @@ public class ImporterV4 extends Importer { break; case Group: - if ( name.equalsIgnoreCase(ElemUuid) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemUuid) ) { ctxGroup.setUUID(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemName) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemName) ) { ctxGroup.setName(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemNotes) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemNotes) ) { ctxGroup.setNotes(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemIcon) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIcon) ) { ctxGroup.setIcon(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0))); - } else if ( name.equalsIgnoreCase(ElemCustomIconID) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconID) ) { ctxGroup.setCustomIcon(db.getIconFactory().getIcon(ReadUuid(xpp))); - } else if ( name.equalsIgnoreCase(ElemTimes) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemTimes) ) { return SwitchContext(ctx, KdbContext.GroupTimes, xpp); - } else if ( name.equalsIgnoreCase(ElemIsExpanded) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIsExpanded) ) { ctxGroup.setExpanded(ReadBool(xpp, true)); - } else if ( name.equalsIgnoreCase(ElemGroupDefaultAutoTypeSeq) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemGroupDefaultAutoTypeSeq) ) { ctxGroup.setDefaultAutoTypeSequence(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemEnableAutoType) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEnableAutoType) ) { ctxGroup.setEnableAutoType(StringToBoolean(ReadString(xpp))); - } else if ( name.equalsIgnoreCase(ElemEnableSearching) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEnableSearching) ) { ctxGroup.setEnableSearching(StringToBoolean(ReadString(xpp))); - } else if ( name.equalsIgnoreCase(ElemLastTopVisibleEntry) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLastTopVisibleEntry) ) { ctxGroup.setLastTopVisibleEntry(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemCustomData) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData) ) { return SwitchContext(ctx, KdbContext.GroupCustomData, xpp); - } else if ( name.equalsIgnoreCase(ElemGroup) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemGroup) ) { ctxGroup = new PwGroupV4(); ctxGroups.peek().addGroup(ctxGroup); ctxGroups.push(ctxGroup); return SwitchContext(ctx, KdbContext.Group, xpp); - } else if ( name.equalsIgnoreCase(ElemEntry) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEntry) ) { ctxEntry = new PwEntryV4(); ctxGroup.addEntry(ctxEntry); @@ -681,16 +595,16 @@ public class ImporterV4 extends Importer { } break; case GroupCustomData: - if (name.equalsIgnoreCase(ElemStringDictExItem)) { + if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) { return SwitchContext(ctx, KdbContext.GroupCustomDataItem, xpp); } else { ReadUnknown(xpp); } break; case GroupCustomDataItem: - if (name.equalsIgnoreCase(ElemKey)) { + if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemKey)) { groupCustomDataKey = ReadString(xpp); - } else if (name.equalsIgnoreCase(ElemValue)) { + } else if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemValue)) { groupCustomDataValue = ReadString(xpp); } else { ReadUnknown(xpp); @@ -699,31 +613,31 @@ public class ImporterV4 extends Importer { case Entry: - if ( name.equalsIgnoreCase(ElemUuid) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemUuid) ) { ctxEntry.setUUID(ReadUuid(xpp)); - } else if ( name.equalsIgnoreCase(ElemIcon) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIcon) ) { ctxEntry.setIcon(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0))); - } else if ( name.equalsIgnoreCase(ElemCustomIconID) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconID) ) { ctxEntry.setCustomIcon(db.getIconFactory().getIcon(ReadUuid(xpp))); - } else if ( name.equalsIgnoreCase(ElemFgColor) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemFgColor) ) { ctxEntry.setForegroundColor(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemBgColor) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemBgColor) ) { ctxEntry.setBackgroupColor(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemOverrideUrl) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemOverrideUrl) ) { ctxEntry.setOverrideURL(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemTags) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemTags) ) { ctxEntry.setTags(ReadString(xpp)); - } else if ( name.equalsIgnoreCase(ElemTimes) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemTimes) ) { return SwitchContext(ctx, KdbContext.EntryTimes, xpp); - } else if ( name.equalsIgnoreCase(ElemString) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemString) ) { return SwitchContext(ctx, KdbContext.EntryString, xpp); - } else if ( name.equalsIgnoreCase(ElemBinary) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemBinary) ) { return SwitchContext(ctx, KdbContext.EntryBinary, xpp); - } else if ( name.equalsIgnoreCase(ElemAutoType) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoType) ) { return SwitchContext(ctx, KdbContext.EntryAutoType, xpp); - } else if ( name.equalsIgnoreCase(ElemCustomData)) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData)) { return SwitchContext(ctx, KdbContext.EntryCustomData, xpp); - } else if ( name.equalsIgnoreCase(ElemHistory) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemHistory) ) { assert(!entryInHistory); if ( ! entryInHistory ) { @@ -737,16 +651,16 @@ public class ImporterV4 extends Importer { } break; case EntryCustomData: - if (name.equalsIgnoreCase(ElemStringDictExItem)) { + if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) { return SwitchContext(ctx, KdbContext.EntryCustomDataItem, xpp); } else { ReadUnknown(xpp); } break; case EntryCustomDataItem: - if (name.equalsIgnoreCase(ElemKey)) { + if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemKey)) { entryCustomDataKey = ReadString(xpp); - } else if (name.equalsIgnoreCase(ElemValue)) { + } else if (name.equalsIgnoreCase(PwDatabaseV4XML.ElemValue)) { entryCustomDataValue = ReadString(xpp); } else { ReadUnknown(xpp); @@ -762,19 +676,19 @@ public class ImporterV4 extends Importer { tl = ctxEntry; } - if ( name.equalsIgnoreCase(ElemLastModTime) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLastModTime) ) { tl.setLastModificationTime(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemCreationTime) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCreationTime) ) { tl.setCreationTime(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemLastAccessTime) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLastAccessTime) ) { tl.setLastAccessTime(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemExpiryTime) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemExpiryTime) ) { tl.setExpiryTime(ReadPwTime(xpp)); - } else if ( name.equalsIgnoreCase(ElemExpires) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemExpires) ) { tl.setExpires(ReadBool(xpp, false)); - } else if ( name.equalsIgnoreCase(ElemUsageCount) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemUsageCount) ) { tl.setUsageCount(ReadULong(xpp, 0)); - } else if ( name.equalsIgnoreCase(ElemLocationChanged) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemLocationChanged) ) { tl.setLocationChanged(ReadPwTime(xpp)); } else { ReadUnknown(xpp); @@ -782,9 +696,9 @@ public class ImporterV4 extends Importer { break; case EntryString: - if ( name.equalsIgnoreCase(ElemKey) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemKey) ) { ctxStringName = ReadString(xpp); - } else if ( name.equalsIgnoreCase(ElemValue) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemValue) ) { ctxStringValue = ReadProtectedString(xpp); } else { ReadUnknown(xpp); @@ -792,21 +706,21 @@ public class ImporterV4 extends Importer { break; case EntryBinary: - if ( name.equalsIgnoreCase(ElemKey) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemKey) ) { ctxBinaryName = ReadString(xpp); - } else if ( name.equalsIgnoreCase(ElemValue) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemValue) ) { ctxBinaryValue = ReadProtectedBinary(xpp); } break; case EntryAutoType: - if ( name.equalsIgnoreCase(ElemAutoTypeEnabled) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoTypeEnabled) ) { ctxEntry.getAutoType().enabled = ReadBool(xpp, true); - } else if ( name.equalsIgnoreCase(ElemAutoTypeObfuscation) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoTypeObfuscation) ) { ctxEntry.getAutoType().obfuscationOptions = ReadUInt(xpp, 0); - } else if ( name.equalsIgnoreCase(ElemAutoTypeDefaultSeq) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoTypeDefaultSeq) ) { ctxEntry.getAutoType().defaultSequence = ReadString(xpp); - } else if ( name.equalsIgnoreCase(ElemAutoTypeItem) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoTypeItem) ) { return SwitchContext(ctx, KdbContext.EntryAutoTypeItem, xpp); } else { ReadUnknown(xpp); @@ -814,9 +728,9 @@ public class ImporterV4 extends Importer { break; case EntryAutoTypeItem: - if ( name.equalsIgnoreCase(ElemWindow) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemWindow) ) { ctxATName = ReadString(xpp); - } else if ( name.equalsIgnoreCase(ElemKeystrokeSequence) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemKeystrokeSequence) ) { ctxATSeq = ReadString(xpp); } else { ReadUnknown(xpp); @@ -824,7 +738,7 @@ public class ImporterV4 extends Importer { break; case EntryHistory: - if ( name.equalsIgnoreCase(ElemEntry) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemEntry) ) { ctxEntry = new PwEntryV4(); ctxHistoryBase.addToHistory(ctxEntry); @@ -836,7 +750,7 @@ public class ImporterV4 extends Importer { break; case RootDeletedObjects: - if ( name.equalsIgnoreCase(ElemDeletedObject) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDeletedObject) ) { ctxDeletedObject = new PwDeletedObject(); db.addDeletedObject(ctxDeletedObject); @@ -847,9 +761,9 @@ public class ImporterV4 extends Importer { break; case DeletedObject: - if ( name.equalsIgnoreCase(ElemUuid) ) { + if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemUuid) ) { ctxDeletedObject.uuid = ReadUuid(xpp); - } else if ( name.equalsIgnoreCase(ElemDeletionTime) ) { + } else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemDeletionTime) ) { ctxDeletedObject.setDeletionTime(ReadTime(xpp)); } else { ReadUnknown(xpp); @@ -868,17 +782,17 @@ public class ImporterV4 extends Importer { assert(xpp.getEventType() == XmlPullParser.END_TAG); String name = xpp.getName(); - if ( ctx == KdbContext.KeePassFile && name.equalsIgnoreCase(ElemDocNode) ) { + if ( ctx == KdbContext.KeePassFile && name.equalsIgnoreCase(PwDatabaseV4XML.ElemDocNode) ) { return KdbContext.Null; - } else if ( ctx == KdbContext.Meta && name.equalsIgnoreCase(ElemMeta) ) { + } else if ( ctx == KdbContext.Meta && name.equalsIgnoreCase(PwDatabaseV4XML.ElemMeta) ) { return KdbContext.KeePassFile; - } else if ( ctx == KdbContext.Root && name.equalsIgnoreCase(ElemRoot) ) { + } else if ( ctx == KdbContext.Root && name.equalsIgnoreCase(PwDatabaseV4XML.ElemRoot) ) { return KdbContext.KeePassFile; - } else if ( ctx == KdbContext.MemoryProtection && name.equalsIgnoreCase(ElemMemoryProt) ) { + } else if ( ctx == KdbContext.MemoryProtection && name.equalsIgnoreCase(PwDatabaseV4XML.ElemMemoryProt) ) { return KdbContext.Meta; - } else if ( ctx == KdbContext.CustomIcons && name.equalsIgnoreCase(ElemCustomIcons) ) { + } else if ( ctx == KdbContext.CustomIcons && name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIcons) ) { return KdbContext.Meta; - } else if ( ctx == KdbContext.CustomIcon && name.equalsIgnoreCase(ElemCustomIconItem) ) { + } else if ( ctx == KdbContext.CustomIcon && name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconItem) ) { if ( ! customIconID.equals(PwDatabase.UUID_ZERO) ) { PwIconCustom icon = new PwIconCustom(customIconID, customIconData); db.addCustomIcon(icon); @@ -889,11 +803,11 @@ public class ImporterV4 extends Importer { customIconData = null; return KdbContext.CustomIcons; - } else if ( ctx == KdbContext.Binaries && name.equalsIgnoreCase(ElemBinaries) ) { + } else if ( ctx == KdbContext.Binaries && name.equalsIgnoreCase(PwDatabaseV4XML.ElemBinaries) ) { return KdbContext.Meta; - } else if ( ctx == KdbContext.CustomData && name.equalsIgnoreCase(ElemCustomData) ) { + } else if ( ctx == KdbContext.CustomData && name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData) ) { return KdbContext.Meta; - } else if ( ctx == KdbContext.CustomDataItem && name.equalsIgnoreCase(ElemStringDictExItem) ) { + } else if ( ctx == KdbContext.CustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem) ) { if ( customDataKey != null && customDataValue != null) { db.putCustomData(customDataKey, customDataValue); } else assert(false); @@ -902,7 +816,7 @@ public class ImporterV4 extends Importer { customDataValue = null; return KdbContext.CustomData; - } else if ( ctx == KdbContext.Group && name.equalsIgnoreCase(ElemGroup) ) { + } else if ( ctx == KdbContext.Group && name.equalsIgnoreCase(PwDatabaseV4XML.ElemGroup) ) { if ( ctxGroup.getUUID() == null || ctxGroup.getUUID().equals(PwDatabase.UUID_ZERO) ) { ctxGroup.setUUID(UUID.randomUUID()); } @@ -916,11 +830,11 @@ public class ImporterV4 extends Importer { ctxGroup = ctxGroups.peek(); return KdbContext.Group; } - } else if ( ctx == KdbContext.GroupTimes && name.equalsIgnoreCase(ElemTimes) ) { + } else if ( ctx == KdbContext.GroupTimes && name.equalsIgnoreCase(PwDatabaseV4XML.ElemTimes) ) { return KdbContext.Group; - } else if ( ctx == KdbContext.GroupCustomData && name.equalsIgnoreCase(ElemCustomData) ) { + } else if ( ctx == KdbContext.GroupCustomData && name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData) ) { return KdbContext.Group; - } else if ( ctx == KdbContext.GroupCustomDataItem && name.equalsIgnoreCase(ElemStringDictExItem)) { + } else if ( ctx == KdbContext.GroupCustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) { if (groupCustomDataKey != null && groupCustomDataValue != null) { ctxGroup.putCustomData(groupCustomDataKey, groupCustomDataKey); } else { @@ -932,7 +846,7 @@ public class ImporterV4 extends Importer { return KdbContext.GroupCustomData; - } else if ( ctx == KdbContext.Entry && name.equalsIgnoreCase(ElemEntry) ) { + } else if ( ctx == KdbContext.Entry && name.equalsIgnoreCase(PwDatabaseV4XML.ElemEntry) ) { if ( ctxEntry.getUUID() == null || ctxEntry.getUUID().equals(PwDatabase.UUID_ZERO) ) { ctxEntry.setUUID(UUID.randomUUID()); } @@ -943,31 +857,31 @@ public class ImporterV4 extends Importer { } return KdbContext.Group; - } else if ( ctx == KdbContext.EntryTimes && name.equalsIgnoreCase(ElemTimes) ) { + } else if ( ctx == KdbContext.EntryTimes && name.equalsIgnoreCase(PwDatabaseV4XML.ElemTimes) ) { return KdbContext.Entry; - } else if ( ctx == KdbContext.EntryString && name.equalsIgnoreCase(ElemString) ) { + } else if ( ctx == KdbContext.EntryString && name.equalsIgnoreCase(PwDatabaseV4XML.ElemString) ) { ctxEntry.addExtraField(ctxStringName, ctxStringValue); ctxStringName = null; ctxStringValue = null; return KdbContext.Entry; - } else if ( ctx == KdbContext.EntryBinary && name.equalsIgnoreCase(ElemBinary) ) { + } else if ( ctx == KdbContext.EntryBinary && name.equalsIgnoreCase(PwDatabaseV4XML.ElemBinary) ) { ctxEntry.putProtectedBinary(ctxBinaryName, ctxBinaryValue); ctxBinaryName = null; ctxBinaryValue = null; return KdbContext.Entry; - } else if ( ctx == KdbContext.EntryAutoType && name.equalsIgnoreCase(ElemAutoType) ) { + } else if ( ctx == KdbContext.EntryAutoType && name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoType) ) { return KdbContext.Entry; - } else if ( ctx == KdbContext.EntryAutoTypeItem && name.equalsIgnoreCase(ElemAutoTypeItem) ) { + } else if ( ctx == KdbContext.EntryAutoTypeItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemAutoTypeItem) ) { ctxEntry.getAutoType().put(ctxATName, ctxATSeq); ctxATName = null; ctxATSeq = null; return KdbContext.EntryAutoType; - } else if ( ctx == KdbContext.EntryCustomData && name.equalsIgnoreCase(ElemCustomData)) { + } else if ( ctx == KdbContext.EntryCustomData && name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData)) { return KdbContext.Entry; - } else if ( ctx == KdbContext.EntryCustomDataItem && name.equalsIgnoreCase(ElemStringDictExItem)) { + } else if ( ctx == KdbContext.EntryCustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) { if (entryCustomDataKey != null && entryCustomDataValue != null) { ctxEntry.putCustomData(entryCustomDataKey, entryCustomDataValue); } else { @@ -978,12 +892,12 @@ public class ImporterV4 extends Importer { entryCustomDataValue = null; return KdbContext.EntryCustomData; - } else if ( ctx == KdbContext.EntryHistory && name.equalsIgnoreCase(ElemHistory) ) { + } else if ( ctx == KdbContext.EntryHistory && name.equalsIgnoreCase(PwDatabaseV4XML.ElemHistory) ) { entryInHistory = false; return KdbContext.Entry; - } else if ( ctx == KdbContext.RootDeletedObjects && name.equalsIgnoreCase(ElemDeletedObjects) ) { + } else if ( ctx == KdbContext.RootDeletedObjects && name.equalsIgnoreCase(PwDatabaseV4XML.ElemDeletedObjects) ) { return KdbContext.Root; - } else if ( ctx == KdbContext.DeletedObject && name.equalsIgnoreCase(ElemDeletedObject) ) { + } else if ( ctx == KdbContext.DeletedObject && name.equalsIgnoreCase(PwDatabaseV4XML.ElemDeletedObject) ) { ctxDeletedObject = null; return KdbContext.RootDeletedObjects; } else { @@ -1143,7 +1057,7 @@ public class ImporterV4 extends Importer { } private ProtectedBinary ReadProtectedBinary(XmlPullParser xpp) throws XmlPullParserException, IOException { - String ref = xpp.getAttributeValue(null, AttrRef); + String ref = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrRef); if (ref != null) { xpp.next(); // Consume end tag @@ -1152,9 +1066,9 @@ public class ImporterV4 extends Importer { } boolean compressed = false; - String comp = xpp.getAttributeValue(null, AttrCompressed); + String comp = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrCompressed); if (comp != null) { - compressed = comp.equalsIgnoreCase(ValTrue); + compressed = comp.equalsIgnoreCase(PwDatabaseV4XML.ValTrue); } byte[] buf = ProcessNode(xpp); @@ -1201,8 +1115,8 @@ public class ImporterV4 extends Importer { byte[] buf = null; if ( xpp.getAttributeCount() > 0 ) { - String protect = xpp.getAttributeValue(null, AttrProtected); - if ( protect != null && protect.equalsIgnoreCase(ValTrue) ) { + String protect = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrProtected); + if ( protect != null && protect.equalsIgnoreCase(PwDatabaseV4XML.ValTrue) ) { String encrypted = ReadStringRaw(xpp); if ( encrypted.length() > 0 ) { diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutput.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutput.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutput.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutput.java index e56d4e77f..3e1b76ca3 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutput.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutput.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; public class PwDbHeaderOutput { protected byte[] hashOfHeader = null; diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV3.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV3.java similarity index 92% rename from app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV3.java index 7481d0530..3d06d7748 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV3.java @@ -17,15 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; + +import com.kunzisoft.keepass.database.PwDbHeaderV3; +import com.kunzisoft.keepass.stream.LEDataOutputStream; import java.io.IOException; import java.io.OutputStream; - -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.stream.LEDataOutputStream; - public class PwDbHeaderOutputV3 { private PwDbHeaderV3 mHeader; private OutputStream mOS; diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV4.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV4.java similarity index 65% rename from app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV4.java index 4505b364d..27c91950f 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV4.java @@ -17,7 +17,18 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +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.exception.PwDbOutputException; +import com.kunzisoft.keepass.stream.HmacBlockStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.stream.MacOutputStream; +import com.kunzisoft.keepass.utils.Types; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,18 +38,6 @@ import java.security.InvalidKeyException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import com.keepassdroid.collections.VariantDictionary; -import com.keepassdroid.crypto.keyDerivation.KdfParameters; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV4; -import com.keepassdroid.database.PwDbHeaderV4.PwDbHeaderV4Fields; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.stream.HmacBlockStream; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.stream.MacOutputStream; -import com.keepassdroid.utils.Types; - import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -92,35 +91,35 @@ public class PwDbHeaderOutputV4 extends PwDbHeaderOutput { los.writeUInt(header.version); - writeHeaderField(PwDbHeaderV4Fields.CipherID, Types.UUIDtoBytes(db.getDataCipher())); - writeHeaderField(PwDbHeaderV4Fields.CompressionFlags, LEDataOutputStream.writeIntBuf(db.getCompressionAlgorithm().id)); - writeHeaderField(PwDbHeaderV4Fields.MasterSeed, header.masterSeed); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.CipherID, Types.UUIDtoBytes(db.getDataCipher())); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.CompressionFlags, LEDataOutputStream.writeIntBuf(db.getCompressionAlgorithm().id)); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.MasterSeed, header.masterSeed); if (header.version < PwDbHeaderV4.FILE_VERSION_32_4) { - writeHeaderField(PwDbHeaderV4Fields.TransformSeed, header.getTransformSeed()); - writeHeaderField(PwDbHeaderV4Fields.TransformRounds, LEDataOutputStream.writeLongBuf(db.getNumberKeyEncryptionRounds())); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.TransformSeed, header.getTransformSeed()); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.TransformRounds, LEDataOutputStream.writeLongBuf(db.getNumberKeyEncryptionRounds())); } else { - writeHeaderField(PwDbHeaderV4Fields.KdfParameters, KdfParameters.serialize(db.getKdfParameters())); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.KdfParameters, KdfParameters.serialize(db.getKdfParameters())); } if (header.encryptionIV.length > 0) { - writeHeaderField(PwDbHeaderV4Fields.EncryptionIV, header.encryptionIV); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.EncryptionIV, header.encryptionIV); } if (header.version < PwDbHeaderV4.FILE_VERSION_32_4) { - writeHeaderField(PwDbHeaderV4Fields.InnerRandomstreamKey, header.innerRandomStreamKey); - writeHeaderField(PwDbHeaderV4Fields.StreamStartBytes, header.streamStartBytes); - writeHeaderField(PwDbHeaderV4Fields.InnerRandomStreamID, LEDataOutputStream.writeIntBuf(header.innerRandomStream.id)); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.InnerRandomstreamKey, header.innerRandomStreamKey); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.StreamStartBytes, header.streamStartBytes); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.InnerRandomStreamID, LEDataOutputStream.writeIntBuf(header.innerRandomStream.id)); } if (db.containsPublicCustomData()) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); LEDataOutputStream los = new LEDataOutputStream(bos); VariantDictionary.serialize(db.getPublicCustomData(), los); - writeHeaderField(PwDbHeaderV4Fields.PublicCustomData, bos.toByteArray()); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.PublicCustomData, bos.toByteArray()); } - writeHeaderField(PwDbHeaderV4Fields.EndOfHeader, EndHeaderValue); + writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.EndOfHeader, EndHeaderValue); los.flush(); hashOfHeader = dos.getMessageDigest().digest(); diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbInnerHeaderOutputV4.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbInnerHeaderOutputV4.java similarity index 69% rename from app/src/main/java/com/keepassdroid/database/save/PwDbInnerHeaderOutputV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbInnerHeaderOutputV4.java index e1bc45c54..89dc3145e 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbInnerHeaderOutputV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbInnerHeaderOutputV4.java @@ -1,7 +1,7 @@ /* * Copyright 2017 Brian Pellin. * - * This file is part of KeePassDroid. + * This file is part of KeePass DX. * * KeePassDroid is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,14 +17,12 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwDbHeaderV4; -import com.keepassdroid.database.PwDbHeaderV4.PwDbInnerHeaderV4Fields; -import com.keepassdroid.database.PwDbHeaderV4.KdbxBinaryFlags; -import com.keepassdroid.database.security.ProtectedBinary; -import com.keepassdroid.stream.LEDataOutputStream; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.PwDbHeaderV4; +import com.kunzisoft.keepass.database.security.ProtectedBinary; +import com.kunzisoft.keepass.stream.LEDataOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -43,23 +41,23 @@ public class PwDbInnerHeaderOutputV4 { } public void output() throws IOException { - los.write(PwDbInnerHeaderV4Fields.InnerRandomStreamID); + los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.InnerRandomStreamID); los.writeInt(4); los.writeInt(header.innerRandomStream.id); int streamKeySize = header.innerRandomStreamKey.length; - los.write(PwDbInnerHeaderV4Fields.InnerRandomstreamKey); + los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.InnerRandomstreamKey); los.writeInt(streamKeySize); los.write(header.innerRandomStreamKey); for (ProtectedBinary bin : db.getBinPool().binaries()) { - byte flag = KdbxBinaryFlags.None; + byte flag = PwDbHeaderV4.KdbxBinaryFlags.None; if (bin.isProtected()) { - flag |= KdbxBinaryFlags.Protected; + flag |= PwDbHeaderV4.KdbxBinaryFlags.Protected; } byte[] binData = bin.getData(); - los.write(PwDbInnerHeaderV4Fields.Binary); + los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.Binary); los.writeInt(bin.length() + 1); los.write(flag); los.write(binData); @@ -67,7 +65,7 @@ public class PwDbInnerHeaderOutputV4 { Arrays.fill(binData, (byte)0); } - los.write(PwDbInnerHeaderV4Fields.EndOfHeader); + los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.EndOfHeader); los.writeInt(0); } diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbOutput.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbOutput.java similarity index 80% rename from app/src/main/java/com/keepassdroid/database/save/PwDbOutput.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbOutput.java index cf32afb79..2563fa5a0 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbOutput.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbOutput.java @@ -17,26 +17,26 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +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.exception.PwDbOutputException; import java.io.OutputStream; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.exception.PwDbOutputException; - public abstract class PwDbOutput { protected OutputStream mOS; public static PwDbOutput getInstance(PwDatabase pm, OutputStream os) { - if ( pm instanceof PwDatabaseV3 ) { + if ( pm instanceof PwDatabaseV3) { return new PwDbV3Output((PwDatabaseV3)pm, os); - } else if ( pm instanceof PwDatabaseV4 ) { + } else if ( pm instanceof PwDatabaseV4) { return new PwDbV4Output((PwDatabaseV4)pm, os); } @@ -47,7 +47,7 @@ public abstract class PwDbOutput { mOS = os; } - protected SecureRandom setIVs(PwDbHeader header) throws PwDbOutputException { + protected SecureRandom setIVs(PwDbHeader header) throws PwDbOutputException { SecureRandom random; try { random = SecureRandom.getInstance("SHA1PRNG"); diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbV3Output.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3Output.java similarity index 93% rename from app/src/main/java/com/keepassdroid/database/save/PwDbV3Output.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3Output.java index 5f71cb201..bdd53bacd 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbV3Output.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3Output.java @@ -17,18 +17,18 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.database.PwEncryptionAlgorithm; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.database.PwGroupV3; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.stream.NullOutputStream; +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.exception.PwDbOutputException; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.stream.NullOutputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbV3OutputDebug.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3OutputDebug.java similarity index 85% rename from app/src/main/java/com/keepassdroid/database/save/PwDbV3OutputDebug.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3OutputDebug.java index b3234b9bf..14fd7d796 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbV3OutputDebug.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3OutputDebug.java @@ -17,17 +17,17 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; + +import com.kunzisoft.keepass.database.PwDatabaseV3; +import com.kunzisoft.keepass.database.PwDatabaseV3Debug; +import com.kunzisoft.keepass.database.PwDbHeader; +import com.kunzisoft.keepass.database.PwDbHeaderV3; +import com.kunzisoft.keepass.database.exception.PwDbOutputException; import java.io.OutputStream; import java.security.SecureRandom; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwDatabaseV3Debug; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV3; -import com.keepassdroid.database.exception.PwDbOutputException; - public class PwDbV3OutputDebug extends PwDbV3Output { PwDatabaseV3Debug debugDb; private boolean noHeaderHash; diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java similarity index 54% rename from app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java index e194b3206..ab5e79aaa 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java @@ -17,41 +17,41 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; import android.util.Xml; -import com.keepassdroid.crypto.CipherFactory; -import com.keepassdroid.crypto.PwStreamCipherFactory; -import com.keepassdroid.crypto.engine.CipherEngine; -import com.keepassdroid.crypto.keyDerivation.KdfEngine; -import com.keepassdroid.crypto.keyDerivation.KdfFactory; -import com.keepassdroid.database.AutoType; -import com.keepassdroid.database.CrsAlgorithm; -import com.keepassdroid.database.EntryHandler; -import com.keepassdroid.database.GroupHandler; -import com.keepassdroid.database.ITimeLogger; -import com.keepassdroid.database.MemoryProtectionConfig; -import com.keepassdroid.database.PwCompressionAlgorithm; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwDatabaseV4XML; -import com.keepassdroid.database.PwDbHeader; -import com.keepassdroid.database.PwDbHeaderV4; -import com.keepassdroid.database.PwDefsV4; -import com.keepassdroid.database.PwDeletedObject; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.PwGroupV4; -import com.keepassdroid.database.PwIconCustom; -import com.keepassdroid.database.exception.PwDbOutputException; -import com.keepassdroid.database.security.ProtectedBinary; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.stream.HashedBlockOutputStream; -import com.keepassdroid.stream.HmacBlockOutputStream; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.utils.DateUtil; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.MemUtil; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.crypto.CipherFactory; +import com.kunzisoft.keepass.crypto.PwStreamCipherFactory; +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.database.AutoType; +import com.kunzisoft.keepass.database.CrsAlgorithm; +import com.kunzisoft.keepass.database.EntryHandler; +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.PwDbHeader; +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.exception.PwDbOutputException; +import com.kunzisoft.keepass.database.security.ProtectedBinary; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.stream.HashedBlockOutputStream; +import com.kunzisoft.keepass.stream.HmacBlockOutputStream; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.utils.DateUtil; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.MemUtil; +import com.kunzisoft.keepass.utils.Types; import org.joda.time.DateTime; import org.spongycastle.crypto.StreamCipher; @@ -74,90 +74,6 @@ import javax.crypto.CipherOutputStream; import biz.source_code.base64Coder.Base64Coder; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrCompressed; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrId; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrProtected; -import static com.keepassdroid.database.PwDatabaseV4XML.AttrRef; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoType; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeDefaultSeq; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeEnabled; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemAutoTypeObfuscation; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBgColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBinaries; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemBinary; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCreationTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomData; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconID; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItemData; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIconItemID; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemCustomIcons; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDefaultUser; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDefaultUserChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDesc; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbDescChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChangeForce; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChangeRec; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbKeyChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbMntncHistoryDays; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDbNameChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletedObject; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletedObjects; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDeletionTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemDocNode; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEnableAutoType; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEnableSearching; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntry; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntryTemplatesGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemEntryTemplatesGroupChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemExpires; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemExpiryTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemFgColor; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGenerator; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemGroupDefaultAutoTypeSeq; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHeaderHash; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistory; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistoryMaxItems; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemHistoryMaxSize; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemIcon; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemIsExpanded; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemKey; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemKeystrokeSequence; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastAccessTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastModTime; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastSelectedGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastTopVisibleEntry; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLastTopVisibleGroup; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemLocationChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemMemoryProt; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemMeta; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemNotes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemOverrideUrl; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtNotes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtPassword; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtTitle; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtURL; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemProtUserName; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinChanged; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinEnabled; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRecycleBinUuid; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemRoot; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemString; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemStringDictExItem; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemTags; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemTimes; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemUsageCount; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemUuid; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemValue; -import static com.keepassdroid.database.PwDatabaseV4XML.ElemWindow; -import static com.keepassdroid.database.PwDatabaseV4XML.ValFalse; -import static com.keepassdroid.database.PwDatabaseV4XML.ValTrue; - public class PwDbV4Output extends PwDbOutput { PwDatabaseV4 mPM; @@ -281,12 +197,12 @@ public class PwDbV4Output extends PwDbOutput { xml.setOutput(os, "UTF-8"); xml.startDocument("UTF-8", true); - xml.startTag(null, ElemDocNode); + xml.startTag(null, PwDatabaseV4XML.ElemDocNode); writeMeta(); PwGroupV4 root = mPM.getRootGroup(); - xml.startTag(null, ElemRoot); + xml.startTag(null, PwDatabaseV4XML.ElemRoot); startGroup(root); Stack groupStack = new Stack<>(); groupStack.push(root); @@ -295,62 +211,62 @@ public class PwDbV4Output extends PwDbOutput { throw new RuntimeException("Writing groups failed"); while (groupStack.size() > 1) { - xml.endTag(null, ElemGroup); + xml.endTag(null, PwDatabaseV4XML.ElemGroup); groupStack.pop(); } endGroup(); - writeList(ElemDeletedObjects, mPM.getDeletedObjects()); + writeList(PwDatabaseV4XML.ElemDeletedObjects, mPM.getDeletedObjects()); - xml.endTag(null, ElemRoot); + xml.endTag(null, PwDatabaseV4XML.ElemRoot); - xml.endTag(null, ElemDocNode); + xml.endTag(null, PwDatabaseV4XML.ElemDocNode); xml.endDocument(); } private void writeMeta() throws IllegalArgumentException, IllegalStateException, IOException { - xml.startTag(null, ElemMeta); + xml.startTag(null, PwDatabaseV4XML.ElemMeta); - writeObject(ElemGenerator, mPM.localizedAppName); + writeObject(PwDatabaseV4XML.ElemGenerator, mPM.localizedAppName); if (hashOfHeader != null) { - writeObject(ElemHeaderHash, String.valueOf(Base64Coder.encode(hashOfHeader))); + writeObject(PwDatabaseV4XML.ElemHeaderHash, String.valueOf(Base64Coder.encode(hashOfHeader))); } - writeObject(ElemDbName, mPM.getName(), true); - writeObject(ElemDbNameChanged, mPM.getNameChanged().getDate()); - writeObject(ElemDbDesc, mPM.getDescription(), true); - writeObject(ElemDbDescChanged, mPM.getDescriptionChanged().getDate()); - writeObject(ElemDbDefaultUser, mPM.getDefaultUserName(), true); - writeObject(ElemDbDefaultUserChanged, mPM.getDefaultUserNameChanged().getDate()); - writeObject(ElemDbMntncHistoryDays, mPM.getMaintenanceHistoryDays()); - writeObject(ElemDbColor, mPM.getColor()); - writeObject(ElemDbKeyChanged, mPM.getKeyLastChanged().getDate()); - writeObject(ElemDbKeyChangeRec, mPM.getKeyChangeRecDays()); - writeObject(ElemDbKeyChangeForce, mPM.getKeyChangeForceDays()); + writeObject(PwDatabaseV4XML.ElemDbName, mPM.getName(), true); + writeObject(PwDatabaseV4XML.ElemDbNameChanged, mPM.getNameChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemDbDesc, mPM.getDescription(), true); + writeObject(PwDatabaseV4XML.ElemDbDescChanged, mPM.getDescriptionChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemDbDefaultUser, mPM.getDefaultUserName(), true); + writeObject(PwDatabaseV4XML.ElemDbDefaultUserChanged, mPM.getDefaultUserNameChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemDbMntncHistoryDays, mPM.getMaintenanceHistoryDays()); + writeObject(PwDatabaseV4XML.ElemDbColor, mPM.getColor()); + writeObject(PwDatabaseV4XML.ElemDbKeyChanged, mPM.getKeyLastChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemDbKeyChangeRec, mPM.getKeyChangeRecDays()); + writeObject(PwDatabaseV4XML.ElemDbKeyChangeForce, mPM.getKeyChangeForceDays()); - writeList(ElemMemoryProt, mPM.getMemoryProtection()); + writeList(PwDatabaseV4XML.ElemMemoryProt, mPM.getMemoryProtection()); writeCustomIconList(); - writeObject(ElemRecycleBinEnabled, mPM.isRecycleBinEnabled()); - writeObject(ElemRecycleBinUuid, mPM.getRecycleBinUUID()); - writeObject(ElemRecycleBinChanged, mPM.getRecycleBinChanged()); - writeObject(ElemEntryTemplatesGroup, mPM.getEntryTemplatesGroup()); - writeObject(ElemEntryTemplatesGroupChanged, mPM.getEntryTemplatesGroupChanged().getDate()); - writeObject(ElemHistoryMaxItems, mPM.getHistoryMaxItems()); - writeObject(ElemHistoryMaxSize, mPM.getHistoryMaxSize()); - writeObject(ElemLastSelectedGroup, mPM.getLastSelectedGroup()); - writeObject(ElemLastTopVisibleGroup, mPM.getLastTopVisibleGroup()); + writeObject(PwDatabaseV4XML.ElemRecycleBinEnabled, mPM.isRecycleBinEnabled()); + writeObject(PwDatabaseV4XML.ElemRecycleBinUuid, mPM.getRecycleBinUUID()); + writeObject(PwDatabaseV4XML.ElemRecycleBinChanged, mPM.getRecycleBinChanged()); + writeObject(PwDatabaseV4XML.ElemEntryTemplatesGroup, mPM.getEntryTemplatesGroup()); + writeObject(PwDatabaseV4XML.ElemEntryTemplatesGroupChanged, mPM.getEntryTemplatesGroupChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemHistoryMaxItems, mPM.getHistoryMaxItems()); + writeObject(PwDatabaseV4XML.ElemHistoryMaxSize, mPM.getHistoryMaxSize()); + writeObject(PwDatabaseV4XML.ElemLastSelectedGroup, mPM.getLastSelectedGroup()); + writeObject(PwDatabaseV4XML.ElemLastTopVisibleGroup, mPM.getLastTopVisibleGroup()); if (header.version < PwDbHeaderV4.FILE_VERSION_32_4) { writeBinPool(); } - writeList(ElemCustomData, mPM.getCustomData()); + writeList(PwDatabaseV4XML.ElemCustomData, mPM.getCustomData()); - xml.endTag(null, ElemMeta); + xml.endTag(null, PwDatabaseV4XML.ElemMeta); } @@ -426,71 +342,71 @@ public class PwDbV4Output extends PwDbOutput { } private void startGroup(PwGroupV4 group) throws IllegalArgumentException, IllegalStateException, IOException { - xml.startTag(null, ElemGroup); - writeObject(ElemUuid, group.getUUID()); - writeObject(ElemName, group.getName()); - writeObject(ElemNotes, group.getNotes()); - writeObject(ElemIcon, group.getIconStandard().iconId); + xml.startTag(null, PwDatabaseV4XML.ElemGroup); + writeObject(PwDatabaseV4XML.ElemUuid, group.getUUID()); + writeObject(PwDatabaseV4XML.ElemName, group.getName()); + writeObject(PwDatabaseV4XML.ElemNotes, group.getNotes()); + writeObject(PwDatabaseV4XML.ElemIcon, group.getIconStandard().iconId); if (!group.getCustomIcon().equals(PwIconCustom.ZERO)) { - writeObject(ElemCustomIconID, group.getCustomIcon().uuid); + writeObject(PwDatabaseV4XML.ElemCustomIconID, group.getCustomIcon().uuid); } - writeList(ElemTimes, group); - writeObject(ElemIsExpanded, group.isExpanded()); - writeObject(ElemGroupDefaultAutoTypeSeq, group.getDefaultAutoTypeSequence()); - writeObject(ElemEnableAutoType, group.getEnableAutoType()); - writeObject(ElemEnableSearching, group.getEnableSearching()); - writeObject(ElemLastTopVisibleEntry, group.getLastTopVisibleEntry()); + writeList(PwDatabaseV4XML.ElemTimes, group); + writeObject(PwDatabaseV4XML.ElemIsExpanded, group.isExpanded()); + writeObject(PwDatabaseV4XML.ElemGroupDefaultAutoTypeSeq, group.getDefaultAutoTypeSequence()); + writeObject(PwDatabaseV4XML.ElemEnableAutoType, group.getEnableAutoType()); + writeObject(PwDatabaseV4XML.ElemEnableSearching, group.getEnableSearching()); + writeObject(PwDatabaseV4XML.ElemLastTopVisibleEntry, group.getLastTopVisibleEntry()); } private void endGroup() throws IllegalArgumentException, IllegalStateException, IOException { - xml.endTag(null, ElemGroup); + xml.endTag(null, PwDatabaseV4XML.ElemGroup); } private void writeEntry(PwEntryV4 entry, boolean isHistory) throws IllegalArgumentException, IllegalStateException, IOException { assert(entry != null); - xml.startTag(null, ElemEntry); + xml.startTag(null, PwDatabaseV4XML.ElemEntry); - writeObject(ElemUuid, entry.getUUID()); - writeObject(ElemIcon, entry.getIconStandard().iconId); + writeObject(PwDatabaseV4XML.ElemUuid, entry.getUUID()); + writeObject(PwDatabaseV4XML.ElemIcon, entry.getIconStandard().iconId); if (!entry.getCustomIcon().equals(PwIconCustom.ZERO)) { - writeObject(ElemCustomIconID, entry.getCustomIcon().uuid); + writeObject(PwDatabaseV4XML.ElemCustomIconID, entry.getCustomIcon().uuid); } - writeObject(ElemFgColor, entry.getForegroundColor()); - writeObject(ElemBgColor, entry.getBackgroupColor()); - writeObject(ElemOverrideUrl, entry.getOverrideURL()); - writeObject(ElemTags, entry.getTags()); + writeObject(PwDatabaseV4XML.ElemFgColor, entry.getForegroundColor()); + writeObject(PwDatabaseV4XML.ElemBgColor, entry.getBackgroupColor()); + writeObject(PwDatabaseV4XML.ElemOverrideUrl, entry.getOverrideURL()); + writeObject(PwDatabaseV4XML.ElemTags, entry.getTags()); - writeList(ElemTimes, entry); + writeList(PwDatabaseV4XML.ElemTimes, entry); writeList(entry.getFields().getListOfAllFields(), true); writeList(entry.getBinaries()); - writeList(ElemAutoType, entry.getAutoType()); + writeList(PwDatabaseV4XML.ElemAutoType, entry.getAutoType()); if (!isHistory) { - writeList(ElemHistory, entry.getHistory(), true); + writeList(PwDatabaseV4XML.ElemHistory, entry.getHistory(), true); } else { assert(entry.sizeOfHistory() == 0); } - xml.endTag(null, ElemEntry); + xml.endTag(null, PwDatabaseV4XML.ElemEntry); } private void writeObject(String key, ProtectedBinary value, boolean allowRef) throws IllegalArgumentException, IllegalStateException, IOException { assert(key != null && value != null); - xml.startTag(null, ElemBinary); - xml.startTag(null, ElemKey); + xml.startTag(null, PwDatabaseV4XML.ElemBinary); + xml.startTag(null, PwDatabaseV4XML.ElemKey); xml.text(safeXmlString(key)); - xml.endTag(null, ElemKey); + xml.endTag(null, PwDatabaseV4XML.ElemKey); - xml.startTag(null, ElemValue); + xml.startTag(null, PwDatabaseV4XML.ElemValue); String strRef = null; if (allowRef) { int ref = mPM.getBinPool().poolFind(value); @@ -498,19 +414,19 @@ public class PwDbV4Output extends PwDbOutput { } if (strRef != null) { - xml.attribute(null, AttrRef, strRef); + xml.attribute(null, PwDatabaseV4XML.AttrRef, strRef); } else { subWriteValue(value); } - xml.endTag(null, ElemValue); + xml.endTag(null, PwDatabaseV4XML.ElemValue); - xml.endTag(null, ElemBinary); + xml.endTag(null, PwDatabaseV4XML.ElemBinary); } private void subWriteValue(ProtectedBinary value) throws IllegalArgumentException, IllegalStateException, IOException { if (value.isProtected()) { - xml.attribute(null, AttrProtected, ValTrue); + xml.attribute(null, PwDatabaseV4XML.AttrProtected, PwDatabaseV4XML.ValTrue); int valLength = value.length(); if (valLength > 0) { @@ -522,7 +438,7 @@ public class PwDbV4Output extends PwDbOutput { } else { if (mPM.getCompressionAlgorithm() == PwCompressionAlgorithm.Gzip) { - xml.attribute(null, AttrCompressed, ValTrue); + xml.attribute(null, PwDatabaseV4XML.AttrCompressed, PwDatabaseV4XML.ValTrue); byte[] raw = value.getData(); byte[] compressed = MemUtil.compress(raw); xml.text(String.valueOf(Base64Coder.encode(compressed))); @@ -574,10 +490,10 @@ public class PwDbV4Output extends PwDbOutput { text = "null"; } else if (value) { - text = ValTrue; + text = PwDatabaseV4XML.ValTrue; } else { - text = ValFalse; + text = PwDatabaseV4XML.ValFalse; } writeObject(name, text); @@ -607,15 +523,15 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); - writeObject(ElemAutoTypeEnabled, autoType.enabled); - writeObject(ElemAutoTypeObfuscation, autoType.obfuscationOptions); + writeObject(PwDatabaseV4XML.ElemAutoTypeEnabled, autoType.enabled); + writeObject(PwDatabaseV4XML.ElemAutoTypeObfuscation, autoType.obfuscationOptions); if (autoType.defaultSequence.length() > 0) { - writeObject(ElemAutoTypeDefaultSeq, autoType.defaultSequence, true); + writeObject(PwDatabaseV4XML.ElemAutoTypeDefaultSeq, autoType.defaultSequence, true); } for (Entry pair : autoType.entrySet()) { - writeObject(ElemAutoTypeItem, ElemWindow, pair.getKey(), ElemKeystrokeSequence, pair.getValue()); + writeObject(PwDatabaseV4XML.ElemAutoTypeItem, PwDatabaseV4XML.ElemWindow, pair.getKey(), PwDatabaseV4XML.ElemKeystrokeSequence, pair.getValue()); } xml.endTag(null, name); @@ -635,12 +551,12 @@ public class PwDbV4Output extends PwDbOutput { private void writeObject(String key, ProtectedString value, boolean isEntryString) throws IllegalArgumentException, IllegalStateException, IOException { assert(key !=null && value != null); - xml.startTag(null, ElemString); - xml.startTag(null, ElemKey); + xml.startTag(null, PwDatabaseV4XML.ElemString); + xml.startTag(null, PwDatabaseV4XML.ElemKey); xml.text(safeXmlString(key)); - xml.endTag(null, ElemKey); + xml.endTag(null, PwDatabaseV4XML.ElemKey); - xml.startTag(null, ElemValue); + xml.startTag(null, PwDatabaseV4XML.ElemValue); boolean protect = value.isProtected(); if (isEntryString) { if (key.equals(PwDefsV4.TITLE_FIELD)) { @@ -661,7 +577,7 @@ public class PwDbV4Output extends PwDbOutput { } if (protect) { - xml.attribute(null, AttrProtected, ValTrue); + xml.attribute(null, PwDatabaseV4XML.AttrProtected, PwDatabaseV4XML.ValTrue); byte[] data = value.toString().getBytes("UTF-8"); int valLength = data.length; @@ -676,8 +592,8 @@ public class PwDbV4Output extends PwDbOutput { xml.text(safeXmlString(value.toString())); } - xml.endTag(null, ElemValue); - xml.endTag(null, ElemString); + xml.endTag(null, PwDatabaseV4XML.ElemValue); + xml.endTag(null, PwDatabaseV4XML.ElemString); } @@ -686,8 +602,8 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); - writeObject(ElemUuid, value.uuid); - writeObject(ElemDeletionTime, value.getDeletionTime()); + writeObject(PwDatabaseV4XML.ElemUuid, value.uuid); + writeObject(PwDatabaseV4XML.ElemDeletionTime, value.getDeletionTime()); xml.endTag(null, name); } @@ -707,7 +623,7 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); for (PwDeletedObject pdo : value) { - writeObject(ElemDeletedObject, pdo); + writeObject(PwDatabaseV4XML.ElemDeletedObject, pdo); } xml.endTag(null, name); @@ -719,11 +635,11 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); - writeObject(ElemProtTitle, value.protectTitle); - writeObject(ElemProtUserName, value.protectUserName); - writeObject(ElemProtPassword, value.protectPassword); - writeObject(ElemProtURL, value.protectUrl); - writeObject(ElemProtNotes, value.protectNotes); + writeObject(PwDatabaseV4XML.ElemProtTitle, value.protectTitle); + writeObject(PwDatabaseV4XML.ElemProtUserName, value.protectUserName); + writeObject(PwDatabaseV4XML.ElemProtPassword, value.protectPassword); + writeObject(PwDatabaseV4XML.ElemProtURL, value.protectUrl); + writeObject(PwDatabaseV4XML.ElemProtNotes, value.protectNotes); xml.endTag(null, name); @@ -735,7 +651,7 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); for (Entry pair : customData.entrySet()) { - writeObject(ElemStringDictExItem, ElemKey, pair.getKey(), ElemValue, pair.getValue()); + writeObject(PwDatabaseV4XML.ElemStringDictExItem, PwDatabaseV4XML.ElemKey, pair.getKey(), PwDatabaseV4XML.ElemValue, pair.getValue()); } @@ -748,13 +664,13 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, name); - writeObject(ElemLastModTime, it.getLastModificationTime().getDate()); - writeObject(ElemCreationTime, it.getCreationTime().getDate()); - writeObject(ElemLastAccessTime, it.getLastAccessTime().getDate()); - writeObject(ElemExpiryTime, it.getExpiryTime().getDate()); - writeObject(ElemExpires, it.isExpires()); - writeObject(ElemUsageCount, it.getUsageCount()); - writeObject(ElemLocationChanged, it.getLocationChanged().getDate()); + writeObject(PwDatabaseV4XML.ElemLastModTime, it.getLastModificationTime().getDate()); + writeObject(PwDatabaseV4XML.ElemCreationTime, it.getCreationTime().getDate()); + writeObject(PwDatabaseV4XML.ElemLastAccessTime, it.getLastAccessTime().getDate()); + writeObject(PwDatabaseV4XML.ElemExpiryTime, it.getExpiryTime().getDate()); + writeObject(PwDatabaseV4XML.ElemExpires, it.isExpires()); + writeObject(PwDatabaseV4XML.ElemUsageCount, it.getUsageCount()); + writeObject(PwDatabaseV4XML.ElemLocationChanged, it.getLocationChanged().getDate()); xml.endTag(null, name); } @@ -776,34 +692,34 @@ public class PwDbV4Output extends PwDbOutput { List customIcons = mPM.getCustomIcons(); if (customIcons.size() == 0) return; - xml.startTag(null, ElemCustomIcons); + xml.startTag(null, PwDatabaseV4XML.ElemCustomIcons); for (PwIconCustom icon : customIcons) { - xml.startTag(null, ElemCustomIconItem); + xml.startTag(null, PwDatabaseV4XML.ElemCustomIconItem); - writeObject(ElemCustomIconItemID, icon.uuid); - writeObject(ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.imageData))); + writeObject(PwDatabaseV4XML.ElemCustomIconItemID, icon.uuid); + writeObject(PwDatabaseV4XML.ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.imageData))); - xml.endTag(null, ElemCustomIconItem); + xml.endTag(null, PwDatabaseV4XML.ElemCustomIconItem); } - xml.endTag(null, ElemCustomIcons); + xml.endTag(null, PwDatabaseV4XML.ElemCustomIcons); } private void writeBinPool() throws IllegalArgumentException, IllegalStateException, IOException { - xml.startTag(null, ElemBinaries); + xml.startTag(null, PwDatabaseV4XML.ElemBinaries); for (Entry pair : mPM.getBinPool().entrySet()) { - xml.startTag(null, ElemBinary); - xml.attribute(null, AttrId, Integer.toString(pair.getKey())); + xml.startTag(null, PwDatabaseV4XML.ElemBinary); + xml.attribute(null, PwDatabaseV4XML.AttrId, Integer.toString(pair.getKey())); subWriteValue(pair.getValue()); - xml.endTag(null, ElemBinary); + xml.endTag(null, PwDatabaseV4XML.ElemBinary); } - xml.endTag(null, ElemBinaries); + xml.endTag(null, PwDatabaseV4XML.ElemBinaries); } diff --git a/app/src/main/java/com/keepassdroid/database/save/PwEntryOutputV3.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/save/PwEntryOutputV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java index d8e055fee..2a640e843 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwEntryOutputV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; + +import com.kunzisoft.keepass.database.PwEntryV3; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.OutputStream; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.utils.Types; - public class PwEntryOutputV3 { // Constants public static final byte[] UUID_FIELD_TYPE = LEDataOutputStream.writeUShortBuf(1); diff --git a/app/src/main/java/com/keepassdroid/database/save/PwGroupOutputV3.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java similarity index 95% rename from app/src/main/java/com/keepassdroid/database/save/PwGroupOutputV3.java rename to app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java index 6ceb58a18..74dbff568 100644 --- a/app/src/main/java/com/keepassdroid/database/save/PwGroupOutputV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java @@ -17,16 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.save; +package com.kunzisoft.keepass.database.save; + +import com.kunzisoft.keepass.database.PwGroupV3; +import com.kunzisoft.keepass.stream.LEDataOutputStream; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.OutputStream; - -import com.keepassdroid.database.PwGroupV3; -import com.keepassdroid.stream.LEDataOutputStream; -import com.keepassdroid.utils.Types; - public class PwGroupOutputV3 { // Constants public static final byte[] GROUPID_FIELD_TYPE = LEDataOutputStream.writeUShortBuf(1); diff --git a/app/src/main/java/com/keepassdroid/database/security/ProtectedBinary.java b/app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedBinary.java similarity index 97% rename from app/src/main/java/com/keepassdroid/database/security/ProtectedBinary.java rename to app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedBinary.java index fb720e9fa..f73024d92 100644 --- a/app/src/main/java/com/keepassdroid/database/security/ProtectedBinary.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedBinary.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.security; +package com.kunzisoft.keepass.database.security; import java.io.Serializable; import java.util.Arrays; diff --git a/app/src/main/java/com/keepassdroid/database/security/ProtectedString.java b/app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedString.java similarity index 96% rename from app/src/main/java/com/keepassdroid/database/security/ProtectedString.java rename to app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedString.java index f497e9db3..a5d925535 100644 --- a/app/src/main/java/com/keepassdroid/database/security/ProtectedString.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedString.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.database.security; +package com.kunzisoft.keepass.database.security; import java.io.Serializable; diff --git a/app/src/main/java/com/keepassdroid/dialogs/AssignMasterKeyDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/AssignMasterKeyDialogFragment.java similarity index 98% rename from app/src/main/java/com/keepassdroid/dialogs/AssignMasterKeyDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/AssignMasterKeyDialogFragment.java index 381fb817c..c0ad76fd1 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/AssignMasterKeyDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/AssignMasterKeyDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; @@ -37,10 +37,10 @@ import android.widget.CompoundButton; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.UriUtil; -import com.keepassdroid.fileselect.KeyFileHelper; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.fileselect.KeyFileHelper; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.UriUtil; public class AssignMasterKeyDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/keepassdroid/dialogs/CreateFileDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java similarity index 98% rename from app/src/main/java/com/keepassdroid/dialogs/CreateFileDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java index f6138a872..7973f2dc0 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/CreateFileDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Activity; import android.app.Dialog; @@ -41,9 +41,9 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Spinner; -import com.keepassdroid.fileselect.FilePickerStylishActivity; -import com.keepassdroid.utils.UriUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.fileselect.FilePickerStylishActivity; +import com.kunzisoft.keepass.utils.UriUtil; import com.nononsenseapps.filepicker.FilePickerActivity; import com.nononsenseapps.filepicker.Utils; diff --git a/app/src/main/java/com/keepassdroid/dialogs/GeneratePasswordDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/GeneratePasswordDialogFragment.java similarity index 98% rename from app/src/main/java/com/keepassdroid/dialogs/GeneratePasswordDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/GeneratePasswordDialogFragment.java index 39623c19a..5265a16ec 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/GeneratePasswordDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/GeneratePasswordDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; @@ -33,9 +33,9 @@ import android.widget.EditText; import android.widget.SeekBar; import android.widget.Toast; -import com.keepassdroid.password.PasswordGenerator; -import com.keepassdroid.settings.PreferencesUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.password.PasswordGenerator; +import com.kunzisoft.keepass.settings.PreferencesUtil; import java.util.Set; diff --git a/app/src/main/java/com/keepassdroid/dialogs/GroupEditDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java similarity index 97% rename from app/src/main/java/com/keepassdroid/dialogs/GroupEditDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java index 21c534225..6de3238b2 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/GroupEditDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; @@ -32,9 +32,9 @@ import android.widget.ImageButton; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.database.PwNode; -import com.keepassdroid.icons.Icons; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.PwNode; +import com.kunzisoft.keepass.icons.Icons; public class GroupEditDialogFragment extends DialogFragment implements IconPickerDialogFragment.IconPickerListener { diff --git a/app/src/main/java/com/keepassdroid/dialogs/IconPickerDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java similarity index 97% rename from app/src/main/java/com/keepassdroid/dialogs/IconPickerDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java index 5f337b70b..ffd3509c1 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/IconPickerDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; @@ -37,8 +37,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.kunzisoft.keepass.R; -import com.keepassdroid.icons.Icons; -import com.keepassdroid.stylish.StylishActivity; +import com.kunzisoft.keepass.icons.Icons; +import com.kunzisoft.keepass.stylish.StylishActivity; public class IconPickerDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/keepassdroid/dialogs/PasswordEncodingDialogHelper.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/PasswordEncodingDialogHelper.java similarity index 97% rename from app/src/main/java/com/keepassdroid/dialogs/PasswordEncodingDialogHelper.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/PasswordEncodingDialogHelper.java index 8bc1f8d49..ac8c1d6a9 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/PasswordEncodingDialogHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/PasswordEncodingDialogHelper.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.AlertDialog; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/dialogs/ReadOnlyDialog.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/ReadOnlyDialog.java similarity index 93% rename from app/src/main/java/com/keepassdroid/dialogs/ReadOnlyDialog.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/ReadOnlyDialog.java index 4507d4e43..4f260f9f3 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/ReadOnlyDialog.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/ReadOnlyDialog.java @@ -17,12 +17,12 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.content.Context; import com.kunzisoft.keepass.R; -import com.keepassdroid.compat.BuildCompat; +import com.kunzisoft.keepass.compat.BuildCompat; public class ReadOnlyDialog extends WarningDialog { diff --git a/app/src/main/java/com/keepassdroid/dialogs/SortDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/SortDialogFragment.java similarity index 99% rename from app/src/main/java/com/keepassdroid/dialogs/SortDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/SortDialogFragment.java index 1f2532f2c..53425449c 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/SortDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/SortDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; @@ -32,8 +32,8 @@ import android.view.View; import android.widget.CompoundButton; import android.widget.RadioGroup; -import com.keepassdroid.database.SortNodeEnum; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.SortNodeEnum; public class SortDialogFragment extends DialogFragment { diff --git a/app/src/main/java/com/keepassdroid/dialogs/StorageAccessFrameworkDialog.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/StorageAccessFrameworkDialog.java similarity index 97% rename from app/src/main/java/com/keepassdroid/dialogs/StorageAccessFrameworkDialog.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/StorageAccessFrameworkDialog.java index 16fd9f42f..34fd68a89 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/StorageAccessFrameworkDialog.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/StorageAccessFrameworkDialog.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/UnavailableFeatureDialogFragment.java similarity index 99% rename from app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/UnavailableFeatureDialogFragment.java index f93701260..b3cc5eef5 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/UnavailableFeatureDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/UnavailableFeatureDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.os.Build; diff --git a/app/src/main/java/com/keepassdroid/dialogs/WarningDialog.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/WarningDialog.java similarity index 98% rename from app/src/main/java/com/keepassdroid/dialogs/WarningDialog.java rename to app/src/main/java/com/kunzisoft/keepass/dialogs/WarningDialog.java index d2ee657be..7511672fe 100644 --- a/app/src/main/java/com/keepassdroid/dialogs/WarningDialog.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/WarningDialog.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.dialogs; +package com.kunzisoft.keepass.dialogs; import android.app.AlertDialog; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/fileselect/BrowserDialog.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/BrowserDialog.java similarity index 95% rename from app/src/main/java/com/keepassdroid/fileselect/BrowserDialog.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/BrowserDialog.java index c47093820..4ded1e954 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/BrowserDialog.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/BrowserDialog.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.app.Dialog; import android.os.Bundle; @@ -28,8 +28,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.Button; -import com.keepassdroid.utils.Util; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.utils.Util; public class BrowserDialog extends DialogFragment { diff --git a/app/src/main/java/com/keepassdroid/fileselect/DeleteFileHistoryAsyncTask.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/DeleteFileHistoryAsyncTask.java similarity index 97% rename from app/src/main/java/com/keepassdroid/fileselect/DeleteFileHistoryAsyncTask.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/DeleteFileHistoryAsyncTask.java index 637fc6270..f8ceed45a 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/DeleteFileHistoryAsyncTask.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/DeleteFileHistoryAsyncTask.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.os.AsyncTask; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileDbHelper.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileDbHelper.java similarity index 97% rename from app/src/main/java/com/keepassdroid/fileselect/FileDbHelper.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileDbHelper.java index 22dd30329..7d48aa22c 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileDbHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileDbHelper.java @@ -17,10 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; - -import java.io.File; -import java.io.FileFilter; +package com.kunzisoft.keepass.fileselect; import android.content.ContentValues; import android.content.Context; @@ -30,14 +27,17 @@ import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import com.keepassdroid.compat.EditorCompat; +import com.kunzisoft.keepass.compat.EditorCompat; + +import java.io.File; +import java.io.FileFilter; public class FileDbHelper { public static final String LAST_FILENAME = "lastFile"; public static final String LAST_KEYFILE = "lastKey"; - public static final String DATABASE_NAME = "keepassdroid"; + public static final String DATABASE_NAME = "keepassdroid"; // TODO Change db name private static final String FILE_TABLE = "files"; private static final int DATABASE_VERSION = 1; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileInformationDialogFragment.java similarity index 98% rename from app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileInformationDialogFragment.java index f90ebe976..7c8b28810 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileInformationDialogFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.app.Dialog; import android.content.DialogInterface; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FilePickerStylishActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FilePickerStylishActivity.java index 5bccab6da..35a38dae2 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FilePickerStylishActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FilePickerStylishActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.content.Context; import android.os.Bundle; @@ -25,8 +25,8 @@ import android.support.annotation.Nullable; import android.support.annotation.StyleRes; import android.util.Log; -import com.keepassdroid.stylish.Stylish; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.stylish.Stylish; import com.nononsenseapps.filepicker.FilePickerActivity; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java similarity index 94% rename from app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java index 1d0872a29..813b3c4f8 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.Manifest; import android.app.Activity; @@ -42,24 +42,24 @@ import android.view.View; import android.widget.EditText; import android.widget.Toast; -import com.keepassdroid.activities.GroupActivity; -import com.keepassdroid.app.App; -import com.keepassdroid.autofill.AutofillHelper; -import com.keepassdroid.database.edit.CreateDB; -import com.keepassdroid.database.edit.FileOnFinish; -import com.keepassdroid.database.exception.ContentFileNotFoundException; -import com.keepassdroid.dialogs.AssignMasterKeyDialogFragment; -import com.keepassdroid.dialogs.CreateFileDialogFragment; -import com.keepassdroid.password.AssignPasswordHelper; -import com.keepassdroid.password.PasswordActivity; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.stylish.StylishActivity; -import com.keepassdroid.tasks.ProgressTask; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.MenuUtil; -import com.keepassdroid.utils.UriUtil; -import com.keepassdroid.view.FileNameView; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.activities.GroupActivity; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.autofill.AutofillHelper; +import com.kunzisoft.keepass.database.edit.CreateDB; +import com.kunzisoft.keepass.database.edit.FileOnFinish; +import com.kunzisoft.keepass.database.exception.ContentFileNotFoundException; +import com.kunzisoft.keepass.dialogs.AssignMasterKeyDialogFragment; +import com.kunzisoft.keepass.dialogs.CreateFileDialogFragment; +import com.kunzisoft.keepass.password.AssignPasswordHelper; +import com.kunzisoft.keepass.password.PasswordActivity; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.stylish.StylishActivity; +import com.kunzisoft.keepass.tasks.ProgressTask; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.MenuUtil; +import com.kunzisoft.keepass.utils.UriUtil; +import com.kunzisoft.keepass.view.FileNameView; import java.io.File; import java.io.FileNotFoundException; @@ -75,8 +75,8 @@ import permissions.dispatcher.RuntimePermissions; @RuntimePermissions public class FileSelectActivity extends StylishActivity implements - CreateFileDialogFragment.DefinePathDialogListener , - AssignMasterKeyDialogFragment.AssignPasswordDialogListener, + CreateFileDialogFragment.DefinePathDialogListener, + AssignMasterKeyDialogFragment.AssignPasswordDialogListener, FileSelectAdapter.FileItemOpenListener, FileSelectAdapter.FileSelectClearListener, FileSelectAdapter.FileInformationShowListener { diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectAdapter.java similarity index 98% rename from app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectAdapter.java index 434445abc..f8c1baf18 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectAdapter.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectAdapter.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.content.Context; import android.content.res.Resources; @@ -33,8 +33,8 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.keepassdroid.settings.PreferencesUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.settings.PreferencesUtil; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectBean.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectBean.java similarity index 98% rename from app/src/main/java/com/keepassdroid/fileselect/FileSelectBean.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectBean.java index 553bf7b1b..c62d9c978 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectBean.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectBean.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.content.Context; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectViewHolder.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectViewHolder.java similarity index 97% rename from app/src/main/java/com/keepassdroid/fileselect/FileSelectViewHolder.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectViewHolder.java index 497d17d2a..efe29e1b0 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectViewHolder.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectViewHolder.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/keepassdroid/fileselect/KeyFileHelper.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/KeyFileHelper.java similarity index 96% rename from app/src/main/java/com/keepassdroid/fileselect/KeyFileHelper.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/KeyFileHelper.java index 748f3c1f4..982b380f1 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/KeyFileHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/KeyFileHelper.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.app.Activity; import android.content.ContentResolver; @@ -29,11 +29,10 @@ import android.support.v4.app.FragmentActivity; import android.util.Log; import android.view.View; -import com.keepassdroid.compat.ContentResolverCompat; -import com.keepassdroid.compat.StorageAF; -import com.keepassdroid.fileselect.BrowserDialog; -import com.keepassdroid.utils.Interaction; -import com.keepassdroid.utils.UriUtil; +import com.kunzisoft.keepass.compat.ContentResolverCompat; +import com.kunzisoft.keepass.compat.StorageAF; +import com.kunzisoft.keepass.utils.Interaction; +import com.kunzisoft.keepass.utils.UriUtil; import javax.annotation.Nullable; diff --git a/app/src/main/java/com/keepassdroid/fileselect/OpenFileHistoryAsyncTask.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/OpenFileHistoryAsyncTask.java similarity index 97% rename from app/src/main/java/com/keepassdroid/fileselect/OpenFileHistoryAsyncTask.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/OpenFileHistoryAsyncTask.java index 5336aa9ff..872ef8179 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/OpenFileHistoryAsyncTask.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/OpenFileHistoryAsyncTask.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.os.AsyncTask; diff --git a/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/RecentFileHistory.java similarity index 98% rename from app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java rename to app/src/main/java/com/kunzisoft/keepass/fileselect/RecentFileHistory.java index 84ff99453..56223830a 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/RecentFileHistory.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fileselect; +package com.kunzisoft.keepass.fileselect; import android.content.Context; import android.content.SharedPreferences; @@ -26,9 +26,9 @@ import android.database.Cursor; import android.net.Uri; import android.preference.PreferenceManager; -import com.keepassdroid.compat.EditorCompat; -import com.keepassdroid.utils.UriUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.compat.EditorCompat; +import com.kunzisoft.keepass.utils.UriUtil; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintAnimatedVector.java b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintAnimatedVector.java similarity index 97% rename from app/src/main/java/com/keepassdroid/fingerprint/FingerPrintAnimatedVector.java rename to app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintAnimatedVector.java index 836425387..d156455dc 100644 --- a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintAnimatedVector.java +++ b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintAnimatedVector.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fingerprint; +package com.kunzisoft.keepass.fingerprint; import android.content.Context; import android.graphics.drawable.Animatable2; diff --git a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintDialog.java b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintDialog.java similarity index 96% rename from app/src/main/java/com/keepassdroid/fingerprint/FingerPrintDialog.java rename to app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintDialog.java index 9718ed31b..be2813fc6 100644 --- a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintDialog.java +++ b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintDialog.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.fingerprint; +package com.kunzisoft.keepass.fingerprint; import android.app.Dialog; import android.content.DialogInterface; @@ -32,7 +32,6 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; -import com.keepassdroid.fingerprint.FingerPrintAnimatedVector; import com.kunzisoft.keepass.R; @RequiresApi(api = Build.VERSION_CODES.M) diff --git a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintHelper.java similarity index 99% rename from app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java rename to app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintHelper.java index db2202b5d..152188f39 100644 --- a/app/src/main/java/com/keepassdroid/fingerprint/FingerPrintHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/fingerprint/FingerPrintHelper.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid.fingerprint; +package com.kunzisoft.keepass.fingerprint; import android.annotation.SuppressLint; import android.app.KeyguardManager; diff --git a/app/src/main/java/com/keepassdroid/icons/DrawableFactory.java b/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java similarity index 93% rename from app/src/main/java/com/keepassdroid/icons/DrawableFactory.java rename to app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java index dfa2dd7fb..9d38950d4 100644 --- a/app/src/main/java/com/keepassdroid/icons/DrawableFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java @@ -17,10 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.icons; - -import org.apache.commons.collections.map.AbstractReferenceMap; -import org.apache.commons.collections.map.ReferenceMap; +package com.kunzisoft.keepass.icons; import android.content.res.Resources; import android.graphics.Bitmap; @@ -29,10 +26,13 @@ import android.graphics.drawable.Drawable; import android.widget.ImageView; import com.kunzisoft.keepass.R; -import com.keepassdroid.compat.BitmapDrawableCompat; -import com.keepassdroid.database.PwIcon; -import com.keepassdroid.database.PwIconCustom; -import com.keepassdroid.database.PwIconStandard; +import com.kunzisoft.keepass.compat.BitmapDrawableCompat; +import com.kunzisoft.keepass.database.PwIcon; +import com.kunzisoft.keepass.database.PwIconCustom; +import com.kunzisoft.keepass.database.PwIconStandard; + +import org.apache.commons.collections.map.AbstractReferenceMap; +import org.apache.commons.collections.map.ReferenceMap; public class DrawableFactory { private static Drawable blank = null; diff --git a/app/src/main/java/com/keepassdroid/icons/Icons.java b/app/src/main/java/com/kunzisoft/keepass/icons/Icons.java similarity index 97% rename from app/src/main/java/com/keepassdroid/icons/Icons.java rename to app/src/main/java/com/kunzisoft/keepass/icons/Icons.java index ba27844db..062148584 100644 --- a/app/src/main/java/com/keepassdroid/icons/Icons.java +++ b/app/src/main/java/com/kunzisoft/keepass/icons/Icons.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.icons; +package com.kunzisoft.keepass.icons; import android.util.SparseIntArray; diff --git a/app/src/main/java/com/keepassdroid/notifications/NotificationCopyingService.java b/app/src/main/java/com/kunzisoft/keepass/notifications/NotificationCopyingService.java similarity index 97% rename from app/src/main/java/com/keepassdroid/notifications/NotificationCopyingService.java rename to app/src/main/java/com/kunzisoft/keepass/notifications/NotificationCopyingService.java index bb5e72115..469b2a57c 100755 --- a/app/src/main/java/com/keepassdroid/notifications/NotificationCopyingService.java +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/NotificationCopyingService.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.notifications; +package com.kunzisoft.keepass.notifications; import android.app.Notification; import android.app.NotificationChannel; @@ -34,10 +34,10 @@ import android.support.v4.app.NotificationCompat; import android.util.Log; import android.util.TypedValue; -import com.keepassdroid.database.exception.SamsungClipboardException; -import com.keepassdroid.stylish.Stylish; -import com.keepassdroid.timeout.ClipboardHelper; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.exception.SamsungClipboardException; +import com.kunzisoft.keepass.stylish.Stylish; +import com.kunzisoft.keepass.timeout.ClipboardHelper; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/notifications/NotificationField.java b/app/src/main/java/com/kunzisoft/keepass/notifications/NotificationField.java similarity index 99% rename from app/src/main/java/com/keepassdroid/notifications/NotificationField.java rename to app/src/main/java/com/kunzisoft/keepass/notifications/NotificationField.java index 5ed3088e7..6d35bbf3f 100644 --- a/app/src/main/java/com/keepassdroid/notifications/NotificationField.java +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/NotificationField.java @@ -18,7 +18,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.notifications; +package com.kunzisoft.keepass.notifications; import android.content.res.Resources; import android.os.Parcel; diff --git a/app/src/main/java/com/keepassdroid/password/AssignPasswordHelper.java b/app/src/main/java/com/kunzisoft/keepass/password/AssignPasswordHelper.java similarity index 89% rename from app/src/main/java/com/keepassdroid/password/AssignPasswordHelper.java rename to app/src/main/java/com/kunzisoft/keepass/password/AssignPasswordHelper.java index c4a806f62..04fae9b44 100644 --- a/app/src/main/java/com/keepassdroid/password/AssignPasswordHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/password/AssignPasswordHelper.java @@ -17,19 +17,19 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.password; +package com.kunzisoft.keepass.password; import android.content.Context; import android.content.DialogInterface; import android.net.Uri; import android.os.Handler; -import com.keepassdroid.tasks.ProgressTask; -import com.keepassdroid.app.App; -import com.keepassdroid.database.edit.FileOnFinish; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.database.edit.SetPassword; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.edit.FileOnFinish; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.database.edit.SetPassword; +import com.kunzisoft.keepass.tasks.ProgressTask; public class AssignPasswordHelper { diff --git a/app/src/main/java/com/keepassdroid/password/PasswordActivity.java b/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/password/PasswordActivity.java rename to app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java index bd9397aa1..859e5adeb 100644 --- a/app/src/main/java/com/keepassdroid/password/PasswordActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.password; +package com.kunzisoft.keepass.password; import android.Manifest; import android.app.Activity; @@ -48,28 +48,28 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.activities.GroupActivity; -import com.keepassdroid.activities.LockingActivity; -import com.keepassdroid.app.App; -import com.keepassdroid.autofill.AutofillHelper; -import com.keepassdroid.compat.BackupManagerCompat; -import com.keepassdroid.compat.ClipDataCompat; -import com.keepassdroid.compat.EditorCompat; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.edit.LoadDB; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.dialogs.PasswordEncodingDialogHelper; -import com.keepassdroid.fingerprint.FingerPrintAnimatedVector; -import com.keepassdroid.fingerprint.FingerPrintHelper; -import com.keepassdroid.settings.PreferencesUtil; -import com.keepassdroid.stylish.StylishActivity; -import com.keepassdroid.tasks.ProgressTask; -import com.keepassdroid.utils.EmptyUtils; -import com.keepassdroid.utils.MenuUtil; -import com.keepassdroid.utils.UriUtil; -import com.keepassdroid.fingerprint.FingerPrintDialog; -import com.keepassdroid.fileselect.KeyFileHelper; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.activities.GroupActivity; +import com.kunzisoft.keepass.activities.LockingActivity; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.autofill.AutofillHelper; +import com.kunzisoft.keepass.compat.BackupManagerCompat; +import com.kunzisoft.keepass.compat.ClipDataCompat; +import com.kunzisoft.keepass.compat.EditorCompat; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.edit.LoadDB; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.dialogs.PasswordEncodingDialogHelper; +import com.kunzisoft.keepass.fileselect.KeyFileHelper; +import com.kunzisoft.keepass.fingerprint.FingerPrintAnimatedVector; +import com.kunzisoft.keepass.fingerprint.FingerPrintDialog; +import com.kunzisoft.keepass.fingerprint.FingerPrintHelper; +import com.kunzisoft.keepass.settings.PreferencesUtil; +import com.kunzisoft.keepass.stylish.StylishActivity; +import com.kunzisoft.keepass.tasks.ProgressTask; +import com.kunzisoft.keepass.utils.EmptyUtils; +import com.kunzisoft.keepass.utils.MenuUtil; +import com.kunzisoft.keepass.utils.UriUtil; import java.io.File; import java.io.FileNotFoundException; @@ -81,10 +81,6 @@ import permissions.dispatcher.OnShowRationale; import permissions.dispatcher.PermissionRequest; import permissions.dispatcher.RuntimePermissions; -import static com.keepassdroid.fingerprint.FingerPrintHelper.Mode.NOT_CONFIGURED_MODE; -import static com.keepassdroid.fingerprint.FingerPrintHelper.Mode.OPEN_MODE; -import static com.keepassdroid.fingerprint.FingerPrintHelper.Mode.STORE_MODE; - @RuntimePermissions public class PasswordActivity extends StylishActivity implements FingerPrintHelper.FingerPrintCallback, UriIntentInitTaskCallback { @@ -417,7 +413,7 @@ public class PasswordActivity extends StylishActivity // fingerprint related code here @RequiresApi(api = Build.VERSION_CODES.M) private void initForFingerprint() { - fingerPrintMode = NOT_CONFIGURED_MODE; + fingerPrintMode = FingerPrintHelper.Mode.NOT_CONFIGURED_MODE; fingerPrintHelper = new FingerPrintHelper(this, this); @@ -444,9 +440,9 @@ public class PasswordActivity extends StylishActivity // encrypt or decrypt mode based on how much input or not setFingerPrintView(validInput ? R.string.store_with_fingerprint : R.string.scanning_fingerprint); if (validInput) - toggleFingerprintMode(STORE_MODE); + toggleFingerprintMode(FingerPrintHelper.Mode.STORE_MODE); else - toggleFingerprintMode(OPEN_MODE); + toggleFingerprintMode(FingerPrintHelper.Mode.OPEN_MODE); } } }); @@ -515,7 +511,7 @@ public class PasswordActivity extends StylishActivity @RequiresApi(api = Build.VERSION_CODES.M) private void initEncryptData() { setFingerPrintView(R.string.store_with_fingerprint); - fingerPrintMode = STORE_MODE; + fingerPrintMode = FingerPrintHelper.Mode.STORE_MODE; if (fingerPrintHelper != null) fingerPrintHelper.initEncryptData(); } @@ -523,7 +519,7 @@ public class PasswordActivity extends StylishActivity @RequiresApi(api = Build.VERSION_CODES.M) private void initDecryptData() { setFingerPrintView(R.string.scanning_fingerprint); - fingerPrintMode = OPEN_MODE; + fingerPrintMode = FingerPrintHelper.Mode.OPEN_MODE; if (fingerPrintHelper != null) { final String ivSpecValue = prefsNoBackup.getString(getPreferenceKeyIvSpec(), null); if (ivSpecValue != null) @@ -560,7 +556,7 @@ public class PasswordActivity extends StylishActivity fingerPrintAnimatedVector.stopScan(); } // stop listening when we go in background - fingerPrintMode = NOT_CONFIGURED_MODE; + fingerPrintMode = FingerPrintHelper.Mode.NOT_CONFIGURED_MODE; if (fingerPrintHelper != null) { fingerPrintHelper.stopListening(); } @@ -680,7 +676,7 @@ public class PasswordActivity extends StylishActivity private void deleteEntryKey() { fingerPrintHelper.deleteEntryKey(); removePrefsNoBackupKey(); - fingerPrintMode = NOT_CONFIGURED_MODE; + fingerPrintMode = FingerPrintHelper.Mode.NOT_CONFIGURED_MODE; checkFingerprintAvailability(); } diff --git a/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java b/app/src/main/java/com/kunzisoft/keepass/password/PasswordGenerator.java similarity index 99% rename from app/src/main/java/com/keepassdroid/password/PasswordGenerator.java rename to app/src/main/java/com/kunzisoft/keepass/password/PasswordGenerator.java index 1239e7c7f..a59482314 100644 --- a/app/src/main/java/com/keepassdroid/password/PasswordGenerator.java +++ b/app/src/main/java/com/kunzisoft/keepass/password/PasswordGenerator.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.password; - -import java.security.SecureRandom; +package com.kunzisoft.keepass.password; import android.content.Context; import com.kunzisoft.keepass.R; +import java.security.SecureRandom; + public class PasswordGenerator { private static final String UPPERCASE_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; private static final String LOWERCASE_CHARS = "abcdefghijklmnopqrstuvwxyz"; diff --git a/app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java b/app/src/main/java/com/kunzisoft/keepass/password/UriIntentInitTaskCallback.java similarity index 95% rename from app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java rename to app/src/main/java/com/kunzisoft/keepass/password/UriIntentInitTaskCallback.java index ea76bc0e8..07f11e59e 100644 --- a/app/src/main/java/com/keepassdroid/password/UriIntentInitTaskCallback.java +++ b/app/src/main/java/com/kunzisoft/keepass/password/UriIntentInitTaskCallback.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.password; +package com.kunzisoft.keepass.password; import android.net.Uri; diff --git a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java b/app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java similarity index 86% rename from app/src/main/java/com/keepassdroid/search/SearchDbHelper.java rename to app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java index d6a12b7ad..5cd4b7352 100644 --- a/app/src/main/java/com/keepassdroid/search/SearchDbHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java @@ -17,22 +17,22 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.search; +package com.kunzisoft.keepass.search; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV3; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwEntryV3; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.database.PwGroupV3; -import com.keepassdroid.database.PwGroupV4; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.PwDatabaseV3; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwEntryV3; +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwGroup; +import com.kunzisoft.keepass.database.PwGroupV3; +import com.kunzisoft.keepass.database.PwGroupV4; import java.util.ArrayList; import java.util.Iterator; @@ -47,7 +47,7 @@ public class SearchDbHelper. * */ -package com.keepassdroid.search; +package com.kunzisoft.keepass.search; import android.app.SearchManager; import android.content.Intent; @@ -29,12 +29,12 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.keepassdroid.activities.ListNodesActivity; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; -import com.keepassdroid.database.PwGroup; -import com.keepassdroid.utils.MenuUtil; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.activities.ListNodesActivity; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwGroup; +import com.kunzisoft.keepass.utils.MenuUtil; public class SearchResultsActivity extends ListNodesActivity { diff --git a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java b/app/src/main/java/com/kunzisoft/keepass/settings/MainPreferenceFragment.java similarity index 96% rename from app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java rename to app/src/main/java/com/kunzisoft/keepass/settings/MainPreferenceFragment.java index 103ea34b6..45824bfb8 100644 --- a/app/src/main/java/com/keepassdroid/settings/MainPreferenceFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/MainPreferenceFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.content.Context; import android.os.Bundle; @@ -25,9 +25,9 @@ import android.support.v4.app.DialogFragment; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceFragmentCompat; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; public class MainPreferenceFragment extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener { diff --git a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.java similarity index 97% rename from app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java rename to app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.java index aa0db3d19..148c08e06 100644 --- a/app/src/main/java/com/keepassdroid/settings/NestedSettingsFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.content.ActivityNotFoundException; import android.content.DialogInterface; @@ -40,13 +40,13 @@ import android.util.Log; import android.view.autofill.AutofillManager; import android.widget.Toast; -import com.keepassdroid.app.App; -import com.keepassdroid.database.Database; -import com.keepassdroid.dialogs.StorageAccessFrameworkDialog; -import com.keepassdroid.dialogs.UnavailableFeatureDialogFragment; -import com.keepassdroid.fingerprint.FingerPrintHelper; -import com.keepassdroid.stylish.Stylish; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.dialogs.StorageAccessFrameworkDialog; +import com.kunzisoft.keepass.dialogs.UnavailableFeatureDialogFragment; +import com.kunzisoft.keepass.fingerprint.FingerPrintHelper; +import com.kunzisoft.keepass.stylish.Stylish; public class NestedSettingsFragment extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener { diff --git a/app/src/main/java/com/keepassdroid/settings/PreferencesUtil.java b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java similarity index 98% rename from app/src/main/java/com/keepassdroid/settings/PreferencesUtil.java rename to app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java index 3f8c984e3..cacfef14c 100644 --- a/app/src/main/java/com/keepassdroid/settings/PreferencesUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java @@ -17,14 +17,14 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.keepassdroid.database.SortNodeEnum; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.SortNodeEnum; import java.util.Arrays; import java.util.HashSet; diff --git a/app/src/main/java/com/keepassdroid/settings/RoundsFixPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsFixPreferenceDialogFragmentCompat.java similarity index 98% rename from app/src/main/java/com/keepassdroid/settings/RoundsFixPreferenceDialogFragmentCompat.java rename to app/src/main/java/com/kunzisoft/keepass/settings/RoundsFixPreferenceDialogFragmentCompat.java index c09feb25d..4b0a4677c 100644 --- a/app/src/main/java/com/keepassdroid/settings/RoundsFixPreferenceDialogFragmentCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsFixPreferenceDialogFragmentCompat.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.os.Bundle; import android.support.v7.preference.DialogPreference; diff --git a/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreference.java similarity index 98% rename from app/src/main/java/com/keepassdroid/settings/RoundsPreference.java rename to app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreference.java index 5a564ff08..5f5cbb5bf 100644 --- a/app/src/main/java/com/keepassdroid/settings/RoundsPreference.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreference.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreferenceDialogFragmentCompat.java similarity index 93% rename from app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java rename to app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreferenceDialogFragmentCompat.java index 5dfb7c8e9..58ad00074 100644 --- a/app/src/main/java/com/keepassdroid/settings/RoundsPreferenceDialogFragmentCompat.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/RoundsPreferenceDialogFragmentCompat.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.content.Context; import android.os.Bundle; @@ -27,12 +27,12 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.app.App; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.database.edit.SaveDB; -import com.keepassdroid.tasks.ProgressTask; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.database.edit.SaveDB; +import com.kunzisoft.keepass.tasks.ProgressTask; public class RoundsPreferenceDialogFragmentCompat extends PreferenceDialogFragmentCompat { diff --git a/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.java similarity index 95% rename from app/src/main/java/com/keepassdroid/settings/SettingsActivity.java rename to app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.java index fafdb6165..fbf62d198 100644 --- a/app/src/main/java/com/keepassdroid/settings/SettingsActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.app.Activity; import android.content.Intent; @@ -26,9 +26,9 @@ import android.support.v4.app.Fragment; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import com.keepassdroid.activities.LockingActivity; -import com.keepassdroid.compat.BackupManagerCompat; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.activities.LockingActivity; +import com.kunzisoft.keepass.compat.BackupManagerCompat; public class SettingsActivity extends LockingActivity implements MainPreferenceFragment.Callback { diff --git a/app/src/main/java/com/keepassdroid/settings/SettingsAutofillActivity.java b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.java similarity index 96% rename from app/src/main/java/com/keepassdroid/settings/SettingsAutofillActivity.java rename to app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.java index 3b2af9451..de5dcc6f1 100644 --- a/app/src/main/java/com/keepassdroid/settings/SettingsAutofillActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsAutofillActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.settings; +package com.kunzisoft.keepass.settings; import android.support.v4.app.Fragment; diff --git a/app/src/main/java/com/keepassdroid/stream/BetterCipherInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/BetterCipherInputStream.java similarity index 99% rename from app/src/main/java/com/keepassdroid/stream/BetterCipherInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/BetterCipherInputStream.java index b91964003..5e13428a4 100644 --- a/app/src/main/java/com/keepassdroid/stream/BetterCipherInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/BetterCipherInputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.FilterInputStream; import java.io.IOException; diff --git a/app/src/main/java/com/keepassdroid/stream/CopyInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/CopyInputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/CopyInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/CopyInputStream.java index dd775e14f..52fe74eea 100644 --- a/app/src/main/java/com/keepassdroid/stream/CopyInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/CopyInputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/CountInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/CountInputStream.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stream/CountInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/CountInputStream.java index 51b9cea55..604a93b19 100644 --- a/app/src/main/java/com/keepassdroid/stream/CountInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/CountInputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/CountOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/CountOutputStream.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stream/CountOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/CountOutputStream.java index 57f328a24..945874a1c 100644 --- a/app/src/main/java/com/keepassdroid/stream/CountOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/CountOutputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/HashedBlockInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockInputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/HashedBlockInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockInputStream.java index e632b5b3e..c44a2b6bd 100644 --- a/app/src/main/java/com/keepassdroid/stream/HashedBlockInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockInputStream.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/HashedBlockOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockOutputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/HashedBlockOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockOutputStream.java index dd4aa1e2e..b1fce5c47 100644 --- a/app/src/main/java/com/keepassdroid/stream/HashedBlockOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockOutputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/HmacBlockInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockInputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/HmacBlockInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockInputStream.java index 6c18972f7..485700e80 100644 --- a/app/src/main/java/com/keepassdroid/stream/HmacBlockInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockInputStream.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/HmacBlockOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockOutputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/HmacBlockOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockOutputStream.java index 452bca94c..ba00ed9ff 100644 --- a/app/src/main/java/com/keepassdroid/stream/HmacBlockOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockOutputStream.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/HmacBlockStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockStream.java similarity index 96% rename from app/src/main/java/com/keepassdroid/stream/HmacBlockStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockStream.java index 0a17859b0..3ccbd47eb 100644 --- a/app/src/main/java/com/keepassdroid/stream/HmacBlockStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockStream.java @@ -17,9 +17,8 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.security.DigestOutputStream; import java.security.MessageDigest; diff --git a/app/src/main/java/com/keepassdroid/stream/LEDataInputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/LEDataInputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/LEDataInputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/LEDataInputStream.java index 9342263e3..a213f7c76 100644 --- a/app/src/main/java/com/keepassdroid/stream/LEDataInputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/LEDataInputStream.java @@ -17,9 +17,9 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; -import com.keepassdroid.utils.Types; +import com.kunzisoft.keepass.utils.Types; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/LEDataOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/LEDataOutputStream.java similarity index 98% rename from app/src/main/java/com/keepassdroid/stream/LEDataOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/LEDataOutputStream.java index fd1217353..82a02fbe6 100644 --- a/app/src/main/java/com/keepassdroid/stream/LEDataOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/LEDataOutputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/MacOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/MacOutputStream.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stream/MacOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/MacOutputStream.java index e1356fd71..abff8df7f 100644 --- a/app/src/main/java/com/keepassdroid/stream/MacOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/MacOutputStream.java @@ -17,7 +17,7 @@ * along with KeePassDroid. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/NullOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/NullOutputStream.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stream/NullOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/NullOutputStream.java index 775fc639d..0e1a70b66 100644 --- a/app/src/main/java/com/keepassdroid/stream/NullOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/NullOutputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stream/RandomFileOutputStream.java b/app/src/main/java/com/kunzisoft/keepass/stream/RandomFileOutputStream.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stream/RandomFileOutputStream.java rename to app/src/main/java/com/kunzisoft/keepass/stream/RandomFileOutputStream.java index f479c0856..220ba2e64 100644 --- a/app/src/main/java/com/keepassdroid/stream/RandomFileOutputStream.java +++ b/app/src/main/java/com/kunzisoft/keepass/stream/RandomFileOutputStream.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stream; +package com.kunzisoft.keepass.stream; import java.io.IOException; import java.io.OutputStream; diff --git a/app/src/main/java/com/keepassdroid/stylish/Stylish.java b/app/src/main/java/com/kunzisoft/keepass/stylish/Stylish.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stylish/Stylish.java rename to app/src/main/java/com/kunzisoft/keepass/stylish/Stylish.java index 7144eefbd..32f28b614 100644 --- a/app/src/main/java/com/keepassdroid/stylish/Stylish.java +++ b/app/src/main/java/com/kunzisoft/keepass/stylish/Stylish.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stylish; +package com.kunzisoft.keepass.stylish; import android.content.Context; import android.support.annotation.StyleRes; diff --git a/app/src/main/java/com/keepassdroid/stylish/StylishActivity.java b/app/src/main/java/com/kunzisoft/keepass/stylish/StylishActivity.java similarity index 97% rename from app/src/main/java/com/keepassdroid/stylish/StylishActivity.java rename to app/src/main/java/com/kunzisoft/keepass/stylish/StylishActivity.java index 666691c06..ba193be46 100644 --- a/app/src/main/java/com/keepassdroid/stylish/StylishActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/stylish/StylishActivity.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.stylish; +package com.kunzisoft.keepass.stylish; import android.os.Bundle; import android.support.annotation.Nullable; diff --git a/app/src/main/java/com/keepassdroid/tasks/ProgressTask.java b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTask.java similarity index 93% rename from app/src/main/java/com/keepassdroid/tasks/ProgressTask.java rename to app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTask.java index 1b6b197c1..3eae9817d 100644 --- a/app/src/main/java/com/keepassdroid/tasks/ProgressTask.java +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTask.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tasks; +package com.kunzisoft.keepass.tasks; import android.app.ProgressDialog; import android.content.Context; import android.os.Handler; -import com.keepassdroid.database.edit.OnFinish; -import com.keepassdroid.database.edit.RunnableOnFinish; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.edit.OnFinish; +import com.kunzisoft.keepass.database.edit.RunnableOnFinish; /** Designed to Pop up a progress dialog, run a thread in the background, * run cleanup in the current thread, close the dialog. Without blocking diff --git a/app/src/main/java/com/keepassdroid/tasks/UIToastTask.java b/app/src/main/java/com/kunzisoft/keepass/tasks/UIToastTask.java similarity index 96% rename from app/src/main/java/com/keepassdroid/tasks/UIToastTask.java rename to app/src/main/java/com/kunzisoft/keepass/tasks/UIToastTask.java index d1e65e286..a891f10db 100644 --- a/app/src/main/java/com/keepassdroid/tasks/UIToastTask.java +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/UIToastTask.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tasks; +package com.kunzisoft.keepass.tasks; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java b/app/src/main/java/com/kunzisoft/keepass/tasks/UpdateStatus.java similarity index 97% rename from app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java rename to app/src/main/java/com/kunzisoft/keepass/tasks/UpdateStatus.java index c0f9470be..43488a9ed 100644 --- a/app/src/main/java/com/keepassdroid/tasks/UpdateStatus.java +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/UpdateStatus.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.tasks; +package com.kunzisoft.keepass.tasks; import android.app.ProgressDialog; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/timeout/ClipboardHelper.java b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.java similarity index 97% rename from app/src/main/java/com/keepassdroid/timeout/ClipboardHelper.java rename to app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.java index c5af93f90..96eaa55e9 100644 --- a/app/src/main/java/com/keepassdroid/timeout/ClipboardHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.java @@ -18,7 +18,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.timeout; +package com.kunzisoft.keepass.timeout; import android.app.Activity; import android.app.AlertDialog; @@ -34,9 +34,9 @@ import android.text.util.Linkify; import android.widget.TextView; import android.widget.Toast; -import com.keepassdroid.database.exception.SamsungClipboardException; -import com.keepassdroid.tasks.UIToastTask; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.exception.SamsungClipboardException; +import com.kunzisoft.keepass.tasks.UIToastTask; import java.util.Timer; import java.util.TimerTask; diff --git a/app/src/main/java/com/keepassdroid/timeout/Timeout.java b/app/src/main/java/com/kunzisoft/keepass/timeout/Timeout.java similarity index 95% rename from app/src/main/java/com/keepassdroid/timeout/Timeout.java rename to app/src/main/java/com/kunzisoft/keepass/timeout/Timeout.java index 741c94048..f40691ca3 100644 --- a/app/src/main/java/com/keepassdroid/timeout/Timeout.java +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/Timeout.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.timeout; +package com.kunzisoft.keepass.timeout; import android.app.AlarmManager; import android.app.PendingIntent; @@ -31,7 +31,7 @@ import com.kunzisoft.keepass.R; public class Timeout { - public static final String TIMEOUT = "com.keepassdroid.timeout"; + public static final String TIMEOUT = "com.kunzisoft.keepass.timeout"; private static final int REQUEST_ID = 0; private static final long DEFAULT_TIMEOUT = 5 * 60 * 1000; // 5 minutes diff --git a/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.java similarity index 93% rename from app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java rename to app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.java index 50c44cf9a..a7aa33360 100644 --- a/app/src/main/java/com/keepassdroid/timeout/TimeoutHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.java @@ -17,16 +17,16 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.timeout; +package com.kunzisoft.keepass.timeout; import android.app.Activity; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.keepassdroid.activities.LockingActivity; import com.kunzisoft.keepass.R; -import com.keepassdroid.app.App; -import com.keepassdroid.compat.EditorCompat; +import com.kunzisoft.keepass.activities.LockingActivity; +import com.kunzisoft.keepass.app.App; +import com.kunzisoft.keepass.compat.EditorCompat; public class TimeoutHelper { diff --git a/app/src/main/java/com/keepassdroid/timeout/TimeoutService.java b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutService.java similarity index 94% rename from app/src/main/java/com/keepassdroid/timeout/TimeoutService.java rename to app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutService.java index a63441295..b5b9aa66c 100644 --- a/app/src/main/java/com/keepassdroid/timeout/TimeoutService.java +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutService.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.timeout; +package com.kunzisoft.keepass.timeout; import android.app.NotificationManager; import android.app.Service; @@ -29,10 +29,11 @@ import android.os.Binder; import android.os.IBinder; import android.util.Log; -import com.keepassdroid.app.App; +import com.kunzisoft.keepass.app.App; public class TimeoutService extends Service { - private static final String TAG = "KeePassDroid Timer"; + + private static final String TAG = TimeoutService.class.getName(); private BroadcastReceiver mIntentReceiver; @Override diff --git a/app/src/main/java/com/keepassdroid/utils/DateUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/DateUtil.java similarity index 97% rename from app/src/main/java/com/keepassdroid/utils/DateUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/DateUtil.java index 25a782232..b706a6ab8 100644 --- a/app/src/main/java/com/keepassdroid/utils/DateUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/DateUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/app/src/main/java/com/keepassdroid/utils/EmptyUtils.java b/app/src/main/java/com/kunzisoft/keepass/utils/EmptyUtils.java similarity index 86% rename from app/src/main/java/com/keepassdroid/utils/EmptyUtils.java rename to app/src/main/java/com/kunzisoft/keepass/utils/EmptyUtils.java index a8c24f1ad..c84c76f87 100644 --- a/app/src/main/java/com/keepassdroid/utils/EmptyUtils.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/EmptyUtils.java @@ -17,13 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import android.net.Uri; -import com.keepassdroid.database.PwDate; - -import static com.keepassdroid.database.PwDate.DEFAULT_PWDATE; +import com.kunzisoft.keepass.database.PwDate; public class EmptyUtils { public static boolean isNullOrEmpty(String str) { @@ -35,7 +33,7 @@ public class EmptyUtils { } public static boolean isNullOrEmpty(PwDate date) { - return (date == null) || date.equals(DEFAULT_PWDATE); + return (date == null) || date.equals(PwDate.DEFAULT_PWDATE); } public static boolean isNullOrEmpty(Uri uri) { diff --git a/app/src/main/java/com/keepassdroid/utils/Interaction.java b/app/src/main/java/com/kunzisoft/keepass/utils/Interaction.java similarity index 98% rename from app/src/main/java/com/keepassdroid/utils/Interaction.java rename to app/src/main/java/com/kunzisoft/keepass/utils/Interaction.java index 0166aa5ee..f498c4e05 100644 --- a/app/src/main/java/com/keepassdroid/utils/Interaction.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/Interaction.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; - -import java.util.List; +package com.kunzisoft.keepass.utils; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import java.util.List; + public class Interaction { /** * Indicates whether the specified action can be used as an intent. This diff --git a/app/src/main/java/com/keepassdroid/utils/MemUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/MemUtil.java similarity index 97% rename from app/src/main/java/com/keepassdroid/utils/MemUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/MemUtil.java index a5726874d..c39c2885d 100644 --- a/app/src/main/java/com/keepassdroid/utils/MemUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/MemUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java similarity index 93% rename from app/src/main/java/com/keepassdroid/utils/MenuUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java index 7f47ff471..ff9ed7c8f 100644 --- a/app/src/main/java/com/keepassdroid/utils/MenuUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -26,11 +26,11 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Toast; -import com.keepassdroid.activities.AboutActivity; -import com.keepassdroid.settings.SettingsActivity; -import com.keepassdroid.stylish.StylishActivity; import com.kunzisoft.keepass.BuildConfig; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.activities.AboutActivity; +import com.kunzisoft.keepass.settings.SettingsActivity; +import com.kunzisoft.keepass.stylish.StylishActivity; public class MenuUtil { diff --git a/app/src/main/java/com/keepassdroid/utils/SpannableReplacer.java b/app/src/main/java/com/kunzisoft/keepass/utils/SpannableReplacer.java similarity index 98% rename from app/src/main/java/com/keepassdroid/utils/SpannableReplacer.java rename to app/src/main/java/com/kunzisoft/keepass/utils/SpannableReplacer.java index d0aa6aeac..38e81f2d1 100644 --- a/app/src/main/java/com/keepassdroid/utils/SpannableReplacer.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/SpannableReplacer.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import android.os.Parcel; import android.text.Spannable; diff --git a/app/src/main/java/com/keepassdroid/utils/SprContextV4.java b/app/src/main/java/com/kunzisoft/keepass/utils/SprContextV4.java similarity index 89% rename from app/src/main/java/com/keepassdroid/utils/SprContextV4.java rename to app/src/main/java/com/kunzisoft/keepass/utils/SprContextV4.java index abaacf38d..2491c416e 100644 --- a/app/src/main/java/com/keepassdroid/utils/SprContextV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/SprContextV4.java @@ -17,10 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.PwEntryV4; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/keepassdroid/utils/SprEngineV4.java b/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java similarity index 93% rename from app/src/main/java/com/keepassdroid/utils/SprEngineV4.java rename to app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java index 352d6d0aa..451018fb4 100644 --- a/app/src/main/java/com/keepassdroid/utils/SprEngineV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java @@ -17,15 +17,15 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; -import com.keepassdroid.database.PwDatabase; -import com.keepassdroid.database.PwDatabaseV4; -import com.keepassdroid.database.PwEntry; -import com.keepassdroid.database.PwEntryV4; -import com.keepassdroid.database.PwGroupV4; -import com.keepassdroid.database.EntrySearchV4; -import com.keepassdroid.database.SearchParametersV4; +import com.kunzisoft.keepass.database.EntrySearchV4; +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.PwDatabaseV4; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwGroupV4; +import com.kunzisoft.keepass.database.SearchParametersV4; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/utils/StrUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/StrUtil.java similarity index 98% rename from app/src/main/java/com/keepassdroid/utils/StrUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/StrUtil.java index e13fafee8..8d00133d0 100644 --- a/app/src/main/java/com/keepassdroid/utils/StrUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/StrUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/keepassdroid/utils/Types.java b/app/src/main/java/com/kunzisoft/keepass/utils/Types.java similarity index 98% rename from app/src/main/java/com/keepassdroid/utils/Types.java rename to app/src/main/java/com/kunzisoft/keepass/utils/Types.java index 11a6a8ba4..18271e031 100644 --- a/app/src/main/java/com/keepassdroid/utils/Types.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/Types.java @@ -40,15 +40,15 @@ 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.keepassdroid.utils; +package com.kunzisoft.keepass.utils; + +import com.kunzisoft.keepass.stream.LEDataOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.UUID; -import com.keepassdroid.stream.LEDataOutputStream; - /** * Tools for slicing and dicing Java and KeePass data types. diff --git a/app/src/main/java/com/keepassdroid/utils/UriUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.java similarity index 98% rename from app/src/main/java/com/keepassdroid/utils/UriUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.java index 3510a145c..475bcc178 100644 --- a/app/src/main/java/com/keepassdroid/utils/UriUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import com.keepassdroid.compat.StorageAF; +import com.kunzisoft.keepass.compat.StorageAF; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/keepassdroid/utils/Util.java b/app/src/main/java/com/kunzisoft/keepass/utils/Util.java similarity index 99% rename from app/src/main/java/com/keepassdroid/utils/Util.java rename to app/src/main/java/com/kunzisoft/keepass/utils/Util.java index 09b367667..d4112d1b4 100644 --- a/app/src/main/java/com/keepassdroid/utils/Util.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/Util.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import android.content.ActivityNotFoundException; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/utils/UuidUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/UuidUtil.java similarity index 97% rename from app/src/main/java/com/keepassdroid/utils/UuidUtil.java rename to app/src/main/java/com/kunzisoft/keepass/utils/UuidUtil.java index c344ee7c1..0caa8b448 100644 --- a/app/src/main/java/com/keepassdroid/utils/UuidUtil.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/UuidUtil.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.utils; +package com.kunzisoft.keepass.utils; import java.util.UUID; diff --git a/app/src/main/java/com/keepassdroid/view/AddNodeButtonView.java b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.java similarity index 99% rename from app/src/main/java/com/keepassdroid/view/AddNodeButtonView.java rename to app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.java index 1602f8e21..05d8d8328 100644 --- a/app/src/main/java/com/keepassdroid/view/AddNodeButtonView.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.java similarity index 98% rename from app/src/main/java/com/keepassdroid/view/EntryContentsView.java rename to app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.java index 9a8b8d3f1..52305149c 100644 --- a/app/src/main/java/com/keepassdroid/view/EntryContentsView.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.text.method.PasswordTransformationMethod; @@ -29,9 +29,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.utils.Util; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.utils.Util; import java.text.DateFormat; import java.util.Date; diff --git a/app/src/main/java/com/keepassdroid/view/EntryCustomField.java b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.java similarity index 95% rename from app/src/main/java/com/keepassdroid/view/EntryCustomField.java rename to app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.java index f64bde4c1..83f593f7b 100644 --- a/app/src/main/java/com/keepassdroid/view/EntryCustomField.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.util.AttributeSet; @@ -26,9 +26,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.utils.Util; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.utils.Util; public class EntryCustomField extends LinearLayout { diff --git a/app/src/main/java/com/keepassdroid/view/EntryCustomFieldProtected.java b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomFieldProtected.java similarity index 95% rename from app/src/main/java/com/keepassdroid/view/EntryCustomFieldProtected.java rename to app/src/main/java/com/kunzisoft/keepass/view/EntryCustomFieldProtected.java index 3597f9401..b5ae29ccb 100644 --- a/app/src/main/java/com/keepassdroid/view/EntryCustomFieldProtected.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomFieldProtected.java @@ -17,13 +17,13 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.text.method.PasswordTransformationMethod; import android.util.AttributeSet; -import com.keepassdroid.database.security.ProtectedString; +import com.kunzisoft.keepass.database.security.ProtectedString; public class EntryCustomFieldProtected extends EntryCustomField{ diff --git a/app/src/main/java/com/keepassdroid/view/EntryEditCustomField.java b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.java similarity index 95% rename from app/src/main/java/com/keepassdroid/view/EntryEditCustomField.java rename to app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.java index 8cffd99de..dd3d7c427 100644 --- a/app/src/main/java/com/keepassdroid/view/EntryEditCustomField.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryEditCustomField.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.util.AttributeSet; @@ -30,9 +30,9 @@ import android.widget.EditText; import android.widget.RelativeLayout; import android.widget.TextView; -import com.keepassdroid.database.security.ProtectedString; -import com.keepassdroid.utils.Util; import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.security.ProtectedString; +import com.kunzisoft.keepass.utils.Util; public class EntryEditCustomField extends RelativeLayout { diff --git a/app/src/main/java/com/keepassdroid/view/FileNameView.java b/app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java similarity index 98% rename from app/src/main/java/com/keepassdroid/view/FileNameView.java rename to app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java index e93ab474b..de1264d33 100644 --- a/app/src/main/java/com/keepassdroid/view/FileNameView.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.os.Environment; diff --git a/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java b/app/src/main/java/com/kunzisoft/keepass/view/GroupHeaderView.java similarity index 95% rename from app/src/main/java/com/keepassdroid/view/GroupHeaderView.java rename to app/src/main/java/com/kunzisoft/keepass/view/GroupHeaderView.java index 5b5547183..c1bbb9e4b 100644 --- a/app/src/main/java/com/keepassdroid/view/GroupHeaderView.java +++ b/app/src/main/java/com/kunzisoft/keepass/view/GroupHeaderView.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.keepassdroid.view; +package com.kunzisoft.keepass.view; import android.content.Context; import android.util.AttributeSet; @@ -26,7 +26,7 @@ import android.view.View; import android.widget.RelativeLayout; import com.kunzisoft.keepass.R; -import com.keepassdroid.app.App; +import com.kunzisoft.keepass.app.App; public class GroupHeaderView extends RelativeLayout { diff --git a/app/src/main/jni/argon2/argon2_jni.c b/app/src/main/jni/argon2/argon2_jni.c index 852c3a3e0..2f7c91b30 100644 --- a/app/src/main/jni/argon2/argon2_jni.c +++ b/app/src/main/jni/argon2/argon2_jni.c @@ -129,7 +129,7 @@ void throwExceptionF(JNIEnv *env, jclass exception, const char *format, ...) { #define NB_BLOCKSIZE 1024 JNIEXPORT jbyteArray -JNICALL Java_com_keepassdroid_crypto_keyDerivation_Argon2Native_nTransformMasterKey(JNIEnv *env, +JNICALL Java_com_kunzisoft_keepass_crypto_keyDerivation_Argon2Native_nTransformMasterKey(JNIEnv *env, jobject this, jbyteArray password, jbyteArray salt, jint parallelism, jlong memory, jlong iterations, jbyteArray secretKey, jbyteArray associatedData, jlong version) { diff --git a/app/src/main/jni/final_key/kpd_jni.c b/app/src/main/jni/final_key/kpd_jni.c index a74164681..0de0d72d2 100644 --- a/app/src/main/jni/final_key/kpd_jni.c +++ b/app/src/main/jni/final_key/kpd_jni.c @@ -118,7 +118,7 @@ JNIEXPORT void JNICALL JNI_OnUnload( JavaVM *vm, void *reserved ) { return; } -JNIEXPORT jlong JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nInit(JNIEnv *env, jobject this, jboolean encrypting, jbyteArray key, jbyteArray iv) { +JNIEXPORT jlong JNICALL Java_com_kunzisoft_keepass_crypto_NativeAESCipherSpi_nInit(JNIEnv *env, jobject this, jboolean encrypting, jbyteArray key, jbyteArray iv) { uint8_t ckey[32]; aes_state *state; jint key_len = (*env)->GetArrayLength(env, key); @@ -150,7 +150,7 @@ JNIEXPORT jlong JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nInit(JN return (jlong)state; } -JNIEXPORT void JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nCleanup(JNIEnv *env, jclass this, jlong state) { +JNIEXPORT void JNICALL Java_com_kunzisoft_keepass_crypto_NativeAESCipherSpi_nCleanup(JNIEnv *env, jclass this, jlong state) { free((void *)state); } @@ -163,7 +163,7 @@ JNIEXPORT void JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nCleanup( not a full block. */ -JNIEXPORT jint JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nUpdate(JNIEnv *env, jobject this, +JNIEXPORT jint JNICALL Java_com_kunzisoft_keepass_crypto_NativeAESCipherSpi_nUpdate(JNIEnv *env, jobject this, jlong state, jbyteArray input, jint inputOffset, jint inputLen, jbyteArray output, jint outputOffset, jint outputSize) { int aes_ret; uint32_t outLen, bytes2cache, cryptLen; @@ -258,7 +258,7 @@ JNIEXPORT jint JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nUpdate(J outputSize must be at least 32 for encryption since the buffer may contain >= 1 full block outputSize must be at least 16 for decryption */ -JNIEXPORT jint JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nFinal(JNIEnv *env, jobject this, +JNIEXPORT jint JNICALL Java_com_kunzisoft_keepass_crypto_NativeAESCipherSpi_nFinal(JNIEnv *env, jobject this, jlong state, jboolean doPadding, jbyteArray output, jint outputOffset, jint outputSize) { int i; uint32_t padValue, paddedCacheLen; @@ -361,7 +361,7 @@ JNIEXPORT jint JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nFinal(JN } } -JNIEXPORT jint JNICALL Java_com_keepassdroid_crypto_NativeAESCipherSpi_nGetCacheSize(JNIEnv* env, jobject this, jlong state) { +JNIEXPORT jint JNICALL Java_com_kunzisoft_keepass_crypto_NativeAESCipherSpi_nGetCacheSize(JNIEnv* env, jobject this, jlong state) { aes_state *c_state; c_state = (aes_state *)state; @@ -438,7 +438,7 @@ void *generate_key_material(void *arg) { return (void *)flip; } -JNIEXPORT jbyteArray JNICALL Java_com_keepassdroid_crypto_finalkey_NativeFinalKey_nTransformMasterKey(JNIEnv *env, jobject this, jbyteArray seed, jbyteArray key, jlong rounds) { +JNIEXPORT jbyteArray JNICALL Java_com_kunzisoft_keepass_crypto_finalkey_NativeFinalKey_nTransformMasterKey(JNIEnv *env, jobject this, jbyteArray seed, jbyteArray key, jlong rounds) { master_key mk; uint32_t flip; pthread_t t1, t2; diff --git a/app/src/main/res/layout/entry_view.xml b/app/src/main/res/layout/entry_view.xml index b8f358a2f..13bf0d02b 100644 --- a/app/src/main/res/layout/entry_view.xml +++ b/app/src/main/res/layout/entry_view.xml @@ -65,7 +65,7 @@ android:fillViewport="true" android:scrollbarStyle="insideOverlay"> - diff --git a/app/src/main/res/layout/file_selection.xml b/app/src/main/res/layout/file_selection.xml index 605a58542..42f306956 100644 --- a/app/src/main/res/layout/file_selection.xml +++ b/app/src/main/res/layout/file_selection.xml @@ -45,7 +45,7 @@ app:contentScrim="?attr/colorPrimary" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> - - - \ No newline at end of file + android:settingsActivity="com.kunzisoft.keepass.settings.SettingsAutofillActivity" /> \ No newline at end of file diff --git a/app/src/main/res/xml/db_preferences.xml b/app/src/main/res/xml/db_preferences.xml index caca4e269..2b773be5d 100644 --- a/app/src/main/res/xml/db_preferences.xml +++ b/app/src/main/res/xml/db_preferences.xml @@ -56,7 +56,7 @@ android:key="@string/key_derivation_function_key" android:persistent="false" android:title="@string/key_derivation_function"/> - -