Merge branch 'release/4.0.2'

fix: Add buggy method comment #1638
fix: Upgrade to 4.0.2
2025-12-04 15:49:33 +01:00 · 2023-09-11 21:55:48 +02:00 · 2023-09-11 21:38:12 +02:00 · 2023-09-11 21:17:18 +02:00 · 2023-09-11 21:13:26 +02:00 · 2023-09-10 11:07:13 +02:00
1766 changed files with 130270 additions and 56867 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: [J-Jamet] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: Kunzisoft # Replace with a single Liberapay username
+issuehunt: Kunzisoft/KeePassDX # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://www.keepassdx.com/#donation'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,49 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**KeePass Database**
+
+ - Created with: [e.g Windows KeePass 2.42]
+ - Version: [e.g. 2]
+ - Location: [e.g. Remote file retrieved with GDrive app]
+ - File provider (`content://` URI): [e.g. `content://com.google.android.apps.docs.storage/5`]
+ - Size: [e.g. 150Mo]
+ - Contains attachment: [e.g. Yes]
+
+**KeePassDX:**
+
+ - Version: [e.g. 2.5.0.0beta23]
+ - Build: [e.g. Free]
+ - Language: [e.g. French]
+
+**Android:**
+
+ - Device: [e.g. GalaxyS8]
+ - Version: [e.g. 8.1]
+
+**Additional context**
+
+Add any other context about the problem here.
+ - Browser for Autofill: [e.g. Chrome version X]
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,13 @@ proguard/
 # Android Studio captures folder
 captures/

+# Eclipse/VS Code
+.project
+.settings/*
+*/.project
+*/.classpath
+*/.settings/*
+
 # Intellij
 *.iml
 .idea/workspace.xml
@@ -71,7 +78,12 @@ app/app.iml
 # Art
 art/screen*.png
 art/logo_512.png
+art/store_screens/
+
+# Release
+releases/*

 # Dir linux
 .directory
 */.directory
+.idea
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintAppCompatResource" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintMissingTranslation" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
-      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-    </inspection_tool>
-  </profile>
-</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/KeePassDX.iml" filepath="$PROJECT_DIR$/KeePassDX.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/601
+++ b/601
@@ -1,4 +1,589 @@
-KeepassDX (2.5.0.0beta5)
+KeePassDX(4.0.2)
+ * Fix Autofill with API 33
+
+KeePassDX(4.0.1)
+ * Fix back lock #1635 #1629 #1634
+ * Fix lock button in settings #1630
+ * Improve theme translation #1631
+
+KeePassDX(4.0.0)
+ * New UX/UI with Material 3 #1183 #1529 #1428 #1441 #1607
+ * Material You theme (follow system colors) #1469
+ * Refactoring inner code #1371
+ * Migration to API 33
+ * Cut, copy and delete from search #891 #1308 #1263
+ * Fix behaviors #1351 #874 #1327
+ * Fix bugs #1589 #1584 #1545 #1563 #1371 #1609
+
+KeePassDX(3.5.1)
+ * Fix action dialog with YubiKey challenge-response #1506
+
+KeePassDX(3.5.0)
+ * Support YubiKey challenge-response #8 #137
+ * Better exception management during database save #1346
+ * Add "Screenshot mode" setting #459 #1377 #1354 (Thx @GianpaMX)
+ * Hide clipboard sensitive text when copy entry field #1386
+ * Fix attachment download button #1401
+ * Add monochrome icon #1403 #1404 (Thx @Sandelinos)
+ * Fix lock with back button #1412 #1414 (Thx @ryg-git)
+ * Vanadium compatibility #1447 (Thx @flawedworld)
+
+KeePassDX(3.4.5)
+ * Fix custom data in group (fix KeeShare) #1335
+ * Fix device credential unlocking #1344
+ * New clipboard manager #1343
+ * Keep screen on by default when viewing an entry
+ * Change the order of the search filters
+ * Fix searchable selection
+
+KeePassDX(3.4.4)
+ * Fix crash in New Android 13 #1321
+ * Better backstack management for selection mode
+ * Prevent Tapjacking #1318
+ * Small changes #1298
+
+KeePassDX(3.4.3)
+ * Remove "Select share info" setting for Magikeyboard #1304
+ * Fix quick search and better loadGroup implementation #1302
+ * Fix small bugs
+
+KeePassDX(3.4.2)
+ * Fix service parameter and workflow to remove notification when service is killed
+ * Fix color
+
+KeePassDX(3.4.1)
+ * Fix search mode with Magikeyboard #1292
+ * Fix select another entry with Magikeyboard #1293
+ * Fix unexpected lock with Magikeyboard #1294
+ * Small UI changes
+
+KeePassDX(3.4.0)
+ * Passphrase implementation #218
+ * Show visual password strength indicator with entropy #631 #869 #454 #1270
+ * Dynamically save password generator configuration #618 #696
+ * Add advanced password filters #1052 #448 #983 #271 #539
+ * Better search implementation #175 #1254 #1267
+ * Manage package name from Magikeyboard #1010 #1261
+ * Ask confirmation to lock if changes without save #970
+ * Fix small bugs #1282
+
+KeePassDX(3.3.3)
+ * Fix shared otpauth link if database not open #1274
+ * Ellipsize attachment name #1253
+ * Add a warning to inform about KeyStore usage #1269
+ * Fingerprint unlock no more by default #1273
+ * Tabs to show main and advanced content separately
+ * Fix URL color
+
+KeePassDX(3.3.2)
+ * Merge KeePassDX & KeePassDX Pro #1257
+ * Create new Contributor Pro app
+
+KeePassDX(3.3.1)
+ * Fix Japanese keyboard in search #1248
+ * Better OOM management #256
+ * Fix filters #1249
+ * Fix temp advanced unlocking #1245
+ * Best autofill recognition #1250
+ * Workaround to fill OTP token in multiple fields with Magikeyboard (long press) #1158
+
+KeePassDX(3.3.0)
+ * Quick search and dynamic filters #163 #462 #521
+ * Keep search context #1141
+ * Add searchable groups #905 #1006
+ * Search with regular expression #175
+ * Merge from file and save as copy #1221 #1204 #840
+ * Fix custom data #1236
+ * Fix education hints #1192
+ * Fix save and app instance in selection mode
+ * New UI and fix styles
+ * Add "Simple" and "Reply" themes
+
+KeePassDX(3.2.0)
+ * Manage data merge #840 #977
+ * Manage Tags #633
+ * Inherit colors and icon from template #1213 #1130
+ * Entry colors setting #1207
+ * Setting to keep the screen on when watching the entry #1119
+ * Add path in quick search
+ * Small fixes
+
+KeePassDX(3.1.0)
+ * Add breadcrumb
+ * Add path in search results #1148
+ * Add group info dialog #1177
+ * Manage colors #64 #913
+ * Fix UI in Android 8 #509
+ * Upgrade libs and SDK to 31 #833
+ * Fix parser of database v1 #1201
+ * Stop asking WRITE_EXTERNAL_STORAGE permission
+
+KeePassDX(3.0.4)
+ * Fix autofill inline bugs #1173 #1165
+ * Small UI change
+
+KeePassDX(3.0.3)
+ * Change default Argon2 parameters #1098
+ * Add & edit custom icon name #976
+ * Fix templates #1128 #1133 #1138
+ * Update Autofill compatibility list #725 #1154
+ * Improve fingerprint usage #1137 #1145
+ * Change backup configuration #1144
+ * Add lock button in database notification
+
+KeePassDX(3.0.2)
+ * Samsung DeX mode #1114 #245 (Thx @chenxiaolong)
+
+KeePassDX(3.0.1)
+ * Fix text size and smallest margin #1085
+ * Fix number of lines during an edition #1073
+ * Fix Magikeyboard URL auto action #1100
+ * Fix exception after group name change and save #1112
+ * Fix timeout reset #1107
+ * Fix search actions #1091 #1092
+ * Small changes #1106 #1085
+
+KeePassDX(3.0.0)
+ * Add / Manage dynamic templates #191
+ * Manually select RecycleBin group and Templates group #191
+ * Setting to display OTP Token in list #655
+ * Fix timeout in dialogs #716
+ * Check URI permissions #626
+ * Better autofill implementation #943 #946 #984 #1070 (Thx @uduerholz)
+ * Improvements #680 #1035 #1043 #942 #1021 #1027 #1046 #1082 #1083 (Thx @chenxiaolong)
+
+KeePassDX(2.10.5)
+ * Increase the saving speed of database #1028
+ * Fix advanced unlocking by device credential #1029
+
+KeePassDX(2.10.4)
+ * Hot fix to increase the opening speed of database #1028
+
+KeePassDX(2.10.3)
+ * Improve Magikeyboard options description #1022 #1023 (Thx @djibux)
+ * Fix database opened without notification (database is now closed when screen is killed in background #1025)
+ * Fix biometric prompt #1018
+
+KeePassDX(2.10.2)
+ * Fix search fields references #987
+ * Fix Auto-Types with same key #997
+
+KeePassDX(2.10.1)
+ * Fix parcelable with custom data #986
+
+KeePassDX(2.10.0)
+ * Manage new database format 4.1 #956
+ * Fix show button consistency #980
+ * Fix persistent notification #979
+
+KeePassDX(2.9.20)
+ * Fix search with non-latin chars #971
+ * Fix action mode with search #972 (rollback ignore accents #945)
+ * Fix timeout with 0s #974
+
+KeePassDX(2.9.19)
+ * Fix search slowdown #964
+ * Fix closing notification after lock request #965
+ * Better temp advanced unlocking code implementation #965
+ * Fix OTP token generation #967
+
+KeePassDX(2.9.18)
+ * Move groups #658
+ * Improve autofill recognition #960
+ * Remove diacritical marks in search string #945
+ * Fix search in references #962
+ * Fix themes in Libre version
+
+KeePassDX(2.9.17)
+ * Import / Export app properties #839
+ * Force twofish padding compatibility #955
+ * Better timeout preference #579
+
+KeePassDX(2.9.16)
+ * Fix small bugs #948
+
+KeePassDX(2.9.15)
+ * Fix themes #935 #926
+ * Decrease default clipboard time #934
+ * Better opening performance #929 #933
+ * Fix memory usage setting #941
+
+KeePassDX(2.9.14)
+ * Add custom icons #96
+ * Dark Themes #532 #714
+ * Fix binary deduplication #715
+ * Fix IconId #901
+ * Resize image stream dynamically to prevent slowdown #919
+ * Small changes #795 #900 #903 #909 #914
+
+KeePassDX(2.9.13)
+ * Binary image viewer #473 #749
+ * Fix TOTP plugin settings #878
+ * Allow Emoji #796
+ * Scroll and better UI in entry edition screen #876
+ * Better UI #876
+ * Fix themes and add Purple Dark #889
+ * Allow OTP with many padding #585
+ * Add notes in groups #734
+
+KeePassDX(2.9.12)
+ * Fix OTP token type #863
+ * Fix auto open biometric prompt #862
+ * Fix back appearance setting #865
+ * Fix orientation change in settings #872
+ * Change memory unit to MiB #851
+ * Small changes #642
+
+KeePassDX(2.9.11)
+ * Add Keyfile XML version 2 (fix hex) #844
+ * Fix hex Keyfile #861
+
+KeePassDX(2.9.10)
+ * Try to fix autofill #852
+ * Fix database change dialog displayed too often #853
+
+KeePassDX(2.9.9)
+ * Detect file changes and reload database #794
+ * Inline suggestions autofill with compatible keyboard (Android R) #827
+ * Add Keyfile XML version 2 #844
+ * Fix binaries of 64 bytes #835
+ * Special search in title fields #830
+ * Priority to OTP button in notifications #845
+ * Fix OTP generation for long secret key #848
+ * Fix small bugs #849
+
+KeePassDX(2.9.8)
+ * Fix specific attachments with kdbx3.1 databases #828
+ * Fix small bugs
+
+KeePassDX(2.9.7)
+ * Remove write permission since Android 10 #823
+ * Fix small bugs
+
+KeePassDX(2.9.6)
+ * Fix KeyFile bug #820
+
+KeePassDX(2.9.5)
+ * Unlock database by device credentials (PIN/Password/Pattern) with Android M+ #102 #152 #811
+ * Prevent auto switch back to previous keyboard if otp field exists #814
+ * Fix timeout reset #817
+
+KeePassDX(2.9.4)
+ * Fix small bugs #812
+ * Argon2ID implementation #791
+
+KeePassDX(2.9.3)
+ * Unlock database by device credentials (PIN/Password/Pattern) #779 #102
+ * Advanced unlock with timeout #102 #437 #566
+ * Remove default database parameter when the file is no longer accessible #803
+ * Move OTP button to the first view level in Magikeyboard #587
+ * Tooltips for Magikeyboard #586
+ * Fix small bugs #805
+
+KeePassDX(2.9.2)
+ * Managing OTP links from QR applications #556
+ * Prevent manual creation of existing field name #718
+ * Harmonization of field names #789
+ * Different channels for each type of notification #688
+ * Fix OTP #780 #781
+ * Fix same save shared info #783
+ * Fix switch back to previous keyboard #782
+ * Fix read only #792
+ * Better UI #719 #534 #617 #793
+
+KeePassDX(2.9.1)
+ * Copy password from generator #697
+ * Fix Magikeyboard not fully visible #772
+ * Fix change font size #770
+ * Fix crash #774
+ * Small fixes #771
+
+KeePassDX(2.9)
+ * Upgrade to Android API 30 #723
+ * Save new credentials with Autofill #524
+ * Setting to close database after Autofill selection #755
+ * Setting to switch keyboard when database is locked #625
+ * Fix biometric issues #724 #740 #731
+ * Fix autofill #725 #551
+ * Fix subdomain search #728
+ * Fix backup search #759
+ * Small fixes and translations #732 #736 #737 #738 #742 #767
+
+KeePassDX(2.8.7)
+ * Downgrade to Android API 29 (crash on startup with API 30 on some devices)
+ Sorry for the inconvenience
+
+KeePassDX(2.8.6)
+ * Fix Autofill recognition #712
+ * Keep value after renaming custom field #709
+ * Prevent random binary bug #713
+ * Fix dialog background #717
+ * Better domain recognition for autofill #702
+ * Write custom data #651
+ * Fix autolink #720
+
+KeePassDX(2.8.5)
+ * Fix Base 64 #708
+
+KeePassDX(2.8.4)
+ * Fix incomplete attachment deletion #684
+ * Fix opening database v1 without backup folder #692
+ * Fix ANR during first entry education #685
+ * Entry edition as fragment and manual views to fix focus #686
+ * Fix opening database with corrupted attachment #691
+ * Manage empty keyfile #679
+
+KeePassDX(2.8.3)
+ * Upload attachments
+ * Visibility button for each hidden field
+ * Fix read header file
+ * Fix deletion in KDB database
+ * Fix minor issues
+
+KeePassDX(2.8.2)
+ * Fix themes / new UI
+ * Fix multiples notifications
+ * Fix entry in Magikeyboard memory
+ * Fix biometric view visibility
+ * Fix fields order
+ * Upgrade code with ViewModel and LiveData
+
+KeePassDX(2.8.1)
+ * Capture exceptions in coroutines
+
+KeePassDX(2.8)
+ * Fix TOTP period (> 60s)
+ * Fix searching in recycle bin
+ * Settings to back to the previous keyboard during database credentials and after form filling
+ * Improve action tasks
+ * Improve recognition to reset app timeout
+ * Fix minor issues
+
+KeePassDX(2.7)
+ * Add blocklists for autofill
+ * Add autofill compatibility mode (usefull for Browser not compatible)
+ * Upgrade autofill recognition algorithm
+ * Setting to search through web subdomains
+ * Refactoring selection mode
+
+KeePassDX(2.6)
+ * Share a web domain to automatically search for an entry
+ * Default group icon for a new entry
+ * Better autofill recognition
+ * Fix entry not visually deleted in search
+ * Fix hanged loading dialog
+ * Fix auto open biometric prompt if comes from background
+ * Minor fixes
+
+KeePassDX(2.5)
+ * First stable version of KeePassDX
+ * Fork completely rewritten from the KeePassDroid project
+ * Fix small issues from the last Release Candidate
+
+KeePassDX(2.5RC2)
+ * Replacement of Spongy Castle by Bouncy Castle
+ * Update Autofill compatibility
+ * Fix Magikeyboard "Go" action
+ * Fix KeeWeb database opening
+ * Fix default username
+ * Fix themes
+ * Fix small issues
+
+KeePassDX(2.5RC1)
+ * Add write permission to keep compatibility with old file managers
+ * Fix autofill for apps
+ * Auto search for autofill
+ * New keyfile input
+ * Icon to hide keyfile input
+ * New lock button
+ * Setting to hide lock button in user interface
+ * Clickable links in notes
+ * Fix autofill for key-value pairs
+
+KeePassDX(2.5beta30)
+ * Fix Lock after screen off (wait 1.5 seconds)
+ * Upgrade autofill algorithm
+ * Fix ANR during file verifications
+
+KeePassDX(2.5beta29)
+ * Upgrade autofill algorithm
+ * Delete registered KeyFile after save new credentials
+ * Fix title and username entry view refresh after an update
+ * Fix database lock request (open notification always active)
+ * Allow empty title in entries
+ * Add expiration datetime
+
+KeePassDX(2.5beta28)
+ * Fix read only database
+ * Upgrade to Android SDK 29
+
+KeePassDX (2.5beta27)
+ * New setting to hide broken links
+ * Show URL when title is empty
+ * Setting to open search field at database opening
+ * Fix settings for database locations
+ * Fix error message when database file not writable
+ * Fix appearance refresh settings
+ * Sort optimization
+
+KeePassDX (2.5.0.0beta26)
+ * Download attachments
+ * Change file size string format
+ * Prevent screenshot for all screen
+ * Auto performed "Go" key in Magikeyboard
+ * Restore and delete entry history
+ * Setting to hide expired entries
+ * New Black theme
+ * Fix crash when clearing clipboard
+ * Fix attachments compressions
+ * Fix dates
+ * Fix UUID message for Database v1
+
+KeePassDX (2.5.0.0beta25)
+ * Setting for Recycle Bin
+ * Fix Recycle bin issues
+ * Fix TOTP
+ * Fix infinite save
+ * Fix update group
+ * Fix OOM
+
+KeePassDX (2.5.0.0beta24)
+ * Add OTP (HOTP / TOTP)
+ * Add settings (Color, Security, Master Key)
+ * Show history of each entry
+ * Auto repair database for nodes with same UUID
+ * Management of expired nodes
+ * Multi-selection for actions (Cut - Copy - Delete)
+ * Open/Save database as service / Add persistent notification
+ * Fix settings / edit group / small bugs
+
+KeePassDX (2.5.0.0beta23)
+ * New, more secure database creation workflow
+ * Recognize more database files
+ * Add alias for history files (WARNING: history is erased)
+ * New Biometric unlock (Fingerprint with new API)
+ * Fix entry references
+ * Fix OOM with KeyFile
+ * Fix small issues
+
+KeePassDX (2.5.0.0beta22)
+ * Rebuild code for actions
+ * Add UUID as entry view
+ * Fix bug with natural order
+ * Fix number of entries in databaseV1
+ * New entry views
+
+KeePassDX (2.5.0.0beta21)
+ * Fix nested groups no longer visible in V1 databases
+ * Improved data import algorithm for V1 databases
+ * Add natural database sort
+ * Add username database sort
+ * Fix button disabled with only KeyFile
+ * Show the number of entries in a group
+
+KeePassDX (2.5.0.0beta20)
+ * Fix a major bug that displays an entry history
+
+KeePassDX (2.5.0.0beta19)
+ * Add lock button always visible
+ * New connection workflow
+ * Code refactored in Kotlin
+ * Better notification implementation
+ * Better views for large screen
+ * Magikeyboard enhancement
+ * Fix Recycle Bin
+ * Fix memory when load database
+ * Fix small bugs
+
+KeePassDX (2.5.0.0beta18)
+ * New recent databases views
+ * New information dialog
+ * Custom fields for the Magikeyboard
+ * Timeout for the Magikeyboard
+ * Long press for keyboard selection
+ * Fix memory when opening the database
+ * Memory management for attachments
+
+KeePassDX (2.5.0.0beta17)
+ * Fix font and search
+
+KeePassDX (2.5.0.0beta16)
+ * New search in a single fragment
+ * Search suggestions
+ * Added the display of usernames
+ * Added translations
+ * Fix read-only mode
+ * Fix parcelable / toolbar / back
+
+KeePassDX (2.5.0.0beta15)
+ * Read only mode
+ * Best group recovery for the navigation fragment
+ * Fix copies in notifications
+ * Fix orientation
+ * Added translations
+
+KeePassDX (2.5.0.0beta14)
+ * Optimize all the memory with parcelables / fix search
+
+KeePassDX (2.5.0.0beta13)
+ * Fix memory issue with parcelable (crash in beta12 version)
+
+KeePassDX (2.5.0.0beta12)
+ * Added the Magikeyboard to fill the forms (settings still in development)
+ * Added move and copy for groups and entries
+ * New navigation in a single screen / new animations between activities
+ * New icons for the material pack / vectorization
+ * New adaptive launcher icon
+ * Icons depends now of setting of list items
+ * Added a setting to disable the open button when no password is identified
+ * Added a setting to disable the education screens
+ * Added a setting to disable the copy of protected custom fields
+ * Fix the fingerprint recognition (WARNING : The keystore is reinit, you must delete the old keys)
+ * Fix small bugs
+
+KeePassDX (2.5.0.0beta11)
+ * Fix crash in beta10 version
+
+KeePassDX (2.5.0.0beta10)
+ * Dynamically change Algorithm and Key Derivation Function in settings
+ * Upgrade translations
+ * New red volcano theme, fix classic dark theme
+ * Add Material Icon Pack to the Free version
+ * Update fingerprint state with checkbox
+ * Fix bugs
+
+KeePassDX (2.5.0.0beta9)
+ * Education Screens to learn how to use the app
+ * New designs
+ * New custom font for character visibility
+ * New themes
+ * New icon pack
+ * Change setting organisation
+ * Pro version
+
+KeePassDX (2.5.0.0beta8)
+ * Hide custom entries protected
+ * Best management of field references (https://KeePass.info/help/base/fieldrefs.html)
+ * Change database / default settings
+ * Add Autofill for search
+ * Add sorting by last access and by creation time
+ * Rebuild custom entries
+ * Refactor old code
+ * Fix bugs
+
+KeePassDX (2.5.0.0beta7)
+ * Rebuild Notifications
+ * Change links to https
+ * Add extended Ascii (ñæËÌÂÝÜ...)
+ * Upgrade custom visibility font
+ * Best fingerprint error management
+ * Add setting to prevent the password copy
+ * Fix bugs
+
+KeePassDX (2.5.0.0beta6)
+ * Fix crash
+
+KeePassDX (2.5.0.0beta5)
 * Autofill (Android O)
 * Deletion for group
 * New sorts with (Asc/Dsc, Groups before or after)
@@ -19,7 +604,7 @@ KeepassDX (2.5.0.0beta5)
 * Fix many small bugs
 * Add recycle bin setting (not yet accessible)

-KeepassDX (2.5.0.0beta4)
+KeePassDX (2.5.0.0beta4)
 * Show only file name
 * Setting for full path
 * Add information for each database file
@@ -28,7 +613,7 @@ KeepassDX (2.5.0.0beta4)
 * Delete view assignment for fingerprint opening
 * Merge KeePassDroid 2.2.1

-KeepassDX (2.5.0.0beta3)
+KeePassDX (2.5.0.0beta3)
 * New database workflow with new screens and folder selection
 * Settings for default password generation
 * Fingerprint dialog for explanations
@@ -39,17 +624,17 @@ KeepassDX (2.5.0.0beta3)
 * Merge KeePassDroid 2.2.0.9
 * Add corruption fix mode

-KeepassDX (2.5.0.0beta2)
+KeePassDX (2.5.0.0beta2)
 * Remove libs for F-Droid

-KeepassDX (2.5.0.0beta1)
- * Fork KeepassDroid
+KeePassDX (2.5.0.0beta1)
+ * Fork KeePassDroid
 * Add Material Design
 * Add Light and Night theme
 * Min API is 14
 * Solve bug for fingerprint
 * Update French translation
- * Change donation (see KeepassDroid to contribute on both projects)
+ * Change donation (see KeePassDroid to contribute on both projects)

 KeePassDroid (2.2.1)
 * Fix kdbx4 date corruption
@@ -310,7 +895,7 @@ KeePassDroid (1.9.10)

 KeePassDroid (1.9.9)
 * Go back to explicitly storing blank fields in the database
-   (works around bug in keepassx)
+   (works around bug in KeePassx)
 * Add support for native code on MIPS architectures
 * Adding Vibrate permission. On some devices notifications fail
   without the vibrate permission.
--- a/45
+++ b/45
@@ -1,45 +0,0 @@
-Original author:
-Brian Pellin
-
-Achim Weimert
-Johan Berts - search patches
-Mike Mohr - Better native code for aes and sha
-Tobias Selig - icon support
-Tolga Onbay, Dirk Bergstrom - password generator
-Space Cowboy - holo theme
-josefwells
-Nicholas FitzRoy-Dale - auto launch intents
-yulin2 - responsiveness improvements
-Tadashi Saito
-vhschlenker
-bumper314 - Samsung multiwindow support
-Hans Cappelle - fingerprint sensor integration
-Jeremy Jamet - Keepass DX Material Design - Patches
-
-Translations:
-Diego Pierotto - Italian
-Laurent, Norman Obry, Nam, Bruno Parmentier, Credomo - French
-Maciej Bieniek, cod3r - Polish
-Максим Сёмочкин, i.nedoboy, filimonic, bboa - Russian
-MaWi, rvs2008, meviox, MaDill, EdlerProgrammierer, Jan Thomas - German
-yslandro - Norwegian Nynorsk
-王科峰 - Chinese
-Typhoon - Slovak
-Masahiro Inamura - Japanese
-Matsuu Takuto - Japanese
-Carlos Schlyter - Portugese (Brazil)
-YSmhXQDd6Z - Portugese (Portugal)
-andriykopanytsia - Ukranian
-intel, Zoltán Antal - Hungarian
-H Vanek - Czech
-jipanos - Spanish
-Erik Fdevriendt, Erik Jan Meijer - Dutch
-Frederik Svarre - Danish
-Oriol Garrote - Catalan
-Mika Takala - Finnish
-Niclas Burgren - Swedish
-Raimonds - Latvian
-dgarciabad - Basque
-Arthur Zamarin - Hebrew
-RaptorTFX - Greek
-zygimantus - Lithuanian
--- a/COPYING.gpl-2.0
+++ b/COPYING.gpl-2.0
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
--- a/10
+++ b/10
@@ -0,0 +1,10 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+source "https://rubygems.org"
+
+gem 'fastlane'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -0,0 +1,220 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.6)
+      rexml
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.15)
+    atomos (0.1.3)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.794.0)
+    aws-sdk-core (3.180.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.100.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.2.7)
+    fastlane (2.214.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (~> 0.1.1)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-versioning_android (0.1.1)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.46.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.7.0)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.1)
+    memoist (0.16.2)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    multi_json (1.15.0)
+    multipart-post (2.3.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    optparse (0.1.1)
+    os (1.1.4)
+    plist (3.7.0)
+    public_suffix (5.0.3)
+    rake (13.0.6)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.6)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.3)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
+    webrick (1.8.1)
+    word_wrap (1.0.0)
+    xcodeproj (1.22.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-versioning_android
+
+BUNDLED WITH
+   2.1.4
--- a/1009
+++ b/1009
--- a/LICENSES/LICENSE_ANDROID_BACKUP_SERVICE
+++ b/LICENSES/LICENSE_ANDROID_BACKUP_SERVICE
@@ -0,0 +1,177 @@
+Terms of Service
+
+This is the terms of service for the Android Backup Service.
+
+1. Your relationship with Google
+
+1.1 Your use of the Android Backup Service (referred to as the "Service" in this document) is subject to the terms of a legal agreement between you and Google. "Google" means Google LLC, whose principal place of business is at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. This document explains how the agreement is made up, and sets out some of the terms of that agreement.
+
+1.2 Unless otherwise agreed in writing with Google, your agreement with Google will always include, at a minimum, the terms and conditions set out in this document. These are referred to below as the "Terms".
+
+1.3 The Terms form a legally binding agreement between you and Google in relation to your use of the Service. It is important that you take the time to read them carefully.
+
+2. Accepting the Terms
+
+2.1 In order to use the Service, you must first agree to the Terms. You may not use the Service if you do not accept the Terms.
+
+2.2 You can accept the Terms by clicking to accept or agree to the Terms, where this option is made available to you by Google.
+
+2.3 You may not use the Service and may not accept the Terms if you are not of legal age to form a binding contract with Google.
+
+2.4 You represent that you have full power, capacity and authority to accept these Terms. If you are accepting on behalf of your employer or another entity, you represent that you have full legal authority to bind your employer or such entity to these Terms. If you don't have the legal authority to bind, please ensure that an authorized person from your entity consents to and accepts these Terms.
+
+3. Provision of the Service by Google
+
+3.1 Google has subsidiaries and affiliated legal entities around the world ("Subsidiaries and Affiliates"). Sometimes, these companies will be providing the Service to you on behalf of Google itself. You acknowledge and agree that Subsidiaries and Affiliates will be entitled to provide the Service to you.
+
+3.2 Google is constantly innovating in order to provide the best possible experience for its users. You acknowledge and agree that the form and nature of the Service which Google provides may change from time to time without prior notice to you.
+
+3.3 As part of this continuing innovation, you acknowledge and agree that Google may stop (permanently or temporarily) providing the Service (or any features within the Service) to you or to users generally at Google's sole discretion, without prior notice to you. You may stop using the Service at any time. You do not need to specifically inform Google when you stop using the Service.
+
+3.4 You acknowledge and agree that if Google disables your Backup Service Key, you and the Android application(s) you developed ("Application(s)") may be prevented from accessing the Service and any content that is stored with the Service.
+
+3.5 You acknowledge and agree that Google may set a fixed upper limit on the number of backup transmissions you may send or receive through the Service or on the amount of storage space used for the provision of the Service at any time, at Google's discretion. You agree to abide by any such fixed upper limits.
+
+4. Use of the Service by you
+
+4.1 In order to access the Service, you must have a unique application identifier ("Package Name") for your Application as described in the documentation for the Service.
+
+4.2 After supplying Google with the Package Name and accepting the Terms, you will be issued an alphanumeric key ("Backup Service Key") assigned to you by Google that is uniquely associated with your Application. Your Application must include this Backup Service Key as described in the documentation for the Service.
+
+4.3 There is currently no limit to the number of Backup Service Keys you may obtain in this manner provided that you use a different Package Name for each Backup Service Key you obtain. You agree that each Backup Service Key is only valid for Applications with the corresponding Package Name. You agree that Google may, in its sole discretion, impose a limit on the number of Backup Service Keys that may be obtained in the future. You agree that your continued use of any of the Backup Service Keys assigned by Google, or distribution of any Applications using such Backup Service Keys, constitutes your continued agreement to these Terms.
+
+4.4 You agree to use the Service only for purposes that are permitted by (a) the Terms and (b) any applicable law, regulation, third-party terms of service, or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.5 You agree not to access (or attempt to access) any of the Service by any means other than through the interfaces, methods, and APIs that are provided by Google, unless you have been specifically allowed to do so in a separate agreement with Google.
+
+4.6 You agree that you will not engage in any activity that interferes with or disrupts the Service (or the servers and networks which are connected to the Service), or the servers or networks of any third-party.
+
+4.7 You agree that your use of the Service will be in compliance with any documentation guidelines provided by Google and that failure to comply with the documentation guidelines may result in the disabling of the Backup Service Key(s) for your Application(s).
+
+4.8 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell (a) use of the Service, or (b) access to the Service.
+
+4.9 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) your and your Application's use of the Service, any breach of your obligations under the Terms, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
+
+4.10 You agree that in your use of the Service, you and your Applications will protect the privacy and legal rights of users. You must provide legally adequate privacy notice and protection for users whose data your Applications back up to the Service. Further, your Application may only use that information for the limited purpose of backing up the data to the Service unless the user has given you permission for further use. If the user has not given you permission to back up information to the Service, you may not transmit such information to the Service.
+
+4.11 You agree that you and your Applications will not transmit or store sensitive user information, such as user names, passwords, or credit card numbers, through the Service.
+
+5. Security
+
+5.1 You agree and understand that you are responsible for maintaining the security associated with any information you provide to access the Service as well as of the Backup Service Key(s) assigned to you by Google. You agree that only you are authorized to use the Backup Service Key(s) assigned to you.
+
+5.2 Accordingly, you agree that you will be solely responsible to Google for all activities that occur in connection with your access to the Service, as well as the Backup Service Key.
+
+5.3 If you become aware of any unauthorized use of your Backup Service Key(s) you agree to notify Google immediately.
+
+6. Privacy and your personal information
+
+6.1 For information about Google's data protection practices, please read Google's privacy policy at http://www.google.com/privacy.html. This policy explains how Google treats your personal information when you use the Service.
+
+6.2 You agree to the use of your data in accordance with Google's privacy policies.
+
+7. Content in the Service
+
+7.1 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any Content that you or your Applications transmit or store through the Service and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. You agree that you are solely responsible for (A) any Content that is transmitted through the Service by your Applications, and (B) any Content that Devices retrieve from the Service by virtue of your Applications. For purposes of the Terms, "Content" means information such as data, messages, settings information, written text, computer software, music, audio files or other sounds, photographs, videos or other images. "Device(s)" means device(s) powered by the Android operating system.
+
+7.2 You agree that you will not transmit any Content through the Service that is copyrighted, protected by trade secret or otherwise subject to third party proprietary rights, including patent, privacy and publicity rights, unless you are the owner of such rights or have permission from their rightful owner to transmit the Content through the Service.
+
+8. Proprietary rights
+
+8.1 You acknowledge and agree that Google (or Google's licensors) own all legal right, title and interest in and to the Service, including any intellectual property rights which subsist in the Service (whether those rights happen to be registered or not, and wherever in the world those rights may exist).
+
+8.2 Unless you have agreed otherwise in writing with Google, nothing in the Terms gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, and other distinctive brand features.
+
+8.3 If you have been given an explicit right to use any of these brand features in a separate written agreement with Google, then you agree that your use of such features shall be in compliance with that agreement, any applicable provisions of the Terms, and Google's brand feature use guidelines as updated from time to time. These guidelines can be viewed online at http://www.google.com/permissions/ guidelines.html (or such other URL as Google may provide for this purpose from time to time).
+
+8.4 You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright, trade mark notices) which may be affixed to or contained within the Service.
+
+9. License from Google
+
+9.1 Subject to terms and conditions of these Terms, Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided to you by Google. This license is for the sole purpose of enabling you to use and enjoy the benefit of the Service as provided by Google, in the manner permitted by the Terms.
+
+9.2 You may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to extract the source code from the Service or any part thereof, unless this is expressly permitted or required by law, or unless you have been specifically told that you may do so by Google, in writing.
+
+9.3 Unless Google has given you specific written permission to do so, you may not assign (or grant a sub-license of) your rights to use the Service, grant a security interest in or over your rights to use the Service, or otherwise transfer any part of your rights to use the Service.
+
+10. Your code
+
+10.1 Google claims no ownership or control over any source code written by you to be used with the Service. You retain copyright and any other rights you already hold in this code, and you are responsible for protecting those rights, as appropriate.
+
+11. Ending your relationship with Google
+
+11.1 The Terms will continue to apply until terminated by either you or Google as set out below.
+
+11.2 You may terminate your legal agreement with Google by discontinuing your use of the Service at any time.
+
+11.3 Google may, at any time, terminate its legal agreement with you if:
+
+  (A) you have breached any provision of the Terms (or have acted in manner which clearly shows that you do not intend to, or are unable to comply with the provisions of the Terms); or
+
+  (B) Google is required to do so by law (for example, where the provision of the Service to you is, or becomes, unlawful); or
+
+  (C) Google is transitioning to no longer providing the Service; or
+
+  (D) your Application fails to meet the documentation guidelines provided by Google.
+
+11.4 Nothing in this Section shall affect Google's rights regarding provision of the Service under Section 3 of the Terms.
+
+11.5 When these Terms come to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the Terms have been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of Sections 12, 13 and Paragraph 16 shall continue to apply to such rights, obligations and liabilities indefinitely.
+
+12. EXCLUSION OF WARRANTIES
+
+12.1 NOTHING IN THESE TERMS, INCLUDING SECTIONS 12 AND 13, SHALL EXCLUDE OR LIMIT GOOGLE'S WARRANTY OR LIABILITY FOR LOSSES WHICH MAY NOT BE LAWFULLY EXCLUDED OR LIMITED BY APPLICABLE LAW. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR CONDITIONS OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR LOSS OR DAMAGE CAUSED BY NEGLIGENCE, BREACH OF CONTRACT OR BREACH OF IMPLIED TERMS, OR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, ONLY THE LIMITATIONS WHICH ARE LAWFUL IN YOUR JURISDICTION WILL APPLY TO YOU AND OUR LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY LAW.
+
+12.2 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SERVICE IS AT YOUR SOLE RISK AND THAT THE SERVICE AND CONTENT ARE PROVIDED "AS IS" AND "AS AVAILABLE".
+
+12.3 IN PARTICULAR, GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS DO NOT REPRESENT OR WARRANT TO YOU THAT:
+
+  (A) YOUR USE OF THE SERVICE WILL MEET YOUR REQUIREMENTS,
+
+  (B) YOUR USE OF THE SERVICE WILL BE UNINTERRUPTED, TIMELY, SECURE OR FREE FROM ERROR, AND
+
+  (C) THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE PROVIDED TO YOU AS PART OF THE SERVICE WILL BE CORRECTED.
+
+12.4 NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM GOOGLE OR THROUGH OR FROM THE SERVICE SHALL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN THE TERMS.
+
+12.5 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+13. LIMITATION OF LIABILITY
+
+13.1 SUBJECT TO OVERALL PROVISION IN PARAGRAPH 12.1 ABOVE, YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU FOR:
+
+  (A) ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES WHICH MAY BE INCURRED BY YOU, HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY. THIS SHALL INCLUDE, BUT NOT BE LIMITED TO, ANY LOSS OF PROFIT (WHETHER INCURRED DIRECTLY OR INDIRECTLY), ANY LOSS OF GOODWILL OR BUSINESS REPUTATION, ANY LOSS OF DATA SUFFERED, COST OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICE, OR OTHER INTANGIBLE LOSS;
+
+  (B) ANY LOSS OR DAMAGE WHICH MAY BE INCURRED BY YOU, INCLUDING BUT NOT LIMITED TO LOSS OR DAMAGE AS A RESULT OF:
+
+    (I) ANY CHANGES WHICH GOOGLE MAY MAKE TO THE SERVICE, OR FOR ANY PERMANENT OR TEMPORARY CESSATION IN THE PROVISION OF THE SERVICE (OR ANY FEATURES WITHIN THE SERVICE);
+
+    (II) THE DELETION OF, CORRUPTION OF, OR FAILURE TO STORE, ANY CONTENT AND OTHER COMMUNICATIONS DATA MAINTAINED OR TRANSMITTED BY OR THROUGH YOUR USE OF THE SERVICE;
+
+    (III) YOUR FAILURE TO PROVIDE GOOGLE WITH ACCURATE ACCOUNT INFORMATION; OR
+
+    (IV) YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL.
+
+13.2 THE LIMITATIONS ON GOOGLE'S LIABILITY TO YOU IN PARAGRAPH 13.1 ABOVE SHALL APPLY WHETHER OR NOT GOOGLE HAS BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+14. Indemnification
+
+14.1 You agree to hold harmless and indemnify Google, and its subsidiaries, affiliates, officers, agents, employees, or licensors from and against any third party claim arising from or in any way related to (a) your breach of the Terms, (b) your use of the Service, or (c) your violation of applicable laws, rules or regulations in connection with the Service, including any liability or expense arising from all claims, losses, damages (actual and consequential), suits, judgments, litigation costs and attorneys' fees, of every kind and nature. In such a case, Google will provide you with written notice of such claim, suit or action.
+
+15. Changes to the Terms
+
+15.1 Due to things like changes to the law or changes to functionality offered through the Service, Google may need to change these Terms from time to time. You should look at the Terms regularly. We'll post notice of the modified Terms within, or through, the Service. Once the modified Terms are posted, the changes will become effective immediately, and you are deemed to have accepted the modified Terms if you continue to use the Service. If you do not agree to the modified Terms for the Service, please stop using the Service.
+
+16. General legal terms
+
+16.1 The Terms constitute the whole legal agreement between you and Google and govern your use of the Service (but excluding any service which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Service.
+
+16.2 You agree that Google may provide you with notices, including those regarding changes to the Terms, by email, regular mail, or postings on the Service.
+
+16.3 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the Terms (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+16.4 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of these Terms is invalid, then that provision will be removed from the Terms without affecting the rest of the Terms. The remaining provisions of the Terms will continue to be valid and enforceable.
+
+16.5 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the Terms and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the Terms which confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the Terms.
+
+16.6 The Terms, and your relationship with Google under the Terms, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the Terms. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
--- a/LICENSES/LICENSE_APACHE
+++ b/LICENSES/LICENSE_APACHE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/LICENSES/LICENSE_BOUNCY_CASTLE
+++ b/LICENSES/LICENSE_BOUNCY_CASTLE
@@ -0,0 +1,7 @@
+Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR
+++ b/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR
@@ -0,0 +1,93 @@
+Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/LICENSES/LICENSE_ICON_PACK_CLASSIC
+++ b/LICENSES/LICENSE_ICON_PACK_CLASSIC
@@ -0,0 +1,111 @@
+Files ic00.png to ic61.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+TITLE:    NUVOLA ICON THEME for KDE 3.x
+AUTHOR:    David Vignoni | ICON KING
+SITE:    http://www.icon-king.com
+MAILING LIST: http://mail.icon-king.com/mailman/listinfo/nuvola_icon-king.com
+
+Copyright (c)  2003-2004  David Vignoni.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation,
+version 2.1 of the License.
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+You should have received a copy of the GNU Lesser General Public
+License along with this library (see the the license.txt file); if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#######**** NOTE THIS ADD-ON ****#######
+The GNU Lesser General Public License or LGPL is written for software libraries
+in the first place. The LGPL has to be considered valid for this artwork
+library too.
+Nuvola icon theme for KDE 3.x is a special kind of software library, it is an
+artwork library, it's elements can be used in a Graphical User Interface, or
+GUI.
+Source code, for this library means:
+ - raster png image* .
+The LGPL in some sections obliges you to make the files carry
+notices. With images this is in some cases impossible or hardly usefull.
+With this library a notice is placed at a prominent place in the directory
+containing the elements. You may follow this practice.
+The exception in section 6 of the GNU Lesser General Public License covers
+the use of elements of this art library in a GUI.
+dave [at] icon-king.com
+
+Date:        15 october 2004
+Version:    1.0
+
+DESCRIPTION:
+
+Icon theme for KDE 3.x.
+Icons where designed using Adobe Illustrator, and then exported to PNG format.
+Icons shadows and minor corrections were done using Adobe Photoshop.
+Kiconedit was used to correct some 16x16 and 22x22 icons.
+
+LICENSE
+
+Released under GNU Lesser General Public License (LGPL)
+Look at the license.txt file.
+
+CONTACT
+
+David Vignoni
+e-mail :        david [at] icon-king.com
+ICQ :            117761009
+http:               http://www.icon-king.com
+
+---
+
+Files ic62.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://de.wikipedia.org/w/index.php?title=Datei:Tux.svg&filetimestamp=20090927073505
+
+The copyright holder of this file allows anyone to use it for any purpose, 
+provided that the copyright holders Larry Ewing, Simon Budig and
+Anja Gerwinski are mentioned.
+
+---
+
+Files ic63.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://en.wikipedia.org/wiki/File:ASF-logo.svg
+
+Apache logo
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may
+obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+
+---
+
+Files ic64.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Created by Jeremy JAMET and licensed under the terms of the GPLv3.
+
+---
+
+Files ic65.png, ic67.png and ic68.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Created by Tobias Selig and licensed under the terms of the GPLv2 or GPLv3.
+
+---
+
+File ic66.png under under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://commons.wikimedia.org/wiki/File:Dollar_symbol_gold.svg
+
+Author: Rugby471
+
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU Free Documentation License, Version 1.2 or any later
+version published by the Free Software Foundation; with no Invariant Sections,
+no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is
+included in the section entitled "GNU Free Documentation License".
+
+---
--- a/LICENSES/LICENSE_ICON_PACK_MATERIAL_FONT_AWESOME
+++ b/LICENSES/LICENSE_ICON_PACK_MATERIAL_FONT_AWESOME
@@ -0,0 +1,396 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+
--- a/LICENSES/LICENSE_MOZILLA_COMPONENTS
+++ b/LICENSES/LICENSE_MOZILLA_COMPONENTS
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,94 @@
+# Android KeePassDX
+
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> **Lightweight password manager for Android**, KeePassDX allows editing encrypted data in a single file in KeePass format and fill in the forms in a secure way.
+
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen.jpg" width="220">
+
+### Features
+
+ - Create database files / entries and groups.
+ - Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm.
+ - **Compatible** with the majority of alternative programs (KeePass, KeePassXC, KeeWeb, …).
+ - Allows opening and **copying URI / URL fields quickly**.
+ - **Biometric recognition** for fast unlocking *(fingerprint / face unlock / …)*.
+ - **One-Time Password** management *(HOTP / TOTP)* for Two-factor authentication (2FA).
+ - Material design with **themes**.
+ - **Auto-Fill** and Integration.
+ - Field filling **keyboard**.
+ - Dynamic **templates** 
+ - **History** of each entry.
+ - Precise management of **settings**.
+ - Code written in **native languages** *(Kotlin / Java / JNI / C)*.
+
+KeePassDX is **open source** and **ad-free**.
+
+## What is KeePassDX?
+
+An alternative to remembering an endless list of passwords manually. This is made more difficult by **using different passwords for each account**. If you use one password everywhere and security fails only one of those places, it grants access to your e-mail account, website, etc, and you may not know about it or notice, before bad things happen.
+
+KeePassDX is a **password manager for Android**, which helps you **manage your passwords in a secure way**. You can put all your passwords in one database, locked with a **master key** and/or a **keyfile**. You **only have to remember one single master password and/or select the keyfile** to unlock the whole database. The databases are encrypted using the best and **most secure encryption algorithms** currently known.
+
+## Small print?
+
+KeePassDX is under **open source GPL3 license**, meaning you can use, study, change and share it at will. Copyleft ensures it stays that way.
+From the full source, anyone can build, fork, and check whether for example the encryption algorithms are implemented correctly.
+There is **no advertising**.
+
+Do not worry, **the main features remain completely free**.
+
+Optional visual styles are accessible after a contribution (and a congratulatory message (Ո‿Ո) ) or the purchase of an extended version to encourage contribution to the work of open source projects!
+*If you contribute to the project and do not have access to the styles, do not hesitate to contact the author at [contact@kunzisoft.com](contact@kunzisoft.com).*
+
+## Contributions
+
+* Add features by making a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
+* Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** KeePassDX to your language (on [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or by sending a [pull request](https://help.github.com/articles/about-pull-requests/)).
+* **[Donate](https://www.keepassdx.com/#donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX.
+
+## Download
+
+*[F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) is the recommended way of installing, a libre software project that verifies that all the libraries and app code is libre software.*
+
+[<img src="https://f-droid.org/badge/get-it-on.png"
+      alt="Get it on F-Droid"
+      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+	height="80">](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free)
+[<img src="https://raw.githubusercontent.com/Kunzisoft/Github-badge/main/get-it-on-github.png"
+      alt="Get it on Github"
+	height="80">](https://github.com/Kunzisoft/KeePassDX/releases)
+	
+## Frequently Asked Questions
+
+Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/wiki/FAQ) 
+	
+## Other devices
+
+- [KeePass](https://keepass.info/) (https://keepass.info/) is the original and official project for the desktop, with technical documentation for standardized database files. It is updated regularly with active maintenance (written in C#).
+
+- [KeePassXC](https://keepassxc.org/) (https://keepassxc.org/) is an alternative integration of KeePass written in C++.
+
+- [KeeWeb](https://keeweb.info/) (https://keeweb.info/) is a web version that is also compatible with KeePass files.
+
+## License
+
+  Copyright © 2023 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+
+  This file is part of KeePassDX.
+
+  [KeePassDX](https://www.keepassdx.com) is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDX is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+  
+  *This project is a fork of [KeePassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,68 +0,0 @@
-# Android Keepass DX
-
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/icon.png"> Keepass DX is a material design Keepass Client for manage keys and passwords in crypt database for your android device.
-
-### Features
-
-* Create database files / entries and groups
-* Support for .kdb and .kdbx files (version 1 to 4)
-* Open database, copy username / password, open URI / URL
-* Fingerprint for fast unlocking
-* Material design with themes
-* AutoFill and Integration (Development in progress)
-* Precise management of settings
-
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen1.jpg" width="220">
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen2.jpg" width="220">
-
-## What is KeePass?
-
-Today you need to remember many passwords. You need a password for the Windows network logon, your e-mail account, your website's FTP password, online passwords (like website member account), etc. etc. etc. The list is endless. Also, you should use different passwords for each account. Because if you use only one password everywhere and someone gets this password you have a problem... A serious problem. The thief would have access to your e-mail account, website, etc. Unimaginable.
-
-KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password or select the key file to unlock the whole database. The databases are encrypted using the best and most secure encryption algorithms currently known (AES and Twofish). For more information, see the features page. 
-
-## Is it really free?
-
-Yes, KeePass is really free, and more than that: it is open source (OSI certified). You can have a look at its full source and check whether the encryption algorithms are implemented correctly.
-
-## Donation
-
-Even if the application is free, to maintain the application, you can make donations.
-
-[![Donation Paypal](https://4.bp.blogspot.com/-ncaIbUGaHOk/WfhaThYUPGI/AAAAAAAAAVQ/_HidNgdB1q4DaC24ujaKNzH64KUUJiQewCLcBGAs/s1600/pay-with-paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KM6QMDAXZM3UU "Kunzisoft Paypal Donation")
-
-[![Donation Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Kunzisoft/donate "Kunzisoft Liberapay Donation")
-
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen4.jpg" width="220">
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen5.jpg" width="220">
-
-## Download
-
-[<img src="https://f-droid.org/badge/get-it-on.png"
-      alt="Get it on F-Droid"
-      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Get it on Google Play"
-	height="80">](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free)
-
-## License
-
- Copyright (c) 2017 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePass DX.
-
-  KeePass DX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  KeePass DX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
-  
-  This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
+.cxx
 .externalNativeBuild
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,92 +1,141 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion = 27
-    buildToolsVersion = "27.0.3"
+    namespace 'com.kunzisoft.keepass'
+    compileSdkVersion 33
+    buildToolsVersion "33.0.2"

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
-        minSdkVersion 14
-        targetSdkVersion 27
-        versionCode = 5
-        versionName = "2.5.0.0beta5"
+        minSdkVersion 15
+        targetSdkVersion 33
+        versionCode = 125
+        versionName = "4.0.2"
        multiDexEnabled true

-        testApplicationId = "com.keepassdroid.tests"
-        testInstrumentationRunner = "android.test.InstrumentationTestRunner"
+        testApplicationId = "com.kunzisoft.keepass.tests"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a',
-                    'arm64-v8a', 'mips', 'mips64'
+        buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
+        manifestPlaceholders = [ googleAndroidBackupAPIKey:"unused" ]
+
+        kapt {
+            arguments {
+                arg("room.incremental", "true")
+                arg("room.schemaLocation", "$projectDir/schemas".toString())
+            }
        }
    }

-    externalNativeBuild {
-        cmake {
-            path "src/main/jni/CMakeLists.txt"
-        }
-    }
-
-
    buildTypes {
        release {
            minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

-    dexOptions {
-    }
-
-    flavorDimensions "tier"
+    flavorDimensions "version"
    productFlavors {
        libre {
+            dimension "version"
            applicationIdSuffix = ".libre"
-            versionNameSuffix "-libre"
-            buildConfigField "boolean", "FULL_VERSION", "true"
-            buildConfigField "boolean", "GOOGLE_PLAY_VERSION", "false"
+            buildConfigField "String", "BUILD_VERSION", "\"libre\""
+            buildConfigField "boolean", "CLOSED_STORE", "false"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Reply\"," +
+                            "\"KeepassDXStyle_Reply_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"," +
+                            "\"KeepassDXStyle_Dynamic_Light\"," +
+                            "\"KeepassDXStyle_Dynamic_Night\"}"
+            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
        }
-        pro_google {
-            applicationIdSuffix = ".pro"
-            versionNameSuffix "-pro"
-            buildConfigField "boolean", "FULL_VERSION", "true"
-            buildConfigField "boolean", "GOOGLE_PLAY_VERSION", "true"
-        }
-        free_google {
+        free {
+            dimension "version"
            applicationIdSuffix = ".free"
-            versionNameSuffix "-free"
-            buildConfigField "boolean", "FULL_VERSION", "false"
-            buildConfigField "boolean", "GOOGLE_PLAY_VERSION", "true"
+            buildConfigField "String", "BUILD_VERSION", "\"free\""
+            buildConfigField "boolean", "CLOSED_STORE", "true"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Blue\"," +
+                            "\"KeepassDXStyle_Blue_Night\"," +
+                            "\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Reply\"," +
+                            "\"KeepassDXStyle_Reply_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"," +
+                            "\"KeepassDXStyle_Dynamic_Light\"," +
+                            "\"KeepassDXStyle_Dynamic_Night\"}"
+            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
+            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
    }
+
+    sourceSets {
+        libre.res.srcDir 'src/libre/res'
+        free.res.srcDir 'src/free/res'
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+    }
+
    compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
    }
 }

-def supportVersion = "27.1.0"
-def spongycastleVersion = "1.58.0.0"
-def permissionDispatcherVersion = "3.1.0"
+def room_version = "2.5.1"

 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:preference-v7:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.madgag.spongycastle:core:$spongycastleVersion"
-    implementation "com.madgag.spongycastle:prov:$spongycastleVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "com.android.support:multidex:1.0.3"
+    implementation "androidx.appcompat:appcompat:$android_appcompat_version"
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'androidx.biometric:biometric:1.1.0'
+    implementation 'androidx.media:media:1.6.0'
+    // Lifecycle - LiveData - ViewModel - Coroutines
+    implementation "androidx.core:core-ktx:$android_core_version"
+    implementation 'androidx.fragment:fragment-ktx:1.6.0'
+    implementation "com.google.android.material:material:$android_material_version"
+    // Token auto complete
+    // From sources until https://github.com/splitwise/TokenAutoComplete/pull/422 fixed
+    implementation "com.splitwise:tokenautocomplete:4.0.0-beta05"
+    // Database
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    // Autofill
+    implementation "androidx.autofill:autofill:1.1.0"
    // Time
-    implementation "joda-time:joda-time:2.9.9"
-    implementation "org.sufficientlysecure:html-textview:3.5"
-    implementation "com.nononsenseapps:filepicker:4.1.0"
-    // Permissions
-    implementation ("com.github.hotchemi:permissionsdispatcher:$permissionDispatcherVersion") {
-        // if you don't use android.app.Fragment you can exclude support for them
-        exclude module: "support-v13"
-    }
-    annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
-    implementation group: 'com.google.guava', name: 'guava', version: '23.0-android'
+    implementation 'joda-time:joda-time:2.10.13'
+    // Color
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
+    // Education
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
+    // Apache Commons
+    implementation 'commons-io:commons-io:2.8.0'
+    implementation 'commons-codec:commons-codec:1.15'
+    // Password generator
+    implementation 'me.gosimple:nbvcxz:1.5.0'
+    
+    // Modules import
+    implementation project(path: ':database')
+    implementation project(path: ':icon-pack')
+
+    // Tests
+    androidTestImplementation "androidx.test:runner:$android_test_version"
+    androidTestImplementation "androidx.test:rules:$android_test_version"
 }
--- a/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/1.json
+++ b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/1.json
@@ -0,0 +1,84 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "56438e5f7372ef3e36e33b782aed245d",
+    "entities": [
+      {
+        "tableName": "file_database_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `database_alias` TEXT NOT NULL, `keyfile_uri` TEXT, `updated` INTEGER NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "databaseAlias",
+            "columnName": "database_alias",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyFileUri",
+            "columnName": "keyfile_uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updated",
+            "columnName": "updated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "cipher_database",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `encrypted_value` TEXT NOT NULL, `specs_parameters` TEXT NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedValue",
+            "columnName": "encrypted_value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "specParameters",
+            "columnName": "specs_parameters",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '56438e5f7372ef3e36e33b782aed245d')"
+    ]
+  }
+}
--- a/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json
+++ b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json
@@ -0,0 +1,90 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "f8fb4aed546de19ae7ca0797f49b26a4",
+    "entities": [
+      {
+        "tableName": "file_database_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `database_alias` TEXT NOT NULL, `keyfile_uri` TEXT, `hardware_key` TEXT, `updated` INTEGER NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "databaseAlias",
+            "columnName": "database_alias",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyFileUri",
+            "columnName": "keyfile_uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hardwareKey",
+            "columnName": "hardware_key",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updated",
+            "columnName": "updated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "cipher_database",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `encrypted_value` TEXT NOT NULL, `specs_parameters` TEXT NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedValue",
+            "columnName": "encrypted_value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "specParameters",
+            "columnName": "specs_parameters",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f8fb4aed546de19ae7ca0797f49b26a4')"
+    ]
+  }
+}
--- a/app/src/androidTest/java/com/keepassdroid/tests/AccentTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/AccentTest.java
@@ -1,42 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests;
-
-import android.test.AndroidTestCase;
-
-import com.keepassdroid.tests.database.TestData;
-
-public class AccentTest extends AndroidTestCase {
-	
-	private static final String KEYFILE = "";
-	private static final String PASSWORD = "é";
-	private static final String ASSET = "accent.kdb";
-	private static final String FILENAME = "/sdcard/accent.kdb";
-	
-	public void testOpen() {
-
-		try {
-			TestData.GetDb(getContext(), ASSET, PASSWORD, KEYFILE, FILENAME);
-		} catch (Exception e) {
-			assertTrue("Failed to open database", false);
-		}
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/AllTests.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/AllTests.java
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import android.test.suitebuilder.TestSuiteBuilder;
-
-public class AllTests extends TestSuite {
-
-    public static Test suite() {
-        return new TestSuiteBuilder(AllTests.class)
-                .includeAllPackagesUnderHere()
-                .build();
-    }
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/OutputTests.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/OutputTests.java
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import android.test.suitebuilder.TestSuiteBuilder;
-
-public class OutputTests extends TestSuite {
-
-	public static Test suite() {
-
-		return new TestSuiteBuilder(AllTests.class)
-		.includePackages("com.keepassdroid.tests.output")
-		.build();
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/PwDateTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/PwDateTest.java
@@ -1,38 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import junit.framework.TestCase;
-
-import com.keepassdroid.database.PwDate;
-
-public class PwDateTest extends TestCase {
-	public void testDate() {
-		PwDate jDate = new PwDate(System.currentTimeMillis());
-		
-		PwDate intermediate = (PwDate) jDate.clone();
-		
-		PwDate cDate = new PwDate(intermediate.getCDate(), 0);
-		
-		assertTrue("jDate and intermediate not equal", jDate.equals(intermediate));
-		assertTrue("jDate and cDate not equal", cDate.equals(jDate));
-		
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV3.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV3.java
@@ -1,63 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Calendar;
-
-
-import android.test.AndroidTestCase;
-
-import com.keepassdroid.database.PwEntryV3;
-import com.keepassdroid.tests.database.TestData;
-
-public class PwEntryTestV3 extends AndroidTestCase {
-	PwEntryV3 mPE;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mPE = (PwEntryV3) TestData.GetTest1(getContext()).entries.get(0);
-		
-	}
-	
-	public void testName() {
-		assertTrue("Name was " + mPE.title, mPE.title.equals("Amazon"));
-	}
-	
-	public void testPassword() throws UnsupportedEncodingException {
-		String sPass = "12345";
-		byte[] password = sPass.getBytes("UTF-8");
-		
-		assertArrayEquals(password, mPE.getPasswordBytes());
-	}
-	
-	public void testCreation() {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(mPE.tCreation.getJDate());
-		
-		assertEquals("Incorrect year.", cal.get(Calendar.YEAR), 2009);
-		assertEquals("Incorrect month.", cal.get(Calendar.MONTH), 3);
-		assertEquals("Incorrect day.", cal.get(Calendar.DAY_OF_MONTH), 23);
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV4.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/PwEntryTestV4.java
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import java.util.UUID;
-
-import junit.framework.TestCase;
-
-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;
-
-public class PwEntryTestV4 extends TestCase {
-	public void testAssign() {
-		PwEntryV4 entry = new PwEntryV4();
-		
-		entry.additional = "test223";
-		
-		entry.autoType = entry.new AutoType();
-		entry.autoType.defaultSequence = "1324";
-		entry.autoType.enabled = true;
-		entry.autoType.obfuscationOptions = 123412432109L;
-		entry.autoType.put("key", "value");
-		
-		entry.backgroupColor = "blue";
-		entry.binaries.put("key1", new ProtectedBinary(false, new byte[] {0,1}));
-		entry.customIcon = new PwIconCustom(UUID.randomUUID(), new byte[0]);
-		entry.foregroundColor = "red";
-		entry.history.add(new PwEntryV4());
-		entry.icon = new PwIconStandard(5);
-		entry.overrideURL = "override";
-		entry.parent = new PwGroupV4();
-		entry.addField("key2", new ProtectedString(false, "value2"));
-		entry.url = "http://localhost";
-		entry.uuid = UUID.randomUUID();
-
-		PwEntryV4 target = new PwEntryV4();
-		target.assign(entry);
-		
-		/* This test is not so useful now that I am not implementing value equality for Entries
-		assertTrue("Entries do not match.", entry.equals(target));
-		*/
-		
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/PwGroupTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/PwGroupTest.java
@@ -1,44 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-
-import android.test.AndroidTestCase;
-
-import com.keepassdroid.database.PwGroupV3;
-import com.keepassdroid.tests.database.TestData;
-
-public class PwGroupTest extends AndroidTestCase {
-
-	PwGroupV3 mPG;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mPG = (PwGroupV3) TestData.GetTest1(getContext()).getGroups().get(0);
-		
-	}
-	
-	public void testGroupName() {
-		 assertTrue("Name was " + mPG.name, mPG.name.equals("Internet"));
-	}
-}
-
--- a/app/src/androidTest/java/com/keepassdroid/tests/TestUtil.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/TestUtil.java
@@ -1,71 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.net.Uri;
-import android.os.Environment;
-
-import com.keepassdroid.utils.EmptyUtils;
-import com.keepassdroid.utils.UriUtil;
-
-public class TestUtil {
-	private static final File sdcard = Environment.getExternalStorageDirectory();
-
-	public static void extractKey(Context ctx, String asset, String target) throws Exception {
-		
-		InputStream key = ctx.getAssets().open(asset, AssetManager.ACCESS_STREAMING);
-		
-		FileOutputStream keyFile = new FileOutputStream(target);
-		while (true) {
-			byte[] buf = new byte[1024];
-			int read = key.read(buf);
-			if ( read == -1 ) {
-				break;
-			} else {
-				keyFile.write(buf, 0, read);
-			}
-		}
-		
-		keyFile.close();
-
-	}
-
-	public static InputStream getKeyFileInputStream(Context ctx, String keyfile) throws FileNotFoundException {
-		InputStream keyIs = null;
-		if (!EmptyUtils.isNullOrEmpty(keyfile)) {
-			Uri uri = UriUtil.parseDefaultFile(keyfile);
-			keyIs = UriUtil.getUriInputStream(ctx, uri);
-		}
-
-		return keyIs;
-	}
-
-	public static String getSdPath(String filename) {
-		File file = new File(sdcard, filename);
-		return file.getAbsolutePath();
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/TypesTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/TypesTest.java
@@ -1,211 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Calendar;
-import java.util.Random;
-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;
-
-public class TypesTest extends TestCase {
-
-	public void testReadWriteLongZero() {
-		testReadWriteLong((byte) 0);
-	}
-	
-	public void testReadWriteLongMax() {
-		testReadWriteLong(Byte.MAX_VALUE);
-	}
-	
-	public void testReadWriteLongMin() {
-		testReadWriteLong(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteLongRnd() {
-		Random rnd = new Random();
-		byte[] buf = new byte[1];
-		rnd.nextBytes(buf);
-		
-		testReadWriteLong(buf[0]);
-	}
-	
-	private void testReadWriteLong(byte value) {
-		byte[] orig = new byte[8];
-		byte[] dest = new byte[8];
-		
-		setArray(orig, value, 0, 8);
-		
-		long one = LEDataInputStream.readLong(orig, 0);
-		LEDataOutputStream.writeLong(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-
-	}
-	
-	public void testReadWriteIntZero() {
-		testReadWriteInt((byte) 0);
-	}
-	
-	public void testReadWriteIntMin() {
-		testReadWriteInt(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteIntMax() {
-		testReadWriteInt(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteInt(byte value) {
-		byte[] orig = new byte[4];
-		byte[] dest = new byte[4];
-		
-		for (int i = 0; i < 4; i++ ) {
-			orig[i] = 0;
-		}
-		
-		setArray(orig, value, 0, 4);
-				
-		int one = LEDataInputStream.readInt(orig, 0);
-		
-		LEDataOutputStream.writeInt(one, dest, 0);
-
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	private void setArray(byte[] buf, byte value, int offset, int size) {
-		for (int i = offset; i < offset + size; i++) {
-			buf[i] = value;
-		}
-	}
-	
-	public void testReadWriteShortOne() {
-		byte[] orig = new byte[2];
-		byte[] dest = new byte[2];
-		
-		orig[0] = 0;
-		orig[1] = 1;
-		
-		int one = LEDataInputStream.readUShort(orig, 0);
-		dest = LEDataOutputStream.writeUShortBuf(one);
-		
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	public void testReadWriteShortMin() {
-		testReadWriteShort(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteShortMax() {
-		testReadWriteShort(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteShort(byte value) {
-		byte[] orig = new byte[2];
-		byte[] dest = new byte[2];
-		
-		setArray(orig, value, 0, 2);
-		
-		int one = LEDataInputStream.readUShort(orig, 0);
-		LEDataOutputStream.writeUShort(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-
-	}
-
-	public void testReadWriteByteZero() {
-		testReadWriteByte((byte) 0);
-	}
-	
-	public void testReadWriteByteMin() {
-		testReadWriteByte(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteByteMax() {
-		testReadWriteShort(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteByte(byte value) {
-		byte[] orig = new byte[1];
-		byte[] dest = new byte[1];
-		
-		setArray(orig, value, 0, 1);
-		
-		int one = Types.readUByte(orig, 0);
-		Types.writeUByte(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	public void testDate() {
-		Calendar cal = Calendar.getInstance();
-		
-		Calendar expected = Calendar.getInstance();
-		expected.set(2008, 1, 2, 3, 4, 5);
-		
-		byte[] buf = PwDate.writeTime(expected.getTime(), cal);
-		Calendar actual = Calendar.getInstance();
-		actual.setTime(PwDate.readTime(buf, 0, cal));
-		
-		assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR));
-		assertEquals("Month mismatch: ", 1, actual.get(Calendar.MONTH));
-		assertEquals("Day mismatch: ", 1, actual.get(Calendar.DAY_OF_MONTH));
-		assertEquals("Hour mismatch: ", 3, actual.get(Calendar.HOUR_OF_DAY));
-		assertEquals("Minute mismatch: ", 4, actual.get(Calendar.MINUTE));
-		assertEquals("Second mismatch: ", 5, actual.get(Calendar.SECOND));
-	}
-	
-	public void testUUID() {
-		Random rnd = new Random();
-		byte[] bUUID = new byte[16];
-		rnd.nextBytes(bUUID);
-		
-		UUID uuid = Types.bytestoUUID(bUUID);
-		byte[] eUUID = Types.UUIDtoBytes(uuid);
-		
-		assertArrayEquals("UUID match failed", bUUID, eUUID);
-	}
-
-	public void testULongMax() throws Exception {
-		byte[] ulongBytes = new byte[8];
-		for (int i = 0; i < ulongBytes.length; i++) {
-			ulongBytes[i] = -1;
-		}
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		LEDataOutputStream leos = new LEDataOutputStream(bos);
-		leos.writeLong(Types.ULONG_MAX_VALUE);
-		leos.close();
-
-		byte[] uLongMax = bos.toByteArray();
-
-		assertArrayEquals(ulongBytes, uLongMax);
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/AESTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/crypto/AESTest.java
@@ -1,83 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import junit.framework.TestCase;
-
-import com.keepassdroid.crypto.CipherFactory;
-
-public class AESTest extends TestCase {
-	
-	private Random mRand = new Random();
-	
-	public void testEncrypt() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
-		// Test above below and at the blocksize
-		testFinal(15);
-		testFinal(16);
-		testFinal(17);
-		
-		// Test random larger sizes
-		int size = mRand.nextInt(494) + 18;
-		testFinal(size);
-	}
-	
-	private void testFinal(int dataSize) throws NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
-		
-		// Generate some input
-		byte[] input = new byte[dataSize];
-		mRand.nextBytes(input);
-		
-		// Generate key
-		byte[] keyArray = new byte[32];
-		mRand.nextBytes(keyArray);
-		SecretKeySpec key = new SecretKeySpec(keyArray, "AES");
-		
-		// Generate IV
-		byte[] ivArray = new byte[16];
-		mRand.nextBytes(ivArray);
-		IvParameterSpec iv = new IvParameterSpec(ivArray);
-		
-		Cipher android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true);
-		android.init(Cipher.ENCRYPT_MODE, key, iv);
-		byte[] outAndroid = android.doFinal(input, 0, dataSize);
-		
-		Cipher nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding");
-		nat.init(Cipher.ENCRYPT_MODE, key, iv);
-		byte[] outNative = nat.doFinal(input, 0, dataSize);
-		
-		assertArrayEquals("Arrays differ on size: " + dataSize, outAndroid, outNative);
-	}
-	
-	
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/CipherTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/crypto/CipherTest.java
@@ -1,100 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.IllegalBlockSizeException;
-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;
-
-public class CipherTest extends TestCase {
-	private Random rand = new Random();
-	
-	public void testCipherFactory() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException {
-		byte[] key = new byte[32];
-		byte[] iv = new byte[16];
-		
-		byte[] plaintext = new byte[1024];
-		
-		rand.nextBytes(key);
-		rand.nextBytes(iv);
-		rand.nextBytes(plaintext);
-		
-		CipherEngine aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID);
-		Cipher encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv);
-		Cipher decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv);
-
-		byte[] secrettext = encrypt.doFinal(plaintext);
-		byte[] decrypttext = decrypt.doFinal(secrettext);
-		
-		assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext);
-	}
-
-	public void testCipherStreams() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException, IOException {
-		final int MESSAGE_LENGTH = 1024;
-		
-		byte[] key = new byte[32];
-		byte[] iv = new byte[16];
-		
-		byte[] plaintext = new byte[MESSAGE_LENGTH];
-		
-		rand.nextBytes(key);
-		rand.nextBytes(iv);
-		rand.nextBytes(plaintext);
-
-		CipherEngine aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID);
-		Cipher encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv);
-		Cipher decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv);
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		CipherOutputStream cos = new CipherOutputStream(bos, encrypt);
-		cos.write(plaintext);
-		cos.close();
-		
-		byte[] secrettext = bos.toByteArray();
-		
-		ByteArrayInputStream bis = new ByteArrayInputStream(secrettext);
-		BetterCipherInputStream cis = new BetterCipherInputStream(bis, decrypt);
-		LEDataInputStream lis = new LEDataInputStream(cis);
-		
-		byte[] decrypttext = lis.readBytes(MESSAGE_LENGTH);
-		
-		assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext);
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/crypto/FinalKeyTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/crypto/FinalKeyTest.java
@@ -1,66 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.IOException;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import com.keepassdroid.crypto.finalkey.AndroidFinalKey;
-import com.keepassdroid.crypto.finalkey.NativeFinalKey;
-
-public class FinalKeyTest extends TestCase {
-	private Random mRand;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mRand = new Random();
-	}
-	
-	public void testNativeAndroid() throws IOException {
-		// Test both an old and an even number to test my flip variable
-		testNativeFinalKey(5);
-		testNativeFinalKey(6);
-	}
-	
-	private void testNativeFinalKey(int rounds) throws IOException {
-		byte[] seed = new byte[32];
-		byte[] key = new byte[32];
-		byte[] nativeKey;
-		byte[] androidKey;
-		
-		mRand.nextBytes(seed);
-		mRand.nextBytes(key);
-		
-		AndroidFinalKey aKey = new AndroidFinalKey();
-		androidKey = aKey.transformMasterKey(seed, key, rounds);
-		
-		NativeFinalKey nKey = new NativeFinalKey();
-		nativeKey = nKey.transformMasterKey(seed, key, rounds);
-		
-		assertArrayEquals("Does not match", androidKey, nativeKey);
-		
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/DeleteEntry.java
@@ -1,114 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.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;
-
-public class DeleteEntry extends AndroidTestCase {
-	private static final String GROUP1_NAME = "Group1";
-	private static final String ENTRY1_NAME = "Test1";
-	private static final String ENTRY2_NAME = "Test2";
-	private static final String KEYFILE = "";
-	private static final String PASSWORD = "12345";
-	private static final String ASSET = "delete.kdb";
-	private static final String FILENAME = "/sdcard/delete.kdb";
-	
-	public void testDelete() {
-		
-		Database db;
-		
-		Context ctx = getContext();
-		
-		try {
-			db = TestData.GetDb(ctx, ASSET, PASSWORD, KEYFILE, FILENAME);
-		} catch (Exception e) {
-			assertTrue("Failed to open database: " + e.getMessage(), false);
-			return;
-		}
-		
-		PwDatabaseV3 pm = (PwDatabaseV3) db.pm;
-		PwGroup group1 = getGroup(pm, GROUP1_NAME);
-		assertNotNull("Could not find group1", group1);
-		
-		// Delete the group
-		DeleteGroup task = new DeleteGroup(db, group1, null, true);
-		task.run();
-		
-		// Verify the entries were deleted
-		PwEntry entry1 = getEntry(pm, ENTRY1_NAME);
-		assertNull("Entry 1 was not removed", entry1);
-
-		PwEntry entry2 = getEntry(pm, ENTRY2_NAME);
-		assertNull("Entry 2 was not removed", entry2);
-		
-		// 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);
-		
-		assertEquals("Entry1 was not removed from the search results", 0, results1.numbersOfChildEntries());
-		assertEquals("Entry2 was not removed from the search results", 0, results2.numbersOfChildEntries());
-		
-		// Verify the group was deleted
-		group1 = getGroup(pm, GROUP1_NAME);
-		assertNull("Group 1 was not removed.", group1);
-		
-		
-		
-	}
-	
-	private PwEntry getEntry(PwDatabaseV3 pm, String name) {
-		List<PwEntry> entries = pm.entries;
-		for ( int i = 0; i < entries.size(); i++ ) {
-			PwEntry entry = entries.get(i);
-			if ( entry.getTitle().equals(name) ) {
-				return entry;
-			}
-		}
-		
-		return null;
-		
-	}
-	
-	private PwGroup getGroup(PwDatabase pm, String name) {
-		List<PwGroup> groups = pm.getGroups();
-		for ( int i = 0; i < groups.size(); i++ ) {
-			PwGroup group = groups.get(i);
-			if ( group.getName().equals(name) ) {
-				return group;
-			}
-		}
-		
-		return null;
-	}
-	
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/EntryV4.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/EntryV4.java
@@ -1,52 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import junit.framework.TestCase;
-
-import com.keepassdroid.database.PwDatabaseV4;
-import com.keepassdroid.database.PwEntryV4;
-
-public class EntryV4 extends TestCase {
-
-	public void testBackup() {
-		PwDatabaseV4 db = new PwDatabaseV4();
-		
-		db.historyMaxItems = 2;
-		
-		PwEntryV4 entry = new PwEntryV4();
-		entry.setTitle("Title1", db);
-		entry.setUsername("User1", db);
-		entry.createBackup(db);
-		
-		entry.setTitle("Title2", db);
-		entry.setUsername("User2", db);
-		entry.createBackup(db);
-		
-		entry.setTitle("Title3", db);
-		entry.setUsername("User3", db);
-		entry.createBackup(db);
-		
-		PwEntryV4 backup = entry.history.get(0);
-		assertEquals("Title2", backup.getTitle());
-		assertEquals("User2", backup.getUsername());
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3.java
@@ -1,62 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-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 java.io.InputStream;
-import java.io.File;
-
-public class Kdb3 extends AndroidTestCase {
-	
-	private void testKeyfile(String dbAsset, String keyAsset, String password) throws Exception {
-		Context ctx = getContext();
-
-		File sdcard = Environment.getExternalStorageDirectory();
-		String keyPath = sdcard.getAbsolutePath() + "/key";
-		
-		TestUtil.extractKey(ctx, keyAsset, keyPath);
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open(dbAsset, AssetManager.ACCESS_STREAMING);
-		
-		ImporterV3 importer = new ImporterV3();
-		importer.openDatabase(is, password, TestUtil.getKeyFileInputStream(ctx, keyPath));
-		
-		is.close();
-	}
-	
-	public void testXMLKeyFile() throws Exception {
-		testKeyfile("kdb_with_xml_keyfile.kdb", "keyfile.key", "12345");
-	}
-	
-	public void testBinary64KeyFile() throws Exception {
-		testKeyfile("binary-key.kdb", "binary.key", "12345");
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3Twofish.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb3Twofish.java
@@ -1,49 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import java.io.InputStream;
-
-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;
-
-public class Kdb3Twofish extends AndroidTestCase {
-	public void testReadTwofish() throws Exception {
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("twofish.kdb", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV3 importer = new ImporterV3();
-
-		PwDatabaseV3 db = importer.openDatabase(is, "12345", null);
-		
-		assertTrue(db.algorithm == PwEncryptionAlgorithm.Twofish);
-		
-		is.close();
-
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4.java
@@ -1,171 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.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;
-
-public class Kdb4 extends AndroidTestCase {
-
-    public void testDetection() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-
-        Importer importer = ImporterFactory.createImporter(is);
-
-        assertTrue(importer instanceof ImporterV4);
-        is.close();
-
-    }
-
-    public void testParsing() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", null);
-
-        is.close();
-
-
-    }
-
-    public void testSavingKDBXV3() throws IOException, InvalidDBException, PwDbOutputException {
-       testSaving("test.kdbx", "12345", "test-out.kdbx");
-    }
-
-    public void testSavingKDBXV4() throws IOException, InvalidDBException, PwDbOutputException {
-        testSaving("test-kdbxv4.kdbx", "1", "test-kdbxv4-out.kdbx");
-    }
-
-    private void testSaving(String inputFile, String password, String outputFile) throws IOException, InvalidDBException, PwDbOutputException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open(inputFile, AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        PwDatabaseV4 db = importer.openDatabase(is, password, null);
-        is.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        PwDbV4Output output =  (PwDbV4Output) PwDbOutput.getInstance(db, bos);
-        output.output();
-
-        byte[] data = bos.toByteArray();
-
-        FileOutputStream fos = new FileOutputStream(TestUtil.getSdPath(outputFile), false);
-
-        InputStream bis = new ByteArrayInputStream(data);
-        bis = new CopyInputStream(bis, fos);
-        importer = new ImporterV4();
-        db = importer.openDatabase(bis, password, null);
-        bis.close();
-
-        fos.close();
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        TestUtil.extractKey(getContext(), "keyfile.key", TestUtil.getSdPath("key"));
-        TestUtil.extractKey(getContext(), "binary.key", TestUtil.getSdPath("key-binary"));
-    }
-
-    public void testComposite() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("keyfile.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
-
-        is.close();
-
-    }
-
-    public void testCompositeBinary() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("keyfile-binary.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx,TestUtil.getSdPath("key-binary")));
-
-        is.close();
-
-    }
-
-    public void testKeyfile() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("key-only.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
-
-        is.close();
-
-
-    }
-
-    public void testNoGzip() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("no-encrypt.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", null);
-
-        is.close();
-
-
-    }
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4Header.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/Kdb4Header.java
@@ -1,51 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.keepassdroid.crypto.CipherFactory;
-import com.keepassdroid.crypto.engine.AesEngine;
-import com.keepassdroid.database.PwDatabaseV4;
-import com.keepassdroid.database.load.ImporterV4;
-
-public class Kdb4Header extends AndroidTestCase {
-	public void testReadHeader() throws Exception {
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV4 importer = new ImporterV4();
-
-		PwDatabaseV4 db = importer.openDatabase(is, "12345", null);
-		
-		assertEquals(6000, db.numKeyEncRounds);
-		
-		assertTrue(db.dataCipher.equals(AesEngine.CIPHER_UUID));
-		
-		is.close();
-
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java
@@ -1,79 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import java.io.InputStream;
-import java.util.UUID;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-import biz.source_code.base64Coder.Base64Coder;
-
-import com.keepassdroid.database.PwDatabaseV4;
-import com.keepassdroid.database.PwEntryV4;
-import com.keepassdroid.database.load.ImporterV4;
-import com.keepassdroid.utils.SprEngine;
-import com.keepassdroid.utils.Types;
-
-public class SprEngineTest extends AndroidTestCase {
-	private PwDatabaseV4 db;
-	private SprEngine spr;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV4 importer = new ImporterV4();
-		db = importer.openDatabase(is, "12345", null);
-		
-		is.close();
-		
-		spr = SprEngine.getInstance(db);
-	}
-	
-	private final String REF = "{REF:P@I:2B1D56590D961F48A8CE8C392CE6CD35}";
-	private final String ENCODE_UUID = "IN7RkON49Ui1UZ2ddqmLcw==";
-	private final String RESULT = "Password";
-	public void testRefReplace() {
-		UUID entryUUID = decodeUUID(ENCODE_UUID);
-		
-		PwEntryV4 entry = (PwEntryV4) db.entries.get(entryUUID);
-
-		
-		assertEquals(RESULT, spr.compile(REF, entry, db));
-		
-	}
-	
-	private UUID decodeUUID(String encoded) {
-		if (encoded == null || encoded.length() == 0 ) {
-			return PwDatabaseV4.UUID_ZERO;
-		}
-		
-		byte[] buf = Base64Coder.decode(encoded);
-		return Types.bytestoUUID(buf);
-	}
-
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/TestData.java
@@ -1,77 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.database;
-
-import java.io.InputStream;
-
-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;
-
-public class TestData {
-	private static final String TEST1_KEYFILE = "";
-	private static final String TEST1_KDB = "test1.kdb";
-	private static final String TEST1_PASSWORD = "12345";
-
-	private static Database mDb1;
-
-	
-	public static Database GetDb1(Context ctx) throws Exception {
-		return GetDb1(ctx, false);
-	}
-	
-	public static Database GetDb1(Context ctx, boolean forceReload) throws Exception {
-		if ( mDb1 == null || forceReload ) {
-			mDb1 = GetDb(ctx, TEST1_KDB, TEST1_PASSWORD, TEST1_KEYFILE, "/sdcard/test1.kdb");
-		}
-		
-		return mDb1;
-	}
-	
-	public static Database GetDb(Context ctx, String asset, String password, String keyfile, String filename) throws Exception {
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open(asset, AssetManager.ACCESS_STREAMING);
-
-		Database Db = new Database();
-
-		InputStream keyIs = TestUtil.getKeyFileInputStream(ctx, keyfile);
-
-		Db.LoadData(ctx, is, password, keyIs, Importer.DEBUG);
-		Uri.Builder b = new Uri.Builder();
-
-		Db.mUri = b.scheme("file").path(filename).build();
-		
-		return Db;
-		
-	}
-	
-	public static PwDatabaseV3Debug GetTest1(Context ctx) throws Exception {
-		if ( mDb1 == null ) {
-			GetDb1(ctx);
-		}
-		
-		return (PwDatabaseV3Debug) mDb1.pm;
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/output/PwManagerOutputTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/output/PwManagerOutputTest.java
@@ -1,146 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.output;
- 
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-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;
- 
-public class PwManagerOutputTest extends AndroidTestCase {
-  PwDatabaseV3Debug mPM;
-  
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    
-    mPM = TestData.GetTest1(getContext());
-  }
-  
-  public void testPlainContent() throws IOException, PwDbOutputException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
- 
-    PwDbV3Output pos = new PwDbV3OutputDebug(mPM, bos, true);
-    pos.outputPlanGroupAndEntries(bos);
-    
-    assertTrue("No output", bos.toByteArray().length > 0);
-    assertArrayEquals("Group and entry output doesn't match.", mPM.postHeader, bos.toByteArray());
- 
-  }
- 
-  public void testChecksum() throws NoSuchAlgorithmException, IOException, PwDbOutputException {
-    //FileOutputStream fos = new FileOutputStream("/dev/null");
-	NullOutputStream nos = new NullOutputStream();
-    MessageDigest md = MessageDigest.getInstance("SHA-256");
-    
-    DigestOutputStream dos = new DigestOutputStream(nos, md);
-  
-    PwDbV3Output pos = new PwDbV3OutputDebug(mPM, dos, true);
-    pos.outputPlanGroupAndEntries(dos);
-    dos.close();
-    
-    byte[] digest = md.digest();
-    assertTrue("No output", digest.length > 0);
-    assertArrayEquals("Hash of groups and entries failed.", mPM.dbHeader.contentsHash, digest);
-  }
- 
-  private void assertHeadersEquals(PwDbHeaderV3 expected, PwDbHeaderV3 actual) {
-	  assertEquals("Flags unequal", expected.flags, actual.flags);
-	  assertEquals("Entries unequal", expected.numEntries, actual.numEntries);
-	  assertEquals("Groups unequal", expected.numGroups, actual.numGroups);
-	  assertEquals("Key Rounds unequal", expected.numKeyEncRounds, actual.numKeyEncRounds);
-	  assertEquals("Signature1 unequal", expected.signature1, actual.signature1);
-	  assertEquals("Signature2 unequal", expected.signature2, actual.signature2);
-	  assertTrue("Version incompatible", PwDbHeaderV3.compatibleHeaders(expected.version, actual.version));
-	  assertArrayEquals("Hash unequal", expected.contentsHash, actual.contentsHash);
-	  assertArrayEquals("IV unequal", expected.encryptionIV, actual.encryptionIV);
-	  assertArrayEquals("Seed unequal", expected.masterSeed, actual.masterSeed);
-	  assertArrayEquals("Seed2 unequal", expected.transformSeed, actual.transformSeed);
-  }
-  
-  public void testHeader() throws PwDbOutputException, IOException {
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-    PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-    PwDbHeaderV3 header = pActual.outputHeader(bActual);
-    
-    ByteArrayOutputStream bExpected = new ByteArrayOutputStream();
-    PwDbHeaderOutputV3 outExpected = new PwDbHeaderOutputV3(mPM.dbHeader, bExpected);
-    outExpected.output();
-    
-    assertHeadersEquals(mPM.dbHeader, header);    
-    assertTrue("No output", bActual.toByteArray().length > 0);
-    assertArrayEquals("Header does not match.", bExpected.toByteArray(), bActual.toByteArray()); 
-  }
-  
-  public void testFinalKey() throws PwDbOutputException {
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-    PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-    PwDbHeader hActual = pActual.outputHeader(bActual);
-    byte[] finalKey = pActual.getFinalKey(hActual);
-    
-    assertArrayEquals("Keys mismatched", mPM.finalKey, finalKey);
-	  
-  }
-  
-  public void testFullWrite() throws IOException, PwDbOutputException  {
-	AssetManager am = getContext().getAssets();
-	InputStream is = am.open("test1.kdb");
-
-	// Pull file into byte array (for streaming fun)
-	ByteArrayOutputStream bExpected = new ByteArrayOutputStream();
-	while (true) {
-		int data = is.read();
-		if ( data == -1 ) {
-			break;
-		}
-		bExpected.write(data);
-	}
-	
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-	PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-	pActual.output();
-	//pActual.close();
-
-	FileOutputStream fos = new FileOutputStream(TestUtil.getSdPath("test1_out.kdb"));
-	fos.write(bActual.toByteArray());
-	fos.close();
-	assertArrayEquals("Databases do not match.", bExpected.toByteArray(), bActual.toByteArray());
-  
-  }
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/search/SearchTest.java
@@ -1,73 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.search;
-
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.R;
-import com.keepassdroid.database.Database;
-import com.keepassdroid.database.PwGroup;
-import com.keepassdroid.tests.database.TestData;
-
-public class SearchTest extends AndroidTestCase {
-	
-	private Database mDb;
-	
-	@Override
-	protected void setUp() throws Exception {
-	    super.setUp();
-	    
-	    mDb = TestData.GetDb1(getContext(), true);
-	}
-	
-	public void testSearch() {
-		PwGroup results = mDb.Search("Amazon");
-		assertTrue("Search result not found.", results.numbersOfChildEntries() > 0);
-		
-	}
-	
-	public void testBackupIncluded() {
-		updateOmitSetting(false);
-		PwGroup results = mDb.Search("BackupOnly");
-		
-		assertTrue("Search result not found.", results.numbersOfChildEntries() > 0);
-	}
-	
-	public void testBackupExcluded() {
-		updateOmitSetting(true);
-		PwGroup results = mDb.Search("BackupOnly");
-		
-		assertFalse("Search result found, but should not have been.", results.numbersOfChildEntries() > 0);
-	}
-	
-	private void updateOmitSetting(boolean setting) {
-		Context ctx = getContext();
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-		SharedPreferences.Editor editor = prefs.edit();
-		
-		editor.putBoolean(ctx.getString(R.string.settings_omitbackup_key), setting);
-		editor.commit();
-		
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/stream/HashedBlock.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/stream/HashedBlock.java
@@ -1,110 +0,0 @@
-/*
-* Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
-*
-* This file is part of KeePass DX.
-*
-* KeePass DX is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* KeePass DX is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package com.keepassdroid.tests.stream;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Random;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import junit.framework.TestCase;
-
-import com.keepassdroid.stream.HashedBlockInputStream;
-import com.keepassdroid.stream.HashedBlockOutputStream;
-
-public class HashedBlock extends TestCase {
-	
-	private static Random rand = new Random();
-
-	public void testBlockAligned() throws IOException {
-		testSize(1024, 1024);
-	}
-	
-	public void testOffset() throws IOException {
-		testSize(1500, 1024);
-	}
-	
-	private void testSize(int blockSize, int bufferSize) throws IOException {
-		byte[] orig = new byte[blockSize];
-		
-		rand.nextBytes(orig);
-		
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		HashedBlockOutputStream output = new HashedBlockOutputStream(bos, bufferSize);
-		output.write(orig);
-		output.close();
-		
-		byte[] encoded = bos.toByteArray();
-		
-		ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-		HashedBlockInputStream input = new HashedBlockInputStream(bis);
-
-		ByteArrayOutputStream decoded = new ByteArrayOutputStream();
-		while ( true ) {
-			byte[] buf = new byte[1024];
-			int read = input.read(buf);
-			if ( read == -1 ) {
-				break;
-			}
-			
-			decoded.write(buf, 0, read);
-		}
-		
-		byte[] out = decoded.toByteArray();
-		
-		assertArrayEquals(orig, out);
-		
-	}
-	
-	public void testGZIPStream() throws IOException {
-		final int testLength = 32000;
-		
-		byte[] orig = new byte[testLength];
-		rand.nextBytes(orig);
-		
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		HashedBlockOutputStream hos = new HashedBlockOutputStream(bos);
-		GZIPOutputStream zos = new GZIPOutputStream(hos);
-		
-		zos.write(orig);
-		zos.close();
-		
-		byte[] compressed = bos.toByteArray();
-		ByteArrayInputStream bis = new ByteArrayInputStream(compressed);
-		HashedBlockInputStream his = new HashedBlockInputStream(bis);
-		GZIPInputStream zis = new GZIPInputStream(his);
-		
-		byte[] uncompressed = new byte[testLength];
-		
-		int read = 0;
-		while (read != -1 && testLength - read > 0) {
-			read += zis.read(uncompressed, read, testLength - read);
-			
-		}
-		
-		assertArrayEquals("Output not equal to input", orig, uncompressed);
-		
-		
-	}
-}
--- a/app/src/androidTest/java/com/keepassdroid/tests/utils/StrUtilTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/utils/StrUtilTest.java
@@ -1,57 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.keepassdroid.tests.utils;
-
-import java.util.Locale;
-
-import com.keepassdroid.utils.StrUtil;
-
-import junit.framework.TestCase;
-
-public class StrUtilTest extends TestCase {
-    private final String text = "AbCdEfGhIj";
-    private final String search = "BcDe";
-    private final String badSearch = "Ed";
-
-	public void testIndexOfIgnoreCase1() {
-		assertEquals(1, StrUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH));
-	}
-
-	public void testIndexOfIgnoreCase2() {
-		assertEquals(-1, StrUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH), 2);
-	}
-
-	public void testIndexOfIgnoreCase3() {
-		assertEquals(-1, StrUtil.indexOfIgnoreCase(text, badSearch, Locale.ENGLISH));
-	}
-	
-	private final String repText = "AbCtestingaBc";
-	private final String repSearch = "ABc";
-	private final String repSearchBad = "CCCCCC";
-	private final String repNew = "12345";
-	private final String repResult = "12345testing12345";
-	public void testReplaceAllIgnoresCase1() {
-		assertEquals(repResult, StrUtil.replaceAllIgnoresCase(repText, repSearch, repNew, Locale.ENGLISH));
-	}
-
-	public void testReplaceAllIgnoresCase2() {
-		assertEquals(repText, StrUtil.replaceAllIgnoresCase(repText, repSearchBad, repNew, Locale.ENGLISH));
-	}
-}
--- a/app/src/free/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/free/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="8">
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffa726"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/free/res/drawable-v24/ic_launcher_monochrome.xml
+++ b/app/src/free/res/drawable-v24/ic_launcher_monochrome.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/free/res/drawable/ic_app_key_white_24dp.xml
+++ b/app/src/free/res/drawable/ic_app_key_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+  </group>
+</vector>
--- a/app/src/free/res/drawable/ic_app_lock_white_24dp.xml
+++ b/app/src/free/res/drawable/ic_app_lock_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+  </group>
+</vector>
--- a/app/src/free/res/drawable/ic_launcher_foreground.png
+++ b/app/src/free/res/drawable/ic_launcher_foreground.png
--- a/app/src/free/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/free/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/free/res/mipmap-ldpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-ldpi/ic_launcher.png
--- a/app/src/free/res/mipmap-ldpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-ldpi/ic_launcher_round.png
--- a/app/src/free/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/free/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/free/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/free/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/free/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/free/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/free/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/free/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/free/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/free/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/libre/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/libre/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="8">
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffa726"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/libre/res/drawable-v24/ic_launcher_monochrome.xml
+++ b/app/src/libre/res/drawable-v24/ic_launcher_monochrome.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/libre/res/drawable/ic_app_key_white_24dp.xml
+++ b/app/src/libre/res/drawable/ic_app_key_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+  </group>
+</vector>
--- a/app/src/libre/res/drawable/ic_app_lock_white_24dp.xml
+++ b/app/src/libre/res/drawable/ic_app_lock_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+  </group>
+</vector>
--- a/app/src/libre/res/drawable/ic_launcher_foreground.png
+++ b/app/src/libre/res/drawable/ic_launcher_foreground.png
--- a/app/src/libre/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/libre/res/mipmap-ldpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-ldpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-ldpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-ldpi/ic_launcher_round.png
--- a/app/src/libre/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/libre/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/libre/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/libre/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/libre/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/libre/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/libre/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,78 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kunzisoft.keepass"
    android:installLocation="auto">
    <supports-screens
      android:smallScreens="true"
      android:normalScreens="true"
      android:largeScreens="true"
      android:anyDensity="true" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission
+        android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission
+        android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission
+        android:name="android.permission.VIBRATE"/>
+    <!-- Open apps from links -->
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.CREATE_DOCUMENT" />
+            <data android:mimeType="application/octet-stream" />
+        </intent>
+    </queries>

    <application
        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:theme="@style/KeepassDXStyle.Light"
-        tools:replace="android:theme">
-        <!-- TODO backup API Key -->
+        android:fullBackupContent="@xml/old_backup_rules"
+        android:dataExtractionRules="@xml/backup_rules"
+        android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
+        android:largeHeap="true"
+        android:resizeableActivity="true"
+        android:theme="@style/KeepassDXStyle.Night"
+        tools:targetApi="s">
        <meta-data
            android:name="com.google.android.backup.api_key"
-            android:value="" />
-
-        <!-- Folder picker -->
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/nnf_provider_paths" />
-        </provider>
+            android:value="${googleAndroidBackupAPIKey}" />
        <activity
-            android:name="com.keepassdroid.fileselect.FilePickerStylishActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".KeePass"
-                  android:label="@string/app_name">
+            android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
+            android:launchMode="singleTop"
+            android:exported="true"
+            android:configChanges="keyboardHidden"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity
-            android:name="com.keepassdroid.fileselect.FileSelectActivity"
-            android:launchMode="singleInstance"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="com.keepassdroid.activities.AboutActivity"
-            android:launchMode="singleInstance"
-            android:label="@string/menu_about" />
-        <activity
-            android:name="com.keepassdroid.password.PasswordActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustResize">
+            android:name="com.kunzisoft.keepass.activities.MainCredentialActivity"
+            android:exported="true"
+            android:configChanges="keyboardHidden"
+            android:windowSoftInputMode="adjustResize|stateUnchanged">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="file" />
                <data android:scheme="content" />
-                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="*/*" />
                <data android:host="*" />
                <data android:pathPattern=".*\\.kdb" />
                <data android:pathPattern=".*\\..*\\.kdb" />
@@ -95,58 +89,165 @@
                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
            </intent-filter>
-            <intent-filter tools:ignore="AppLinkUrlError">
+            <intent-filter>
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT"/>
                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream"/>
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/x-kdb" />
+                <data android:mimeType="application/x-kdbx" />
+                <data android:mimeType="application/x-keepass" />
+                <data android:host="*" />
+                <data android:pathPattern=".*" />
+                <data android:pathPattern=".*\\.*" />
+                <data android:pathPattern=".*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
            </intent-filter>
        </activity>
+        <!-- Main Activity -->
        <activity
-            android:name="com.keepassdroid.activities.GroupActivity"
-            android:configChanges="orientation|keyboardHidden"
+            android:name="com.kunzisoft.keepass.activities.GroupActivity"
+            android:exported="false"
+            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustPan">
            <meta-data
                android:name="android.app.default_searchable"
-                android:value="com.keepassdroid.search.SearchResults"
+                android:value="com.kunzisoft.keepass.search.SearchResults"
                android:exported="false"/>
-        </activity>
-        <activity
-            android:name="com.keepassdroid.activities.EntryActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="com.keepassdroid.activities.EntryEditActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="com.keepassdroid.search.SearchResultsActivity"
-            android:launchMode="standard">
            <intent-filter>
                <action android:name="android.intent.action.SEARCH" />
                <category android:name="android.intent.category.DEFAULT" />
-             </intent-filter>
+            </intent-filter>
            <meta-data
                android:name="android.app.searchable"
                android:resource="@xml/searchable" />
        </activity>
-        <activity android:name="com.keepassdroid.settings.SettingsActivity" />
-        <activity android:name="com.keepassdroid.autofill.AutoFillAuthActivity"
-            android:configChanges="orientation|keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.EntryActivity"
+            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.IconPickerActivity"
+            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.KeyGeneratorActivity"
+            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.ImageViewerActivity"
+            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
+            android:windowSoftInputMode="adjustPan" />
+        <!-- About and Settings -->
+        <activity
+            android:name="com.kunzisoft.keepass.activities.AboutActivity"
+            android:launchMode="singleTask"
+            android:label="@string/about" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.AutofillLauncherActivity"
+            android:theme="@style/Theme.Transparent"
+            android:configChanges="keyboardHidden"
+            android:excludeFromRecents="true"/>
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AdvancedUnlockSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AppearanceSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.hardware.HardwareKeyActivity"
+            android:theme="@style/Theme.Transparent" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
+            android:theme="@style/Theme.Transparent"
+            android:launchMode="singleInstance"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth"/>
+                <data android:host="totp"/>
+                <data android:host="hotp"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
+            android:label="@string/keyboard_setting_label"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>

-        <service android:name="com.keepassdroid.services.TimeoutService" />
        <service
-            android:name="com.keepassdroid.autofill.KeeAutofillService"
+            android:name="com.kunzisoft.keepass.services.DatabaseTaskNotificationService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="com.kunzisoft.keepass.services.AttachmentFileNotificationService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="com.kunzisoft.keepass.services.ClipboardEntryNotificationService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="com.kunzisoft.keepass.services.AdvancedUnlockNotificationService"
+            android:enabled="true"
+            android:exported="false" />
+        <!-- Receiver for Autofill -->
+        <service
+            android:name="com.kunzisoft.keepass.autofill.KeeAutofillService"
            android:label="@string/autofill_service_name"
+            android:exported="true"
            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
            <meta-data
                android:name="android.autofill"
                android:resource="@xml/dataset_service" />
-
            <intent-filter>
                <action android:name="android.service.autofill.AutofillService" />
            </intent-filter>
        </service>
+        <service
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikeyboardService"
+            android:label="@string/keyboard_label"
+            android:exported="true"
+            android:permission="android.permission.BIND_INPUT_METHOD" >
+            <meta-data android:name="android.view.im"
+                android:resource="@xml/keyboard_method"/>
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+        </service>
+        <service
+            android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
+            android:enabled="true"
+            android:exported="false" />
+        <receiver
+            android:name="com.kunzisoft.keepass.receivers.DexModeReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.app.action.ENTER_KNOX_DESKTOP_MODE" />
+                <action android:name="android.app.action.EXIT_KNOX_DESKTOP_MODE" />
+            </intent-filter>
+        </receiver>
+
        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
    </application>
-</manifest> 
+</manifest> 
--- a/app/src/main/assets/accent.kdb
+++ b/app/src/main/assets/accent.kdb
--- a/app/src/main/assets/binary-key.kdb
+++ b/app/src/main/assets/binary-key.kdb
--- a/app/src/main/assets/binary.key
+++ b/app/src/main/assets/binary.key
@@ -1,2 +0,0 @@
-v7<EFBFBD><07>gx<67><78><EFBFBD>"<04>Dm<44>]tIWRP<52>g<18>y<15>/˰1<CBB0><31><13>X<0B><>fW[<5B>F%<25><1E>\<5C>up4
-<EFBFBD><EFBFBD>-t;<3B>z<EFBFBD>
--- a/app/src/main/assets/delete.kdb
+++ b/app/src/main/assets/delete.kdb
--- a/app/src/main/assets/fonts/DejaVuSansMono.ttf
+++ b/app/src/main/assets/fonts/DejaVuSansMono.ttf
--- a/app/src/main/assets/fonts/FiraMono-Regular.ttf
+++ b/app/src/main/assets/fonts/FiraMono-Regular.ttf
--- a/app/src/main/assets/kdb_with_xml_keyfile.kdb
+++ b/app/src/main/assets/kdb_with_xml_keyfile.kdb
--- a/app/src/main/assets/key-only.kdbx
+++ b/app/src/main/assets/key-only.kdbx
--- a/app/src/main/assets/keyfile-binary.kdbx
+++ b/app/src/main/assets/keyfile-binary.kdbx
--- a/Show More
+++ b/Show More