Release v1.2-beta5

Merge pull request #460 from alexbakker/fix-intro-back
Disable wizard mode when the done slide of the intro is reached
2020-06-10 14:59:22 +02:00 · 2020-06-10 10:51:35 +02:00 · 2020-06-10 09:59:37 +02:00 · 2020-06-08 17:49:35 +02:00 · 2020-06-08 10:35:44 +02:00 · 2020-06-07 23:33:21 +02:00
317 changed files with 14610 additions and 3916 deletions
@@ -0,0 +1 @@
+custom: ['https://www.buymeacoffee.com/beemdevelopment']
@@ -0,0 +1,34 @@
+---
+name: "Bug report"
+about: "Create a report to help us fix a bug"
+labels: bug
+---
+
+<!-- Please read the [bug reports section of the contribution
+guidelines](/CONTRIBUTING.md#bug-reports) before submitting an issue. -->
+
+###### Info
+
+* __Version__: 
+* __Source__: (Google Play/GitHub/F-Droid/?)
+* __Vault encrypted:__ Yes (with biometric unlock)/Yes/No
+* __Device:__
+* __Android version and ROM:__
+
+###### Steps to reproduce
+
+A detailed list of reproduction steps.
+
+###### What do you expect to happen?
+
+...
+
+###### What happens instead?
+
+...
+
+###### Log
+
+```
+If applicable, paste the debug log here.
+```
@@ -0,0 +1,6 @@
+---
+name: "Feature request"
+about: "Suggest a new feature for this project"
+labels: proposal
+---
+
@@ -16,6 +16,7 @@ out/
 # Gradle files
 .gradle/
 build/
+release/

 # Local configuration file (sdk path, etc)
 local.properties
@@ -34,8 +35,8 @@ captures/

 # Intellij
 *.iml
-.idea/workspace.xml
-.idea/libraries
+.idea/

 # Keystore files
 *.jks
+crowdin.properties
@@ -1 +0,0 @@
-Aegis
@@ -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>
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
@@ -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>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="F:\Android\Android Studio\gradle\gradle-2.14.1" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
@@ -1,33 +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="JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Aegis.iml" filepath="$PROJECT_DIR$/Aegis.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
@@ -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>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
@@ -0,0 +1,15 @@
+language: android
+env:
+  global:
+    - ANDROID_HOME=/usr/local/android-sdk
+android:
+  components:
+  - android-29
+  - build-tools-29.0.2
+before_install:
+  - mkdir -p $ANDROID_HOME/licenses
+  - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
+  - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/licenses/android-sdk-license
+  - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" >> $ANDROID_HOME/licenses/android-sdk-license
+script:
+  - ./gradlew build test
@@ -0,0 +1,106 @@
+# Contributing
+
+There are a couple of ways to contribute to Aegis. This document contains some
+general guidelines for each type of contribution.
+
+## Pull requests
+
+If you're planning on adding a new feature or making other large changes, please
+discuss it with us first through a proposal on GitHub. Discussing your idea with
+us first ensures that everyone is on the same page before you start working on
+your change. We don't like rejecting pull requests.
+
+## Bug reports
+
+We use GitHub's issue tracker to track bugs. Bug reports must follow [the
+template](.github/ISSUE_TEMPLATE/bug.md). If a bug report does not follow the
+template and does not contain enough information, it will be closed without a
+response. Duplicate bug reports receive the same treatment.
+
+Please consider trying to find the root cause yourself first and perhaps even
+send us a patch that fixes the issue! We're happy to help you if you get stuck
+along the way.
+
+### Capturing a log with ADB
+
+In some cases, we ask our users to obtain a debug log from their device. This is
+typically only necessary if Aegis:
+- Is unable to recover from an error and crashes.
+- Only shows a generic error to the user, but writes a more detailed one to the
+  log.
+
+Capturing a log with the Android Debug Bridge (ADB) allows us to see the stack
+trace and the exception that occurred.
+
+#### Preparation
+
+Before you can capture a log, you first need to go through a one-time setup
+process on your Android device and computer.
+
+##### Prerequisites
+
+- Your Android device.
+- A computer with Windows, Mac or Linux.
+- A USB cable to connect your Android device to your computer.
+
+##### Setup
+
+__On your Android device__:
+
+1. Navigate to ``Settings -> About``, scroll down and start tapping on the build
+   number until developer options are enabled.
+2. Navigate to ``Settings -> System -> Developer options`` and enable ``USB
+   debugging``.
+
+These navigation steps may differ slightly across Android versions and ROMs.
+
+__On your computer__:
+
+3. Download and extract the SDK platform tools for Android:
+   https://developer.android.com/studio/releases/platform-tools.
+4. Start your terminal emulator (If you're on Windows, start PowerShell) and
+   navigate to the folder where platform-tools was extracted.
+5. Execute ``adb devices``.
+
+__On your Android device__:
+
+6. A prompt will appear. Select "Always allow from this computer" and accept the
+   connection.
+
+#### Capturing a log
+
+__On your Android device__:
+
+1. Start Aegis.
+
+__On your PC__:
+
+2. Start your terminal emulator (If you're on Windows, start PowerShell) and
+   navigate to the folder where platform-tools was extracted.
+3. Start a log capture by executing the following commands.
+
+    ```
+    adb logcat -c
+    adb logcat -f debug.log
+    ```
+
+    The logcat command captures the full system log by default, which may expose
+    some sensitive information. While this information can sometimes help with
+    finding the root cause of the issue, it is not always necessary. To only
+    capture the log output of Aegis, replace the last logcat command with the
+    one below:
+
+    ```sh
+    adb logcat --pid=$(adb shell pidof -s com.beemdevelopment.aegis) -f debug.log
+    ```
+    _If you are using a debug APK, replace ``com.beemdevelopment.aegis`` with
+   ``com.beemdevelopment.aegis.debug``._
+
+__On your Android device__:
+
+4. Reproduce the issue.
+
+__On your PC__:
+
+5. Stop the log capture with Ctrl+C.
+6. Attach the ``debug.log`` file to your issue on GitHub.
@@ -2,63 +2,130 @@

 Aegis is a free, secure and open source 2FA app for Android.

+Aegis' security design and vault format is described in detail in [this
+document](docs/vault.md).
+
 # Features

 - Free and open source
 - Secure
  - Encryption (AES-256)
    - Password (scrypt)
-	- Fingerprint (Android Keystore)
+    - Biometrics (Android Keystore)
  - Screen capture prevention
  - Tap to reveal ability
 - Multiple ways to add new entries
  - Scan QR code
  - Enter details manually
-  - Import
+  - Import from files
    - andOTP
    - FreeOTP
+    - Aegis
+  - Import from apps (requires root):
+    - Google Authenticator
+    - Steam
 - Supported algorithms:
   - HOTP ([RFC 4226](https://tools.ietf.org/html/rfc4226))
   - TOTP ([RFC 6238](https://tools.ietf.org/html/rfc6238))
+   - Steam ([RFC 6238](https://tools.ietf.org/html/rfc6238) with custom
+     encoding)
 - Compatible with Google Authenticator
 - Organization
  - Custom or default icons
  - Drag and drop
  - Custom groups
  - Advanced entry editing
- Material design
-  - Light and dark themes
+- Material design with multiple themes:
+  - Light theme
+  - Dark theme
+  - Amoled / true dark theme
 - Export (plaintext or encrypted)

 ## Screenshots

-[<img width=200 alt="Main Activity" src="metadata/en-US/images/phoneScreenshots/screenshot_main.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot_main.png?raw=true)
-[<img width=200 alt="Settings Activity" src="metadata/en-US/images/phoneScreenshots/screenshot_settings.png?raw=true">](/metadata/en-US/images/phoneScreenshots/screenshot_settings.png?raw=true)
-[<img width=200 alt="Edit Activity" src="metadata/en-US/images/phoneScreenshots/screenshot_edit.png?raw=true">](/metadata/en-US/images/phoneScreenshots/screenshot_edit.png?raw=true).png
+[<img width=200 alt="Screenshot 1"
+src="metadata/en-US/images/phoneScreenshots/screenshot1.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot1.png?raw=true)
+[<img width=200 alt="Screenshot 2"
+src="metadata/en-US/images/phoneScreenshots/screenshot2.png?raw=true">](/metadata/en-US/images/phoneScreenshots/screenshot2.png?raw=true)
+[<img width=200 alt="Screenshot 3"
+src="metadata/en-US/images/phoneScreenshots/screenshot3.png?raw=true">](/metadata/en-US/images/phoneScreenshots/screenshot3.png?raw=true)

-[<img width=200 alt="Main Activity" src="metadata/en-US/images/phoneScreenshots/screenshot_main_group.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot_main_group.png?raw=true)
-[<img width=200 alt="Main Activity" src="metadata/en-US/images/phoneScreenshots/screenshot_main_dark.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot_main_dark.png?raw=true)
+[<img width=200 alt="Screenshot 4"
+src="metadata/en-US/images/phoneScreenshots/screenshot4.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot4.png?raw=true)
+[<img width=200 alt="Screenshot 5"
+src="metadata/en-US/images/phoneScreenshots/screenshot5.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot5.png?raw=true)
+[<img width=200 alt="Screenshot 6"
+src="metadata/en-US/images/phoneScreenshots/screenshot6.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot6.png?raw=true)
+
+[<img width=200 alt="Screenshot 7"
+src="metadata/en-US/images/phoneScreenshots/screenshot7.png?raw=true">](metadata/en-US/images/phoneScreenshots/screenshot7.png?raw=true)

 ## Downloads

-Aegis is available in the Google Play Store.
+Aegis is available on the Google Play Store and on F-Droid.

-[<img height=80 alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" />](http://play.google.com/store/apps/details?id=com.beemdevelopment.aegis)
+[<img height=80 alt="Get it on Google Play"
+src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+/>](http://play.google.com/store/apps/details?id=com.beemdevelopment.aegis)
+[<img height="80" alt="Get it on F-Droid"
+src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+/>](https://f-droid.org/app/com.beemdevelopment.aegis)
+      
+### Verification

-There are plans to make it available on F-Droid as well.
+APK releases on Google Play and GitHub are signed using the same key. They can
+be verified using
+[apksigner](https://developer.android.com/studio/command-line/apksigner.html#options-verify):
+
+```
+apksigner verify --print-certs --verbose aegis.apk
+```
+
+The output should look like:
+
+```
+Verifies
+Verified using v1 scheme (JAR signing): true
+Verified using v2 scheme (APK Signature Scheme v2): true
+```
+
+The certificate fingerprints should correspond to the ones listed below:
+
+```
+Owner: CN=Beem Development
+Issuer: CN=Beem Development
+Serial number: 172380c
+Valid from: Sat Feb 09 14:05:49 CET 2019 until: Wed Feb 03 14:05:49 CET 2044
+Certificate fingerprints:
+   MD5:  AA:EE:86:DB:C7:B8:88:9F:1F:C9:D0:7A:EC:37:36:32
+   SHA1: 59:FB:63:B7:1F:CE:95:74:6C:EB:1E:1A:CB:2C:2E:45:E5:FF:13:50
+   SHA256: C6:DB:80:A8:E1:4E:52:30:C1:DE:84:15:EF:82:0D:13:DC:90:1D:8F:E3:3C:F3:AC:B5:7B:68:62:D8:58:A8:23
+```
+
+### Community
+
+- [aegis-icons](https://github.com/krisu5/aegis-icons)
+
+  While we're still working on better icon support in Aegis, krisu5 has started
+  a third-party repository for icons that you may want to check out.
+
+  [<img width=500 alt="Aegis-icons preview"
+  src="https://raw.githubusercontent.com/krisu5/aegis-icons/master/showcase.png">](https://github.com/krisu5/aegis-icons)

 ## Libraries

 - [TextDrawable](https://github.com/amulyakhare/TextDrawable) by Amulya Khare
- [FloatingActionButton](https://github.com/Clans/FloatingActionButton) by Dmytro Tarianyk
+- [FloatingActionButton](https://github.com/Clans/FloatingActionButton) by
+  Dmytro Tarianyk
 - [AppIntro](https://github.com/AppIntro/AppIntro) by Paolo Rotolo
 - [Krop](https://github.com/avito-tech/krop) by Avito Technology
 - [SpongyCastle](https://github.com/rtyley/spongycastle) by Roberto Tyley
- [Swirl](https://github.com/mattprecious/swirl) by Matthew Precious
- [CircleImageView](https://github.com/hdodenhof/CircleImageView) by Henning Dodenhof
+- [CircleImageView](https://github.com/hdodenhof/CircleImageView) by Henning
+  Dodenhof
 - [barcodescanner](https://github.com/dm77/barcodescanner) by Dushyanth
 - [libsu](https://github.com/topjohnwu/libsu) by John Wu

 ## License

-This project is licensed under the GNU General Public License v3.0. See the [LICENSE](LICENSE) file for details.
+This project is licensed under the GNU General Public License v3.0. See the
+[LICENSE](LICENSE) file for details.
@@ -1,52 +1,134 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.protobuf'
+
+def getCmdOutput = { cmd ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine cmd
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+def getGitHash = { -> return getCmdOutput(["git", "rev-parse", "--short", "HEAD"]) }
+def getGitBranch = { -> return getCmdOutput(["git", "rev-parse", "--abbrev-ref", "HEAD"]) }

 android {
-    compileSdkVersion 28
+    compileSdkVersion 29

    defaultConfig {
        applicationId "com.beemdevelopment.aegis"
-        minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 3
-        versionName "0.2"
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 34
+        versionName "1.2-beta5"
+        multiDexEnabled true
+        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
+        buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\""
    }
+
+    lintOptions {
+        abortOnError true
+        disable "MissingTranslation"
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            ignoreFailures false
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+            }
+        }
+    }
+
    buildTypes {
        debug {
-            minifyEnabled false
            applicationIdSuffix ".debug"
-            manifestPlaceholders = [title:"AegisDev", iconName:"ic_launcher_debug"]
+            manifestPlaceholders = [title: "AegisDev", iconName: "ic_launcher_debug"]
+            resValue "bool", "pref_secure_screen_default", "false"
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                obfuscate false
+                optimizeCode false
+                proguardFiles getDefaultProguardFile('proguard-defaults.txt'), 'proguard-rules.pro'
+            }
        }
        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            manifestPlaceholders = [title:"Aegis", iconName:"ic_launcher"]
+            manifestPlaceholders = [title: "Aegis", iconName: "ic_launcher"]
+            resValue "bool", "pref_secure_screen_default", "true"
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                obfuscate false
+                optimizeCode true
+                proguardFiles getDefaultProguardFile('proguard-defaults.txt'), 'proguard-rules.pro'
+            }
        }
    }
+
    compileOptions {
        targetCompatibility 1.8
        sourceCompatibility 1.8
    }
 }

+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.8.0'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
 dependencies {
-    def libsuVersion = '2.3.2'
+    def glideVersion = '4.11.0'
+    def guavaVersion = '29.0'
+    def junitVersion = '5.6.2'
+    def libsuVersion = '2.5.1'
+
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
+
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.biometric:biometric:1.0.1"
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
    implementation 'com.getbase:floatingactionbutton:1.10.1'
-    implementation 'com.github.apl-devs:appintro:v4.2.2'
-    implementation 'com.github.avito-tech:krop:3e65e12'
-    implementation 'com.madgag.spongycastle:core:1.58.0.0'
-    implementation 'com.mattprecious.swirl:swirl:1.0.0'
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
-    implementation 'me.dm7.barcodescanner:zxing:1.9'
+    implementation 'com.github.apl-devs:appintro:6.0.0'
+    implementation 'com.github.avito-tech:krop:0.44'
+    implementation "com.github.bumptech.glide:annotations:${glideVersion}"
+    implementation "com.github.bumptech.glide:glide:${glideVersion}"
+    implementation("com.github.bumptech.glide:recyclerview-integration:${glideVersion}") {
+        transitive = false
+    }
    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
    implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
-    testImplementation 'junit:junit:4.12'
+    implementation "com.google.guava:guava:${guavaVersion}-android"
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.protobuf:protobuf-javalite:3.12.1'
+    implementation "com.mikepenz:iconics-core:3.2.5"
+    implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
+    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
+    implementation 'net.lingala.zip4j:zip4j:2.6.0'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
+
+    testImplementation "com.google.guava:guava:${guavaVersion}-jre"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
 }
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore regexp="X509LDAPCertStoreSpi" />
+    </issue>
+</lint>
@@ -15,3 +15,8 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep class com.beemdevelopment.aegis.importers.** { *; }
+
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-keep class !org.bouncycastle.jce.provider.X509LDAPCertStoreSpi { *; }
@@ -1,13 +0,0 @@
-package com.beemdevelopment.aegis;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
@@ -3,61 +3,75 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.beemdevelopment.aegis">

-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />

    <application
-        android:name="com.beemdevelopment.aegis.AegisApplication"
-        android:allowBackup="true"
+        android:name=".AegisApplication"
+        android:allowBackup="false"
        android:icon="@mipmap/${iconName}"
        android:label="Aegis"
        android:supportsRtl="true"
-        tools:replace="android:theme"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:theme="@style/AppTheme.NoActionBar"
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:replace="android:theme">
+        <activity android:name=".ui.TransferEntriesActivity"
+            android:label="@string/title_activity_transfer" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.MainActivity"
+            android:name=".ui.AboutActivity"
+            android:label="@string/title_activity_about" />
+        <activity
+            android:name=".ui.SelectEntriesActivity"
+            android:label="Select entries" />
+        <activity
+            android:name=".ui.MainActivity"
            android:label="${title}"
-            android:alwaysRetainTaskState="true"
            android:launchMode="singleTask">
            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </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" />
            </intent-filter>
        </activity>
        <activity
-            android:name="com.beemdevelopment.aegis.ui.ScannerActivity"
+            android:name=".ui.ScannerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="Scan a QR code"
-            android:theme="@style/AppTheme.Fullscreen"
-            android:screenOrientation="portrait"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
+            android:screenOrientation="portrait" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.EditEntryActivity"
-            android:label="Edit profile"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:name=".ui.EditEntryActivity"
+            android:label="Edit entry" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.IntroActivity"
-            android:theme="@style/Theme.Intro"
-            android:launchMode="singleTop">
-        </activity>
+            android:name=".ui.IntroActivity"
+            android:theme="@style/Theme.Intro" />
+        <activity android:name=".ui.AuthActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.AuthActivity"
-            android:launchMode="singleTop">
-        </activity>
-        <activity android:name="com.beemdevelopment.aegis.ui.PreferencesActivity">
-        </activity>
+            android:name=".ui.PreferencesActivity"
+            android:label="@string/title_activity_preferences" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.SlotManagerActivity"
-            android:label="Manage key slots"
-            android:theme="@style/AppTheme.TransparentActionBar">
-        </activity>
+            android:name=".ui.SlotManagerActivity"
+            android:label="Manage key slots" />
        <activity
-            android:name="com.beemdevelopment.aegis.ui.GroupManagerActivity"
-            android:label="Manage groups"
-            android:theme="@style/AppTheme.TransparentActionBar">
-        </activity>
+            android:name=".ui.GroupManagerActivity"
+            android:label="Manage groups" />
+
+        <service android:name=".services.NotificationService" />
    </application>
-</manifest>
+
+</manifest>
@@ -0,0 +1,154 @@
+<html>
+    <head>
+        <style type="text/css">
+            * {
+            word-wrap: break-word;
+            }
+            body {
+                background-color: %1$s;
+                color: %2$s;
+            }
+            ul {
+                list-style-position: inside;
+                padding: 0;
+                padding-left: 5px;
+                margin-bottom: 5px;
+            }
+            li {
+                padding-bottom: 8px;
+                list-style-position: outside;
+                margin-left: 1em;
+            }
+            h4 {
+                margin-top: 0px;
+                margin-bottom: 0px;
+            }
+            h3 {
+                margin-bottom: 7px;
+                padding-top: 7px;
+            }
+        </style>
+    </head>
+    <body>
+        <div></div>
+        <h3>Version 1.2</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Add navigation bar color to themes</li>
+            <li>Add support for importing from TOTP Authenticator</li>
+            <li>Add support for importing from Microsoft Authenticator</li>
+            <li>Add support for importing from Authenticator Plus</li>
+            <li>Add support for importing a plain text Google Authenticator URI file</li>
+            <li>Add support for importing from the new Google Authenticator export QR codes</li>
+            <li>Add support for otpauth://steam URI's</li>
+            <li>Add an option to copy tokens on tap (and disable it by default)</li>
+            <li>Improve method to notify users on copy</li>
+            <li>Add support for backups</li>
+            <li>Improve multiselect flow</li>
+            <li>Automatically adapt to system theme</li>
+            <li>Add setting to change from 3 digit group size to 2 digit group size</li>
+            <li>Use most frequent period to show progress</li>
+            <li>Append a timestamp to the filename of exported vaults</li>
+            <li>Add Hungarian translation</li>
+            <li>Add Turkish translation</li>
+            <li>Display a warning if automatic time sync is not enabled</li>
+            <li>Minor card entry layout overhaul</li>
+            <li>Ability to transfer tokens with qr codes</li>
+            <li>Lockscreen overhaul</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Improve overall exception handling and error feedback to the user</li>
+            <li>Improve icon editing flow</li>
+            <li>Protect writes of the vault file against corruption with AtomicFile</li>
+            <li>Make the parsing logic of the QR code URI more robust</li>
+            <li>Importing from Authy now asks for password if needed</li>
+            <li>Update Russian localization</li>
+            <li>Increase password reminder period to 30 days</li>
+            <li>Fix importing andOTP backups with more than 10000 PBKDF iterations</li>
+            <li>Respect the global animator duration scale setting</li>
+        </ul>
+        <p>Various other minor improvements</p>
+        <h3>Version 1.1.4</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>The export filename was missing the ".json" extension in some cases</li>
+        </ul>
+        <h3>Version 1.1.3</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Password reminder for users who use biometric unlock</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Tokens would not refresh in some rare cases</li>
+        </ul>
+        <h3>Version 1.1.2</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Ability to select multiple entries</li>
+            <li>Ability to select a file location when exporting the vault (including cloud providers like Google Drive)</li>
+            <li>Explanation and warning for the security options</li>
+            <li>Removed external storage permissions</li>
+        </ul>
+        <h3>Version 1.1.1</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Exporting the vault did not work on Android 10</li>
+        </ul>
+        <h3>Version 1.1</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Support for other types of biometric authentication (i.e. Pixel 4 face unlock)</li>
+            <li>Support for importing from WinAuth</li>
+            <li>Support for Chromebooks</li>
+            <li>Option to highlight entries when tapped</li>
+            <li>Filter for ungrouped tokens</li>
+            <li>Ability to search for token account names</li>
+            <li>Simplified Chinese translation (thanks RunningMelos!)</li>
+            <li>Updated translations (thanks to all Crowdin contributers!)</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>The behavior of highlighting and revealing entries was inconsistent</li>
+            <li>The changelog dialog didn't work</li>
+            <li>The persistent notification was shown even after the app was killed</li>
+        </ul>
+        <h3>Version 1.0.3</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Support for andOTP's new backup file format</li>
+        </ul>
+        <h3>Version 1.0.2</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Search feature on Huawei devices</li>
+        </ul>
+        <h4>Notes</h4>
+        <ul>
+            <li>Disabled automatic backups through the Google Play Store</li>
+        </ul>
+        <h3>Version 1.0.1</h3>
+        <h4>Notes</h4>
+        <ul>
+            <li>Temporarily disabled search feature on Huawei devices</li>
+        </ul>
+        <h3>Version 1.0</h3>
+        <h4>New</h4>
+        <ul>
+            <li>New icon</li>
+            <li>Overhaul of interaction with the entry list</li>
+            <li>Persistent notification while the vault is unlocked</li>
+            <li>Language override option</li>
+            <li>Support for importing from FreeOTP+</li>
+            <li>Ability to toggle password visibility during unlock</li>
+            <li>Support for deeplinking otpauth URIs</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Bad overall performance and high battery usage</li>
+            <li>Codes with an uneven number of digits are displayed incorrectly</li>
+            <li>Crash when entering a large value for OTP period</li>
+        </ul>
+    </body>
+</html>
@@ -1,35 +1,109 @@
 package com.beemdevelopment.aegis;

 import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;

-import com.beemdevelopment.aegis.db.DatabaseManager;
-import com.beemdevelopment.aegis.ui.MainActivity;
-
 import androidx.annotation.RequiresApi;

+import com.beemdevelopment.aegis.services.NotificationService;
+import com.beemdevelopment.aegis.ui.MainActivity;
+import com.beemdevelopment.aegis.vault.Vault;
+import com.beemdevelopment.aegis.vault.VaultFile;
+import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultManager;
+import com.beemdevelopment.aegis.vault.VaultManagerException;
+import com.mikepenz.iconics.Iconics;
+import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
+
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;

 public class AegisApplication extends Application {
-    private DatabaseManager _manager;
+    private VaultFile _vaultFile;
+    private VaultManager _manager;
    private Preferences _prefs;
+    private List<LockListener> _lockListeners;
+
+    private static final String CODE_LOCK_STATUS_ID = "lock_status_channel";
+    private static final String CODE_LOCK_VAULT_ACTION = "lock_vault";

    @Override
    public void onCreate() {
        super.onCreate();
-        _manager = new DatabaseManager(this);
        _prefs = new Preferences(this);
+        _lockListeners = new ArrayList<>();
+
+        Iconics.init(this);
+        Iconics.registerFont(new MaterialDesignIconic());
+
+        // listen for SCREEN_OFF events
+        ScreenOffReceiver receiver = new ScreenOffReceiver();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+        intentFilter.addAction(CODE_LOCK_VAULT_ACTION);
+        registerReceiver(receiver, intentFilter);

        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
            initAppShortcuts();
        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            initNotificationChannels();
+        }
    }

-    public DatabaseManager getDatabaseManager() {
+    public boolean isVaultLocked() {
+        return _manager == null;
+    }
+
+    /**
+     * Loads the vault file from disk at the default location, stores an internal
+     * reference to it for future use and returns it. This must only be called before
+     * initVaultManager() or after lock().
+     */
+    public VaultFile loadVaultFile() throws VaultManagerException {
+        if (!isVaultLocked()) {
+            throw new AssertionError("loadVaultFile() may only be called before initVaultManager() or after lock()");
+        }
+
+        if (_vaultFile == null) {
+            _vaultFile = VaultManager.readFile(this);
+        }
+
+        return _vaultFile;
+    }
+
+    /**
+     * Initializes the vault manager by decrypting the given vaultFile with the given
+     * creds. This removes the internal reference to the raw vault file.
+     */
+    public VaultManager initVaultManager(VaultFile vaultFile, VaultFileCredentials creds) throws VaultManagerException {
+        _vaultFile = null;
+        _manager = VaultManager.init(this, vaultFile, creds);
+        return _manager;
+    }
+
+    /**
+     * Initializes the vault manager with the given vault and creds. This removes the
+     * internal reference to the raw vault file.
+     */
+    public VaultManager initVaultManager(Vault vault, VaultFileCredentials creds) {
+        _vaultFile = null;
+        _manager = new VaultManager(this, vault, creds);
+        return _manager;
+    }
+
+    public VaultManager getVaultManager() {
        return _manager;
    }

@@ -37,6 +111,27 @@ public class AegisApplication extends Application {
        return _prefs;
    }

+    public boolean isAutoLockEnabled() {
+        return _prefs.isAutoLockEnabled() && !isVaultLocked() && _manager.isEncryptionEnabled() ;
+    }
+
+    public void registerLockListener(LockListener listener) {
+        _lockListeners.add(listener);
+    }
+
+    public void unregisterLockListener(LockListener listener) {
+        _lockListeners.remove(listener);
+    }
+
+    public void lock() {
+        _manager = null;
+        for (LockListener listener : _lockListeners) {
+            listener.onLocked();
+        }
+
+        stopService(new Intent(AegisApplication.this, NotificationService.class));
+    }
+
    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
    private void initAppShortcuts() {
        ShortcutManager shortcutManager = getSystemService(ShortcutManager.class);
@@ -49,12 +144,39 @@ public class AegisApplication extends Application {
        intent.setAction(Intent.ACTION_MAIN);

        ShortcutInfo shortcut = new ShortcutInfo.Builder(this, "shortcut_new")
-                .setShortLabel(getString(R.string.new_profile))
-                .setLongLabel(getString(R.string.add_new_profile))
-                .setIcon(Icon.createWithResource(this, R.drawable.qr_scanner))
+                .setShortLabel(getString(R.string.new_entry))
+                .setLongLabel(getString(R.string.add_new_entry))
+                .setIcon(Icon.createWithResource(this, R.drawable.ic_qr_code))
                .setIntent(intent)
                .build();

        shortcutManager.setDynamicShortcuts(Collections.singletonList(shortcut));
    }
+
+    private void initNotificationChannels() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = getString(R.string.channel_name_lock_status);
+            String description = getString(R.string.channel_description_lock_status);
+            int importance = NotificationManager.IMPORTANCE_LOW;
+
+            NotificationChannel channel = new NotificationChannel(CODE_LOCK_STATUS_ID, name, importance);
+            channel.setDescription(description);
+
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+
+    public class ScreenOffReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (isAutoLockEnabled()) {
+                lock();
+            }
+        }
+    }
+
+    public interface LockListener {
+        void onLocked();
+    }
 }
@@ -0,0 +1,7 @@
+package com.beemdevelopment.aegis;
+
+public enum CancelAction {
+    KILL,
+    CLOSE
+}
+
@@ -2,35 +2,81 @@ package com.beemdevelopment.aegis;

 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Build;
 import android.preference.PreferenceManager;

+import java.util.Date;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
 public class Preferences {
    private SharedPreferences _prefs;

    public Preferences(Context context) {
        _prefs = PreferenceManager.getDefaultSharedPreferences(context);
-    }

-    public boolean isDarkModeEnabled() {
-        return _prefs.getBoolean("pref_dark_mode", false);
+        if (getPasswordReminderTimestamp().getTime() == 0) {
+            resetPasswordReminderTimestamp();
+        }
    }

    public boolean isTapToRevealEnabled() {
        return _prefs.getBoolean("pref_tap_to_reveal", false);
    }

+    public boolean isSearchAccountNameEnabled() {
+        return _prefs.getBoolean("pref_search_names", false);
+    }
+
+    public boolean isEntryHighlightEnabled() {
+        return _prefs.getBoolean("pref_highlight_entry", false);
+    }
+
    public boolean isSecureScreenEnabled() {
-        return _prefs.getBoolean("pref_secure_screen", true);
+        // screen security should be enabled by default, but not for debug builds
+        return _prefs.getBoolean("pref_secure_screen", !BuildConfig.DEBUG);
+    }
+
+    public boolean isPasswordReminderEnabled() {
+        return _prefs.getBoolean("pref_password_reminder", true);
+    }
+
+    public boolean isPasswordReminderNeeded() {
+        long diff = new Date().getTime() - getPasswordReminderTimestamp().getTime();
+        long days = TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS);
+        return isPasswordReminderEnabled() && days >= 30;
+    }
+
+    public Date getPasswordReminderTimestamp() {
+        return new Date(_prefs.getLong("pref_password_reminder_counter", 0));
+    }
+
+    public void resetPasswordReminderTimestamp() {
+        _prefs.edit().putLong("pref_password_reminder_counter", new Date().getTime()).apply();
    }

    public boolean isAccountNameVisible() {
-        return _prefs.getBoolean("pref_account_name", false);
+        return _prefs.getBoolean("pref_account_name", true);
+    }
+
+    public int getCodeGroupSize() {
+        if (_prefs.getBoolean("pref_code_group_size", false)) {
+            return 2;
+        } else {
+            return 3;
+        }
    }

    public boolean isIntroDone() {
        return _prefs.getBoolean("pref_intro", false);
    }

+    public boolean isAutoLockEnabled() {
+        return _prefs.getBoolean("pref_auto_lock", true);
+    }
+
    public void setIntroDone(boolean done) {
        _prefs.edit().putBoolean("pref_intro", done).apply();
    }
@@ -39,12 +85,90 @@ public class Preferences {
        _prefs.edit().putInt("pref_tap_to_reveal_time", number).apply();
    }

+    public void setCurrentSortCategory(SortCategory category) {
+        _prefs.edit().putInt("pref_current_sort_category", category.ordinal()).apply();
+    }
+
+    public SortCategory getCurrentSortCategory() {
+        return SortCategory.fromInteger(_prefs.getInt("pref_current_sort_category", 0));
+    }
+
    public int getTapToRevealTime() {
        return _prefs.getInt("pref_tap_to_reveal_time", 30);
    }

+    public Theme getCurrentTheme() {
+        return Theme.fromInteger(_prefs.getInt("pref_current_theme", Theme.SYSTEM.ordinal()));
+    }
+
+    public void setCurrentTheme(Theme theme) {
+        _prefs.edit().putInt("pref_current_theme", theme.ordinal()).apply();
+    }
+
+    public ViewMode getCurrentViewMode() {
+        return ViewMode.fromInteger(_prefs.getInt("pref_current_view_mode", 0));
+    }
+
+    public void setCurrentViewMode(ViewMode viewMode) {
+        _prefs.edit().putInt("pref_current_view_mode", viewMode.ordinal()).apply();
+    }

    public int getTimeout() {
        return _prefs.getInt("pref_timeout", -1);
    }
+
+    public Locale getLocale() {
+        String lang = _prefs.getString("pref_lang", "system");
+
+        if (lang.equals("system")) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                return Resources.getSystem().getConfiguration().getLocales().get(0);
+            } else {
+                return Resources.getSystem().getConfiguration().locale;
+            }
+        }
+
+        return new Locale(lang);
+    }
+
+    public boolean isBackupsEnabled() {
+        return _prefs.getBoolean("pref_backups", false);
+    }
+
+    public void setIsBackupsEnabled(boolean enabled) {
+        _prefs.edit().putBoolean("pref_backups", enabled).apply();
+    }
+
+    public Uri getBackupsLocation() {
+        String str = _prefs.getString("pref_backups_location", null);
+        if (str != null) {
+            return Uri.parse(str);
+        }
+
+        return null;
+    }
+
+    public void setBackupsLocation(Uri location) {
+        _prefs.edit().putString("pref_backups_location", location == null ? null : location.toString()).apply();
+    }
+
+    public int getBackupsVersionCount() {
+        return _prefs.getInt("pref_backups_versions", 5);
+    }
+
+    public void setBackupsVersionCount(int versions) {
+        _prefs.edit().putInt("pref_backups_versions", versions).apply();
+    }
+
+    public boolean isTimeSyncWarningEnabled() {
+        return _prefs.getBoolean("pref_warn_time_sync", true);
+    }
+
+    public void setIsTimeSyncWarningEnabled(boolean enabled) {
+        _prefs.edit().putBoolean("pref_warn_time_sync", enabled).apply();
+    }
+
+    public boolean isCopyOnTapEnabled() {
+        return _prefs.getBoolean("pref_copy_on_tap", false);
+    }
 }
@@ -0,0 +1,64 @@
+package com.beemdevelopment.aegis;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.helpers.comparators.AccountNameComparator;
+import com.beemdevelopment.aegis.helpers.comparators.IssuerNameComparator;
+
+import java.util.Collections;
+import java.util.Comparator;
+
+public enum SortCategory {
+    CUSTOM,
+    ACCOUNT,
+    ACCOUNT_REVERSED,
+    ISSUER,
+    ISSUER_REVERSED;
+
+    private static SortCategory[] _values;
+
+    static {
+        _values = values();
+    }
+
+    public static SortCategory fromInteger(int x) {
+        return _values[x];
+    }
+
+    public Comparator<VaultEntry> getComparator() {
+        Comparator<VaultEntry> comparator = null;
+
+        switch (this) {
+            case ACCOUNT:
+                comparator = new AccountNameComparator();
+                break;
+            case ACCOUNT_REVERSED:
+                comparator = Collections.reverseOrder(new AccountNameComparator());
+                break;
+            case ISSUER:
+                comparator = new IssuerNameComparator();
+                break;
+            case ISSUER_REVERSED:
+                comparator = Collections.reverseOrder(new IssuerNameComparator());
+                break;
+        }
+
+        return comparator;
+    }
+
+    public int getMenuItem() {
+        switch (this) {
+            case CUSTOM:
+                return R.id.menu_sort_custom;
+            case ACCOUNT:
+                return R.id.menu_sort_alphabetically_name;
+            case ACCOUNT_REVERSED:
+                return R.id.menu_sort_alphabetically_name_reverse;
+            case ISSUER:
+                return R.id.menu_sort_alphabetically;
+            case ISSUER_REVERSED:
+                return R.id.menu_sort_alphabetically_reverse;
+            default:
+                return R.id.menu_sort_custom;
+        }
+    }
+}
@@ -0,0 +1,19 @@
+package com.beemdevelopment.aegis;
+
+public enum Theme {
+    LIGHT,
+    DARK,
+    AMOLED,
+    SYSTEM,
+    SYSTEM_AMOLED;
+
+    private static Theme[] _values;
+
+    static {
+        _values = values();
+    }
+
+    public static Theme fromInteger(int x) {
+        return _values[x];
+    }
+}
@@ -0,0 +1,44 @@
+package com.beemdevelopment.aegis;
+
+import androidx.annotation.LayoutRes;
+
+public enum ViewMode {
+    NORMAL,
+    COMPACT,
+    SMALL;
+
+    private static ViewMode[] _values;
+
+    static {
+        _values = values();
+    }
+
+    public static ViewMode fromInteger(int x) {
+        return _values[x];
+    }
+
+    @LayoutRes
+    public int getLayoutId() {
+        switch (this) {
+            case NORMAL:
+                return R.layout.card_entry;
+            case COMPACT:
+                return R.layout.card_entry_compact;
+            case SMALL:
+                return R.layout.card_entry_small;
+            default:
+                return R.layout.card_entry;
+        }
+    }
+
+    /**
+     * Retrieves the height (in dp) that the divider between entries should have in this view mode.
+     */
+    public float getDividerHeight() {
+        if (this == ViewMode.COMPACT) {
+            return 0;
+        }
+
+        return 20;
+    }
+}
@@ -1,7 +1,7 @@
 package com.beemdevelopment.aegis.crypto;

+import com.beemdevelopment.aegis.encoding.EncodingException;
 import com.beemdevelopment.aegis.encoding.Hex;
-import com.beemdevelopment.aegis.encoding.HexException;

 import org.json.JSONException;
 import org.json.JSONObject;
@@ -30,7 +30,7 @@ public class CryptParameters implements Serializable {
        return obj;
    }

-    public static CryptParameters fromJson(JSONObject obj) throws JSONException, HexException {
+    public static CryptParameters fromJson(JSONObject obj) throws JSONException, EncodingException {
        byte[] nonce = Hex.decode(obj.getString("nonce"));
        byte[] tag = Hex.decode(obj.getString("tag"));
        return new CryptParameters(nonce, tag);
@@ -2,11 +2,13 @@ package com.beemdevelopment.aegis.crypto;

 import android.os.Build;

+import org.bouncycastle.crypto.generators.SCrypt;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -24,21 +26,24 @@ import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;

-import org.spongycastle.crypto.generators.SCrypt;
-
 public class CryptoUtils {
    public static final String CRYPTO_AEAD = "AES/GCM/NoPadding";
    public static final byte CRYPTO_AEAD_KEY_SIZE = 32;
    public static final byte CRYPTO_AEAD_TAG_SIZE = 16;
+    public static final byte CRYPTO_AEAD_NONCE_SIZE = 12;

    public static final int CRYPTO_SCRYPT_N = 1 << 15;
    public static final int CRYPTO_SCRYPT_r = 8;
    public static final int CRYPTO_SCRYPT_p = 1;

+    public static SecretKey deriveKey(byte[] input, SCryptParameters params) {
+        byte[] keyBytes = SCrypt.generate(input, params.getSalt(), params.getN(), params.getR(), params.getP(), CRYPTO_AEAD_KEY_SIZE);
+        return new SecretKeySpec(keyBytes, 0, keyBytes.length, "AES");
+    }
+
    public static SecretKey deriveKey(char[] password, SCryptParameters params) {
        byte[] bytes = toBytes(password);
-        byte[] keyBytes = SCrypt.generate(bytes, params.getSalt(), params.getN(), params.getR(), params.getP(), CRYPTO_AEAD_KEY_SIZE);
-        return new SecretKeySpec(keyBytes, 0, keyBytes.length, "AES");
+        return deriveKey(bytes, params);
    }

    public static Cipher createEncryptCipher(SecretKey key)
@@ -88,9 +93,14 @@ public class CryptoUtils {

    public static CryptResult decrypt(byte[] encrypted, Cipher cipher, CryptParameters params)
            throws IOException, BadPaddingException, IllegalBlockSizeException {
+        return decrypt(encrypted, 0, encrypted.length, cipher, params);
+    }
+
+    public static CryptResult decrypt(byte[] encrypted, int encryptedOffset, int encryptedLen, Cipher cipher, CryptParameters params)
+            throws IOException, BadPaddingException, IllegalBlockSizeException {
        // append the tag to the ciphertext
        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        stream.write(encrypted);
+        stream.write(encrypted, encryptedOffset, encryptedLen);
        stream.write(params.getTag());

        encrypted = stream.toByteArray();
@@ -120,9 +130,18 @@ public class CryptoUtils {
        return data;
    }

-    private static byte[] toBytes(char[] chars) {
+    public static byte[] toBytes(char[] chars) {
        CharBuffer charBuf = CharBuffer.wrap(chars);
-        ByteBuffer byteBuf = Charset.forName("UTF-8").encode(charBuf);
+        ByteBuffer byteBuf = StandardCharsets.UTF_8.encode(charBuf);
+        byte[] bytes = new byte[byteBuf.limit()];
+        byteBuf.get(bytes);
+        return bytes;
+    }
+
+    @Deprecated
+    public static byte[] toBytesOld(char[] chars) {
+        CharBuffer charBuf = CharBuffer.wrap(chars);
+        ByteBuffer byteBuf = StandardCharsets.UTF_8.encode(charBuf);
        return byteBuf.array();
    }
 }
@@ -2,9 +2,10 @@ package com.beemdevelopment.aegis.crypto;

 import android.os.Build;
 import android.security.keystore.KeyGenParameterSpec;
-import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;

+import androidx.annotation.RequiresApi;
+
 import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -12,8 +13,10 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.ProviderException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
+import java.util.Collections;

 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -58,6 +61,14 @@ public class KeyStoreHandle {
                    .build());

            return generator.generateKey();
+        } catch (ProviderException e) {
+            // a ProviderException can occur at runtime with buggy Keymaster HAL implementations
+            // so if this was caused by a KeyStoreException, throw a KeyStoreHandleException instead
+            Throwable cause = e.getCause();
+            if (cause instanceof KeyStoreException) {
+                throw new KeyStoreHandleException(cause);
+            }
+            throw e;
        } catch (NoSuchAlgorithmException | NoSuchProviderException | InvalidAlgorithmParameterException e) {
            throw new KeyStoreHandleException(e);
        }
@@ -76,22 +87,29 @@ public class KeyStoreHandle {
            throw new KeyStoreHandleException(e);
        }

-        // try to initialize a dummy cipher
-        // and see if KeyPermanentlyInvalidatedException is thrown
-        if (isSupported()) {
-            try {
-                Cipher cipher = Cipher.getInstance(CryptoUtils.CRYPTO_AEAD);
-                cipher.init(Cipher.ENCRYPT_MODE, key);
-            } catch (KeyPermanentlyInvalidatedException e) {
-                return null;
-            } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
-                throw new RuntimeException(e);
-            }
+        if (isSupported() && isKeyPermanentlyInvalidated(key)) {
+            return null;
        }

        return key;
    }

+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private static boolean isKeyPermanentlyInvalidated(SecretKey key) {
+        // try to initialize a dummy cipher and see if an InvalidKeyException is thrown
+        try {
+            Cipher cipher = Cipher.getInstance(CryptoUtils.CRYPTO_AEAD);
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+        } catch (InvalidKeyException e) {
+            // some devices throw a plain InvalidKeyException, not KeyPermanentlyInvalidatedException
+            return true;
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+            throw new RuntimeException(e);
+        }
+
+        return false;
+    }
+
    public void deleteKey(String id) throws KeyStoreHandleException {
        try {
            _keyStore.deleteEntry(id);
@@ -100,6 +118,16 @@ public class KeyStoreHandle {
        }
    }

+    public void clear() throws KeyStoreHandleException {
+        try {
+            for (String alias : Collections.list(_keyStore.aliases())) {
+                deleteKey(alias);
+            }
+        } catch (KeyStoreException e) {
+            throw new KeyStoreHandleException(e);
+        }
+    }
+
    public static boolean isSupported() {
        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
    }
@@ -17,7 +17,7 @@ public class MasterKey implements Serializable {

    public MasterKey(SecretKey key)  {
        if (key == null) {
-            throw new NullPointerException();
+            throw new IllegalArgumentException("Key cannot be null");
        }
        _key = key;
    }
@@ -2,8 +2,8 @@ package com.beemdevelopment.aegis.crypto.otp;

 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;

 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -12,7 +12,7 @@ public class HOTP {
    private HOTP() {
    }

-    public static String generateOTP(byte[] secret, String algo, int digits, long counter)
+    public static OTP generateOTP(byte[] secret, String algo, int digits, long counter)
            throws NoSuchAlgorithmException, InvalidKeyException {
        SecretKeySpec key = new SecretKeySpec(secret, "RAW");

@@ -30,18 +30,11 @@ public class HOTP {
        // truncate hash to get the HTOP value
        // http://tools.ietf.org/html/rfc4226#section-5.4
        int offset = hash[hash.length - 1] & 0xf;
-        long bin = ((hash[offset] & 0x7f) << 24)
+        int otp = ((hash[offset] & 0x7f) << 24)
                | ((hash[offset + 1] & 0xff) << 16)
                | ((hash[offset + 2] & 0xff) << 8)
                | (hash[offset + 3] & 0xff);
-        long otp = bin % (long) Math.pow(10, digits);

-        // prepend zeroes if needed
-        StringBuilder res = new StringBuilder(Long.toString(otp));
-        while (res.length() < digits) {
-            res.insert(0, "0");
-        }
-
-        return res.toString();
+        return new OTP(otp, digits);
    }
 }
@@ -0,0 +1,50 @@
+package com.beemdevelopment.aegis.crypto.otp;
+
+import androidx.annotation.NonNull;
+
+public class OTP {
+    private static final String STEAM_ALPHABET = "23456789BCDFGHJKMNPQRTVWXY";
+
+    private int _code;
+    private int _digits;
+
+    public OTP(int code, int digits) {
+        _code = code;
+        _digits = digits;
+    }
+
+    public int getCode() {
+        return _code;
+    }
+
+    public int getDigits() {
+        return _digits;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        int code = _code % (int) Math.pow(10, _digits);
+
+        // prepend zeroes if needed
+        StringBuilder res = new StringBuilder(Long.toString(code));
+        while (res.length() < _digits) {
+            res.insert(0, "0");
+        }
+
+        return res.toString();
+    }
+
+    public String toSteamString() {
+        int code = _code;
+        StringBuilder res = new StringBuilder();
+
+        for (int i = 0; i < _digits; i++) {
+            char c = STEAM_ALPHABET.charAt(code % STEAM_ALPHABET.length());
+            res.append(c);
+            code /= STEAM_ALPHABET.length();
+        }
+
+        return res.toString();
+    }
+}
@@ -8,13 +8,13 @@ public class TOTP {
    private TOTP() {
    }

-    public static String generateOTP(byte[] secret, String algo, int digits, long period, long seconds)
+    public static OTP generateOTP(byte[] secret, String algo, int digits, long period, long seconds)
            throws InvalidKeyException, NoSuchAlgorithmException {
        long counter = (long) Math.floor((double) seconds / period);
        return HOTP.generateOTP(secret, algo, digits, counter);
    }

-    public static String generateOTP(byte[] secret, String algo, int digits, long period)
+    public static OTP generateOTP(byte[] secret, String algo, int digits, long period)
            throws InvalidKeyException, NoSuchAlgorithmException {
        return generateOTP(secret, algo, digits, period, System.currentTimeMillis() / 1000);
    }
@@ -1,77 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-import com.beemdevelopment.aegis.encoding.Base64Exception;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.List;
-import java.util.UUID;
-
-public class Database {
-    private static final int VERSION = 1;
-    private DatabaseEntryList _entries = new DatabaseEntryList();
-
-    public JSONObject toJson() {
-        try {
-            JSONArray array = new JSONArray();
-            for (DatabaseEntry e : _entries) {
-                array.put(e.toJson());
-            }
-
-            JSONObject obj = new JSONObject();
-            obj.put("version", VERSION);
-            obj.put("entries", array);
-            return obj;
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Database fromJson(JSONObject obj) throws DatabaseException {
-        Database db = new Database();
-
-        try {
-            int ver = obj.getInt("version");
-            if (ver != VERSION) {
-                throw new DatabaseException("Unsupported version");
-            }
-
-            JSONArray array = obj.getJSONArray("entries");
-            for (int i = 0; i < array.length(); i++) {
-                DatabaseEntry entry = DatabaseEntry.fromJson(array.getJSONObject(i));
-                db.addEntry(entry);
-            }
-        } catch (Base64Exception | OtpInfoException | JSONException e) {
-            throw new DatabaseException(e);
-        }
-
-        return db;
-    }
-
-    public void addEntry(DatabaseEntry entry) {
-        _entries.add(entry);
-    }
-
-    public void removeEntry(DatabaseEntry entry) {
-        _entries.remove(entry);
-    }
-
-    public void replaceEntry(DatabaseEntry newEntry) {
-        _entries.replace(newEntry);
-    }
-
-    public void swapEntries(DatabaseEntry entry1, DatabaseEntry entry2) {
-        _entries.swap(entry1, entry2);
-    }
-
-    public List<DatabaseEntry> getEntries() {
-        return _entries.getList();
-    }
-
-    public DatabaseEntry getEntryByUUID(UUID uuid) {
-        return _entries.getByUUID(uuid);
-    }
-}
@@ -1,62 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-import androidx.annotation.NonNull;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-
-public class DatabaseEntryList implements Iterable<DatabaseEntry>, Serializable {
-    private List<DatabaseEntry> _entries = new ArrayList<>();
-
-    @NonNull
-    @Override
-    public Iterator<DatabaseEntry> iterator() {
-        return _entries.iterator();
-    }
-
-    public void add(DatabaseEntry entry) {
-        if (getByUUID(entry.getUUID()) != null) {
-            throw new AssertionError("entry found with the same uuid");
-        }
-        _entries.add(entry);
-    }
-
-    public void remove(DatabaseEntry entry) {
-        entry = mustGetByUUID(entry.getUUID());
-        _entries.remove(entry);
-    }
-
-    public void replace(DatabaseEntry newEntry) {
-        DatabaseEntry oldEntry = mustGetByUUID(newEntry.getUUID());
-        _entries.set(_entries.indexOf(oldEntry), newEntry);
-    }
-
-    public void swap(DatabaseEntry entry1, DatabaseEntry entry2) {
-        Collections.swap(_entries, _entries.indexOf(entry1), _entries.indexOf(entry2));
-    }
-
-    public List<DatabaseEntry> getList() {
-        return Collections.unmodifiableList(_entries);
-    }
-
-    public DatabaseEntry getByUUID(UUID uuid) {
-        for (DatabaseEntry entry : _entries) {
-            if (entry.getUUID().equals(uuid)) {
-                return entry;
-            }
-        }
-        return null;
-    }
-
-    private DatabaseEntry mustGetByUUID(UUID uuid) {
-        DatabaseEntry entry = getByUUID(uuid);
-        if (entry == null) {
-            throw new AssertionError("no entry found with the same uuid");
-        }
-        return entry;
-    }
-}
@@ -1,11 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-public class DatabaseException extends Exception {
-    public DatabaseException(Throwable cause) {
-        super(cause);
-    }
-
-    public DatabaseException(String message) {
-        super(message);
-    }
-}
@@ -1,11 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-public class DatabaseFileException extends Exception {
-    public DatabaseFileException(Throwable cause) {
-        super(cause);
-    }
-
-    public DatabaseFileException(String message) {
-        super(message);
-    }
-}
@@ -1,236 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-import android.content.Context;
-import android.os.Environment;
-
-import org.json.JSONObject;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.Collator;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import com.beemdevelopment.aegis.BuildConfig;
-import com.beemdevelopment.aegis.R;
-
-public class DatabaseManager {
-    private static final String FILENAME = "aegis.json";
-    private static final String FILENAME_EXPORT = "aegis_export.json";
-    private static final String FILENAME_EXPORT_PLAIN = "aegis_export_plain.json";
-
-    private Database _db;
-    private DatabaseFile _file;
-    private DatabaseFileCredentials _creds;
-    private boolean _encrypt;
-
-    private Context _context;
-
-    public DatabaseManager(Context context) {
-        _context = context;
-    }
-
-    public boolean fileExists() {
-        File file = new File(_context.getFilesDir(), FILENAME);
-        return file.exists() && file.isFile();
-    }
-
-    public void load() throws DatabaseManagerException {
-        assertState(true, false);
-
-        try (FileInputStream file = _context.openFileInput(FILENAME)) {
-            byte[] fileBytes = new byte[(int) file.getChannel().size()];
-            DataInputStream stream = new DataInputStream(file);
-            stream.readFully(fileBytes);
-            stream.close();
-
-            _file = DatabaseFile.fromBytes(fileBytes);
-            _encrypt = _file.isEncrypted();
-            if (!isEncryptionEnabled()) {
-                JSONObject obj = _file.getContent();
-                _db = Database.fromJson(obj);
-            }
-        } catch (IOException | DatabaseFileException | DatabaseException e) {
-            throw new DatabaseManagerException(e);
-        }
-    }
-
-    public void lock() {
-        assertState(false, true);
-        _creds = null;
-        _db = null;
-    }
-
-    public void unlock(DatabaseFileCredentials creds) throws DatabaseManagerException {
-        assertState(true, true);
-
-        try {
-            JSONObject obj = _file.getContent(creds);
-            _db = Database.fromJson(obj);
-            _creds = creds;
-        } catch (DatabaseFileException | DatabaseException e) {
-            throw new DatabaseManagerException(e);
-        }
-    }
-
-    public static void save(Context context, DatabaseFile file) throws DatabaseManagerException {
-        byte[] bytes = file.toBytes();
-        try (FileOutputStream stream = context.openFileOutput(FILENAME, Context.MODE_PRIVATE)) {
-            stream.write(bytes);
-        } catch (IOException e) {
-            throw new DatabaseManagerException(e);
-        }
-    }
-
-    public void save() throws DatabaseManagerException {
-        assertState(false, true);
-
-        try {
-            JSONObject obj = _db.toJson();
-            if (isEncryptionEnabled()) {
-                _file.setContent(obj, _creds);
-            } else {
-                _file.setContent(obj);
-            }
-            save(_context, _file);
-        } catch (DatabaseFileException e) {
-            throw new DatabaseManagerException(e);
-        }
-    }
-
-    public String export(boolean encrypt) throws DatabaseManagerException {
-        assertState(false, true);
-
-        try {
-            DatabaseFile dbFile = new DatabaseFile();
-            if (encrypt && isEncryptionEnabled()) {
-                dbFile.setContent(_db.toJson(), _creds);
-            } else {
-                dbFile.setContent(_db.toJson());
-            }
-
-            String dirName = !BuildConfig.DEBUG ? _context.getString(R.string.app_name) : _context.getString(R.string.app_name_dev);
-            File dir = new File(Environment.getExternalStorageDirectory(), dirName);
-            if (!dir.exists() && !dir.mkdirs()) {
-                throw new IOException("error creating external storage directory");
-            }
-
-            byte[] bytes = dbFile.toBytes();
-            File file = new File(dir.getAbsolutePath(), encrypt ? FILENAME_EXPORT : FILENAME_EXPORT_PLAIN);
-            try (FileOutputStream stream = new FileOutputStream(file)) {
-                stream.write(bytes);
-            }
-
-            return file.getAbsolutePath();
-        } catch (IOException | DatabaseFileException e) {
-            throw new DatabaseManagerException(e);
-        }
-    }
-
-    public void addEntry(DatabaseEntry entry) {
-        assertState(false, true);
-        _db.addEntry(entry);
-    }
-
-    public void removeEntry(DatabaseEntry entry) {
-        assertState(false, true);
-        _db.removeEntry(entry);
-    }
-
-    public void replaceEntry(DatabaseEntry entry) {
-        assertState(false, true);
-        _db.replaceEntry(entry);
-    }
-
-    public void swapEntries(DatabaseEntry entry1, DatabaseEntry entry2) {
-        assertState(false, true);
-        _db.swapEntries(entry1, entry2);
-    }
-
-    public List<DatabaseEntry> getEntries() {
-        assertState(false, true);
-        return _db.getEntries();
-    }
-
-    public DatabaseEntry getEntryByUUID(UUID uuid) {
-        assertState(false, true);
-        return _db.getEntryByUUID(uuid);
-    }
-
-    public TreeSet<String> getGroups() {
-        assertState(false, true);
-
-        TreeSet<String> groups = new TreeSet<>(Collator.getInstance());
-        for (DatabaseEntry entry : getEntries()) {
-            String group = entry.getGroup();
-            if (group != null) {
-                groups.add(group);
-            }
-        }
-        return groups;
-    }
-
-    public DatabaseFileCredentials getCredentials() {
-        assertState(false, true);
-        return _creds;
-    }
-
-    public void setCredentials(DatabaseFileCredentials creds) {
-        assertState(false, true);
-        _creds = creds;
-    }
-
-    public DatabaseFile.Header getFileHeader() {
-        assertLoaded(true);
-        return _file.getHeader();
-    }
-
-    public boolean isEncryptionEnabled() {
-        assertLoaded(true);
-        return _encrypt;
-    }
-
-    public void enableEncryption(DatabaseFileCredentials creds) throws DatabaseManagerException {
-        assertState(false, true);
-        _creds = creds;
-        _encrypt = true;
-        save();
-    }
-
-    public void disableEncryption() throws DatabaseManagerException {
-        assertState(false, true);
-        _creds = null;
-        _encrypt = false;
-        save();
-    }
-
-    public boolean isLoaded() {
-        return _file != null;
-    }
-
-    public boolean isLocked() {
-        return _db == null;
-    }
-
-    private void assertState(boolean locked, boolean loaded) {
-        assertLoaded(loaded);
-
-        if (isLocked() && !locked) {
-            throw new AssertionError("database file has not been unlocked yet");
-        } else if (!isLocked() && locked) {
-            throw new AssertionError("database file has already been unlocked");
-        }
-    }
-
-    private void assertLoaded(boolean loaded) {
-        if (isLoaded() && !loaded) {
-            throw new AssertionError("database file has already been loaded");
-        } else if (!isLoaded() && loaded) {
-            throw new AssertionError("database file has not been loaded yet");
-        }
-    }
-}
@@ -1,7 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-public class DatabaseManagerException extends Exception {
-    public DatabaseManagerException(Throwable cause) {
-        super(cause);
-    }
-}
@@ -1,20 +0,0 @@
-package com.beemdevelopment.aegis.db.slots;
-
-import com.beemdevelopment.aegis.crypto.CryptParameters;
-
-import java.util.UUID;
-
-public class FingerprintSlot extends RawSlot {
-    public FingerprintSlot() {
-        super();
-    }
-
-    FingerprintSlot(UUID uuid, byte[] key, CryptParameters keyParams) {
-        super(uuid, key, keyParams);
-    }
-
-    @Override
-    public byte getType() {
-        return TYPE_FINGERPRINT;
-    }
-}
@@ -1,155 +1,21 @@
 package com.beemdevelopment.aegis.encoding;

-// modified for use in Aegis
+import com.google.common.io.BaseEncoding;

-/* (PD) 2001 The Bitzi Corporation
- * Please see http://bitzi.com/publicdomain for more info.
- *
- * As modified by Patrick Woodworth:
- *
- * Copyright 2011 Patrick Woodworth
- *
- * 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.
- */
-
-import java.util.Arrays;
-
-/**
- * Base32 - encodes and decodes RFC3548 Base32
- * (see http://www.faqs.org/rfcs/rfc3548.html )
- *
- * @author Robert Kaye
- * @author Gordon Mohr
- */
 public class Base32 {
-    private static final String base32Chars =
-            "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-    private static final int[] base32Lookup =
-            { 0xFF,0xFF,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, // '0', '1', '2', '3', '4', '5', '6', '7'
-                    0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // '8', '9', ':', ';', '<', '=', '>', '?'
-                    0xFF,0x00,0x01,0x02,0x03,0x04,0x05,0x06, // '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G'
-                    0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E, // 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O'
-                    0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16, // 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W'
-                    0x17,0x18,0x19,0xFF,0xFF,0xFF,0xFF,0xFF, // 'X', 'Y', 'Z', '[', '\', ']', '^', '_'
-                    0xFF,0x00,0x01,0x02,0x03,0x04,0x05,0x06, // '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g'
-                    0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E, // 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o'
-                    0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16, // 'p', 'q', 'r', 's', 't', 'u', 'v', 'w'
-                    0x17,0x18,0x19,0xFF,0xFF,0xFF,0xFF,0xFF  // 'x', 'y', 'z', '{', '|', '}', '~', 'DEL'
-            };
+    private Base32() {

-    /**
-     * Encodes byte array to Base32 String.
-     *
-     * @param bytes Bytes to encode.
-     * @return Encoded byte array <code>bytes</code> as a String.
-     *
-     */
-    public static char[] encode(final byte[] bytes) {
-        int i = 0, index = 0, digit = 0, j = 0;
-        int currByte, nextByte;
-        char[] base32 = new char[(bytes.length + 7) * 8 / 5];
-
-        while (i < bytes.length) {
-            currByte = (bytes[i] >= 0) ? bytes[i] : (bytes[i] + 256); // unsign
-
-            /* Is the current digit going to span a byte boundary? */
-            if (index > 3) {
-                if ((i + 1) < bytes.length) {
-                    nextByte =
-                            (bytes[i + 1] >= 0) ? bytes[i + 1] : (bytes[i + 1] + 256);
-                } else {
-                    nextByte = 0;
-                }
-
-                digit = currByte & (0xFF >> index);
-                index = (index + 5) % 8;
-                digit <<= index;
-                digit |= nextByte >> (8 - index);
-                i++;
-            } else {
-                digit = (currByte >> (8 - (index + 5))) & 0x1F;
-                index = (index + 5) % 8;
-                if (index == 0)
-                    i++;
-            }
-            base32[j++] = base32Chars.charAt(digit);
-        }
-
-        return Arrays.copyOf(base32, j);
    }

-    /**
-     * Decodes the given Base32 String to a raw byte array.
-     *
-     * @param base32
-     * @return Decoded <code>base32</code> String as a raw byte array.
-     */
-    public static byte[] decode(final char[] base32) throws Base32Exception {
-        int i, index, lookup, offset, digit;
-        byte[] bytes = new byte[base32.length * 5 / 8];
-
-        for (i = 0, index = 0, offset = 0; i < base32.length; i++) {
-            // stop decoding when a padding char is encountered
-            if (base32[i] == '=') {
-                // make sure the rest is also padding, but don't bother verifying the length
-                for (int j = i + 1; j < base32.length; j++) {
-                    if (base32[j] != '=') {
-                        throw new Base32Exception("bad padding");
-                    }
-                }
-                break;
-            }
-
-            lookup = base32[i] - '0';
-            digit = decodeDigit(lookup);
-
-            if (index <= 3) {
-                index = (index + 5) % 8;
-                if (index == 0) {
-                    bytes[offset] |= digit;
-                    offset++;
-                    if (offset >= bytes.length)
-                        break;
-                } else {
-                    bytes[offset] |= digit << (8 - index);
-                }
-            } else {
-                index = (index + 5) % 8;
-                bytes[offset] |= (digit >>> index);
-                offset++;
-
-                if (offset >= bytes.length) {
-                    break;
-                }
-                bytes[offset] |= digit << (8 - index);
-            }
+    public static byte[] decode(String s) throws EncodingException {
+        try {
+            return BaseEncoding.base32().decode(s.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new EncodingException(e);
        }
-        return bytes;
    }

-    private static int decodeDigit(int c) throws Base32Exception {
-        /* Skip chars outside the lookup table */
-        if (c < 0 || c >= base32Lookup.length) {
-            throw new Base32Exception("char not found in base32 lookup table");
-        }
-
-        int digit = base32Lookup[c];
-
-        /* If this digit is not in the table, ignore it */
-        if (digit == 0xFF) {
-            throw new Base32Exception("char not found in base32 lookup table");
-        }
-
-        return digit;
+    public static String encode(byte[] data) {
+        return BaseEncoding.base32().omitPadding().encode(data);
    }
 }
@@ -1,7 +0,0 @@
-package com.beemdevelopment.aegis.encoding;
-
-public class Base32Exception extends Exception {
-    public Base32Exception(String message) {
-        super(message);
-    }
-}
@@ -1,29 +1,27 @@
 package com.beemdevelopment.aegis.encoding;

-import java.io.UnsupportedEncodingException;
+import com.google.common.io.BaseEncoding;
+
+import java.nio.charset.StandardCharsets;

 public class Base64 {
-    private static final int _flags = android.util.Base64.NO_WRAP;
-
    private Base64() {

    }

-    public static byte[] decode(String s) throws Base64Exception {
+    public static byte[] decode(String s) throws EncodingException {
        try {
-            return android.util.Base64.decode(s, _flags);
+            return BaseEncoding.base64().decode(s);
        } catch (IllegalArgumentException e) {
-            throw new Base64Exception(e);
+            throw new EncodingException(e);
        }
    }

+    public static byte[] decode(byte[] s) throws EncodingException {
+        return decode(new String(s, StandardCharsets.UTF_8));
+    }
+
    public static String encode(byte[] data) {
-        byte[] encoded = android.util.Base64.encode(data, _flags);
-
-        try {
-            return new String(encoded, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return BaseEncoding.base64().encode(data);
    }
 }
@@ -1,7 +0,0 @@
-package com.beemdevelopment.aegis.encoding;
-
-public class Base64Exception extends Exception {
-    public Base64Exception(Throwable cause) {
-        super(cause);
-    }
-}
@@ -0,0 +1,9 @@
+package com.beemdevelopment.aegis.encoding;
+
+import java.io.IOException;
+
+public class EncodingException extends IOException {
+    public EncodingException(Throwable cause) {
+        super(cause);
+    }
+}
@@ -1,46 +1,21 @@
 package com.beemdevelopment.aegis.encoding;

-// The hexadecimal utility functions in this file were taken and modified from: http://www.docjar.com/html/api/com/sun/xml/internal/bind/DatatypeConverterImpl.java.html
-// It is licensed under GPLv2 with a classpath exception.
+import com.google.common.io.BaseEncoding;
+
 public class Hex {
    private Hex() {
+
    }

-    private static int hexToBin(char ch) {
-        if ('0' <= ch && ch <= '9') return ch - '0';
-        if ('A' <= ch && ch <= 'F') return ch - 'A' + 10;
-        if ('a' <= ch && ch <= 'f') return ch - 'a' + 10;
-        return -1;
-    }
-
-    private static final char[] hexCode = "0123456789abcdef".toCharArray();
-
-    public static byte[] decode(String s) throws HexException {
-        final int len = s.length();
-
-        if (len % 2 != 0)
-            throw new HexException("hexBinary needs to be even-length: " + s);
-
-        byte[] out = new byte[len / 2];
-
-        for (int i = 0; i < len; i += 2) {
-            int h = hexToBin(s.charAt(i));
-            int l = hexToBin(s.charAt(i + 1));
-            if (h == -1 || l == -1)
-                throw new HexException("contains illegal character for hexBinary: " + s);
-
-            out[i / 2] = (byte) (h * 16 + l);
+    public static byte[] decode(String s) throws EncodingException {
+        try {
+            return BaseEncoding.base16().decode(s.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new EncodingException(e);
        }
-
-        return out;
    }

    public static String encode(byte[] data) {
-        StringBuilder r = new StringBuilder(data.length * 2);
-        for (byte b : data) {
-            r.append(hexCode[(b >> 4) & 0xF]);
-            r.append(hexCode[(b & 0xF)]);
-        }
-        return r.toString();
+        return BaseEncoding.base16().lowerCase().encode(data);
    }
 }
@@ -1,7 +0,0 @@
-package com.beemdevelopment.aegis.encoding;
-
-public class HexException extends Exception {
-    public HexException(String message) {
-        super(message);
-    }
-}
@@ -0,0 +1,136 @@
+package com.beemdevelopment.aegis.helpers;
+
+import androidx.annotation.NonNull;
+import androidx.biometric.BiometricPrompt;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
+import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
+import com.beemdevelopment.aegis.vault.slots.BiometricSlot;
+import com.beemdevelopment.aegis.vault.slots.Slot;
+import com.beemdevelopment.aegis.vault.slots.SlotException;
+
+import java.util.Objects;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+
+/**
+ * A class that can prepare initialization of a BiometricSlot by generating a new
+ * key in the Android KeyStore and authenticating a cipher for it through a
+ * BiometricPrompt.
+ */
+public class BiometricSlotInitializer extends BiometricPrompt.AuthenticationCallback {
+    private BiometricSlot _slot;
+    private Listener _listener;
+    private BiometricPrompt _prompt;
+
+    public BiometricSlotInitializer(Fragment fragment, Listener listener) {
+        _listener = listener;
+        _prompt = new BiometricPrompt(fragment, new UiThreadExecutor(), this);
+    }
+
+    public BiometricSlotInitializer(FragmentActivity activity, Listener listener) {
+        _listener = listener;
+        _prompt = new BiometricPrompt(activity, new UiThreadExecutor(), this);
+    }
+
+    /**
+     * Generates a new key in the Android KeyStore for the new BiometricSlot,
+     * initializes a cipher with it and shows a BiometricPrompt to the user for
+     * authentication. If authentication is successful, the new slot will be
+     * initialized and delivered back through the listener.
+     */
+    public void authenticate(BiometricPrompt.PromptInfo info) {
+        if (_slot != null) {
+            throw new IllegalStateException("Biometric authentication already in progress");
+        }
+
+        KeyStoreHandle keyStore;
+        try {
+            keyStore = new KeyStoreHandle();
+        } catch (KeyStoreHandleException e) {
+            fail(e);
+            return;
+        }
+
+        // generate a new Android KeyStore key
+        // and assign it the UUID of the new slot as an alias
+        Cipher cipher;
+        BiometricSlot slot = new BiometricSlot();
+        try {
+            SecretKey key = keyStore.generateKey(slot.getUUID().toString());
+            cipher = Slot.createEncryptCipher(key);
+        } catch (KeyStoreHandleException | SlotException e) {
+            fail(e);
+            return;
+        }
+
+        _slot = slot;
+        _prompt.authenticate(info, new BiometricPrompt.CryptoObject(cipher));
+    }
+
+    /**
+     * Cancels the BiometricPrompt and resets the state of the initializer. It will
+     * also attempt to delete the previously generated Android KeyStore key.
+     */
+    public void cancelAuthentication() {
+        if (_slot == null) {
+            throw new IllegalStateException("Biometric authentication not in progress");
+        }
+
+        reset();
+        _prompt.cancelAuthentication();
+    }
+
+    private void reset() {
+        if (_slot != null) {
+            try {
+                // clean up the unused KeyStore key
+                // this is non-critical, so just fail silently if an error occurs
+                String uuid = _slot.getUUID().toString();
+                KeyStoreHandle keyStore = new KeyStoreHandle();
+                if (keyStore.containsKey(uuid)) {
+                    keyStore.deleteKey(uuid);
+                }
+            } catch (KeyStoreHandleException e) {
+                e.printStackTrace();
+            }
+
+            _slot = null;
+        }
+    }
+
+    private void fail(int errorCode, CharSequence errString) {
+        reset();
+        _listener.onSlotInitializationFailed(errorCode, errString);
+    }
+
+    private void fail(Exception e) {
+        e.printStackTrace();
+        fail(0, e.toString());
+    }
+
+    @Override
+    public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+        super.onAuthenticationError(errorCode, errString);
+        fail(errorCode, errString.toString());
+    }
+
+    @Override
+    public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+        super.onAuthenticationSucceeded(result);
+        _listener.onInitializeSlot(_slot, Objects.requireNonNull(result.getCryptoObject()).getCipher());
+    }
+
+    @Override
+    public void onAuthenticationFailed() {
+        super.onAuthenticationFailed();
+    }
+
+    public interface Listener {
+        void onInitializeSlot(BiometricSlot slot, Cipher cipher);
+        void onSlotInitializationFailed(int errorCode, @NonNull CharSequence errString);
+    }
+}
@@ -0,0 +1,30 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.content.Context;
+
+import androidx.biometric.BiometricConstants;
+import androidx.biometric.BiometricManager;
+
+public class BiometricsHelper {
+    private BiometricsHelper() {
+
+    }
+
+    public static BiometricManager getManager(Context context) {
+        BiometricManager manager = BiometricManager.from(context);
+        if (manager.canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS) {
+            return manager;
+        }
+        return null;
+    }
+
+    public static boolean isCanceled(int errorCode) {
+        return errorCode == BiometricConstants.ERROR_CANCELED
+                || errorCode == BiometricConstants.ERROR_USER_CANCELED
+                || errorCode == BiometricConstants.ERROR_NEGATIVE_BUTTON;
+    }
+
+    public static boolean isAvailable(Context context) {
+        return getManager(context) != null;
+    }
+}
@@ -14,9 +14,17 @@ public class EditTextHelper {
    }

    public static char[] getEditTextChars(EditText text) {
-        Editable editable = text.getText();
-        char[] chars = new char[editable.length()];
-        editable.getChars(0, editable.length(), chars, 0);
+        return getEditTextChars(text, false);
+    }
+
+    public static char[] getEditTextChars(EditText text, boolean removeSpaces) {
+        String editTextString = text.getText().toString();
+        if (removeSpaces) {
+            editTextString = editTextString.replaceAll("\\s","");
+        }
+
+        char[] chars = new char[editTextString.length()];
+        editTextString.getChars(0, editTextString.length(), chars, 0);
        return chars;
    }

@@ -0,0 +1,49 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.getbase.floatingactionbutton.FloatingActionsMenu;
+
+public class FabScrollHelper {
+    private View _fabMenu;
+    private boolean _isAnimating;
+
+    public FabScrollHelper(View floatingActionsMenu) {
+        _fabMenu = floatingActionsMenu;
+    }
+
+    public void onScroll(int dx, int dy) {
+        if (dy > 0 && _fabMenu.getVisibility() == View.VISIBLE && !_isAnimating) {
+            _isAnimating = true;
+            CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) _fabMenu.getLayoutParams();
+            int fabBottomMargin = lp.bottomMargin;
+            _fabMenu.animate()
+                    .translationY(_fabMenu.getHeight() + fabBottomMargin)
+                    .setInterpolator(new AccelerateInterpolator(2))
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            _isAnimating = false;
+                            _fabMenu.setVisibility(View.INVISIBLE);
+                            super.onAnimationEnd(animation);
+                        }
+                    }).start();
+        } else if (dy < 0 && _fabMenu.getVisibility() != View.VISIBLE && !_isAnimating) {
+            _fabMenu.setVisibility(View.VISIBLE);
+            _fabMenu.animate()
+                    .translationY(0)
+                    .setInterpolator(new DecelerateInterpolator(2))
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            _isAnimating = false;
+                            super.onAnimationEnd(animation);
+                        }
+                    }).start();
+        }
+    }
+}
@@ -1,26 +0,0 @@
-package com.beemdevelopment.aegis.helpers;
-
-import android.Manifest;
-import android.content.Context;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
-
-public class FingerprintHelper {
-    private FingerprintHelper() {
-
-    }
-
-    public static FingerprintManager getManager(Context context) {
-        if (isSupported() && PermissionHelper.granted(context, Manifest.permission.USE_FINGERPRINT)) {
-            FingerprintManager manager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
-            if (manager != null && manager.isHardwareDetected() && manager.hasEnrolledFingerprints()) {
-                return manager;
-            }
-        }
-        return null;
-    }
-
-    public static boolean isSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-    }
-}
@@ -1,156 +0,0 @@
-// This file was originally taken from https://github.com/googlesamples/android-FingerprintDialog/blob/2feb02945ae220ebd1bc2c2b620a1d43e30daea8/Application/src/main/java/com/example/android/fingerprintdialog/FingerprintUiHelper.java
-// It has been modified to suit Aegis' needs
-
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * 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
- */
-
-package com.beemdevelopment.aegis.helpers;
-
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
-import android.os.CancellationSignal;
-import androidx.annotation.RequiresApi;
-import android.widget.TextView;
-
-import com.mattprecious.swirl.SwirlView;
-
-import com.beemdevelopment.aegis.R;
-
-/**
- * Small helper class to manage text/icon around fingerprint authentication UI.
- */
-@RequiresApi(api = Build.VERSION_CODES.M)
-public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback {
-
-    private static final long ERROR_TIMEOUT_MILLIS = 1600;
-    private static final long SUCCESS_DELAY_MILLIS = 100;
-
-    private final FingerprintManager mFingerprintManager;
-    private final SwirlView mIcon;
-    private final TextView mErrorTextView;
-    private final Callback mCallback;
-    private CancellationSignal mCancellationSignal;
-
-    private boolean mSelfCancelled;
-
-    /**
-     * Constructor for {@link FingerprintUiHelper}.
-     */
-    public FingerprintUiHelper(FingerprintManager fingerprintManager,
-                               SwirlView icon, TextView errorTextView, Callback callback) {
-        mFingerprintManager = fingerprintManager;
-        mIcon = icon;
-        mErrorTextView = errorTextView;
-        mCallback = callback;
-    }
-
-    public boolean isFingerprintAuthAvailable() {
-        // The line below prevents the false positive inspection from Android Studio
-        // noinspection ResourceType
-        return mFingerprintManager.isHardwareDetected()
-                && mFingerprintManager.hasEnrolledFingerprints();
-    }
-
-    public void startListening(FingerprintManager.CryptoObject cryptoObject) {
-        if (!isFingerprintAuthAvailable()) {
-            return;
-        }
-        mCancellationSignal = new CancellationSignal();
-        mSelfCancelled = false;
-        // The line below prevents the false positive inspection from Android Studio
-        // noinspection ResourceType
-        mFingerprintManager
-                .authenticate(cryptoObject, mCancellationSignal, 0 /* flags */, this, null);
-        mIcon.setState(SwirlView.State.ON);
-    }
-
-    public void stopListening() {
-        if (mCancellationSignal != null) {
-            mSelfCancelled = true;
-            mCancellationSignal.cancel();
-            mCancellationSignal = null;
-        }
-    }
-
-    @Override
-    public void onAuthenticationError(int errMsgId, CharSequence errString) {
-        if (!mSelfCancelled) {
-            showError(errString);
-            mIcon.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mCallback.onError();
-                }
-            }, ERROR_TIMEOUT_MILLIS);
-        }
-    }
-
-    @Override
-    public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
-        showError(helpString);
-    }
-
-    @Override
-    public void onAuthenticationFailed() {
-        showError(mIcon.getResources().getString(
-                R.string.fingerprint_not_recognized));
-    }
-
-    @Override
-    public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-        mErrorTextView.removeCallbacks(mResetErrorTextRunnable);
-        mIcon.setState(SwirlView.State.OFF);
-        mErrorTextView.setText(
-                mErrorTextView.getResources().getString(R.string.fingerprint_success));
-        mIcon.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mCallback.onAuthenticated();
-            }
-        }, SUCCESS_DELAY_MILLIS);
-
-        // ugly hack to keep the fingerprint icon visible while also giving visual feedback of success to the user
-        mIcon.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mIcon.setState(SwirlView.State.ON);
-            }
-        }, 500);
-    }
-
-    private void showError(CharSequence error) {
-        mIcon.setState(SwirlView.State.ERROR);
-        mErrorTextView.setText(error);
-        mErrorTextView.removeCallbacks(mResetErrorTextRunnable);
-        mErrorTextView.postDelayed(mResetErrorTextRunnable, ERROR_TIMEOUT_MILLIS);
-    }
-
-    private Runnable mResetErrorTextRunnable = new Runnable() {
-        @Override
-        public void run() {
-            mErrorTextView.setText(
-                    mErrorTextView.getResources().getString(R.string.fingerprint_hint));
-            mIcon.setState(SwirlView.State.ON);
-        }
-    };
-
-    public interface Callback {
-
-        void onAuthenticated();
-
-        void onError();
-    }
-}
@@ -3,12 +3,13 @@ package com.beemdevelopment.aegis.helpers;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;

 import java.util.ArrayList;
 import java.util.List;

+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 public class PermissionHelper {
    private PermissionHelper() {

@@ -1,10 +1,15 @@
 package com.beemdevelopment.aegis.helpers;

-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.ui.views.EntryAdapter;

 public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {

+    private VaultEntry _selectedEntry;
+
    private final ItemTouchHelperAdapter _adapter;
    private boolean _positionChanged = false;
    private boolean _isLongPressDragEnabled = true;
@@ -22,6 +27,10 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
        _isLongPressDragEnabled = enabled;
    }

+    public void setSelectedEntry(VaultEntry entry) {
+        _selectedEntry = entry;
+    }
+
    @Override
    public boolean isItemViewSwipeEnabled() {
        return false;
@@ -30,7 +39,15 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
    @Override
    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
        int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-        int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
+        int swipeFlags = 0;
+
+        int position = viewHolder.getAdapterPosition();
+        EntryAdapter adapter = (EntryAdapter)recyclerView.getAdapter();
+        if (adapter.getEntryAt(position) != _selectedEntry)
+        {
+            dragFlags = 0;
+        }
+
        return makeMovementFlags(dragFlags, swipeFlags);
    }

@@ -56,4 +73,6 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
            _positionChanged = false;
        }
    }
+
+
 }
@@ -1,12 +1,13 @@
 package com.beemdevelopment.aegis.helpers;

 import android.content.Context;
-import androidx.annotation.ArrayRes;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;

 import java.util.List;

+import androidx.annotation.ArrayRes;
+
 public class SpinnerHelper {
    private SpinnerHelper() {

@@ -0,0 +1,23 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.util.TypedValue;
+
+import androidx.annotation.ColorInt;
+
+import com.beemdevelopment.aegis.R;
+
+public class ThemeHelper {
+    private ThemeHelper() {
+
+    }
+
+    public static int getThemeColor(int attributeId, Resources.Theme currentTheme) {
+        TypedValue typedValue = new TypedValue();
+        currentTheme.resolveAttribute(attributeId, typedValue, true);
+        @ColorInt int color = typedValue.data;
+
+        return color;
+    }
+}
@@ -12,6 +12,11 @@ public class UiRefresher {
        _handler = new Handler();
    }

+    public void destroy() {
+        stop();
+        _listener = null;
+    }
+
    public void start() {
        if (_running) {
            return;
@@ -22,15 +27,14 @@ public class UiRefresher {
        _handler.postDelayed(new Runnable() {
            @Override
            public void run() {
-                if (_running) {
-                    _listener.onRefresh();
-                    _handler.postDelayed(this, _listener.getMillisTillNextRefresh());
-                }
+                _listener.onRefresh();
+                _handler.postDelayed(this, _listener.getMillisTillNextRefresh());
            }
        }, _listener.getMillisTillNextRefresh());
    }

    public void stop() {
+        _handler.removeCallbacksAndMessages(null);
        _running = false;
    }

@@ -0,0 +1,17 @@
+package com.beemdevelopment.aegis.helpers;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+
+import java.util.concurrent.Executor;
+
+public class UiThreadExecutor implements Executor {
+    private final Handler _handler = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void execute(@NonNull Runnable command) {
+        _handler.post(command);
+    }
+}
@@ -0,0 +1,12 @@
+package com.beemdevelopment.aegis.helpers.comparators;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.Comparator;
+
+public class AccountNameComparator implements Comparator<VaultEntry> {
+    @Override
+    public int compare(VaultEntry a, VaultEntry b) {
+        return a.getName().compareToIgnoreCase(b.getName());
+    }
+}
@@ -0,0 +1,12 @@
+package com.beemdevelopment.aegis.helpers.comparators;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.Comparator;
+
+public class IssuerNameComparator implements Comparator<VaultEntry> {
+    @Override
+    public int compare(VaultEntry a, VaultEntry b) {
+        return a.getIssuer().compareToIgnoreCase(b.getIssuer());
+    }
+}
@@ -1,64 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import org.json.JSONObject;
-
-import java.util.List;
-
-import com.beemdevelopment.aegis.db.Database;
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.db.DatabaseException;
-import com.beemdevelopment.aegis.db.DatabaseFile;
-import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
-import com.beemdevelopment.aegis.db.DatabaseFileException;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-public class AegisFileImporter extends DatabaseFileImporter {
-    private DatabaseFileCredentials _creds;
-    private DatabaseFile _file;
-
-    public AegisFileImporter(Context context, ByteInputStream stream) {
-        super(context, stream);
-    }
-
-    @Override
-    public void parse() throws DatabaseImporterException {
-        try {
-            byte[] bytes = _stream.getBytes();
-            _file = DatabaseFile.fromBytes(bytes);
-        } catch (DatabaseFileException e) {
-            throw new DatabaseImporterException(e);
-        }
-    }
-
-    @Override
-    public List<DatabaseEntry> convert() throws DatabaseImporterException {
-        try {
-            JSONObject obj;
-            if (_file.isEncrypted() && _creds != null) {
-                obj = _file.getContent(_creds);
-            } else {
-                obj = _file.getContent();
-            }
-
-            Database db = Database.fromJson(obj);
-            return db.getEntries();
-        } catch (DatabaseException | DatabaseFileException e) {
-            throw new DatabaseImporterException(e);
-        }
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return _file.isEncrypted();
-    }
-
-    public void setCredentials(DatabaseFileCredentials creds) {
-        _creds = creds;
-    }
-
-    public DatabaseFile getFile() {
-        return _file;
-    }
-}
@@ -0,0 +1,110 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultFile;
+import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultFileException;
+import com.beemdevelopment.aegis.vault.slots.SlotList;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class AegisImporter extends DatabaseImporter {
+
+    public AegisImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            byte[] bytes = reader.readAll();
+            VaultFile file = VaultFile.fromBytes(bytes);
+            if (file.isEncrypted()) {
+                return new EncryptedState(file);
+            }
+            return new DecryptedState(file.getContent());
+        } catch (VaultFileException | IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class EncryptedState extends State {
+        private VaultFile _file;
+
+        private EncryptedState(VaultFile file) {
+            super(true);
+            _file = file;
+        }
+
+        public SlotList getSlots() {
+            return _file.getHeader().getSlots();
+        }
+
+        public State decrypt(VaultFileCredentials creds) throws VaultFileException {
+            JSONObject obj = _file.getContent(creds);
+            return new DecryptedState(obj);
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+
+        }
+    }
+
+    public static class DecryptedState extends State {
+        private JSONObject _obj;
+
+        private DecryptedState(JSONObject obj) {
+            super(false);
+            _obj = obj;
+        }
+
+        @Override
+        public Result convert() throws DatabaseImporterException {
+            Result result = new Result();
+
+            try {
+                JSONArray array = _obj.getJSONArray("entries");
+                for (int i = 0; i < array.length(); i++) {
+                    JSONObject entryObj = array.getJSONObject(i);
+                    try {
+                        VaultEntry entry = convertEntry(entryObj);
+                        result.addEntry(entry);
+                    } catch (DatabaseImporterEntryException e) {
+                        result.addError(e);
+                    }
+                }
+            } catch (JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                return VaultEntry.fromJson(obj);
+            } catch (JSONException | OtpInfoException | EncodingException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}
@@ -1,87 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.encoding.Base32;
-import com.beemdevelopment.aegis.encoding.Base32Exception;
-import com.beemdevelopment.aegis.otp.HotpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.otp.TotpInfo;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-public class AndOtpFileImporter extends DatabaseFileImporter {
-    private JSONArray _obj;
-
-    public AndOtpFileImporter(Context context, ByteInputStream stream) {
-        super(context, stream);
-    }
-
-    @Override
-    public void parse() throws DatabaseImporterException {
-        try {
-            _obj = new JSONArray(new String(_stream.getBytes(), "UTF-8"));
-        } catch (JSONException e) {
-            throw new DatabaseImporterException(e);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public List<DatabaseEntry> convert() throws DatabaseImporterException {
-        List<DatabaseEntry> entries = new ArrayList<>();
-
-        try {
-            for (int i = 0; i < _obj.length(); i++) {
-                JSONObject obj = _obj.getJSONObject(i);
-
-                String type = obj.getString("type").toLowerCase();
-                String algo = obj.getString("algorithm");
-                int digits = obj.getInt("digits");
-                byte[] secret = Base32.decode(obj.getString("secret").toCharArray());
-
-                OtpInfo info;
-                if (type.equals("totp")) {
-                    info = new TotpInfo(secret, algo, digits, obj.getInt("period"));
-                } else if (type.equals("hotp")) {
-                    info = new HotpInfo(secret, algo, digits, obj.getLong("counter"));
-                } else {
-                    throw new DatabaseImporterException("unsupported otp type: " + type);
-                }
-
-                String issuer = "";
-                String name = "";
-
-                String[] parts = obj.getString("label").split(" - ");
-                if (parts.length > 1) {
-                    issuer = parts[0];
-                    name = parts[1];
-                } else {
-                    name = parts[0];
-                }
-
-                DatabaseEntry entry = new DatabaseEntry(info, name, issuer);
-                entries.add(entry);
-            }
-        } catch (Base32Exception | OtpInfoException | JSONException e) {
-            throw new DatabaseImporterException(e);
-        }
-
-        return entries;
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-}
@@ -0,0 +1,312 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.crypto.CryptParameters;
+import com.beemdevelopment.aegis.crypto.CryptResult;
+import com.beemdevelopment.aegis.crypto.CryptoUtils;
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.HotpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.Dialogs;
+import com.beemdevelopment.aegis.ui.tasks.ProgressDialogTask;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Arrays;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AndOtpImporter extends DatabaseImporter {
+    private static final int INT_SIZE = 4;
+    private static final int NONCE_SIZE = 12;
+    private static final int TAG_SIZE = 16;
+    private static final int SALT_SIZE = 12;
+    private static final int KEY_SIZE = 256; // bits
+
+    public AndOtpImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        byte[] bytes;
+        try {
+            bytes = reader.readAll();
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+
+        try {
+            return read(bytes);
+        } catch (JSONException e) {
+            // andOTP doesn't have a proper way to indicate whether a file is encrypted
+            // so, if we can't parse it as JSON, we'll have to assume it is
+            return new EncryptedState(bytes);
+        }
+    }
+
+    private static DecryptedState read(byte[] bytes) throws JSONException {
+        JSONArray array = new JSONArray(new String(bytes, StandardCharsets.UTF_8));
+        return new DecryptedState(array);
+    }
+
+    public static class EncryptedState extends DatabaseImporter.State {
+        private byte[] _data;
+
+        public EncryptedState(byte[] data) {
+            super(true);
+            _data = data;
+        }
+
+        private DecryptedState decryptData(SecretKey key, int offset) throws DatabaseImporterException {
+            byte[] nonce = Arrays.copyOfRange(_data, offset, offset + NONCE_SIZE);
+            byte[] tag = Arrays.copyOfRange(_data, _data.length - TAG_SIZE, _data.length);
+            CryptParameters params = new CryptParameters(nonce, tag);
+
+            try {
+                Cipher cipher = CryptoUtils.createDecryptCipher(key, nonce);
+                int len = _data.length - offset - NONCE_SIZE - TAG_SIZE;
+                CryptResult result = CryptoUtils.decrypt(_data, offset + NONCE_SIZE, len, cipher, params);
+                return read(result.getData());
+            } catch (IOException | BadPaddingException | JSONException e) {
+                throw new DatabaseImporterException(e);
+            } catch (NoSuchAlgorithmException
+                    | InvalidAlgorithmParameterException
+                    | InvalidKeyException
+                    | NoSuchPaddingException
+                    | IllegalBlockSizeException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private void decrypt(Context context, char[] password, boolean oldFormat, DecryptListener listener) throws DatabaseImporterException {
+            if (oldFormat) {
+                // WARNING: DON'T DO THIS IN YOUR OWN CODE
+                // this exists solely to support the old andOTP backup format
+                // it is not a secure way to derive a key from a password
+                MessageDigest hash;
+                try {
+                    hash = MessageDigest.getInstance("SHA-256");
+                } catch (NoSuchAlgorithmException e) {
+                    throw new RuntimeException(e);
+                }
+                byte[] keyBytes = hash.digest(CryptoUtils.toBytes(password));
+                SecretKey key = new SecretKeySpec(keyBytes, "AES");
+                DecryptedState state = decryptData(key, 0);
+                listener.onStateDecrypted(state);
+            } else {
+                int offset = INT_SIZE + SALT_SIZE;
+
+                byte[] iterBytes = Arrays.copyOfRange(_data, 0, INT_SIZE);
+                int iterations = ByteBuffer.wrap(iterBytes).getInt();
+                if (iterations < 1) {
+                    throw new DatabaseImporterException(String.format("Invalid number of iterations for PBKDF: %d", iterations));
+                }
+
+                byte[] salt = Arrays.copyOfRange(_data, INT_SIZE, offset);
+                AndOtpKeyDerivationTask.Params params = new AndOtpKeyDerivationTask.Params(password, salt, iterations);
+                AndOtpKeyDerivationTask task = new AndOtpKeyDerivationTask(context, key1 -> {
+                    try {
+                        DecryptedState state = decryptData(key1, offset);
+                        listener.onStateDecrypted(state);
+                    } catch (DatabaseImporterException e) {
+                        listener.onError(e);
+                    }
+                });
+                task.execute(params);
+            }
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+            String[] choices = new String[]{
+                    context.getResources().getString(R.string.andotp_new_format),
+                    context.getResources().getString(R.string.andotp_old_format)
+            };
+
+            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+                    .setTitle(R.string.choose_andotp_importer)
+                    .setSingleChoiceItems(choices, 0, null)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                        int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                        Dialogs.showPasswordInputDialog(context, password -> {
+                            try {
+                                decrypt(context, password, i != 0, listener);
+                            } catch (DatabaseImporterException e) {
+                                listener.onError(e);
+                            }
+                        });
+                    })
+                    .create());
+        }
+    }
+
+    public static class DecryptedState extends DatabaseImporter.State {
+        private JSONArray _obj;
+
+        private DecryptedState(JSONArray obj) {
+            super(false);
+            _obj = obj;
+        }
+
+        @Override
+        public Result convert() throws DatabaseImporterException {
+            Result result = new Result();
+
+            for (int i = 0; i < _obj.length(); i++) {
+                try {
+                    JSONObject obj = _obj.getJSONObject(i);
+                    VaultEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (JSONException e) {
+                    throw new DatabaseImporterException(e);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                String type = obj.getString("type").toLowerCase();
+                String algo = obj.getString("algorithm");
+                int digits = obj.getInt("digits");
+                byte[] secret = Base32.decode(obj.getString("secret"));
+
+                OtpInfo info;
+                switch (type) {
+                    case "hotp":
+                        info = new HotpInfo(secret, algo, digits, obj.getLong("counter"));
+                        break;
+                    case "totp":
+                        info = new TotpInfo(secret, algo, digits, obj.getInt("period"));
+                        break;
+                    case "steam":
+                        info = new SteamInfo(secret, algo, digits, obj.optInt("period", 30));
+                        break;
+                    default:
+                        throw new DatabaseImporterException("unsupported otp type: " + type);
+                }
+
+                String name;
+                String issuer = "";
+
+                if (obj.has("issuer")) {
+                    name = obj.getString("label");
+                    issuer = obj.getString("issuer");
+                } else {
+                    String[] parts = obj.getString("label").split(" - ");
+                    if (parts.length > 1) {
+                        issuer = parts[0];
+                        name = parts[1];
+                    } else {
+                        name = parts[0];
+                    }
+                }
+
+                return new VaultEntry(info, name, issuer);
+            } catch (DatabaseImporterException | EncodingException | OtpInfoException | JSONException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+
+    private static class AndOtpKeyDerivationTask extends ProgressDialogTask<AndOtpKeyDerivationTask.Params, SecretKey> {
+        private Callback _cb;
+
+        public AndOtpKeyDerivationTask(Context context, Callback cb) {
+            super(context, context.getString(R.string.unlocking_vault));
+            _cb = cb;
+        }
+
+        @Override
+        protected SecretKey doInBackground(AndOtpKeyDerivationTask.Params... args) {
+            setPriority();
+
+            AndOtpKeyDerivationTask.Params params = args[0];
+            SecretKey key;
+            try {
+                SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+                KeySpec spec = new PBEKeySpec(params.getPassword(), params.getSalt(), params.getIterations(), KEY_SIZE);
+                key = factory.generateSecret(spec);
+            } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+                throw new RuntimeException(e);
+            }
+
+            return key;
+        }
+
+        @Override
+        protected void onPostExecute(SecretKey key) {
+            super.onPostExecute(key);
+            _cb.onTaskFinished(key);
+        }
+
+        public static class Params {
+            private char[] _password;
+            private byte[] _salt;
+            private int _iterations;
+
+            public Params(char[] password, byte[] salt, int iterations) {
+                _iterations = iterations;
+                _password = password;
+                _salt = salt;
+            }
+
+            public char[] getPassword() {
+                return _password;
+            }
+
+            public int getIterations() {
+                return _iterations;
+            }
+
+            public byte[] getSalt() {
+                return _salt;
+            }
+        }
+
+        public interface Callback {
+            void onTaskFinished(SecretKey key);
+        }
+    }
+}
@@ -0,0 +1,73 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.ui.Dialogs;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class AuthenticatorPlusImporter extends DatabaseImporter {
+    private static final String FILENAME = "Accounts.txt";
+
+    public AuthenticatorPlusImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            return new EncryptedState(reader.readAll());
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class EncryptedState extends DatabaseImporter.State {
+        private byte[] _data;
+
+        private EncryptedState(byte[] data) {
+            super(true);
+            _data = data;
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+            Dialogs.showPasswordInputDialog(context, password -> {
+                try (ByteArrayInputStream inStream = new ByteArrayInputStream(_data);
+                     ZipInputStream zipStream = new ZipInputStream(inStream, password)) {
+                    LocalFileHeader header;
+                    while ((header = zipStream.getNextEntry()) != null) {
+                        File file = new File(header.getFileName());
+                        if (file.getName().equals(FILENAME)) {
+                            FileReader reader = new FileReader(zipStream);
+                            GoogleAuthUriImporter importer = new GoogleAuthUriImporter(context);
+                            GoogleAuthUriImporter.State state = importer.read(reader);
+                            listener.onStateDecrypted(state);
+                            return;
+                        }
+                    }
+
+                    throw new FileNotFoundException(FILENAME);
+                } catch (IOException | DatabaseImporterException e) {
+                    listener.onError(e);
+                }
+            });
+        }
+    }
+}
@@ -0,0 +1,220 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.util.Xml;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.Dialogs;
+import com.beemdevelopment.aegis.util.PreferenceParser;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+
+public class AuthyImporter extends DatabaseImporter {
+    private static final String _subPath = "shared_prefs/com.authy.storage.tokens.authenticator.xml";
+    private static final String _pkgName = "com.authy.authy";
+
+    private static final int ITERATIONS = 1000;
+    private static final int KEY_SIZE = 256;
+    private static final byte[] IV = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    public AuthyImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+            parser.setInput(reader.getStream(), null);
+            parser.nextTag();
+
+            JSONArray array = new JSONArray();
+            for (PreferenceParser.XmlEntry entry : PreferenceParser.parse(parser)) {
+                if (entry.Name.equals("com.authy.storage.tokens.authenticator.key")) {
+                    array = new JSONArray(entry.Value);
+                }
+            }
+
+            for (int i = 0; i < array.length(); i++) {
+                if (!array.getJSONObject(i).has("decryptedSecret")) {
+                    return new EncryptedState(array);
+                }
+            }
+
+            return new DecryptedState(array);
+        } catch (XmlPullParserException | JSONException | IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class EncryptedState extends DatabaseImporter.State {
+        private JSONArray _array;
+
+        private EncryptedState(JSONArray array) {
+            super(true);
+            _array = array;
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+            Dialogs.showPasswordInputDialog(context, R.string.enter_password_authy_message, password -> {
+                try {
+                    for (int i = 0; i < _array.length(); i++) {
+                        JSONObject obj = _array.getJSONObject(i);
+                        String secretString = obj.optString("encryptedSecret", null);
+                        if (secretString == null) {
+                            continue;
+                        }
+
+                        byte[] encryptedSecret = Base64.decode(secretString);
+                        byte[] salt = obj.getString("salt").getBytes(StandardCharsets.UTF_8);
+                        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+                        KeySpec spec = new PBEKeySpec(password, salt, ITERATIONS, KEY_SIZE);
+                        SecretKey key = factory.generateSecret(spec);
+
+                        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
+                        IvParameterSpec ivSpec = new IvParameterSpec(IV);
+                        cipher.init(Cipher.DECRYPT_MODE, key, ivSpec);
+
+                        byte[] secret = cipher.doFinal(encryptedSecret);
+                        obj.remove("encryptedSecret");
+                        obj.remove("salt");
+                        obj.put("decryptedSecret", new String(secret, StandardCharsets.UTF_8));
+                    }
+
+                    DecryptedState state = new DecryptedState(_array);
+                    listener.onStateDecrypted(state);
+                } catch (JSONException
+                        | EncodingException
+                        | NoSuchAlgorithmException
+                        | InvalidKeySpecException
+                        | InvalidAlgorithmParameterException
+                        | InvalidKeyException
+                        | NoSuchPaddingException
+                        | BadPaddingException
+                        | IllegalBlockSizeException e) {
+                    listener.onError(e);
+                }
+            });
+        }
+    }
+
+    public static class DecryptedState extends DatabaseImporter.State {
+        private JSONArray _array;
+
+        private DecryptedState(JSONArray array) {
+            super(false);
+            _array = array;
+        }
+
+        @Override
+        public Result convert() throws DatabaseImporterException {
+            Result result = new Result();
+
+            try {
+                for (int i = 0; i < _array.length(); i++) {
+                    JSONObject entryObj = _array.getJSONObject(i);
+                    try {
+                        VaultEntry entry = convertEntry(entryObj);
+                        result.addEntry(entry);
+                    } catch (DatabaseImporterEntryException e) {
+                        result.addError(e);
+                    }
+                }
+            } catch (JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject entry) throws DatabaseImporterEntryException {
+            try {
+                AuthyEntryInfo authyEntryInfo = new AuthyEntryInfo();
+                authyEntryInfo.OriginalName = entry.optString("originalName", null);
+                authyEntryInfo.OriginalIssuer = entry.optString("originalIssuer", null);
+                authyEntryInfo.AccountType = entry.getString("accountType");
+                authyEntryInfo.Name = entry.optString("name");
+
+                sanitizeEntryInfo(authyEntryInfo);
+
+                int digits = entry.getInt("digits");
+                byte[] secret = Base32.decode(entry.getString("decryptedSecret"));
+
+                OtpInfo info = new TotpInfo(secret, "SHA1", digits, 30);
+
+                return new VaultEntry(info, authyEntryInfo.Name, authyEntryInfo.Issuer);
+            } catch (OtpInfoException | JSONException | EncodingException e) {
+                throw new DatabaseImporterEntryException(e, entry.toString());
+            }
+        }
+
+        private static void sanitizeEntryInfo(AuthyEntryInfo info) {
+            String separator = "";
+
+            if (info.OriginalIssuer != null) {
+                info.Issuer = info.OriginalIssuer;
+            } else if (info.OriginalName != null && info.OriginalName.contains(":")) {
+                info.Issuer = info.OriginalName.substring(0, info.OriginalName.indexOf(":"));
+                separator = ":";
+            } else if (info.Name.contains(" - ")) {
+                info.Issuer = info.Name.substring(0, info.Name.indexOf(" - "));
+                separator = " - ";
+            } else {
+                info.Issuer = info.AccountType.substring(0, 1).toUpperCase() + info.AccountType.substring(1);
+            }
+
+            info.Name = info.Name.replace(info.Issuer + separator, "");
+        }
+    }
+
+    private static class AuthyEntryInfo {
+        String OriginalName;
+        String OriginalIssuer;
+        String AccountType;
+        String Issuer;
+        String Name;
+    }
+}
@@ -1,50 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class DatabaseAppImporter implements DatabaseImporter {
-    private static Map<String, Class<? extends DatabaseAppImporter>> _importers;
-    static {
-        // note: keep this list sorted alphabetically
-        LinkedHashMap<String, Class<? extends DatabaseAppImporter>> importers = new LinkedHashMap<>();
-        importers.put("Google Authenticator", GoogleAuthAppImporter.class);
-        _importers = Collections.unmodifiableMap(importers);
-    }
-
-    private Context _context;
-
-    protected DatabaseAppImporter(Context context) {
-        _context = context;
-    }
-
-    public abstract void parse() throws DatabaseImporterException;
-
-    public abstract List<DatabaseEntry> convert() throws DatabaseImporterException;
-
-    public abstract boolean isEncrypted();
-
-    public Context getContext() {
-        return _context;
-    }
-
-    public static DatabaseAppImporter create(Context context, Class<? extends DatabaseAppImporter> type) {
-        try {
-            return type.getConstructor(Context.class).newInstance(context);
-        } catch (IllegalAccessException | InstantiationException
-                | NoSuchMethodException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Map<String, Class<? extends DatabaseAppImporter>> getImporters() {
-        return _importers;
-    }
-}
@@ -1,55 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-public abstract class DatabaseFileImporter implements DatabaseImporter {
-    private static Map<String, Class<? extends DatabaseFileImporter>> _importers;
-    static {
-        // note: keep this list sorted alphabetically
-        LinkedHashMap<String, Class<? extends DatabaseFileImporter>> importers = new LinkedHashMap<>();
-        importers.put("Aegis", AegisFileImporter.class);
-        importers.put("andOTP", AndOtpFileImporter.class);
-        importers.put("FreeOTP", FreeOtpFileImporter.class);
-        _importers = Collections.unmodifiableMap(importers);
-    }
-
-    private Context _context;
-    protected ByteInputStream _stream;
-
-    protected DatabaseFileImporter(Context context, ByteInputStream stream) {
-        _context = context;
-        _stream = stream;
-    }
-
-    public abstract void parse() throws DatabaseImporterException;
-
-    public abstract List<DatabaseEntry> convert() throws DatabaseImporterException;
-
-    public abstract boolean isEncrypted();
-
-    public Context getContext() {
-        return _context;
-    }
-
-    public static DatabaseFileImporter create(Context context, ByteInputStream stream, Class<? extends DatabaseFileImporter> type) {
-        try {
-            return type.getConstructor(Context.class, ByteInputStream.class).newInstance(context, stream);
-        } catch (IllegalAccessException | InstantiationException
-                | NoSuchMethodException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Map<String, Class<? extends DatabaseFileImporter>> getImporters() {
-        return _importers;
-    }
-}
@@ -1,14 +1,175 @@
 package com.beemdevelopment.aegis.importers;

 import android.content.Context;
+import android.content.pm.PackageManager;

-import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.util.IOUtils;
+import com.beemdevelopment.aegis.util.UUIDMap;
+import com.topjohnwu.superuser.io.SuFile;

+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;

-public interface DatabaseImporter {
-    void parse() throws DatabaseImporterException;
-    List<DatabaseEntry> convert() throws DatabaseImporterException;
-    boolean isEncrypted();
-    Context getContext();
+public abstract class DatabaseImporter {
+    private Context _context;
+
+    private static Map<String, Class<? extends DatabaseImporter>> _importers;
+    private static Map<String, Class<? extends DatabaseImporter>> _appImporters;
+
+    static {
+        // note: keep these lists sorted alphabetically
+        _importers = new LinkedHashMap<>();
+        _importers.put("Aegis", AegisImporter.class);
+        _importers.put("Authenticator Plus", AuthenticatorPlusImporter.class);
+        _importers.put("Authy", AuthyImporter.class);
+        _importers.put("andOTP", AndOtpImporter.class);
+        _importers.put("FreeOTP", FreeOtpImporter.class);
+        _importers.put("FreeOTP+", FreeOtpPlusImporter.class);
+        _importers.put("Google Authenticator", GoogleAuthImporter.class);
+        _importers.put("Microsoft Authenticator", MicrosoftAuthImporter.class);
+        _importers.put("Plain text", GoogleAuthUriImporter.class);
+        _importers.put("Steam", SteamImporter.class);
+        _importers.put("TOTP Authenticator", TotpAuthenticatorImporter.class);
+        _importers.put("WinAuth", WinAuthImporter.class);
+
+        _appImporters = new LinkedHashMap<>();
+        _appImporters.put("Authy", AuthyImporter.class);
+        _appImporters.put("FreeOTP", FreeOtpImporter.class);
+        _appImporters.put("FreeOTP+", FreeOtpPlusImporter.class);
+        _appImporters.put("Google Authenticator", GoogleAuthImporter.class);
+        _appImporters.put("Microsoft Authenticator", MicrosoftAuthImporter.class);
+        _appImporters.put("Steam", SteamImporter.class);
+        _appImporters.put("TOTP Authenticator", TotpAuthenticatorImporter.class);
+    }
+
+    public DatabaseImporter(Context context) {
+        _context = context;
+    }
+
+    protected Context getContext() {
+        return _context;
+    }
+
+    public SuFile getAppPath() throws DatabaseImporterException, PackageManager.NameNotFoundException {
+        return getAppPath(getAppPkgName(), getAppSubPath());
+    }
+
+    protected SuFile getAppPath(String pkgName, String subPath) throws PackageManager.NameNotFoundException {
+        PackageManager man = getContext().getPackageManager();
+        return new SuFile(man.getApplicationInfo(pkgName, 0).dataDir, subPath);
+    }
+
+    protected abstract String getAppPkgName();
+
+    protected abstract String getAppSubPath() throws DatabaseImporterException, PackageManager.NameNotFoundException;
+
+    public abstract State read(FileReader reader) throws DatabaseImporterException;
+
+    public static DatabaseImporter create(Context context, Class<? extends DatabaseImporter> type) {
+        try {
+            return type.getConstructor(Context.class).newInstance(context);
+        } catch (IllegalAccessException | InstantiationException
+                | NoSuchMethodException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Map<String, Class<? extends DatabaseImporter>> getImporters() {
+        return Collections.unmodifiableMap(_importers);
+    }
+
+    public static Map<String, Class<? extends DatabaseImporter>> getAppImporters() {
+        return Collections.unmodifiableMap(_appImporters);
+    }
+
+    public static abstract class State {
+        private boolean _encrypted;
+
+        public State(boolean encrypted) {
+            _encrypted = encrypted;
+        }
+
+        public boolean isEncrypted() {
+            return _encrypted;
+        }
+
+        public void decrypt(Context context, DecryptListener listener) throws DatabaseImporterException {
+            if (!_encrypted) {
+                throw new RuntimeException("Attempted to decrypt a plain text database");
+            }
+
+            throw new UnsupportedOperationException();
+        }
+
+        public Result convert() throws DatabaseImporterException {
+            if (_encrypted) {
+                throw new RuntimeException("Attempted to convert database before decrypting it");
+            }
+
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class Result {
+        private UUIDMap<VaultEntry> _entries = new UUIDMap<>();
+        private List<DatabaseImporterEntryException> _errors = new ArrayList<>();
+
+        public void addEntry(VaultEntry entry) {
+            _entries.add(entry);
+        }
+
+        public void addError(DatabaseImporterEntryException error) {
+            _errors.add(error);
+        }
+
+        public UUIDMap<VaultEntry> getEntries() {
+            return _entries;
+        }
+
+        public List<DatabaseImporterEntryException> getErrors() {
+            return _errors;
+        }
+    }
+
+    public static class FileReader {
+        private InputStream _stream;
+        private boolean _internal;
+
+        public FileReader(InputStream stream) {
+            this(stream, false);
+        }
+
+        public FileReader(InputStream stream, boolean internal) {
+            _stream = stream;
+            _internal = internal;
+        }
+
+        public byte[] readAll() throws IOException {
+            return IOUtils.readAll(_stream);
+        }
+
+        public InputStream getStream() {
+            return _stream;
+        }
+
+        /**
+         * Reports whether this reader reads the internal state of an app.
+         * @return true if reading from internal file, false if reading from external file
+         */
+        public boolean isInternal() {
+            return _internal;
+        }
+    }
+
+    public interface DecryptListener {
+        void onStateDecrypted(State state);
+        void onError(Exception e);
+    }
 }
@@ -0,0 +1,19 @@
+package com.beemdevelopment.aegis.importers;
+
+public class DatabaseImporterEntryException extends Exception {
+    private String _text;
+
+    public DatabaseImporterEntryException(String message, String text) {
+        super(message);
+        _text = text;
+    }
+
+    public DatabaseImporterEntryException(Throwable cause, String text) {
+        super(cause);
+        _text = text;
+    }
+
+    public String getText() {
+        return _text;
+    }
+}
@@ -1,161 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-import android.util.Xml;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.otp.HotpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.otp.TotpInfo;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-public class FreeOtpFileImporter extends DatabaseFileImporter {
-    private List<XmlEntry> _xmlEntries;
-
-    public FreeOtpFileImporter(Context context, ByteInputStream stream) {
-        super(context, stream);
-    }
-
-    private static class XmlEntry {
-        String Name;
-        String Value;
-    }
-
-    @Override
-    public void parse() throws DatabaseImporterException {
-        try {
-            XmlPullParser parser = Xml.newPullParser();
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
-            parser.setInput(_stream, null);
-            parser.nextTag();
-            _xmlEntries = parse(parser);
-        } catch (XmlPullParserException | IOException e) {
-            throw new DatabaseImporterException(e);
-        }
-    }
-
-    @Override
-    public List<DatabaseEntry> convert() throws DatabaseImporterException {
-        List<DatabaseEntry> entries = new ArrayList<>();
-
-        try {
-            for (XmlEntry xmlEntry : _xmlEntries) {
-                if (xmlEntry.Name.equals("tokenOrder")) {
-                    // TODO: order
-                    JSONArray array = new JSONArray(xmlEntry.Value);
-                } else {
-                    JSONObject obj = new JSONObject(xmlEntry.Value);
-
-                    String type = obj.getString("type").toLowerCase();
-                    String algo = obj.getString("algo");
-                    int digits = obj.getInt("digits");
-                    byte[] secret = toBytes(obj.getJSONArray("secret"));
-
-                    OtpInfo info;
-                    if (type.equals("totp")) {
-                        info = new TotpInfo(secret, algo, digits, obj.getInt("period"));
-                    } else if (type.equals("hotp")) {
-                        info = new HotpInfo(secret, algo, digits, obj.getLong("counter"));
-                    } else {
-                        throw new DatabaseImporterException("unsupported otp type: " + type);
-                    }
-
-                    String issuer = obj.getString("issuerExt");
-                    String name = obj.optString("label");
-
-                    DatabaseEntry entry = new DatabaseEntry(info, name, issuer);
-                    entries.add(entry);
-                }
-            }
-        } catch (OtpInfoException | JSONException e) {
-            throw new DatabaseImporterException(e);
-        }
-
-        return entries;
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
-    private static List<XmlEntry> parse(XmlPullParser parser)
-            throws IOException, XmlPullParserException {
-        List<XmlEntry> entries = new ArrayList<>();
-
-        parser.require(XmlPullParser.START_TAG, null, "map");
-        while (parser.next() != XmlPullParser.END_TAG) {
-            if (parser.getEventType() != XmlPullParser.START_TAG) {
-                continue;
-            }
-
-            if (!parser.getName().equals("string")) {
-                skip(parser);
-                continue;
-            }
-
-            entries.add(parseEntry(parser));
-        }
-
-        return entries;
-    }
-
-    private static byte[] toBytes(JSONArray array) throws JSONException {
-        byte[] bytes = new byte[array.length()];
-        for (int i = 0; i < array.length(); i++) {
-            bytes[i] = (byte)array.getInt(i);
-        }
-        return bytes;
-    }
-
-    private static XmlEntry parseEntry(XmlPullParser parser) throws IOException, XmlPullParserException {
-        parser.require(XmlPullParser.START_TAG, null, "string");
-        String name = parser.getAttributeValue(null, "name");
-        String value = parseText(parser);
-        parser.require(XmlPullParser.END_TAG, null, "string");
-
-        XmlEntry entry = new XmlEntry();
-        entry.Name = name;
-        entry.Value = value;
-        return entry;
-    }
-
-    private static String parseText(XmlPullParser parser) throws IOException, XmlPullParserException {
-        String text = "";
-        if (parser.next() == XmlPullParser.TEXT) {
-            text = parser.getText();
-            parser.nextTag();
-        }
-        return text;
-    }
-
-    private static void skip(XmlPullParser parser) throws IOException, XmlPullParserException {
-        // source: https://developer.android.com/training/basics/network-ops/xml.html
-        if (parser.getEventType() != XmlPullParser.START_TAG) {
-            throw new IllegalStateException();
-        }
-
-        int depth = 1;
-        while (depth != 0) {
-            switch (parser.next()) {
-                case XmlPullParser.END_TAG:
-                    depth--;
-                    break;
-                case XmlPullParser.START_TAG:
-                    depth++;
-                    break;
-            }
-        }
-    }
-}
@@ -0,0 +1,193 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.util.Xml;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.otp.HotpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.util.PreferenceParser;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FreeOtpImporter extends DatabaseImporter {
+    private static final String _subPath = "shared_prefs/tokens.xml";
+    private static final String _pkgName = "org.fedorahosted.freeotp";
+
+    public FreeOtpImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+            parser.setInput(reader.getStream(), null);
+            parser.nextTag();
+
+            List<JSONObject> entries = new ArrayList<>();
+            for (PreferenceParser.XmlEntry entry : PreferenceParser.parse(parser)) {
+                if (!entry.Name.equals("tokenOrder")) {
+                    entries.add(new JSONObject(entry.Value));
+                }
+            }
+            return new State(entries);
+        } catch (XmlPullParserException | IOException | JSONException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private List<JSONObject> _entries;
+
+        public State(List<JSONObject> entries) {
+            super(false);
+            _entries = entries;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (JSONObject obj : _entries) {
+                try {
+                    VaultEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                String type = obj.getString("type").toLowerCase();
+                String algo = obj.getString("algo");
+                int digits = obj.getInt("digits");
+                byte[] secret = toBytes(obj.getJSONArray("secret"));
+
+                String issuer = obj.getString("issuerExt");
+                String name = obj.optString("label");
+
+                OtpInfo info;
+                switch (type) {
+                    case "totp":
+                        int period = obj.getInt("period");
+                        if (issuer.equals("Steam")) {
+                            info = new SteamInfo(secret, algo, digits, period);
+                        } else {
+                            info = new TotpInfo(secret, algo, digits, period);
+                        }
+                        break;
+                    case "hotp":
+                        info = new HotpInfo(secret, algo, digits, obj.getLong("counter"));
+                        break;
+                    default:
+                        throw new DatabaseImporterException("unsupported otp type: " + type);
+                }
+
+                return new VaultEntry(info, name, issuer);
+            } catch (DatabaseImporterException | OtpInfoException | JSONException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+
+    private static List<JSONObject> parseXml(XmlPullParser parser)
+            throws IOException, XmlPullParserException, JSONException {
+        List<JSONObject> entries = new ArrayList<>();
+
+        parser.require(XmlPullParser.START_TAG, null, "map");
+        while (parser.next() != XmlPullParser.END_TAG) {
+            if (parser.getEventType() != XmlPullParser.START_TAG) {
+                continue;
+            }
+
+            if (!parser.getName().equals("string")) {
+                skip(parser);
+                continue;
+            }
+
+            JSONObject entry = parseXmlEntry(parser);
+            if (entry != null) {
+                entries.add(entry);
+            }
+        }
+
+        return entries;
+    }
+
+    private static byte[] toBytes(JSONArray array) throws JSONException {
+        byte[] bytes = new byte[array.length()];
+        for (int i = 0; i < array.length(); i++) {
+            bytes[i] = (byte)array.getInt(i);
+        }
+        return bytes;
+    }
+
+    private static JSONObject parseXmlEntry(XmlPullParser parser)
+            throws IOException, XmlPullParserException, JSONException {
+        parser.require(XmlPullParser.START_TAG, null, "string");
+        String name = parser.getAttributeValue(null, "name");
+        String value = parseXmlText(parser);
+        parser.require(XmlPullParser.END_TAG, null, "string");
+
+        if (name.equals("tokenOrder")) {
+            return null;
+        }
+
+        return new JSONObject(value);
+    }
+
+    private static String parseXmlText(XmlPullParser parser) throws IOException, XmlPullParserException {
+        String text = "";
+        if (parser.next() == XmlPullParser.TEXT) {
+            text = parser.getText();
+            parser.nextTag();
+        }
+        return text;
+    }
+
+    private static void skip(XmlPullParser parser) throws IOException, XmlPullParserException {
+        // source: https://developer.android.com/training/basics/network-ops/xml.html
+        if (parser.getEventType() != XmlPullParser.START_TAG) {
+            throw new IllegalStateException();
+        }
+
+        int depth = 1;
+        while (depth != 0) {
+            switch (parser.next()) {
+                case XmlPullParser.END_TAG:
+                    depth--;
+                    break;
+                case XmlPullParser.START_TAG:
+                    depth++;
+                    break;
+            }
+        }
+    }
+}
@@ -0,0 +1,57 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FreeOtpPlusImporter extends DatabaseImporter {
+    private static final String _subPath = "shared_prefs/tokens.xml";
+    private static final String _pkgName = "org.liberty.android.freeotpplus";
+
+    public FreeOtpPlusImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        State state;
+
+        if (reader.isInternal()) {
+            state = new FreeOtpImporter(getContext()).read(reader);
+        } else {
+            try {
+                String json = new String(reader.readAll(), StandardCharsets.UTF_8);
+                JSONObject obj = new JSONObject(json);
+                JSONArray array = obj.getJSONArray("tokens");
+
+                List<JSONObject> entries = new ArrayList<>();
+                for (int i = 0; i < array.length(); i++) {
+                    entries.add(array.getJSONObject(i));
+                }
+
+                state = new FreeOtpImporter.State(entries);
+            } catch (IOException | JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+        }
+
+        return state;
+    }
+}
@@ -1,124 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.encoding.Base32;
-import com.beemdevelopment.aegis.encoding.Base32Exception;
-import com.beemdevelopment.aegis.otp.HotpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfo;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.otp.TotpInfo;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.database.sqlite.SQLiteDatabase.OPEN_READONLY;
-
-public class GoogleAuthAppImporter extends DatabaseAppImporter {
-    private static final int TYPE_TOTP = 0;
-    private static final int TYPE_HOTP = 1;
-
-    @SuppressLint("SdCardPath")
-    private static final String _filename = "/data/data/com.google.android.apps.authenticator2/databases/databases";
-
-    private List<DatabaseEntry> _entries = new ArrayList<>();
-
-    public GoogleAuthAppImporter(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void parse() throws DatabaseImporterException {
-        File file;
-
-        try {
-            // create a temporary copy of the database so that SQLiteDatabase can open it
-            file = File.createTempFile("google-import-", "", getContext().getCacheDir());
-            try (SuFileInputStream in = new SuFileInputStream(new SuFile(_filename))) {
-                try (FileOutputStream out = new FileOutputStream(file)) {
-                    ShellUtils.pump(in, out);
-                }
-            }
-        } catch (IOException e) {
-            throw new DatabaseImporterException(e);
-        }
-
-        try (SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getAbsolutePath(), null, OPEN_READONLY, null)) {
-            try (Cursor cursor = db.rawQuery("SELECT * FROM accounts", null)) {
-                if (!cursor.moveToFirst()) {
-                    return;
-                }
-
-                do {
-                    int type = getInt(cursor, "type");
-                    byte[] secret = Base32.decode(getString(cursor, "secret").toCharArray());
-
-                    OtpInfo info;
-                    switch (type) {
-                        case TYPE_TOTP:
-                            info = new TotpInfo(secret);
-                            break;
-                        case TYPE_HOTP:
-                            info = new HotpInfo(secret, getInt(cursor, "counter"));
-                            break;
-                        default:
-                            throw new DatabaseImporterException("unsupported otp type: " + type);
-                    }
-
-                    String name = getString(cursor, "email", "");
-                    String issuer = getString(cursor, "issuer", "");
-
-                    String[] parts = name.split(":");
-                    if (parts.length == 2) {
-                        name = parts[1];
-                    }
-
-                    DatabaseEntry entry = new DatabaseEntry(info, name, issuer);
-                    _entries.add(entry);
-                } while(cursor.moveToNext());
-            }
-        } catch (SQLiteException | OtpInfoException | Base32Exception e) {
-            throw new DatabaseImporterException(e);
-        } finally {
-            // always delete the temporary file
-            file.delete();
-        }
-    }
-
-    @Override
-    public List<DatabaseEntry> convert() {
-        return _entries;
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
-    private static String getString(Cursor cursor, String columnName) {
-        return getString(cursor, columnName, null);
-    }
-
-    private static String getString(Cursor cursor, String columnName, String def) {
-        String res = cursor.getString(cursor.getColumnIndex(columnName));
-        if (res == null) {
-            return def;
-        }
-        return res;
-    }
-
-    private static int getInt(Cursor cursor, String columnName) {
-        return cursor.getInt(cursor.getColumnIndex(columnName));
-    }
-}
@@ -0,0 +1,133 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.HotpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.List;
+
+public class GoogleAuthImporter extends DatabaseImporter {
+    private static final int TYPE_TOTP = 0;
+    private static final int TYPE_HOTP = 1;
+
+    private static final String _subPath = "databases/databases";
+    private static final String _pkgName = "com.google.android.apps.authenticator2";
+
+    public GoogleAuthImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        SqlImporterHelper helper = new SqlImporterHelper(getContext());
+        List<Entry> entries = helper.read(Entry.class, reader.getStream(), "accounts");
+        return new State(entries);
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private List<Entry> _entries;
+
+        private State(List<Entry> entries) {
+            super(false);
+            _entries = entries;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (Entry sqlEntry : _entries) {
+                try {
+                    VaultEntry entry = convertEntry(sqlEntry);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(Entry entry) throws DatabaseImporterEntryException {
+            try {
+                byte[] secret = Base32.decode(entry.getSecret());
+
+                OtpInfo info;
+                switch (entry.getType()) {
+                    case TYPE_TOTP:
+                        info = new TotpInfo(secret);
+                        break;
+                    case TYPE_HOTP:
+                        info = new HotpInfo(secret, entry.getCounter());
+                        break;
+                    default:
+                        throw new DatabaseImporterException("unsupported otp type: " + entry.getType());
+                }
+
+                String name = entry.getEmail();
+                String[] parts = name.split(":");
+                if (parts.length == 2) {
+                    name = parts[1];
+                }
+
+                return new VaultEntry(info, name, entry.getIssuer());
+            } catch (EncodingException | OtpInfoException | DatabaseImporterException e) {
+                throw new DatabaseImporterEntryException(e, entry.toString());
+            }
+        }
+    }
+
+    private static class Entry extends SqlImporterHelper.Entry {
+        private int _type;
+        private String _secret;
+        private String _email;
+        private String _issuer;
+        private long _counter;
+
+        public Entry(Cursor cursor) {
+            super(cursor);
+            _type = SqlImporterHelper.getInt(cursor, "type");
+            _secret = SqlImporterHelper.getString(cursor, "secret");
+            _email = SqlImporterHelper.getString(cursor, "email", "");
+            _issuer = SqlImporterHelper.getString(cursor, "issuer", "");
+            _counter = SqlImporterHelper.getLong(cursor, "counter");
+        }
+
+        public int getType() {
+            return _type;
+        }
+
+        public String getSecret() {
+            return _secret;
+        }
+
+        public String getEmail() {
+            return _email;
+        }
+
+        public String getIssuer() {
+            return _issuer;
+        }
+
+        public long getCounter() {
+            return _counter;
+        }
+    }
+}
@@ -0,0 +1,81 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+public class GoogleAuthUriImporter extends DatabaseImporter {
+    public GoogleAuthUriImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return null;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return null;
+    }
+
+    @Override
+    public GoogleAuthUriImporter.State read(DatabaseImporter.FileReader reader) throws DatabaseImporterException {
+        ArrayList<String> lines = new ArrayList<>();
+
+        try (InputStreamReader streamReader = new InputStreamReader(reader.getStream());
+             BufferedReader bufferedReader = new BufferedReader(streamReader)) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (!line.isEmpty()) {
+                    lines.add(line);
+                }
+            }
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+
+        return new GoogleAuthUriImporter.State(lines);
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private ArrayList<String> _lines;
+
+        private State(ArrayList<String> lines) {
+            super(false);
+            _lines = lines;
+        }
+
+        @Override
+        public DatabaseImporter.Result convert() {
+            DatabaseImporter.Result result = new DatabaseImporter.Result();
+
+            for (String line : _lines) {
+                try {
+                    VaultEntry entry = convertEntry(line);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(String line) throws DatabaseImporterEntryException {
+            try {
+                GoogleAuthInfo info = GoogleAuthInfo.parseUri(line);
+                return new VaultEntry(info);
+            } catch (GoogleAuthInfoException e) {
+                throw new DatabaseImporterEntryException(e, line);
+            }
+        }
+    }
+}
@@ -0,0 +1,126 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import java.util.List;
+
+public class MicrosoftAuthImporter extends DatabaseImporter {
+    private static final String _subPath = "databases/PhoneFactor";
+    private static final String _pkgName = "com.azure.authenticator";
+
+    private static final int TYPE_TOTP = 0;
+    private static final int TYPE_MICROSOFT = 1;
+
+    public MicrosoftAuthImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        SqlImporterHelper helper = new SqlImporterHelper(getContext());
+        List<Entry> entries = helper.read(Entry.class, reader.getStream(), "accounts");
+        return new State(entries);
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private List<Entry> _entries;
+
+        private State(List<Entry> entries) {
+            super(false);
+            _entries = entries;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (Entry sqlEntry : _entries) {
+                try {
+                    int type = sqlEntry.getType();
+                    if (type == TYPE_TOTP || type == TYPE_MICROSOFT) {
+                        VaultEntry entry = convertEntry(sqlEntry);
+                        result.addEntry(entry);
+                    }
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(Entry entry) throws DatabaseImporterEntryException {
+            try {
+                byte[] secret;
+                int digits = 6;
+
+                switch (entry.getType()) {
+                    case TYPE_TOTP:
+                        secret = Base32.decode(entry.getSecret());
+                        break;
+                    case TYPE_MICROSOFT:
+                        digits = 8;
+                        secret = Base64.decode(entry.getSecret());
+                        break;
+                    default:
+                        throw new DatabaseImporterEntryException(String.format("Unsupported OTP type: %d", entry.getType()), entry.toString());
+                }
+
+                OtpInfo info = new TotpInfo(secret, "SHA1", digits, 30);
+                return new VaultEntry(info, entry.getUserName(), entry.getIssuer());
+            } catch (EncodingException | OtpInfoException e) {
+                throw new DatabaseImporterEntryException(e, entry.toString());
+            }
+        }
+    }
+
+    private static class Entry extends SqlImporterHelper.Entry {
+        private int _type;
+        private String _secret;
+        private String _issuer;
+        private String _userName;
+
+        public Entry(Cursor cursor) {
+            super(cursor);
+            _type = SqlImporterHelper.getInt(cursor, "account_type");
+            _secret = SqlImporterHelper.getString(cursor, "oath_secret_key");
+            _issuer = SqlImporterHelper.getString(cursor, "name");
+            _userName = SqlImporterHelper.getString(cursor, "username");
+        }
+
+        public int getType() {
+            return _type;
+        }
+
+        public String getSecret() {
+            return _secret;
+        }
+
+        public String getIssuer() {
+            return _issuer;
+        }
+
+        public String getUserName() {
+            return _userName;
+        }
+    }
+}
@@ -0,0 +1,89 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.database.sqlite.SQLiteDatabase.OPEN_READONLY;
+
+public class SqlImporterHelper {
+    private Context _context;
+
+    public SqlImporterHelper(Context context) {
+        _context = context;
+    }
+
+    public <T extends Entry> List<T> read(Class<T> type, InputStream inStream, String table) throws DatabaseImporterException {
+        File file;
+
+        try {
+            // create a temporary copy of the database so that SQLiteDatabase can open it
+            file = File.createTempFile("db-import-", "", _context.getCacheDir());
+            try (FileOutputStream out = new FileOutputStream(file)) {
+                ShellUtils.pump(inStream, out);
+            }
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+
+        try (SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getAbsolutePath(), null, OPEN_READONLY)) {
+            try (Cursor cursor = db.rawQuery(String.format("SELECT * FROM %s", table), null)) {
+                List<T> entries = new ArrayList<>();
+
+                if (cursor.moveToFirst()) {
+                    do {
+                        T entry = type.getDeclaredConstructor(Cursor.class).newInstance(cursor);
+                        entries.add(entry);
+                    } while (cursor.moveToNext());
+                }
+
+                return entries;
+            } catch (InstantiationException | IllegalAccessException
+                    | NoSuchMethodException | InvocationTargetException e) {
+                throw new RuntimeException(e);
+            }
+        } catch (SQLiteException e) {
+            throw new DatabaseImporterException(e);
+        } finally {
+            // always delete the temporary file
+            file.delete();
+        }
+    }
+
+    public static String getString(Cursor cursor, String columnName) {
+        return cursor.getString(cursor.getColumnIndex(columnName));
+    }
+
+    public static String getString(Cursor cursor, String columnName, String def) {
+        String res = cursor.getString(cursor.getColumnIndex(columnName));
+        if (res == null) {
+            return def;
+        }
+        return res;
+    }
+
+    public static int getInt(Cursor cursor, String columnName) {
+        return cursor.getInt(cursor.getColumnIndex(columnName));
+    }
+
+    public static long getLong(Cursor cursor, String columnName) {
+        return cursor.getLong(cursor.getColumnIndex(columnName));
+    }
+
+    public static abstract class Entry {
+        public Entry(Cursor cursor) {
+
+        }
+    }
+}
@@ -0,0 +1,90 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.topjohnwu.superuser.io.SuFile;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class SteamImporter extends DatabaseImporter {
+    private static final String _subDir = "files";
+    private static final String _pkgName = "com.valvesoftware.android.steam.community";
+
+    public SteamImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() throws DatabaseImporterException, PackageManager.NameNotFoundException {
+        // NOTE: this assumes that a global root shell has already been obtained by the caller
+        SuFile path = getAppPath(getAppPkgName(), _subDir);
+        SuFile[] files = path.listFiles((d, name) -> name.startsWith("Steamguard-"));
+        if (files == null || files.length == 0) {
+            throw new DatabaseImporterException(String.format("Empty directory: %s", path.getAbsolutePath()));
+        }
+
+        // TODO: handle multiple files (can this even occur?)
+        return new SuFile(_subDir, files[0].getName()).getPath();
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            byte[] bytes = reader.readAll();
+            JSONObject obj = new JSONObject(new String(bytes, StandardCharsets.UTF_8));
+            return new State(obj);
+        } catch (IOException | JSONException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private JSONObject _obj;
+
+        private State(JSONObject obj) {
+            super(false);
+            _obj = obj;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            try {
+                VaultEntry entry = convertEntry(_obj);
+                result.addEntry(entry);
+            } catch (DatabaseImporterEntryException e) {
+                result.addError(e);
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                byte[] secret = Base64.decode(obj.getString("shared_secret"));
+                SteamInfo info = new SteamInfo(secret);
+
+                String account = obj.getString("account_name");
+                return new VaultEntry(info, account, "Steam");
+            } catch (JSONException | EncodingException | OtpInfoException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}
@@ -0,0 +1,235 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.util.Xml;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.crypto.CryptoUtils;
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.encoding.Hex;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.Dialogs;
+import com.beemdevelopment.aegis.util.PreferenceParser;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class TotpAuthenticatorImporter extends DatabaseImporter {
+    private static final String _subPath = "shared_prefs/TOTP_Authenticator_Preferences.xml";
+    private static final String _pkgName = "com.authenticator.authservice2";
+
+    // WARNING: DON'T DO THIS IN YOUR OWN CODE
+    // this is a hardcoded password and nonce, used solely to decrypt TOTP Authenticator backups
+    private static final char[] PASSWORD = "TotpAuthenticator".toCharArray();
+    private static final byte[] IV = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    private static final String PREF_KEY = "STATIC_TOTP_CODES_LIST";
+
+    public TotpAuthenticatorImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) throws DatabaseImporterException {
+        try {
+            if (reader.isInternal()) {
+                XmlPullParser parser = Xml.newPullParser();
+                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+                parser.setInput(reader.getStream(), null);
+                parser.nextTag();
+
+                String data = null;
+                for (PreferenceParser.XmlEntry entry : PreferenceParser.parse(parser)) {
+                    if (entry.Name.equals(PREF_KEY)) {
+                        data = entry.Value;
+                    }
+                }
+
+                if (data == null) {
+                    throw new DatabaseImporterException(String.format("Key %s not found in shared preference file", PREF_KEY));
+                }
+
+                List<JSONObject> entries = parse(data);
+                return new DecryptedState(entries);
+            } else {
+                byte[] base64 = reader.readAll();
+                byte[] cipherText = Base64.decode(base64);
+                return new EncryptedState(cipherText);
+            }
+        } catch (IOException | XmlPullParserException | JSONException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    private static List<JSONObject> parse(String data) throws JSONException {
+        JSONArray array = new JSONArray(data);
+
+        List<JSONObject> entries = new ArrayList<>();
+        for (int i = 0; i < array.length(); ++i) {
+            String s = array.getString(i);
+            entries.add(new JSONObject(s));
+        }
+
+        return entries;
+    }
+
+    public static class EncryptedState extends DatabaseImporter.State {
+        private byte[] _data;
+
+        public EncryptedState(byte[] data) {
+            super(true);
+            _data = data;
+        }
+
+        private DecryptedState decrypt(char[] password) throws DatabaseImporterException {
+            try {
+                // WARNING: DON'T DO THIS IN YOUR OWN CODE
+                // this is not a secure way to derive a key from a password
+                MessageDigest hash = MessageDigest.getInstance("SHA-256");
+                byte[] keyBytes = hash.digest(CryptoUtils.toBytes(password));
+                SecretKey key = new SecretKeySpec(keyBytes, "AES");
+
+                Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
+                IvParameterSpec spec = new IvParameterSpec(IV);
+                cipher.init(Cipher.DECRYPT_MODE, key, spec);
+
+                byte[] bytes = cipher.doFinal(_data);
+                JSONObject obj = new JSONObject(new String(bytes, StandardCharsets.UTF_8));
+                JSONArray keys = obj.names();
+
+                List<JSONObject> entries = new ArrayList<>();
+                if (keys != null && keys.length() > 0) {
+                    entries = parse((String) keys.get(0));
+                }
+
+                return new DecryptedState(entries);
+            } catch (NoSuchAlgorithmException
+                    | NoSuchPaddingException
+                    | InvalidAlgorithmParameterException
+                    | InvalidKeyException
+                    | BadPaddingException
+                    | IllegalBlockSizeException
+                    | JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+        }
+
+        @Override
+        public void decrypt(Context context, DecryptListener listener) {
+            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+                    .setMessage(R.string.choose_totpauth_importer)
+                    .setPositiveButton(R.string.yes, (dialog, which) -> {
+                        Dialogs.showPasswordInputDialog(context, password -> {
+                            decrypt(password, listener);
+                        });
+                    })
+                    .setNegativeButton(R.string.no, (dialog, which) -> {
+                        decrypt(PASSWORD, listener);
+                    })
+                    .create());
+        }
+
+        private void decrypt(char[] password, DecryptListener listener) {
+            try {
+                DecryptedState state = decrypt(password);
+                listener.onStateDecrypted(state);
+            } catch (DatabaseImporterException e) {
+                listener.onError(e);
+            }
+        }
+    }
+
+    public static class DecryptedState extends DatabaseImporter.State {
+        private List<JSONObject> _objs;
+
+        private DecryptedState(List<JSONObject> objs) {
+            super(false);
+            _objs = objs;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (JSONObject obj : _objs) {
+                try {
+                    VaultEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                int base = obj.getInt("base");
+                String secretString = obj.getString("key");
+
+                byte[] secret;
+                switch (base) {
+                    case 16:
+                        secret = Hex.decode(secretString);
+                        break;
+                    case 32:
+                        secret = Base32.decode(secretString);
+                        break;
+                    case 64:
+                        secret = Base64.decode(secretString);
+                        break;
+                    default:
+                        throw new DatabaseImporterEntryException(String.format("Unsupported secret encoding: base %d", base), obj.toString());
+                }
+
+                TotpInfo info = new TotpInfo(secret, "SHA1", 6, 30);
+                String name = obj.optString("name");
+                String issuer = obj.optString("issuer");
+
+                return new VaultEntry(info, name, issuer);
+            } catch (JSONException | OtpInfoException | EncodingException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}
@@ -0,0 +1,49 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.vault.VaultEntry;
+
+public class WinAuthImporter extends DatabaseImporter {
+    public WinAuthImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected String getAppPkgName() {
+        return null;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return null;
+    }
+
+    @Override
+    public WinAuthImporter.State read(FileReader reader) throws DatabaseImporterException {
+        GoogleAuthUriImporter importer = new GoogleAuthUriImporter(getContext());
+        GoogleAuthUriImporter.State state = importer.read(reader);
+        return new State(state);
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private GoogleAuthUriImporter.State _state;
+
+        private State(GoogleAuthUriImporter.State state) {
+            super(false);
+            _state = state;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = _state.convert();
+
+            for (VaultEntry entry : result.getEntries()) {
+                entry.setIssuer(entry.getName());
+                entry.setName("WinAuth");
+            }
+
+            return result;
+        }
+    }
+}
@@ -2,10 +2,20 @@ package com.beemdevelopment.aegis.otp;

 import android.net.Uri;

+import com.beemdevelopment.aegis.GoogleAuthProtos;
 import com.beemdevelopment.aegis.encoding.Base32;
-import com.beemdevelopment.aegis.encoding.Base32Exception;
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GoogleAuthInfo implements Serializable {
+    public static final String SCHEME = "otpauth";
+    public static final String SCHEME_EXPORT = "otpauth-migration";

-public class GoogleAuthInfo {
    private OtpInfo _info;
    private String _accountName;
    private String _issuer;
@@ -22,16 +32,20 @@ public class GoogleAuthInfo {

    public Uri getUri() {
        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("otpauth");
+        builder.scheme(SCHEME);

        if (_info instanceof TotpInfo) {
-            builder.authority("totp");
+            if (_info instanceof SteamInfo) {
+                builder.authority("steam");
+            } else {
+                builder.authority("totp");
+            }
            builder.appendQueryParameter("period", Integer.toString(((TotpInfo)_info).getPeriod()));
        } else if (_info instanceof HotpInfo) {
            builder.authority("hotp");
            builder.appendQueryParameter("counter", Long.toString(((HotpInfo)_info).getCounter()));
        } else {
-            throw new RuntimeException();
+            throw new RuntimeException(String.format("Unsupported OtpInfo type: %s", _info.getClass()));
        }

        builder.appendQueryParameter("digits", Integer.toString(_info.getDigits()));
@@ -51,34 +65,39 @@ public class GoogleAuthInfo {
    public static GoogleAuthInfo parseUri(String s) throws GoogleAuthInfoException {
        Uri uri = Uri.parse(s);
        if (uri == null) {
-            throw new GoogleAuthInfoException("bad uri format");
+            throw new GoogleAuthInfoException(String.format("Bad URI format: %s", s));
        }
        return GoogleAuthInfo.parseUri(uri);
    }

    public static GoogleAuthInfo parseUri(Uri uri) throws GoogleAuthInfoException {
-        if (!uri.getScheme().equals("otpauth")) {
-            throw new GoogleAuthInfoException("unsupported protocol");
+        String scheme = uri.getScheme();
+        if (scheme == null || !scheme.equals(SCHEME)) {
+            throw new GoogleAuthInfoException("Unsupported protocol");
        }

        // 'secret' is a required parameter
        String encodedSecret = uri.getQueryParameter("secret");
        if (encodedSecret == null) {
-            throw new GoogleAuthInfoException("'secret' is not set");
+            throw new GoogleAuthInfoException("Parameter 'secret' is not present");
        }

        // decode secret
        byte[] secret;
        try {
-            secret = Base32.decode(encodedSecret.toCharArray());
-        } catch (Base32Exception e) {
-            throw new GoogleAuthInfoException("bad secret", e);
+            secret = Base32.decode(encodedSecret);
+        } catch (EncodingException e) {
+            throw new GoogleAuthInfoException("Bad secret", e);
        }

        // check the otp type
        OtpInfo info;
        try {
            String type = uri.getHost();
+            if (type == null) {
+                throw new GoogleAuthInfoException(String.format("Host not present in URI: %s", uri.toString()));
+            }
+
            switch (type) {
                case "totp":
                    TotpInfo totpInfo = new TotpInfo(secret);
@@ -88,19 +107,27 @@ public class GoogleAuthInfo {
                    }
                    info = totpInfo;
                    break;
+                case "steam":
+                    SteamInfo steamInfo = new SteamInfo(secret);
+                    period = uri.getQueryParameter("period");
+                    if (period != null) {
+                        steamInfo.setPeriod(Integer.parseInt(period));
+                    }
+                    info = steamInfo;
+                    break;
                case "hotp":
                    HotpInfo hotpInfo = new HotpInfo(secret);
                    String counter = uri.getQueryParameter("counter");
                    if (counter == null) {
-                        throw new GoogleAuthInfoException("'counter' was not set");
+                        throw new GoogleAuthInfoException("Parameter 'counter' is not present");
                    }
                    hotpInfo.setCounter(Long.parseLong(counter));
                    info = hotpInfo;
                    break;
                default:
-                    throw new GoogleAuthInfoException(String.format("unsupported otp type: %s", type));
+                    throw new GoogleAuthInfoException(String.format("Unsupported OTP type: %s", type));
            }
-        } catch (OtpInfoException e) {
+        } catch (OtpInfoException | NumberFormatException e) {
            throw new GoogleAuthInfoException(e);
        }

@@ -140,13 +167,79 @@ public class GoogleAuthInfo {
            if (digits != null) {
                info.setDigits(Integer.parseInt(digits));
            }
-        } catch (OtpInfoException e) {
+        } catch (OtpInfoException | NumberFormatException e) {
            throw new GoogleAuthInfoException(e);
        }

        return new GoogleAuthInfo(info, accountName, issuer);
    }

+    public static Export parseExportUri(String s) throws GoogleAuthInfoException {
+        Uri uri = Uri.parse(s);
+        if (uri == null) {
+            throw new GoogleAuthInfoException("Bad URI format");
+        }
+        return GoogleAuthInfo.parseExportUri(uri);
+    }
+
+    public static Export parseExportUri(Uri uri) throws GoogleAuthInfoException {
+        String scheme = uri.getScheme();
+        if (scheme == null || !scheme.equals(SCHEME_EXPORT)) {
+            throw new GoogleAuthInfoException("Unsupported protocol");
+        }
+
+        String host = uri.getHost();
+        if (host == null || !host.equals("offline")) {
+            throw new GoogleAuthInfoException("Unsupported host");
+        }
+
+        String data = uri.getQueryParameter("data");
+        if (data == null) {
+            throw new GoogleAuthInfoException("Parameter 'data' is not set");
+        }
+
+        GoogleAuthProtos.MigrationPayload payload;
+        try {
+            byte[] bytes = Base64.decode(data);
+            payload = GoogleAuthProtos.MigrationPayload.parseFrom(bytes);
+        } catch (EncodingException | InvalidProtocolBufferException e) {
+            throw new GoogleAuthInfoException(e);
+        }
+
+        List<GoogleAuthInfo> infos = new ArrayList<>();
+        for (GoogleAuthProtos.MigrationPayload.OtpParameters params : payload.getOtpParametersList()) {
+            OtpInfo otp;
+            try {
+                byte[] secret = params.getSecret().toByteArray();
+                switch (params.getType()) {
+                    case OTP_HOTP:
+                        otp = new HotpInfo(secret, params.getCounter());
+                        break;
+                    case OTP_TOTP:
+                        otp = new TotpInfo(secret);
+                        break;
+                    default:
+                        throw new GoogleAuthInfoException(String.format("Unsupported algorithm: %d", params.getType().ordinal()));
+                }
+            } catch (OtpInfoException e){
+                throw new GoogleAuthInfoException(e);
+            }
+
+            String name = params.getName();
+            String issuer = params.getIssuer();
+            int colonI = name.indexOf(':');
+            if (issuer.isEmpty() && colonI != -1) {
+                issuer = name.substring(0, colonI);
+                name = name.substring(colonI + 1);
+            }
+
+            GoogleAuthInfo info = new GoogleAuthInfo(otp, name, issuer);
+            infos.add(info);
+        }
+
+        return new Export(infos, payload.getBatchId(), payload.getBatchIndex(), payload.getBatchSize());
+    }
+
    public String getIssuer() {
        return _issuer;
    }
@@ -154,4 +247,34 @@ public class GoogleAuthInfo {
    public String getAccountName() {
        return _accountName;
    }
+
+    public static class Export {
+        private int _batchId;
+        private int _batchIndex;
+        private int _batchSize;
+        private List<GoogleAuthInfo> _entries;
+
+        public Export(List<GoogleAuthInfo> entries, int batchId, int batchIndex, int batchSize) {
+            _batchId = batchId;
+            _batchIndex = batchIndex;
+            _batchSize = batchSize;
+            _entries = entries;
+        }
+
+        public List<GoogleAuthInfo> getEntries() {
+            return _entries;
+        }
+
+        public int getBatchSize() {
+            return _batchSize;
+        }
+
+        public int getBatchIndex() {
+            return _batchIndex;
+        }
+
+        public int getBatchId() {
+            return _batchId;
+        }
+    }
 }
@@ -1,6 +1,7 @@
 package com.beemdevelopment.aegis.otp;

 import com.beemdevelopment.aegis.crypto.otp.HOTP;
+import com.beemdevelopment.aegis.crypto.otp.OTP;

 import org.json.JSONException;
 import org.json.JSONObject;
@@ -9,6 +10,8 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;

 public class HotpInfo extends OtpInfo {
+    public static final String ID = "hotp";
+
    private long _counter;

    public HotpInfo(byte[] secret, long counter) throws OtpInfoException {
@@ -28,15 +31,16 @@ public class HotpInfo extends OtpInfo {
    @Override
    public String getOtp() {
        try {
-            return HOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getCounter());
+            OTP otp = HOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getCounter());
+            return otp.toString();
        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
-            throw new RuntimeException();
+            throw new RuntimeException(e);
        }
    }

    @Override
    public String getType() {
-        return "hotp";
+        return ID;
    }

    @Override
@@ -1,7 +1,7 @@
 package com.beemdevelopment.aegis.otp;

 import com.beemdevelopment.aegis.encoding.Base32;
-import com.beemdevelopment.aegis.encoding.Base32Exception;
+import com.beemdevelopment.aegis.encoding.EncodingException;

 import org.json.JSONException;
 import org.json.JSONObject;
@@ -93,23 +93,24 @@ public abstract class OtpInfo implements Serializable {
        OtpInfo info;

        try {
-            byte[] secret = Base32.decode(obj.getString("secret").toCharArray());
+            byte[] secret = Base32.decode(obj.getString("secret"));
            String algo = obj.getString("algo");
            int digits = obj.getInt("digits");

            switch (type) {
-                case "totp":
-                    int period = obj.getInt("period");
-                    info = new TotpInfo(secret, algo, digits, period);
+                case TotpInfo.ID:
+                    info = new TotpInfo(secret, algo, digits, obj.getInt("period"));
                    break;
-                case "hotp":
-                    long counter = obj.getLong("counter");
-                    info = new HotpInfo(secret, algo, digits, counter);
+                case SteamInfo.ID:
+                    info = new SteamInfo(secret, algo, digits, obj.getInt("period"));
+                    break;
+                case HotpInfo.ID:
+                    info = new HotpInfo(secret, algo, digits, obj.getLong("counter"));
                    break;
                default:
                    throw new OtpInfoException("unsupported otp type: " + type);
            }
-        } catch (Base32Exception | JSONException e) {
+        } catch (EncodingException | JSONException e) {
            throw new OtpInfoException(e);
        }

@@ -126,7 +127,8 @@ public abstract class OtpInfo implements Serializable {
        }

        OtpInfo info = (OtpInfo) o;
-        return Arrays.equals(getSecret(), info.getSecret())
+        return getType().equals(info.getType())
+                && Arrays.equals(getSecret(), info.getSecret())
                && getAlgorithm(false).equals(info.getAlgorithm(false))
                && getDigits() == info.getDigits();
    }
@@ -0,0 +1,34 @@
+package com.beemdevelopment.aegis.otp;
+
+import com.beemdevelopment.aegis.crypto.otp.OTP;
+import com.beemdevelopment.aegis.crypto.otp.TOTP;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+public class SteamInfo extends TotpInfo {
+    public static final String ID = "steam";
+
+    public SteamInfo(byte[] secret) throws OtpInfoException {
+        super(secret, "SHA1", 5, 30);
+    }
+
+    public SteamInfo(byte[] secret, String algorithm, int digits, int period) throws OtpInfoException {
+        super(secret, algorithm, digits, period);
+    }
+
+    @Override
+    public String getOtp() {
+        try {
+            OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
+            return otp.toSteamString();
+        } catch (InvalidKeyException | NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getType() {
+        return ID;
+    }
+}
@@ -1,5 +1,6 @@
 package com.beemdevelopment.aegis.otp;

+import com.beemdevelopment.aegis.crypto.otp.OTP;
 import com.beemdevelopment.aegis.crypto.otp.TOTP;

 import org.json.JSONException;
@@ -9,6 +10,8 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;

 public class TotpInfo extends OtpInfo {
+    public static final String ID = "totp";
+
    private int _period;

    public TotpInfo(byte[] secret) throws OtpInfoException {
@@ -24,7 +27,8 @@ public class TotpInfo extends OtpInfo {
    @Override
    public String getOtp() {
        try {
-            return TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
+            OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
+            return otp.toString();
        } catch (InvalidKeyException | NoSuchAlgorithmException e) {
            throw new RuntimeException(e);
        }
@@ -32,7 +36,7 @@ public class TotpInfo extends OtpInfo {

    @Override
    public String getType() {
-        return "totp";
+        return ID;
    }

    @Override
@@ -51,7 +55,12 @@ public class TotpInfo extends OtpInfo {
    }

    public static boolean isPeriodValid(int period) {
-        return period > 0;
+        if (period <= 0) {
+            return false;
+        }
+
+        // check for the possibility of an overflow when converting to milliseconds
+        return period <= Integer.MAX_VALUE / 1000;
    }

    public void setPeriod(int period) throws OtpInfoException {
@@ -0,0 +1,60 @@
+package com.beemdevelopment.aegis.services;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.beemdevelopment.aegis.R;
+
+public class NotificationService extends Service {
+    public static final int VAULT_UNLOCKED_ID = 1;
+
+    private static final String CODE_LOCK_STATUS_ID = "lock_status_channel";
+    private static final String CODE_LOCK_VAULT_ACTION = "lock_vault";
+
+    @Override
+    public int onStartCommand(Intent intent,int flags, int startId){
+        super.onStartCommand(intent, flags, startId);
+        serviceMethod();
+        return Service.START_STICKY;
+    }
+
+    public void serviceMethod() {
+        Intent intentAction = new Intent(CODE_LOCK_VAULT_ACTION);
+        PendingIntent lockDatabaseIntent = PendingIntent.getBroadcast(this, 1, intentAction, 0);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CODE_LOCK_STATUS_ID)
+                .setSmallIcon(R.drawable.ic_fingerprint_black_24dp)
+                .setContentTitle(getString(R.string.app_name_full))
+                .setContentText(getString(R.string.vault_unlocked_state))
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setOngoing(true)
+                .setContentIntent(lockDatabaseIntent);
+
+        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+        notificationManager.notify(VAULT_UNLOCKED_ID, builder.build());
+    }
+
+    @Override
+    public void onDestroy() {
+        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+        notificationManager.cancel(VAULT_UNLOCKED_ID);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        stopSelf();
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}
@@ -0,0 +1,155 @@
+package com.beemdevelopment.aegis.ui;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.StringRes;
+import androidx.core.view.LayoutInflaterCompat;
+
+import com.beemdevelopment.aegis.BuildConfig;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
+import com.beemdevelopment.aegis.ui.glide.GlideLicense;
+import com.mikepenz.iconics.context.IconicsLayoutInflater2;
+
+import de.psdev.licensesdialog.LicenseResolver;
+import de.psdev.licensesdialog.LicensesDialog;
+
+public class AboutActivity extends AegisActivity {
+
+    private static String GITHUB = "https://github.com/beemdevelopment/Aegis";
+    private static String WEBSITE_ALEXANDER = "https://alexbakker.me";
+    private static String GITHUB_MICHAEL = "https://github.com/michaelschattgen";
+
+    private static String MAIL_BEEMDEVELOPMENT = "beemdevelopment@gmail.com";
+    private static String WEBSITE_BEEMDEVELOPMENT = "https://beem.dev/";
+    private static String PLAYSTORE_BEEMDEVELOPMENT = "https://play.google.com/store/apps/details?id=com.beemdevelopment.aegis";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        LayoutInflaterCompat.setFactory2(getLayoutInflater(), new IconicsLayoutInflater2(getDelegate()));
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        View btnLicenses = findViewById(R.id.btn_licenses);
+        btnLicenses.setOnClickListener(v -> showLicenseDialog());
+
+        TextView appVersion = findViewById(R.id.app_version);
+        appVersion.setText(getCurrentAppVersion());
+
+        View btnAppVersion = findViewById(R.id.btn_app_version);
+        btnAppVersion.setOnClickListener(v -> {
+            copyToClipboard(getCurrentAppVersion(), R.string.version_copied);
+        });
+
+        View btnGithub = findViewById(R.id.btn_github);
+        btnGithub.setOnClickListener(v -> openUrl(GITHUB));
+
+        View btnAlexander = findViewById(R.id.btn_alexander);
+        btnAlexander.setOnClickListener(v -> openUrl(WEBSITE_ALEXANDER));
+
+        View btnMichael = findViewById(R.id.btn_michael);
+        btnMichael.setOnClickListener(v -> openUrl(GITHUB_MICHAEL));
+
+        View btnMail = findViewById(R.id.btn_email);
+        btnMail.setOnClickListener(v -> openMail(MAIL_BEEMDEVELOPMENT));
+
+        View btnWebsite = findViewById(R.id.btn_website);
+        btnWebsite.setOnClickListener(v -> openUrl(WEBSITE_BEEMDEVELOPMENT));
+
+        View btnRate = findViewById(R.id.btn_rate);
+        btnRate.setOnClickListener(v -> openUrl(PLAYSTORE_BEEMDEVELOPMENT ));
+
+        View btnChangelog = findViewById(R.id.btn_changelog);
+        btnChangelog.setOnClickListener(v -> {
+            ChangelogDialog.create().setTheme(getCurrentTheme()).show(getSupportFragmentManager(), "CHANGELOG_DIALOG");
+        });
+    }
+
+    private static String getCurrentAppVersion() {
+        if (BuildConfig.DEBUG) {
+            return String.format("%s-%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.GIT_HASH, BuildConfig.GIT_BRANCH);
+        }
+
+        return BuildConfig.VERSION_NAME;
+    }
+
+    private void openUrl(String url) {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW);
+        browserIntent.setData(Uri.parse(url));
+        browserIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        startActivity(browserIntent);
+    }
+
+    private void copyToClipboard(String text, @StringRes int messageId) {
+        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData data = ClipData.newPlainText("text/plain", text);
+        clipboard.setPrimaryClip(data);
+        Toast.makeText(this, messageId, Toast.LENGTH_SHORT).show();
+    }
+
+    private void openMail(String mailaddress) {
+        Intent mailIntent = new Intent(Intent.ACTION_SENDTO);
+        mailIntent.setData(Uri.parse("mailto:" + mailaddress));
+        mailIntent.putExtra(Intent.EXTRA_EMAIL, mailaddress);
+        mailIntent.putExtra(Intent.EXTRA_SUBJECT, R.string.app_name_full);
+
+        startActivity(Intent.createChooser(mailIntent, this.getString(R.string.email)));
+    }
+
+    private void showLicenseDialog() {
+        String stylesheet = getString(R.string.custom_notices_format_style);
+        int backgroundColorResource = getCurrentTheme() == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
+        String backgroundColor = getThemeColorAsHex(backgroundColorResource);
+        String textColor = getThemeColorAsHex(R.attr.primaryText);
+        String licenseColor = getThemeColorAsHex(R.attr.cardBackgroundFocused);
+        String linkColor = getThemeColorAsHex(R.attr.colorAccent);
+
+        stylesheet = String.format(stylesheet, backgroundColor, textColor, licenseColor, linkColor);
+
+        LicenseResolver.registerLicense(new GlideLicense());
+        new LicensesDialog.Builder(this)
+                .setNotices(R.raw.notices)
+                .setTitle(R.string.licenses)
+                .setNoticesCssStyle(stylesheet)
+                .setIncludeOwnLicense(true)
+                .build()
+                .show();
+    }
+
+    private String getThemeColorAsHex(@AttrRes int attributeId) {
+        return String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(attributeId, getTheme())));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+        return true;
+    }
+}
@@ -1,28 +1,79 @@
 package com.beemdevelopment.aegis.ui;

+import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.WindowManager;
+import android.widget.Toast;
+
+import androidx.annotation.CallSuper;
+import androidx.appcompat.app.AppCompatActivity;

 import com.beemdevelopment.aegis.AegisApplication;
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
+import com.beemdevelopment.aegis.vault.VaultManagerException;

-public abstract class AegisActivity extends AppCompatActivity {
+import java.util.Locale;
+
+public abstract class AegisActivity extends AppCompatActivity implements AegisApplication.LockListener {
+    private boolean _resumed;
    private AegisApplication _app;
+    private Theme _currentTheme;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
        _app = (AegisApplication) getApplication();

+        // set the theme and locale before creating the activity
+        Preferences prefs = getPreferences();
+        setPreferredTheme(prefs.getCurrentTheme());
+        setLocale(prefs.getLocale());
+        super.onCreate(savedInstanceState);
+
+        // if the app was killed, relaunch MainActivity and close everything else
+        if (savedInstanceState != null && isOrphan()) {
+            Intent intent = new Intent(this, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            return;
+        }
+
        // set FLAG_SECURE on the window of every AegisActivity
        if (getPreferences().isSecureScreenEnabled()) {
            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
        }

-        // set the theme
-        setPreferredTheme(getPreferences().isDarkModeEnabled());
+        // register a callback to listen for lock events
+        _app.registerLockListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        _app.unregisterLockListener(this);
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        _resumed = true;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        _resumed = false;
+    }
+
+    @CallSuper
+    @Override
+    public void onLocked() {
+        if (isOrphan()) {
+            setResult(RESULT_CANCELED, null);
+            finish();
+        }
    }

    protected AegisApplication getApp() {
@@ -33,11 +84,70 @@ public abstract class AegisActivity extends AppCompatActivity {
        return _app.getPreferences();
    }

-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
+    protected void setPreferredTheme(Theme theme) {
+        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
+            // set the theme based on the system theme
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    theme = Theme.LIGHT;
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
+                    break;
+            }
+        }
+
+        _currentTheme = theme;
+
+        switch (theme) {
+            case LIGHT:
+                setTheme(R.style.AppTheme);
+                break;
+            case DARK:
+                setTheme(R.style.AppTheme_Dark);
+                break;
+            case AMOLED:
+                setTheme(R.style.AppTheme_TrueBlack);
+                break;
        }
    }
+
+    protected void setLocale(Locale locale) {
+        Locale.setDefault(locale);
+
+        Configuration config = new Configuration();
+        config.locale = locale;
+
+        this.getResources().updateConfiguration(config, this.getResources().getDisplayMetrics());
+    }
+
+    protected boolean saveVault() {
+        try {
+            getApp().getVaultManager().save();
+            return true;
+        } catch (VaultManagerException e) {
+            Toast.makeText(this, getString(R.string.saving_error), Toast.LENGTH_LONG).show();
+            return false;
+        }
+    }
+
+    /**
+     * Reports whether this Activity has been resumed. (i.e. onResume was called)
+     */
+    protected boolean isOpen() {
+        return _resumed;
+    }
+
+    /**
+     * Reports whether this Activity instance has become an orphan. This can happen if
+     * the vault was locked by an external trigger while the Activity was still open.
+     */
+    private boolean isOrphan() {
+        return !(this instanceof MainActivity) && _app.isVaultLocked();
+    }
+
+    protected Theme getCurrentTheme() {
+        return _currentTheme;
+    }
 }
@@ -1,58 +1,77 @@
 package com.beemdevelopment.aegis.ui;

+import android.content.Context;
 import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
+import android.content.res.Configuration;
 import android.os.Build;
-import androidx.appcompat.app.AlertDialog;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.biometric.BiometricPrompt;
+
+import com.beemdevelopment.aegis.AegisApplication;
+import com.beemdevelopment.aegis.CancelAction;
+import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
 import com.beemdevelopment.aegis.crypto.MasterKey;
-import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
-import com.beemdevelopment.aegis.helpers.FingerprintUiHelper;
-import com.beemdevelopment.aegis.ui.tasks.SlotListTask;
-import com.mattprecious.swirl.SwirlView;
+import com.beemdevelopment.aegis.helpers.UiThreadExecutor;
+import com.beemdevelopment.aegis.ui.tasks.PasswordSlotDecryptTask;
+import com.beemdevelopment.aegis.vault.VaultFile;
+import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultManager;
+import com.beemdevelopment.aegis.vault.VaultManagerException;
+import com.beemdevelopment.aegis.vault.slots.BiometricSlot;
+import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
+import com.beemdevelopment.aegis.vault.slots.Slot;
+import com.beemdevelopment.aegis.vault.slots.SlotException;
+import com.beemdevelopment.aegis.vault.slots.SlotIntegrityException;
+import com.beemdevelopment.aegis.vault.slots.SlotList;

-import java.lang.reflect.UndeclaredThrowableException;
+import java.util.List;

 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;

-import com.beemdevelopment.aegis.R;
-
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
-import com.beemdevelopment.aegis.db.slots.PasswordSlot;
-import com.beemdevelopment.aegis.db.slots.Slot;
-import com.beemdevelopment.aegis.db.slots.SlotList;
-import com.beemdevelopment.aegis.db.slots.SlotException;
-
-public class AuthActivity extends AegisActivity implements FingerprintUiHelper.Callback, SlotListTask.Callback {
+public class AuthActivity extends AegisActivity {
    private EditText _textPassword;

+    private CancelAction _cancelAction;
    private SlotList _slots;
-    private FingerprintUiHelper _fingerHelper;
-    private Cipher _fingerCipher;
+
+    private SecretKey _bioKey;
+    private BiometricSlot _bioSlot;
+    private BiometricPrompt _bioPrompt;
+
+    private Preferences _prefs;
+    private boolean _stateless;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        _prefs = new Preferences(this);
        setContentView(R.layout.activity_auth);
        _textPassword = findViewById(R.id.text_password);
-        LinearLayout boxFingerprint = findViewById(R.id.box_fingerprint);
-        LinearLayout boxFingerprintInfo = findViewById(R.id.box_fingerprint_info);
-        TextView textFingerprint = findViewById(R.id.text_fingerprint);
+        LinearLayout boxBiometricInfo = findViewById(R.id.box_biometric_info);
        Button decryptButton = findViewById(R.id.button_decrypt);
+        TextView biometricsButton = findViewById(R.id.button_biometrics);

        _textPassword.setOnEditorActionListener((v, actionId, event) -> {
            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
@@ -61,23 +80,30 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
            return false;
        });

-        SwirlView imgFingerprint = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            ViewGroup insertPoint = findViewById(R.id.img_fingerprint_insert);
-            imgFingerprint = new SwirlView(this);
-            insertPoint.addView(imgFingerprint, 0, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        Intent intent = getIntent();
+        _cancelAction = (CancelAction) intent.getSerializableExtra("cancelAction");
+        _slots = (SlotList) intent.getSerializableExtra("slots");
+        _stateless = _slots != null;
+        if (!_stateless) {
+            VaultFile vaultFile;
+            try {
+                vaultFile = getApp().loadVaultFile();
+            } catch (VaultManagerException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(this, R.string.vault_load_error, e, (dialog, which) -> onBackPressed());
+                return;
+            }
+
+            _slots = vaultFile.getHeader().getSlots();
        }

-        Intent intent = getIntent();
-        _slots = (SlotList) intent.getSerializableExtra("slots");
-
-        // only show the fingerprint controls if the api version is new enough, permission is granted, a scanner is found and a fingerprint slot is found
-        FingerprintManager manager = FingerprintHelper.getManager(this);
-        if (manager != null && _slots.has(FingerprintSlot.class)) {
+        // only show the biometric prompt if the api version is new enough, permission is granted, a scanner is found and a biometric slot is found
+        if (_slots.has(BiometricSlot.class) && BiometricsHelper.isAvailable(this)) {
            boolean invalidated = false;
+
            try {
-                // find a fingerprint slot with an id that matches an alias in the keystore
-                for (FingerprintSlot slot : _slots.findAll(FingerprintSlot.class)) {
+                // find a biometric slot with an id that matches an alias in the keystore
+                for (BiometricSlot slot : _slots.findAll(BiometricSlot.class)) {
                    String id = slot.getUUID().toString();
                    KeyStoreHandle handle = new KeyStoreHandle();
                    if (handle.containsKey(id)) {
@@ -87,93 +113,238 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
                            invalidated = true;
                            continue;
                        }
-                        _fingerCipher = slot.createDecryptCipher(key);
-                        _fingerHelper = new FingerprintUiHelper(manager, imgFingerprint, textFingerprint, this);
-                        boxFingerprint.setVisibility(View.VISIBLE);
+
+                        _bioSlot = slot;
+                        _bioKey = key;
+                        biometricsButton.setVisibility(View.VISIBLE);
                        invalidated = false;
                        break;
                    }
                }
-            } catch (KeyStoreHandleException | SlotException e) {
-                throw new UndeclaredThrowableException(e);
+            } catch (KeyStoreHandleException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(this, R.string.biometric_init_error, e);
            }

            // display a help message if a matching invalidated keystore entry was found
            if (invalidated) {
-                boxFingerprintInfo.setVisibility(View.VISIBLE);
+                boxBiometricInfo.setVisibility(View.VISIBLE);
+                biometricsButton.setVisibility(View.GONE);
            }
        }

-        decryptButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                char[] password = EditTextHelper.getEditTextChars(_textPassword);
-                trySlots(PasswordSlot.class, password);
-            }
+        decryptButton.setOnClickListener(v -> {
+            InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+
+            char[] password = EditTextHelper.getEditTextChars(_textPassword);
+            List<PasswordSlot> slots = _slots.findAll(PasswordSlot.class);
+            PasswordSlotDecryptTask.Params params = new PasswordSlotDecryptTask.Params(slots, password);
+            new PasswordSlotDecryptTask(AuthActivity.this, new PasswordDerivationListener()).execute(params);
+        });
+
+        biometricsButton.setOnClickListener(v -> {
+            showBiometricPrompt();
        });
    }

-    private void showError() {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
-                .setTitle(getString(R.string.unlock_vault_error))
-                .setMessage(getString(R.string.unlock_vault_error_description))
-                .setCancelable(false)
-                .setPositiveButton(android.R.string.ok, null)
-                .create());
+    @Override
+    protected void setPreferredTheme(Theme theme) {
+        if (theme == Theme.SYSTEM || theme == Theme.SYSTEM_AMOLED) {
+            // set the theme based on the system theme
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    theme = Theme.LIGHT;
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    theme = theme == Theme.SYSTEM_AMOLED ? Theme.AMOLED : Theme.DARK;
+                    break;
+            }
+        }
+
+        switch (theme) {
+            case LIGHT:
+                setTheme(R.style.AppTheme_Light_NoActionBar);
+                break;
+            case DARK:
+                setTheme(R.style.AppTheme_Dark_NoActionBar);
+                break;
+            case AMOLED:
+                setTheme(R.style.AppTheme_TrueBlack_NoActionBar);
+                break;
+        }
    }

-    private <T extends Slot> void trySlots(Class<T> type, Object obj) {
-        SlotListTask.Params params = new SlotListTask.Params(_slots, obj);
-        new SlotListTask<>(type, this, this).execute(params);
-    }
+    private void selectPassword() {
+        _textPassword.selectAll();

-    private void setKey(MasterKey key) {
-        // send the master key back to the main activity
-        Intent result = new Intent();
-        result.putExtra("creds", new DatabaseFileCredentials(key, _slots));
-        setResult(RESULT_OK, result);
-        finish();
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
    }

    @Override
    public void onBackPressed() {
-        // ignore back button presses
+        switch (_cancelAction) {
+            case KILL:
+                finishAffinity();
+            case CLOSE:
+                finish();
+        }
    }

    @Override
    public void onResume() {
        super.onResume();

-        if (_fingerHelper != null) {
-            _fingerHelper.startListening(new FingerprintManager.CryptoObject(_fingerCipher));
+        if (_bioKey != null) {
+            if (_prefs.isPasswordReminderNeeded()) {
+                focusPasswordField();
+            } else {
+                showBiometricPrompt();
+            }
+        } else {
+            focusPasswordField();
        }
    }

+    @Override
+    public void onAttachedToWindow() {
+        if (_bioKey != null && _prefs.isPasswordReminderNeeded()) {
+            showPasswordReminder();
+        }
+    }
+
+    private void focusPasswordField() {
+        _textPassword.requestFocus();
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+    }
+
+    private void showPasswordReminder() {
+        View popupLayout = getLayoutInflater().inflate(R.layout.popup_password, null);
+        PopupWindow popup = new PopupWindow(popupLayout, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        popup.setFocusable(false);
+        popup.setOutsideTouchable(true);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
+            popup.setElevation(5.0f);
+        }
+        _textPassword.post(() -> popup.showAsDropDown(_textPassword));
+        _textPassword.postDelayed(popup::dismiss, 5000);
+    }
+
+    public void showBiometricPrompt() {
+        Cipher cipher;
+        try {
+            cipher = _bioSlot.createDecryptCipher(_bioKey);
+        } catch (SlotException e) {
+            e.printStackTrace();
+            Dialogs.showErrorDialog(this, R.string.biometric_init_error, e);
+            return;
+        }
+
+        BiometricPrompt.CryptoObject cryptoObj = new BiometricPrompt.CryptoObject(cipher);
+        _bioPrompt = new BiometricPrompt(this, new UiThreadExecutor(), new BiometricPromptListener());
+
+        BiometricPrompt.PromptInfo info = new BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.authentication))
+                .setNegativeButtonText(getString(android.R.string.cancel))
+                .setConfirmationRequired(false)
+                .build();
+        _bioPrompt.authenticate(info, cryptoObj);
+    }
+
    @Override
    public void onPause() {
        super.onPause();

-        if (_fingerHelper != null) {
-            _fingerHelper.stopListening();
+        if (_bioPrompt != null) {
+            _bioPrompt.cancelAuthentication();
        }
    }

-    @Override
-    public void onAuthenticated() {
-        trySlots(FingerprintSlot.class, _fingerCipher);
-    }
+    private void finish(MasterKey key, boolean isSlotRepaired) {
+        VaultFileCredentials creds = new VaultFileCredentials(key, _slots);

-    @Override
-    public void onError() {
-
-    }
-
-    @Override
-    public void onTaskFinished(MasterKey key) {
-        if (key != null) {
-            setKey(key);
+        if (_stateless) {
+            // send the master key back to the calling activity
+            Intent intent = new Intent();
+            intent.putExtra("creds", creds);
+            setResult(RESULT_OK, intent);
        } else {
-            showError();
+            try {
+                AegisApplication app = getApp();
+                VaultManager vault = app.initVaultManager(app.loadVaultFile(), creds);
+                if (isSlotRepaired) {
+                    vault.setCredentials(creds);
+                    saveVault();
+                }
+            } catch (VaultManagerException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(this, R.string.decryption_corrupt_error, e);
+                return;
+            }
+
+            setResult(RESULT_OK);
+        }
+
+        finish();
+    }
+
+    private class PasswordDerivationListener implements PasswordSlotDecryptTask.Callback {
+        @Override
+        public void onTaskFinished(PasswordSlotDecryptTask.Result result) {
+            if (result != null) {
+                // replace the old slot with the repaired one
+                if (result.isSlotRepaired()) {
+                    _slots.replace(result.getSlot());
+                }
+
+                if (result.getSlot().getType() == Slot.TYPE_DERIVED) {
+                    _prefs.resetPasswordReminderTimestamp();
+                }
+
+                finish(result.getKey(), result.isSlotRepaired());
+            } else {
+                Dialogs.showSecureDialog(new AlertDialog.Builder(AuthActivity.this)
+                        .setTitle(getString(R.string.unlock_vault_error))
+                        .setMessage(getString(R.string.unlock_vault_error_description))
+                        .setCancelable(false)
+                        .setPositiveButton(android.R.string.ok, (dialog, which) -> selectPassword())
+                        .create());
+            }
+        }
+    }
+
+    private class BiometricPromptListener extends BiometricPrompt.AuthenticationCallback {
+        @Override
+        public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+            super.onAuthenticationError(errorCode, errString);
+            if (!BiometricsHelper.isCanceled(errorCode)) {
+                Toast.makeText(AuthActivity.this, errString, Toast.LENGTH_LONG).show();
+            }
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+            super.onAuthenticationSucceeded(result);
+
+            MasterKey key;
+            BiometricSlot slot = _slots.find(BiometricSlot.class);
+
+            try {
+                key = slot.getKey(result.getCryptoObject().getCipher());
+            } catch (SlotException | SlotIntegrityException e) {
+                e.printStackTrace();
+                Dialogs.showErrorDialog(AuthActivity.this, R.string.biometric_decrypt_error, e);
+                return;
+            }
+
+            finish(key, false);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            super.onAuthenticationFailed();
        }
    }
 }
@@ -0,0 +1,94 @@
+package com.beemdevelopment.aegis.ui;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.InflateException;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.webkit.WebView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.Theme;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+public class ChangelogDialog extends DialogFragment {
+    private Theme _themeStyle;
+
+    public static ChangelogDialog create() {
+        return new ChangelogDialog();
+    }
+
+    @SuppressLint("InflateParams")
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final View customView;
+        try {
+            customView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_web_view, null);
+        } catch (InflateException e) {
+            e.printStackTrace();
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setMessage(getString(R.string.webview_error))
+                    .setPositiveButton(android.R.string.ok, null)
+                    .show();
+        }
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setTitle("Changelog")
+                .setView(customView)
+                .setPositiveButton(android.R.string.ok, null)
+                .show();
+
+        final WebView webView = customView.findViewById(R.id.web_view);
+        StringBuilder buf = new StringBuilder();
+
+        try (InputStream html = getActivity().getAssets().open("changelog.html")) {
+            BufferedReader in = new BufferedReader(new InputStreamReader(html, "UTF-8"));
+            String str;
+            while ((str = in.readLine()) != null)
+                buf.append(str);
+
+            in.close();
+            String changelog = buf.toString();
+            changelog = replaceStylesheet(changelog);
+            webView.loadData(changelog, "text/html", "UTF-8");
+        } catch (IOException e) {
+            webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
+        }
+        return dialog;
+    }
+
+    private String replaceStylesheet(String changelog) {
+        int backgroundColorResource = _themeStyle == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
+        String backgroundColor = colorToCSS(ThemeHelper.getThemeColor(backgroundColorResource, getContext().getTheme()));
+        String textColor = colorToCSS(0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, getContext().getTheme()));
+
+        return String.format(changelog, backgroundColor, textColor);
+    }
+
+    private static String colorToCSS(int color) {
+        return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color));
+    }
+
+    public ChangelogDialog setTheme(Theme theme) {
+        _themeStyle = theme;
+
+        return this;
+    }
+}
+
@@ -2,41 +2,40 @@ package com.beemdevelopment.aegis.ui;

 import android.app.Activity;
 import android.app.Dialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.hardware.fingerprint.FingerprintManager;
+import android.content.Intent;
+import android.provider.Settings;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
+import android.text.method.PasswordTransformationMethod;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.TextView;

-import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
-import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
-import com.beemdevelopment.aegis.helpers.EditTextHelper;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
-import com.beemdevelopment.aegis.helpers.FingerprintUiHelper;
-import com.beemdevelopment.aegis.ui.tasks.DerivationTask;
-import com.mattprecious.swirl.SwirlView;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;

 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.EditTextHelper;
+import com.beemdevelopment.aegis.ui.tasks.KeyDerivationTask;
+import com.beemdevelopment.aegis.vault.slots.PasswordSlot;
+import com.beemdevelopment.aegis.vault.slots.Slot;
+import com.beemdevelopment.aegis.vault.slots.SlotException;

-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
-import com.beemdevelopment.aegis.db.slots.PasswordSlot;
-import com.beemdevelopment.aegis.db.slots.Slot;
-import com.beemdevelopment.aegis.db.slots.SlotException;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.crypto.Cipher;

 public class Dialogs {
    private Dialogs() {
@@ -54,17 +53,6 @@ public class Dialogs {
        dialog.show();
    }

-    public static void showTextInputDialog(Context context, @StringRes int titleId, TextInputListener listener) {
-        EditText input = new EditText(context);
-
-        showSecureDialog(new AlertDialog.Builder(context)
-                .setTitle(titleId)
-                .setView(input)
-                .setPositiveButton(android.R.string.ok, (dialog, which) ->
-                        listener.onTextInputResult(input.getText().toString()))
-                .create());
-    }
-
    public static void showDeleteEntryDialog(Activity activity, DialogInterface.OnClickListener onDelete) {
        showSecureDialog(new AlertDialog.Builder(activity)
                .setTitle(activity.getString(R.string.delete_entry))
@@ -74,6 +62,24 @@ public class Dialogs {
                .create());
    }

+    public static void showDeleteEntriesDialog(Activity activity, DialogInterface.OnClickListener onDelete, int totalEntries) {
+        String title, message;
+        if (totalEntries > 1) {
+            title = activity.getString(R.string.delete_entries);
+            message = String.format(activity.getString(R.string.delete_entries_description), totalEntries);
+        } else {
+            title = activity.getString(R.string.delete_entry);
+            message = activity.getString(R.string.delete_entry_description);
+        }
+
+        showSecureDialog(new AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setMessage(message)
+                .setPositiveButton(android.R.string.yes, onDelete)
+                .setNegativeButton(android.R.string.no, null)
+                .create());
+    }
+
    public static void showDiscardDialog(Activity activity, DialogInterface.OnClickListener onSave, DialogInterface.OnClickListener onDiscard) {
        showSecureDialog(new AlertDialog.Builder(activity)
                .setTitle(activity.getString(R.string.discard_changes))
@@ -87,6 +93,19 @@ public class Dialogs {
        View view = activity.getLayoutInflater().inflate(R.layout.dialog_password, null);
        EditText textPassword = view.findViewById(R.id.text_password);
        EditText textPasswordConfirm = view.findViewById(R.id.text_password_confirm);
+        CheckBox switchToggleVisibility = view.findViewById(R.id.check_toggle_visibility);
+
+        switchToggleVisibility.setOnCheckedChangeListener((CompoundButton.OnCheckedChangeListener) (buttonView, isChecked) -> {
+            if (isChecked) {
+                textPassword.setTransformationMethod(null);
+                textPasswordConfirm.setTransformationMethod(null);
+                textPassword.clearFocus();
+                textPasswordConfirm.clearFocus();
+            } else {
+                textPassword.setTransformationMethod(new PasswordTransformationMethod());
+                textPasswordConfirm.setTransformationMethod(new PasswordTransformationMethod());
+            }
+        });

        AlertDialog dialog = new AlertDialog.Builder(activity)
                .setTitle(R.string.set_password)
@@ -109,7 +128,7 @@ public class Dialogs {

                char[] password = EditTextHelper.getEditTextChars(textPassword);
                PasswordSlot slot = new PasswordSlot();
-                DerivationTask task = new DerivationTask(activity, key -> {
+                KeyDerivationTask task = new KeyDerivationTask(activity, (passSlot, key) -> {
                    Cipher cipher;
                    try {
                        cipher = Slot.createEncryptCipher(key);
@@ -121,7 +140,7 @@ public class Dialogs {
                    listener.onSlotResult(slot, cipher);
                    dialog.dismiss();
                });
-                task.execute(new DerivationTask.Params(slot, password));
+                task.execute(new KeyDerivationTask.Params(slot, password));
            });
        });

@@ -130,8 +149,12 @@ public class Dialogs {
                boolean equal = EditTextHelper.areEditTextsEqual(textPassword, textPasswordConfirm);
                buttonOK.get().setEnabled(equal);
            }
-            public void beforeTextChanged(CharSequence c, int start, int count, int after) { }
-            public void afterTextChanged(Editable c) { }
+
+            public void beforeTextChanged(CharSequence c, int start, int count, int after) {
+            }
+
+            public void afterTextChanged(Editable c) {
+            }
        };
        textPassword.addTextChangedListener(watcher);
        textPasswordConfirm.addTextChangedListener(watcher);
@@ -139,20 +162,45 @@ public class Dialogs {
        showSecureDialog(dialog);
    }

-    public static void showCreateNewGroupDialog(Activity activity, TextInputListener listener) {
-        View view = activity.getLayoutInflater().inflate(R.layout.dialog_newgroup, null);
-        EditText groupName = view.findViewById(R.id.text_groupname);
+    private static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int messageId, @StringRes int hintId, TextInputListener listener, boolean isSecret) {
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_text_input, null);
+        EditText input = view.findViewById(R.id.text_input);
+        if (isSecret) {
+            input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        }
+        input.setHint(hintId);

-        AlertDialog dialog = new AlertDialog.Builder(activity)
-                .setTitle(R.string.set_group)
+        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+                .setTitle(titleId)
                .setView(view)
-                .setPositiveButton(android.R.string.ok, (dialog1, which) ->
-                        listener.onTextInputResult(groupName.getText().toString()))
-                .create();
+                .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
+                    char[] text = EditTextHelper.getEditTextChars(input);
+                    listener.onTextInputResult(text);
+                });
+        if (messageId != 0) {
+            builder.setMessage(messageId);
+        }

+        AlertDialog dialog = builder.create();
        showSecureDialog(dialog);
    }

+    private static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int hintId, TextInputListener listener, boolean isSecret) {
+        showTextInputDialog(context, titleId, 0, hintId, listener, isSecret);
+    }
+
+    public static void showTextInputDialog(Context context, @StringRes int titleId, @StringRes int hintId, TextInputListener listener) {
+        showTextInputDialog(context, titleId, hintId, listener, false);
+    }
+
+    public static void showPasswordInputDialog(Context context, TextInputListener listener) {
+        showTextInputDialog(context, R.string.set_password, R.string.password, listener, true);
+    }
+
+    public static void showPasswordInputDialog(Context context, @StringRes int messageId, TextInputListener listener) {
+        showTextInputDialog(context, R.string.set_password, messageId, R.string.password, listener, true);
+    }
+
    public static void showNumberPickerDialog(Activity activity, NumberInputListener listener) {
        View view = activity.getLayoutInflater().inflate(R.layout.dialog_number_picker, null);
        NumberPicker numberPicker = view.findViewById(R.id.numberPicker);
@@ -171,48 +219,105 @@ public class Dialogs {
        showSecureDialog(dialog);
    }

-    public static void showFingerprintDialog(Activity activity, Dialogs.SlotListener listener) {
-        View view = activity.getLayoutInflater().inflate(R.layout.dialog_fingerprint, null);
-        TextView textFingerprint = view.findViewById(R.id.text_fingerprint);
-        SwirlView imgFingerprint = view.findViewById(R.id.img_fingerprint);
-
-        Cipher cipher;
-        FingerprintSlot slot;
-        final AtomicReference<FingerprintUiHelper> helper = new AtomicReference<>();
-        FingerprintManager manager = FingerprintHelper.getManager(activity);
-
-        try {
-            slot = new FingerprintSlot();
-            SecretKey key = new KeyStoreHandle().generateKey(slot.getUUID().toString());
-            cipher = Slot.createEncryptCipher(key);
-        } catch (KeyStoreHandleException | SlotException e) {
-            throw new RuntimeException(e);
+    public static void showBackupVersionsPickerDialog(Activity activity, NumberInputListener listener) {
+        final int max = 30;
+        String[] numbers = new String[max / 5];
+        for (int i = 0; i < numbers.length; i++) {
+            numbers[i] = Integer.toString(i * 5 + 5);
        }

+        View view = activity.getLayoutInflater().inflate(R.layout.dialog_number_picker, null);
+        NumberPicker numberPicker = view.findViewById(R.id.numberPicker);
+        numberPicker.setDisplayedValues(numbers);
+        numberPicker.setMaxValue(numbers.length - 1);
+        numberPicker.setMinValue(0);
+        numberPicker.setValue(new Preferences(activity.getApplicationContext()).getBackupsVersionCount() / 5 - 1);
+        numberPicker.setWrapSelectorWheel(false);
+
        AlertDialog dialog = new AlertDialog.Builder(activity)
-                .setTitle(R.string.register_fingerprint)
+                .setTitle(R.string.set_number)
                .setView(view)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setOnDismissListener(d -> {
-                    helper.get().stopListening();
+                .setPositiveButton(android.R.string.ok, (dialog1, which) ->
+                        listener.onNumberInputResult(numberPicker.getValue()))
+                .create();
+
+        showSecureDialog(dialog);
+    }
+
+    public static void showErrorDialog(Context context, @StringRes int message, Exception e) {
+        showErrorDialog(context, message, e, null);
+    }
+
+    public static void showErrorDialog(Context context, @StringRes int message, CharSequence error) {
+        showErrorDialog(context, message, error, null);
+    }
+
+    public static void showErrorDialog(Context context, @StringRes int message, Exception e, DialogInterface.OnClickListener listener) {
+        showErrorDialog(context, message, e.toString(), listener);
+    }
+
+    public static void showErrorDialog(Context context, @StringRes int message, CharSequence error, DialogInterface.OnClickListener listener) {
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_error, null);
+        TextView textDetails = view.findViewById(R.id.error_details);
+        textDetails.setText(error);
+        TextView textMessage = view.findViewById(R.id.error_message);
+        textMessage.setText(message);
+
+        AlertDialog dialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.error_occurred)
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
+                    if (listener != null) {
+                        listener.onClick(dialog1, which);
+                    }
+                })
+                .setNeutralButton(R.string.details, (dialog1, which) -> {
+                    textDetails.setVisibility(View.VISIBLE);
                })
                .create();

-        helper.set(new FingerprintUiHelper(manager, imgFingerprint, textFingerprint, new FingerprintUiHelper.Callback() {
-            @Override
-            public void onAuthenticated() {
-                listener.onSlotResult(slot, cipher);
-                dialog.dismiss();
-            }
+        dialog.setOnShowListener(d -> {
+            Button button = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+            button.setOnClickListener(v -> {
+                if (textDetails.getVisibility() == View.GONE) {
+                    textDetails.setVisibility(View.VISIBLE);
+                    button.setText(R.string.copy);
+                } else {
+                    ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+                    if (clipboard != null) {
+                        ClipData clip = ClipData.newPlainText("text/plain", error);
+                        clipboard.setPrimaryClip(clip);
+                    }
+                }
+            });
+        });

-            @Override
-            public void onError() {
+        Dialogs.showSecureDialog(dialog);
+    }

-            }
-        }));
+    public static void showTimeSyncWarningDialog(Context context, Dialog.OnClickListener listener) {
+        Preferences prefs = new Preferences(context);
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_time_sync, null);
+        CheckBox checkBox = view.findViewById(R.id.check_warning_disable);

-        helper.get().startListening(new FingerprintManager.CryptoObject(cipher));
-        showSecureDialog(dialog);
+        showSecureDialog(new AlertDialog.Builder(context)
+                .setTitle(R.string.time_sync_warning_title)
+                .setView(view)
+                .setCancelable(false)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    if (checkBox.isChecked()) {
+                        prefs.setIsTimeSyncWarningEnabled(false);
+                    }
+                    if (listener != null) {
+                        listener.onClick(dialog, which);
+                    }
+                })
+                .setNegativeButton(R.string.no, (dialog, which) -> {
+                    if (checkBox.isChecked()) {
+                        prefs.setIsTimeSyncWarningEnabled(false);
+                    }
+                })
+                .create());
    }

    public interface NumberInputListener {
@@ -220,7 +325,7 @@ public class Dialogs {
    }

    public interface TextInputListener {
-        void onTextInputResult(String text);
+        void onTextInputResult(char[] text);
    }

    public interface SlotListener {
@@ -4,15 +4,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.ArrayRes;
-import androidx.appcompat.app.ActionBar;
-
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Menu;
@@ -28,45 +23,52 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TableRow;

+import androidx.annotation.ArrayRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.avito.android.krop.KropView;
+import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.encoding.Base32;
-import com.beemdevelopment.aegis.encoding.Base32Exception;
+import com.beemdevelopment.aegis.encoding.EncodingException;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
 import com.beemdevelopment.aegis.helpers.SpinnerHelper;
 import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
 import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.util.Cloner;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.beemdevelopment.aegis.vault.VaultManager;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;

-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.text.Collator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;

-import androidx.appcompat.app.AlertDialog;
 import de.hdodenhof.circleimageview.CircleImageView;
-import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.db.DatabaseEntry;

 public class EditEntryActivity extends AegisActivity {
    private static final int PICK_IMAGE_REQUEST = 0;

    private boolean _isNew = false;
-    private DatabaseEntry _origEntry;
+    private VaultEntry _origEntry;
    private TreeSet<String> _groups;
    private boolean _hasCustomIcon = false;
    // keep track of icon changes separately as the generated jpeg's are not deterministic
    private boolean _hasChangedIcon = false;
+    private boolean _isEditingIcon;
    private CircleImageView _iconView;
    private ImageView _saveImageButton;

@@ -90,25 +92,33 @@ public class EditEntryActivity extends AegisActivity {
    private RelativeLayout _advancedSettingsHeader;
    private RelativeLayout _advancedSettings;

+    private VaultManager _vault;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_edit_entry);

+        _vault = getApp().getVaultManager();
+        _groups = _vault.getGroups();
+
        ActionBar bar = getSupportActionBar();
        bar.setHomeAsUpIndicator(R.drawable.ic_close);
        bar.setDisplayHomeAsUpEnabled(true);

        // retrieve info from the calling activity
        Intent intent = getIntent();
-        _origEntry = (DatabaseEntry) intent.getSerializableExtra("entry");
-        _isNew = intent.getBooleanExtra("isNew", false);
-        _groups = new TreeSet<>(Collator.getInstance());
-        _groups.addAll(intent.getStringArrayListExtra("groups"));
-        if (_isNew) {
-            setTitle(R.string.add_new_profile);
+        UUID entryUUID = (UUID) intent.getSerializableExtra("entryUUID");
+        if (entryUUID != null) {
+            _origEntry = _vault.getEntryByUUID(entryUUID);
+        } else {
+            _origEntry = (VaultEntry) intent.getSerializableExtra("newEntry");
+            _isNew = true;
+            setTitle(R.string.add_new_entry);
        }

+        String selectedGroup = intent.getStringExtra("selectedGroup");
+
        // set up fields
        _iconView = findViewById(R.id.profile_drawable);
        _kropView = findViewById(R.id.krop_view);
@@ -133,51 +143,49 @@ public class EditEntryActivity extends AegisActivity {
        _advancedSettings = findViewById(R.id.expandableLayout);

        // fill the fields with values if possible
-        if (_origEntry != null) {
-            if (_origEntry.hasIcon()) {
-                byte[] imageBytes = _origEntry.getIcon();
-                Bitmap bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
-                _iconView.setImageBitmap(bitmap);
-                _hasCustomIcon = true;
-            } else {
-                TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
-                _iconView.setImageDrawable(drawable);
-            }
-
-            _textName.setText(_origEntry.getName());
-            _textIssuer.setText(_origEntry.getIssuer());
-
-            OtpInfo info = _origEntry.getInfo();
-            if (info instanceof TotpInfo) {
-                _textPeriod.setText(Integer.toString(((TotpInfo) info).getPeriod()));
-                _rowPeriod.setVisibility(View.VISIBLE);
-            } else if (info instanceof HotpInfo) {
-                _textCounter.setText(Long.toString(((HotpInfo) info).getCounter()));
-                _rowCounter.setVisibility(View.VISIBLE);
-            } else {
-                throw new RuntimeException();
-            }
-            _textDigits.setText(Integer.toString(info.getDigits()));
-
-            byte[] secretBytes = _origEntry.getInfo().getSecret();
-            if (secretBytes != null) {
-                char[] secretChars = Base32.encode(secretBytes);
-                _textSecret.setText(secretChars, 0, secretChars.length);
-            }
-
-            String type = _origEntry.getInfo().getType();
-            _spinnerType.setSelection(getStringResourceIndex(R.array.otp_types_array, type.toUpperCase()), false);
-
-            String algo = _origEntry.getInfo().getAlgorithm(false);
-            _spinnerAlgo.setSelection(getStringResourceIndex(R.array.otp_algo_array, algo), false);
-
-            String group = _origEntry.getGroup();
-            if (group != null) {
-                int pos = _groups.contains(group) ? _groups.headSet(group).size() : -1;
-                _spinnerGroup.setSelection(pos + 1, false);
-            }
+        if (_origEntry.hasIcon()) {
+            Glide.with(this)
+                .asDrawable()
+                .load(_origEntry)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(false)
+                .into(_iconView);
+            _hasCustomIcon = true;
+        } else {
+            TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
+            _iconView.setImageDrawable(drawable);
        }

+        _textName.setText(_origEntry.getName());
+        _textIssuer.setText(_origEntry.getIssuer());
+
+        OtpInfo info = _origEntry.getInfo();
+        if (info instanceof TotpInfo) {
+            _textPeriod.setText(Integer.toString(((TotpInfo) info).getPeriod()));
+            _rowPeriod.setVisibility(View.VISIBLE);
+        } else if (info instanceof HotpInfo) {
+            _textCounter.setText(Long.toString(((HotpInfo) info).getCounter()));
+            _rowCounter.setVisibility(View.VISIBLE);
+        } else {
+            throw new RuntimeException(String.format("Unsupported OtpInfo type: %s", info.getClass()));
+        }
+        _textDigits.setText(Integer.toString(info.getDigits()));
+
+        byte[] secretBytes = _origEntry.getInfo().getSecret();
+        if (secretBytes != null) {
+            String secretString = Base32.encode(secretBytes);
+            _textSecret.setText(secretString);
+        }
+
+        String type = _origEntry.getInfo().getType();
+        _spinnerType.setSelection(getStringResourceIndex(R.array.otp_types_array, type), false);
+
+        String algo = _origEntry.getInfo().getAlgorithm(false);
+        _spinnerAlgo.setSelection(getStringResourceIndex(R.array.otp_algo_array, algo), false);
+
+        String group = _origEntry.getGroup();
+        setGroup(group);
+
        // update the icon if the text changed
        _textIssuer.addTextChangedListener(_iconChangeListener);
        _textName.addTextChangedListener(_iconChangeListener);
@@ -186,19 +194,19 @@ public class EditEntryActivity extends AegisActivity {
        _spinnerType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                String type = _spinnerType.getSelectedItem().toString();
-
-                switch (type.toLowerCase()) {
-                    case "totp":
+                String type = _spinnerType.getSelectedItem().toString().toLowerCase();
+                switch (type) {
+                    case TotpInfo.ID:
+                    case SteamInfo.ID:
                        _rowCounter.setVisibility(View.GONE);
                        _rowPeriod.setVisibility(View.VISIBLE);
                        break;
-                    case "hotp":
+                    case HotpInfo.ID:
                        _rowPeriod.setVisibility(View.GONE);
                        _rowCounter.setVisibility(View.VISIBLE);
                        break;
                    default:
-                        throw new RuntimeException();
+                        throw new RuntimeException(String.format("Unsupported OTP type: %s", type));
                }
            }

@@ -215,15 +223,16 @@ public class EditEntryActivity extends AegisActivity {
            @Override
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                if (position == _spinnerGroupList.size() - 1) {
-                    Dialogs.showCreateNewGroupDialog(activity, text -> {
-                        if (text.isEmpty()) {
+                    Dialogs.showTextInputDialog(activity, R.string.set_group, R.string.group_name_hint, text -> {
+                        String str = new String(text);
+                        if (str.isEmpty()) {
                            return;
                        }
-                        _groups.add(text);
+                        _groups.add(str);
                        // reset the selection to "No group" to work around a quirk
                        _spinnerGroup.setSelection(0, false);
                        updateGroupSpinnerList();
-                        _spinnerGroup.setSelection(_spinnerGroupList.indexOf(text), false);
+                        _spinnerGroup.setSelection(_spinnerGroupList.indexOf(str), false);
                    });
                    _spinnerGroup.setSelection(prevPosition, false);
                } else {
@@ -238,11 +247,7 @@ public class EditEntryActivity extends AegisActivity {
        });

        _iconView.setOnClickListener(v -> {
-            Intent galleryIntent = new Intent(Intent.ACTION_PICK);
-            galleryIntent.setDataAndType(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*");
-
-            Intent chooserIntent = Intent.createChooser(galleryIntent, "Select photo");
-            startActivityForResult(Intent.createChooser(chooserIntent, "Select photo"), PICK_IMAGE_REQUEST);
+            startIconSelectionActivity();
        });

        _advancedSettingsHeader.setOnClickListener(v -> openAdvancedSettings());
@@ -250,16 +255,17 @@ public class EditEntryActivity extends AegisActivity {
        // automatically open advanced settings since 'Secret' is required.
        if (_isNew) {
            openAdvancedSettings();
+            setGroup(selectedGroup);
        }
    }

-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
+    private void setGroup(String groupName) {
+        if (groupName == null) {
+            return;
        }
+
+        int pos = _groups.contains(groupName) ? _groups.headSet(groupName).size() : -1;
+        _spinnerGroup.setSelection(pos + 1, false);
    }

    private void openAdvancedSettings() {
@@ -318,8 +324,13 @@ public class EditEntryActivity extends AegisActivity {

    @Override
    public void onBackPressed() {
+        if (_isEditingIcon) {
+            stopEditingIcon(false);
+            return;
+        }
+
        AtomicReference<String> msg = new AtomicReference<>();
-        AtomicReference<DatabaseEntry> entry = new AtomicReference<>();
+        AtomicReference<VaultEntry> entry = new AtomicReference<>();

        try {
            entry.set(parseEntry());
@@ -328,7 +339,7 @@ public class EditEntryActivity extends AegisActivity {
        }

        // close the activity if the entry has not been changed
-        if (_origEntry != null && !_hasChangedIcon && _origEntry.equals(entry.get())) {
+        if (!_hasChangedIcon && _origEntry.equals(entry.get())) {
            super.onBackPressed();
            return;
        }
@@ -342,7 +353,7 @@ public class EditEntryActivity extends AegisActivity {
                        return;
                    }

-                    finish(entry.get(), false);
+                    addAndFinish(entry.get());
                },
                (dialog, which) -> super.onBackPressed()
        );
@@ -359,9 +370,12 @@ public class EditEntryActivity extends AegisActivity {
                break;
            case R.id.action_delete:
                Dialogs.showDeleteEntryDialog(this, (dialog, which) -> {
-                    finish(_origEntry, true);
+                    deleteAndFinish(_origEntry);
                });
                break;
+            case R.id.action_edit_icon:
+                startIconSelectionActivity();
+                break;
            case R.id.action_default_icon:
                TextDrawable drawable = TextDrawableHelper.generate(_origEntry.getIssuer(), _origEntry.getName(), _iconView);
                _iconView.setImageDrawable(drawable);
@@ -374,6 +388,52 @@ public class EditEntryActivity extends AegisActivity {
        return true;
    }

+    private void startIconSelectionActivity() {
+        Intent galleryIntent = new Intent(Intent.ACTION_PICK);
+        galleryIntent.setDataAndType(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*");
+
+        Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_icon));
+        startActivityForResult(Intent.createChooser(chooserIntent, getString(R.string.select_icon)), PICK_IMAGE_REQUEST);
+    }
+
+    private void startEditingIcon(Uri data) {
+        Glide.with(this)
+                .asBitmap()
+                .load(data)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(false)
+                .into(new CustomTarget<Bitmap>() {
+                    @Override
+                    public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                        _kropView.setBitmap(resource);
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                    }
+                });
+        _iconView.setVisibility(View.GONE);
+        _kropView.setVisibility(View.VISIBLE);
+
+        _saveImageButton.setOnClickListener(v -> {
+            stopEditingIcon(true);
+        });
+
+        _isEditingIcon = true;
+    }
+
+    private void stopEditingIcon(boolean save) {
+        if (save) {
+            _iconView.setImageBitmap(_kropView.getCroppedBitmap());
+        }
+        _iconView.setVisibility(View.VISIBLE);
+        _kropView.setVisibility(View.GONE);
+        _hasCustomIcon = _hasCustomIcon || save;
+        _hasChangedIcon = save;
+        _isEditingIcon = false;
+    }
+
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.menu_edit, menu);
@@ -387,46 +447,50 @@ public class EditEntryActivity extends AegisActivity {
        return true;
    }

-    private void finish(DatabaseEntry entry, boolean delete) {
+    private void addAndFinish(VaultEntry entry) {
+        if (_isNew) {
+            _vault.addEntry(entry);
+        } else {
+            _vault.replaceEntry(entry);
+        }
+
+        saveAndFinish(entry, false);
+    }
+
+    private void deleteAndFinish(VaultEntry entry) {
+        _vault.removeEntry(entry);
+        saveAndFinish(entry, true);
+    }
+
+    private void saveAndFinish(VaultEntry entry, boolean delete) {
        Intent intent = new Intent();
-        intent.putExtra("entry", entry);
+        intent.putExtra("entryUUID", entry.getUUID());
        intent.putExtra("delete", delete);
-        setResult(RESULT_OK, intent);
-        finish();
+
+        if (saveVault()) {
+            setResult(RESULT_OK, intent);
+            finish();
+        }
    }

    @Override
    protected void onActivityResult(int requestCode, final int resultCode, Intent data) {
        if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
-            Uri inputFile = (data.getData());
-            InputStream inputStream;
-            Bitmap bitmap;
-            try {
-                inputStream = getContentResolver().openInputStream(inputFile);
-                BitmapFactory.Options bmOptions = new BitmapFactory.Options();
-                bitmap = BitmapFactory.decodeStream(inputStream, null, bmOptions);
-                _kropView.setBitmap(bitmap);
-                _kropView.setVisibility(View.VISIBLE);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-
-
-            _saveImageButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    _iconView.setImageBitmap(_kropView.getCroppedBitmap());
-                    _kropView.setVisibility(View.GONE);
-                    _hasCustomIcon = true;
-                    _hasChangedIcon = true;
-                }
-            });
+            startEditingIcon(data.getData());
        }

        super.onActivityResult(requestCode, resultCode, data);
    }

-    private DatabaseEntry parseEntry() throws ParseException {
+    private int parsePeriod() throws ParseException {
+        try {
+            return Integer.parseInt(_textPeriod.getText().toString());
+        } catch (NumberFormatException e) {
+            throw new ParseException("Period is not an integer.");
+        }
+    }
+
+    private VaultEntry parseEntry() throws ParseException {
        if (_textSecret.length() == 0) {
            throw new ParseException("Secret is a required field.");
        }
@@ -443,25 +507,24 @@ public class EditEntryActivity extends AegisActivity {

        byte[] secret;
        try {
-            secret = Base32.decode(EditTextHelper.getEditTextChars(_textSecret));
-        } catch (Base32Exception e) {
+            secret = Base32.decode(new String(EditTextHelper.getEditTextChars(_textSecret, true)));
+            if (secret.length == 0) {
+                throw new ParseException("Secret cannot be empty");
+            }
+        } catch (EncodingException e) {
            throw new ParseException("Secret is not valid base32.");
        }

-        // set otp info
        OtpInfo info;
        try {
            switch (type.toLowerCase()) {
-                case "totp":
-                    int period;
-                    try {
-                        period = Integer.parseInt(_textPeriod.getText().toString());
-                    } catch (NumberFormatException e) {
-                        throw new ParseException("Period is not an integer.");
-                    }
-                    info = new TotpInfo(secret, algo, digits, period);
+                case TotpInfo.ID:
+                    info = new TotpInfo(secret, algo, digits, parsePeriod());
                    break;
-                case "hotp":
+                case SteamInfo.ID:
+                    info = new SteamInfo(secret, algo, digits, parsePeriod());
+                    break;
+                case HotpInfo.ID:
                    long counter;
                    try {
                        counter = Long.parseLong(_textCounter.getText().toString());
@@ -471,7 +534,7 @@ public class EditEntryActivity extends AegisActivity {
                    info = new HotpInfo(secret, algo, digits, counter);
                    break;
                default:
-                    throw new RuntimeException();
+                    throw new RuntimeException(String.format("Unsupported OTP type: %s", type));
            }

            info.setDigits(digits);
@@ -480,14 +543,8 @@ public class EditEntryActivity extends AegisActivity {
            throw new ParseException("The entered info is incorrect: " + e.getMessage());
        }

-        // set database entry info
-        DatabaseEntry entry;
-        if (_origEntry == null) {
-            entry = new DatabaseEntry(info);
-        } else {
-            entry = cloneEntry(_origEntry);
-            entry.setInfo(info);
-        }
+        VaultEntry entry = Cloner.clone(_origEntry);
+        entry.setInfo(info);
        entry.setIssuer(_textIssuer.getText().toString());
        entry.setName(_textName.getText().toString());

@@ -501,8 +558,9 @@ public class EditEntryActivity extends AegisActivity {

        if (_hasChangedIcon) {
            if (_hasCustomIcon) {
+                Bitmap bitmap = ((BitmapDrawable) _iconView.getDrawable()).getBitmap();
                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                drawableToBitmap(_iconView.getDrawable()).compress(Bitmap.CompressFormat.JPEG, 100, stream);
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
                byte[] data = stream.toByteArray();
                entry.setIcon(data);
            } else {
@@ -522,7 +580,11 @@ public class EditEntryActivity extends AegisActivity {
    }

    private boolean onSave() {
-        DatabaseEntry entry;
+        if (_isEditingIcon) {
+            stopEditingIcon(true);
+        }
+
+        VaultEntry entry;
        try {
            entry = parseEntry();
        } catch (ParseException e) {
@@ -530,7 +592,7 @@ public class EditEntryActivity extends AegisActivity {
            return false;
        }

-        finish(entry, false);
+        addAndFinish(entry);
        return true;
    }

@@ -555,48 +617,13 @@ public class EditEntryActivity extends AegisActivity {
    private int getStringResourceIndex(@ArrayRes int id, String string) {
        String[] res = getResources().getStringArray(id);
        for (int i = 0; i < res.length; i++) {
-            if (res[i].equals(string)) {
+            if (res[i].equalsIgnoreCase(string)) {
                return i;
            }
        }
        return -1;
    }

-    private static Bitmap drawableToBitmap(Drawable drawable) {
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable) drawable).getBitmap();
-        }
-
-        final int width = !drawable.getBounds().isEmpty() ? drawable
-                .getBounds().width() : drawable.getIntrinsicWidth();
-
-        final int height = !drawable.getBounds().isEmpty() ? drawable
-                .getBounds().height() : drawable.getIntrinsicHeight();
-
-        final Bitmap bitmap = Bitmap.createBitmap(width <= 0 ? 1 : width,
-                height <= 0 ? 1 : height, Bitmap.Config.ARGB_8888);
-
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return bitmap;
-    }
-
-    private static DatabaseEntry cloneEntry(DatabaseEntry entry) {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(baos);
-            oos.writeObject(entry);
-
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            ObjectInputStream ois = new ObjectInputStream(bais);
-            return (DatabaseEntry) ois.readObject();
-        } catch (ClassNotFoundException | IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
    private static class ParseException extends Exception {
        public ParseException(String message) {
            super(message);
@@ -4,16 +4,16 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;

+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.views.GroupAdapter;
+
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.TreeSet;

-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.ui.views.GroupAdapter;

 public class GroupManagerActivity extends AegisActivity implements GroupAdapter.Listener {
    private GroupAdapter _adapter;
@@ -28,9 +28,10 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
        _groups = new TreeSet<>(Collator.getInstance());
        _groups.addAll(intent.getStringArrayListExtra("groups"));

-        ActionBar bar = getSupportActionBar();
-        bar.setHomeAsUpIndicator(R.drawable.ic_close);
-        bar.setDisplayHomeAsUpEnabled(true);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }

        // set up the recycler view
        _adapter = new GroupAdapter(this);
@@ -1,56 +1,40 @@
 package com.beemdevelopment.aegis.ui;

-import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.WindowManager;

-import com.github.paolorotolo.appintro.AppIntro2;
-import com.github.paolorotolo.appintro.AppIntroFragment;
-import com.github.paolorotolo.appintro.model.SliderPage;
-import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
-import com.beemdevelopment.aegis.ui.slides.CustomAuthenticatedSlide;
-import com.beemdevelopment.aegis.ui.slides.CustomAuthenticationSlide;
-import com.beemdevelopment.aegis.ui.tasks.DerivationTask;
+import androidx.fragment.app.Fragment;
+
+import com.beemdevelopment.aegis.AegisApplication;
+import com.beemdevelopment.aegis.Preferences;
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.ui.slides.SecuritySetupSlide;
+import com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide;
+import com.beemdevelopment.aegis.vault.Vault;
+import com.beemdevelopment.aegis.vault.VaultFile;
+import com.beemdevelopment.aegis.vault.VaultFileCredentials;
+import com.beemdevelopment.aegis.vault.VaultFileException;
+import com.beemdevelopment.aegis.vault.VaultManager;
+import com.beemdevelopment.aegis.vault.VaultManagerException;
+import com.github.appintro.AppIntro2;
+import com.github.appintro.AppIntroFragment;
+import com.github.appintro.model.SliderPage;

 import org.json.JSONObject;

-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-import com.beemdevelopment.aegis.Preferences;
-import com.beemdevelopment.aegis.R;
-
-import com.beemdevelopment.aegis.db.DatabaseFileException;
-import com.beemdevelopment.aegis.db.DatabaseManagerException;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
-import com.beemdevelopment.aegis.db.slots.PasswordSlot;
-import com.beemdevelopment.aegis.db.slots.Slot;
-import com.beemdevelopment.aegis.db.slots.SlotList;
-import com.beemdevelopment.aegis.db.Database;
-import com.beemdevelopment.aegis.db.DatabaseFile;
-import com.beemdevelopment.aegis.db.DatabaseManager;
-import com.beemdevelopment.aegis.db.slots.SlotException;
-
-public class IntroActivity extends AppIntro2 implements DerivationTask.Callback {
-    public static final int RESULT_OK = 0;
-    public static final int RESULT_EXCEPTION = 1;
-
-    private CustomAuthenticatedSlide _authenticatedSlide;
-    private CustomAuthenticationSlide _authenticationSlide;
+public class IntroActivity extends AppIntro2 {
+    private SecuritySetupSlide securitySetupSlide;
+    private SecurityPickerSlide _securityPickerSlide;
    private Fragment _endSlide;

-    private Database _database;
-    private DatabaseFile _databaseFile;
-    private PasswordSlot _passwordSlot;
-    private Cipher _passwordCipher;
-
+    private AegisApplication _app;
    private Preferences _prefs;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

+        _app = (AegisApplication) getApplication();
        // set FLAG_SECURE on the window of every IntroActivity
        _prefs = new Preferences(this);
        if (_prefs.isSecureScreenEnabled()) {
@@ -58,147 +42,92 @@ public class IntroActivity extends AppIntro2 implements DerivationTask.Callback
        }

        setWizardMode(true);
-        showSkipButton(false);
-        pager.setPagingEnabled(false);
-        //showPagerIndicator(false);
-        setGoBackLock(true);
+        setSkipButtonEnabled(false);
+        showStatusBar(true);
+        setSystemBackButtonLocked(true);
        setBarColor(getResources().getColor(R.color.colorPrimary));

        SliderPage homeSliderPage = new SliderPage();
        homeSliderPage.setTitle(getString(R.string.welcome));
-        homeSliderPage.setImageDrawable(R.drawable.icon_foreground_white);
+        homeSliderPage.setImageDrawable(R.drawable.app_icon);
        homeSliderPage.setTitleColor(getResources().getColor(R.color.primary_text_dark));
        homeSliderPage.setDescription(getString(R.string.app_description));
-        homeSliderPage.setDescColor(getResources().getColor(R.color.primary_text_dark));
-        homeSliderPage.setBgColor(getResources().getColor(R.color.colorSecondary));
+        homeSliderPage.setDescriptionColor(getResources().getColor(R.color.primary_text_dark));
+        homeSliderPage.setBackgroundColor(getResources().getColor(R.color.colorSecondary));
        addSlide(AppIntroFragment.newInstance(homeSliderPage));

-        _authenticationSlide = new CustomAuthenticationSlide();
-        _authenticationSlide.setBgColor(getResources().getColor(R.color.colorSecondary));
-        //_authenticationSlide.setDescColor(getResources().getColor(R.color.primary_text_dark));
-        addSlide(_authenticationSlide);
-        _authenticatedSlide = new CustomAuthenticatedSlide();
-        _authenticatedSlide.setBgColor(getResources().getColor(R.color.colorSecondary));
-        addSlide(_authenticatedSlide);
+        _securityPickerSlide = new SecurityPickerSlide();
+        _securityPickerSlide.setBgColor(getResources().getColor(R.color.colorSecondary));
+        addSlide(_securityPickerSlide);
+        securitySetupSlide = new SecuritySetupSlide();
+        securitySetupSlide.setBgColor(getResources().getColor(R.color.colorSecondary));
+        addSlide(securitySetupSlide);

        SliderPage endSliderPage = new SliderPage();
        endSliderPage.setTitle(getString(R.string.setup_completed));
        endSliderPage.setDescription(getString(R.string.setup_completed_description));
-        endSliderPage.setImageDrawable(R.drawable.icon_foreground_white);
-        endSliderPage.setBgColor(getResources().getColor(R.color.colorSecondary));
+        endSliderPage.setImageDrawable(R.drawable.app_icon);
+        endSliderPage.setBackgroundColor(getResources().getColor(R.color.colorSecondary));
        _endSlide = AppIntroFragment.newInstance(endSliderPage);
        addSlide(_endSlide);
-
-        // create the database and database file
-        _database = new Database();
-        _databaseFile = new DatabaseFile();
-    }
-
-    private void setException(Exception e) {
-        Intent result = new Intent();
-        result.putExtra("exception", e);
-        setResult(RESULT_EXCEPTION, result);
-        finish();
    }

    @Override
    public void onSlideChanged(Fragment oldFragment, Fragment newFragment) {
-        Intent intent = getIntent();
-        int cryptType = intent.getIntExtra("cryptType", CustomAuthenticationSlide.CRYPT_TYPE_INVALID);
-
-        if (newFragment == _endSlide && cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
-            _passwordSlot = new PasswordSlot();
-            DerivationTask.Params params = new DerivationTask.Params(_passwordSlot, _authenticatedSlide.getPassword());
-            new DerivationTask(this, this).execute(params);
-        } else if (oldFragment == _authenticationSlide && newFragment != _endSlide) {
+        if (oldFragment == _securityPickerSlide && newFragment != _endSlide) {
            // skip to the last slide if no encryption will be used
-            if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
+            int cryptType = getIntent().getIntExtra("cryptType", SecurityPickerSlide.CRYPT_TYPE_INVALID);
+            if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
                // TODO: no magic indices
-                getPager().setCurrentItem(4);
+                goToNextSlide(false);
            }
        }
+
+        if (newFragment == _endSlide) {
+            setWizardMode(false);
+        }
+
+        setSwipeLock(true);
    }

    @Override
    public void onDonePressed(Fragment currentFragment) {
        super.onDonePressed(currentFragment);

-        int cryptType = _authenticatedSlide.getCryptType();
-        // wait for the key derivation background task
-        if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE &&
-                (_passwordSlot == null || _passwordCipher == null)) {
-            return;
-        }
+        int cryptType = securitySetupSlide.getCryptType();
+        VaultFileCredentials creds = securitySetupSlide.getCredentials();

-        // generate the master key
-        DatabaseFileCredentials creds = null;
-        if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
-            creds = new DatabaseFileCredentials();
-        }
-
-        SlotList slots = null;
-        if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
-            // encrypt the master key with a key derived from the user's password
-            // and add it to the list of slots
-            if (_passwordSlot == null || _passwordCipher == null) {
-                throw new RuntimeException();
-            }
-            try {
-                _passwordSlot.setKey(creds.getKey(), _passwordCipher);
-                creds.getSlots().add(_passwordSlot);
-            } catch (SlotException e) {
-                setException(e);
-            }
-        }
-
-        if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_FINGER) {
-            try {
-                // encrypt the master key with the fingerprint key
-                // and add it to the list of slots
-                FingerprintSlot slot = _authenticatedSlide.getFingerSlot();
-                Cipher cipher = _authenticatedSlide.getFingerCipher();
-                slot.setKey(creds.getKey(), cipher);
-                creds.getSlots().add(slot);
-            } catch (SlotException e) {
-                setException(e);
-                return;
-            }
-        }
-
-        // finally, save the database
+        Vault vault = new Vault();
+        VaultFile vaultFile = new VaultFile();
        try {
-            JSONObject obj = _database.toJson();
-            if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE) {
-                _databaseFile.setContent(obj);
+            JSONObject obj = vault.toJson();
+            if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
+                vaultFile.setContent(obj);
            } else {
-                _databaseFile.setContent(obj, creds);
+                vaultFile.setContent(obj, creds);
            }
-            DatabaseManager.save(getApplicationContext(), _databaseFile);
-        } catch (DatabaseManagerException | DatabaseFileException e) {
-            setException(e);
+
+            VaultManager.save(getApplicationContext(), vaultFile);
+        } catch (VaultManagerException | VaultFileException e) {
+            e.printStackTrace();
+            Dialogs.showErrorDialog(this, R.string.vault_init_error, e);
            return;
        }

-        // send the master key back to the main activity
-        Intent result = new Intent();
-        result.putExtra("creds", creds);
-        setResult(RESULT_OK, result);
+        if (cryptType == SecurityPickerSlide.CRYPT_TYPE_NONE) {
+            _app.initVaultManager(vault, null);
+        } else {
+            _app.initVaultManager(vault, creds);
+        }

        // skip the intro from now on
        _prefs.setIntroDone(true);
+
+        setResult(RESULT_OK);
        finish();
    }

-    @Override
-    public void onTaskFinished(SecretKey key) {
-        if (key != null) {
-            try {
-                _passwordCipher = Slot.createEncryptCipher(key);
-            } catch (SlotException e) {
-                setException(e);
-            }
-        } else {
-            setException(new NullPointerException());
-        }
+    public void goToNextSlide() {
+        super.goToNextSlide(false);
    }
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`custom: ['https://www.buymeacoffee.com/beemdevelopment']`