Release v1.1-beta1

Make the behavior of highlighting and revealing entries consistent

.github/ISSUE_TEMPLATE/bug.md

@@ -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.
+```

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,6 @@
+---
+name: "Feature request"
+about: "Suggest a new feature for this project"
+labels: proposal
+---
+

.travis.yml

@@ -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

CONTRIBUTING.md

@@ -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.

README.md

@@ -2,13 +2,16 @@
 
 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
@@ -40,17 +43,22 @@ Aegis is a free, secure and open source 2FA app for Android.
 
 ## 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)
+[<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
 
@@ -94,6 +102,16 @@ Certificate fingerprints:
    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
@@ -102,7 +120,6 @@ Certificate fingerprints:
 - [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
 - [barcodescanner](https://github.com/dm77/barcodescanner) by Dushyanth
@@ -112,7 +129,3 @@ Certificate fingerprints:
 
 This project is licensed under the GNU General Public License v3.0. See the
 [LICENSE](LICENSE) file for details.
-
-## Attribution
-
-The icon is largely based on a design by Freepik from Flaticon.

app/build.gradle

@@ -1,27 +1,61 @@
 apply plugin: 'com.android.application'
 
+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 8
-        versionName "0.3.2"
+        targetSdkVersion 29
+        versionCode 23
+        versionName "1.1-beta1"
+        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"
         }
         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"
         }
     }
+
     compileOptions {
         targetCompatibility 1.8
         sourceCompatibility 1.8
@@ -29,24 +63,33 @@ android {
 }
 
 dependencies {
-    def libsuVersion = '2.3.2'
+    def libsuVersion = '2.5.1'
     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.0"
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+    implementation 'androidx.preference:preference:1.1.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 'com.getbase:floatingactionbutton:1.10.1'
-    implementation 'com.github.apl-devs:appintro:v4.2.2'
-    implementation 'com.github.avito-tech:krop:0.43'
+    implementation 'com.github.apl-devs:appintro:5.1.0'
+    implementation 'com.github.avito-tech:krop:0.44'
     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 'de.hdodenhof:circleimageview:3.0.1'
+    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.github.bumptech.glide:annotations:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation "com.mikepenz:iconics-core:3.2.5"
+    implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
+    implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
+    implementation("com.github.bumptech.glide:recyclerview-integration:4.9.0") {
+        transitive = false
+    }
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
 }

app/src/androidTest/java/com/beemdevelopment/aegis/ApplicationTest.java

@@ -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);
-    }
-}

app/src/main/AndroidManifest.xml

@@ -3,58 +3,68 @@
     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-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <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"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:replace="android:theme">
         <activity
-            android:name="com.beemdevelopment.aegis.ui.MainActivity"
+            android:name=".ui.AboutActivity"
+            android:label="@string/title_activity_about"></activity>
+        <activity
+            android:name=".ui.SelectEntriesActivity"
+            android:label="Select entries" />
+        <activity
+            android:name=".ui.MainActivity"
             android:label="${title}"
             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 profile" />
         <activity
-            android:name="com.beemdevelopment.aegis.ui.IntroActivity"
-            android:theme="@style/Theme.Intro">
-        </activity>
-        <activity android:name="com.beemdevelopment.aegis.ui.AuthActivity">
-        </activity>
-        <activity android:name="com.beemdevelopment.aegis.ui.PreferencesActivity">
-        </activity>
+            android:name=".ui.IntroActivity"
+            android:theme="@style/Theme.Intro" />
+        <activity android:name=".ui.AuthActivity" />
+        <activity android:name=".ui.PreferencesActivity" />
         <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>

app/src/main/assets/changelog.html

@@ -0,0 +1,85 @@
+<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.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>
+</ul>
+<h4>Fixes</h4>
+<ul>
+    <li>The behavior of highlighting and revealing entries was inconsistent</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>

app/src/main/java/com/beemdevelopment/aegis/AegisApplication.java

@@ -1,6 +1,8 @@
 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;
@@ -11,29 +13,49 @@ import android.graphics.drawable.Icon;
 import android.os.Build;
 
 import com.beemdevelopment.aegis.db.DatabaseManager;
+import com.beemdevelopment.aegis.services.NotificationService;
 import com.beemdevelopment.aegis.ui.MainActivity;
+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;
 
 import androidx.annotation.RequiresApi;
 
 public class AegisApplication extends Application {
     private DatabaseManager _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_DATABASE_ACTION = "lock_database";
 
     @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();
-        registerReceiver(receiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+        intentFilter.addAction(CODE_LOCK_DATABASE_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() {
@@ -44,6 +66,27 @@ public class AegisApplication extends Application {
         return _prefs;
     }
 
+    public boolean isAutoLockEnabled() {
+        return _prefs.isAutoLockEnabled() && _manager.isLoaded() && _manager.isEncryptionEnabled() && !_manager.isLocked();
+    }
+
+    public void registerLockListener(LockListener listener) {
+        _lockListeners.add(listener);
+    }
+
+    public void unregisterLockListener(LockListener listener) {
+        _lockListeners.remove(listener);
+    }
+
+    public void lock() {
+        _manager.lock();
+        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);
@@ -58,26 +101,37 @@ public class AegisApplication extends Application {
         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))
+                .setIcon(Icon.createWithResource(this, R.drawable.ic_qr_code))
                 .setIntent(intent)
                 .build();
 
         shortcutManager.setDynamicShortcuts(Collections.singletonList(shortcut));
     }
 
-    public boolean isAutoLockEnabled() {
-        return _prefs.isAutoLockEnabled() && _manager.isEncryptionEnabled() && !_manager.isLocked();
+    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);
+        }
     }
 
-    private class ScreenOffReceiver extends BroadcastReceiver {
+    public class ScreenOffReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (isAutoLockEnabled()) {
-                _manager.lock();
-                Intent newIntent = new Intent(getApplicationContext(), MainActivity.class);
-                newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                startActivity(newIntent);
+                lock();
             }
         }
     }
+
+    public interface LockListener {
+        void onLocked();
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/CancelAction.java

@@ -0,0 +1,7 @@
+package com.beemdevelopment.aegis;
+
+public enum CancelAction {
+    KILL,
+    CLOSE
+}
+

app/src/main/java/com/beemdevelopment/aegis/Preferences.java

@@ -2,8 +2,12 @@ package com.beemdevelopment.aegis;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Build;
 import android.preference.PreferenceManager;
 
+import java.util.Locale;
+
 public class Preferences {
     private SharedPreferences _prefs;
 
@@ -15,12 +19,21 @@ public class Preferences {
         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 isAccountNameVisible() {
-        return _prefs.getBoolean("pref_account_name", false);
+        return _prefs.getBoolean("pref_account_name", true);
     }
 
     public boolean isIntroDone() {
@@ -43,24 +56,24 @@ public class Preferences {
         _prefs.edit().putInt("pref_current_sort_category", category.ordinal()).apply();
     }
 
-    public int getCurrentSortCategory() {
-        return _prefs.getInt("pref_current_sort_category", 0);
+    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 int getCurrentTheme() {
-        return _prefs.getInt("pref_current_theme", 0);
+    public Theme getCurrentTheme() {
+        return Theme.fromInteger(_prefs.getInt("pref_current_theme", 0));
     }
 
     public void setCurrentTheme(Theme theme) {
         _prefs.edit().putInt("pref_current_theme", theme.ordinal()).apply();
     }
 
-    public int getCurrentViewMode() {
-        return _prefs.getInt("pref_current_view_mode", 0);
+    public ViewMode getCurrentViewMode() {
+        return ViewMode.fromInteger(_prefs.getInt("pref_current_view_mode", 0));
     }
 
     public void setCurrentViewMode(ViewMode viewMode) {
@@ -70,4 +83,18 @@ public class Preferences {
     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);
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/SortCategory.java

@@ -1,69 +1,61 @@
 package com.beemdevelopment.aegis;
 
+import com.beemdevelopment.aegis.db.DatabaseEntry;
 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,
-    ACCOUNTREVERSED,
+    ACCOUNT_REVERSED,
     ISSUER,
-    ISSUERREVERSED;
+    ISSUER_REVERSED;
+
+    private static SortCategory[] _values;
+
+    static {
+        _values = values();
+    }
 
     public static SortCategory fromInteger(int x) {
-        switch (x) {
-            case 0:
-                return CUSTOM;
-            case 1:
-                return ACCOUNT;
-            case 2:
-                return ACCOUNTREVERSED;
-            case 3:
-                return ISSUER;
-            case 4:
-                return ISSUERREVERSED;
-        }
-        return null;
+        return _values[x];
     }
 
-    public static Comparator getComparator(SortCategory sortCategory) {
-        switch (sortCategory) {
+    public Comparator<DatabaseEntry> getComparator() {
+        Comparator<DatabaseEntry> comparator = null;
+
+        switch (this) {
             case ACCOUNT:
-            case ACCOUNTREVERSED:
-                return new AccountNameComparator();
+                comparator = new AccountNameComparator();
+                break;
+            case ACCOUNT_REVERSED:
+                comparator = Collections.reverseOrder(new AccountNameComparator());
+                break;
             case ISSUER:
-            case ISSUERREVERSED:
-                return new IssuerNameComparator();
-            case CUSTOM:
-                return new IssuerNameComparator();
+                comparator = new IssuerNameComparator();
+                break;
+            case ISSUER_REVERSED:
+                comparator = Collections.reverseOrder(new IssuerNameComparator());
+                break;
         }
-        return null;
+
+        return comparator;
     }
 
-    public static boolean isReversed(SortCategory sortCategory) {
-        switch (sortCategory) {
-            case ACCOUNTREVERSED:
-            case ISSUERREVERSED:
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    public static int getMenuItem(SortCategory sortCategory) {
-        switch (sortCategory) {
+    public int getMenuItem() {
+        switch (this) {
             case CUSTOM:
                 return R.id.menu_sort_custom;
             case ACCOUNT:
                 return R.id.menu_sort_alphabetically_name;
-            case ACCOUNTREVERSED:
+            case ACCOUNT_REVERSED:
                 return R.id.menu_sort_alphabetically_name_reverse;
             case ISSUER:
                 return R.id.menu_sort_alphabetically;
-            case ISSUERREVERSED:
+            case ISSUER_REVERSED:
                 return R.id.menu_sort_alphabetically_reverse;
             default:
                 return R.id.menu_sort_custom;

app/src/main/java/com/beemdevelopment/aegis/Theme.java

@@ -5,43 +5,13 @@ public enum Theme {
     DARK,
     AMOLED;
 
+    private static Theme[] _values;
+
+    static {
+        _values = values();
+    }
+
     public static Theme fromInteger(int x) {
-        switch (x) {
-            case 0:
-                return LIGHT;
-            case 1:
-                return DARK;
-            case 2:
-                return AMOLED;
-        }
-        return null;
-    }
-
-    public static int getThemeNameResource(int x) {
-        switch (x) {
-            case 0:
-                return R.string.light_theme_title;
-            case 1:
-                return R.string.dark_theme_title;
-            case 2:
-                return R.string.amoled_theme_title;
-        }
-        return R.string.light_theme_title;
-    }
-
-    public static String[] getThemeNames() {
-        return new String[]{
-                "Light theme",
-                "Dark theme",
-                "Amoled theme"
-        };
-    }
-
-    public static int[] getThemeNameResources() {
-        return new int[] {
-            R.string.light_theme_title,
-            R.string.dark_theme_title,
-            R.string.amoled_theme_title
-        };
+        return _values[x];
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ViewMode.java

@@ -1,48 +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) {
-        switch (x) {
-            case 0:
-                return NORMAL;
-            case 1:
-                return COMPACT;
-            case 2:
-                return SMALL;
-        }
-        return null;
+        return _values[x];
     }
 
-    public static int getViewModeNameResource(int x) {
-        switch (x) {
-            case 0:
-                return R.string.normal_viewmode_title;
-            case 1:
-                return R.string.compact_mode_title;
-            case 2:
-                return R.string.small_mode_title;
+    @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 R.string.normal_viewmode_title;
-    }
-
-    public static String[] getViewModeNames() {
-        return new String[]{
-                "Normal",
-                "Compact",
-                "Small"
-        };
-    }
-
-    public static int[] getViewModeNameResources() {
-        return new int[] {
-                R.string.normal_viewmode_title,
-                R.string.compact_mode_title,
-                R.string.small_mode_title
-        };
+        return 20;
     }
 }

app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java

@@ -30,15 +30,20 @@ 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,7 +130,16 @@ public class CryptoUtils {
         return data;
     }
 
-    private static byte[] toBytes(char[] chars) {
+    public static byte[] toBytes(char[] chars) {
+        CharBuffer charBuf = CharBuffer.wrap(chars);
+        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();

app/src/main/java/com/beemdevelopment/aegis/db/Database.java

@@ -2,17 +2,15 @@ package com.beemdevelopment.aegis.db;
 
 import com.beemdevelopment.aegis.encoding.Base64Exception;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.util.UUIDMap;
 
 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();
+    private UUIDMap<DatabaseEntry> _entries = new UUIDMap<>();
 
     public JSONObject toJson() {
         try {
@@ -32,6 +30,7 @@ public class Database {
 
     public static Database fromJson(JSONObject obj) throws DatabaseException {
         Database db = new Database();
+        UUIDMap<DatabaseEntry> entries = db.getEntries();
 
         try {
             int ver = obj.getInt("version");
@@ -42,7 +41,7 @@ public class Database {
             JSONArray array = obj.getJSONArray("entries");
             for (int i = 0; i < array.length(); i++) {
                 DatabaseEntry entry = DatabaseEntry.fromJson(array.getJSONObject(i));
-                db.addEntry(entry);
+                entries.add(entry);
             }
         } catch (Base64Exception | OtpInfoException | JSONException e) {
             throw new DatabaseException(e);
@@ -51,27 +50,7 @@ public class Database {
         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);
+    public UUIDMap<DatabaseEntry> getEntries() {
+        return _entries;
     }
 }

app/src/main/java/com/beemdevelopment/aegis/db/DatabaseEntry.java

@@ -5,17 +5,17 @@ import com.beemdevelopment.aegis.encoding.Base64Exception;
 import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.util.UUIDMap;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
 
-public class DatabaseEntry implements Serializable {
-    private UUID _uuid;
+public class DatabaseEntry extends UUIDMap.Value {
     private String _name = "";
     private String _issuer = "";
     private String _group;
@@ -23,12 +23,13 @@ public class DatabaseEntry implements Serializable {
     private byte[] _icon;
 
     private DatabaseEntry(UUID uuid, OtpInfo info) {
-        _uuid = uuid;
+        super(uuid);
         _info = info;
     }
 
     public DatabaseEntry(OtpInfo info) {
-        this(UUID.randomUUID(), info);
+        super();
+        _info = info;
     }
 
     public DatabaseEntry(OtpInfo info, String name, String issuer) {
@@ -46,7 +47,7 @@ public class DatabaseEntry implements Serializable {
 
         try {
             obj.put("type", _info.getType());
-            obj.put("uuid", _uuid.toString());
+            obj.put("uuid", getUUID().toString());
             obj.put("name", _name);
             obj.put("issuer", _issuer);
             obj.put("group", _group);
@@ -82,14 +83,6 @@ public class DatabaseEntry implements Serializable {
         return entry;
     }
 
-    public void resetUUID() {
-        _uuid = UUID.randomUUID();
-    }
-
-    public UUID getUUID() {
-        return _uuid;
-    }
-
     public String getName() {
         return _name;
     }
@@ -136,19 +129,39 @@ public class DatabaseEntry implements Serializable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
         if (!(o instanceof DatabaseEntry)) {
             return false;
         }
 
         DatabaseEntry entry = (DatabaseEntry) o;
-        return getUUID().equals(entry.getUUID())
-                && getName().equals(entry.getName())
+        return super.equals(entry) && equivalates(entry);
+    }
+
+    /**
+     * Reports whether this entry is equivalent to the given entry. The UUIDs of these
+     * entries are ignored during the comparison, so they are not necessarily the same
+     * instance.
+     */
+    public boolean equivalates(DatabaseEntry entry) {
+        return getName().equals(entry.getName())
                 && getIssuer().equals(entry.getIssuer())
                 && Objects.equals(getGroup(), entry.getGroup())
                 && getInfo().equals(entry.getInfo())
                 && Arrays.equals(getIcon(), entry.getIcon());
     }
+
+    /**
+     * Reports whether this entry has its values set to the defaults.
+     */
+    public boolean isDefault() {
+        return equivalates(getDefault());
+    }
+
+    public static DatabaseEntry getDefault() {
+        try {
+            return new DatabaseEntry(new TotpInfo(null));
+        } catch (OtpInfoException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/db/DatabaseEntryList.java

@@ -1,62 +0,0 @@
-package com.beemdevelopment.aegis.db;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-
-import androidx.annotation.NonNull;
-
-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;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/db/DatabaseManager.java

@@ -1,10 +1,12 @@
 package com.beemdevelopment.aegis.db;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Environment;
 
 import com.beemdevelopment.aegis.BuildConfig;
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.services.NotificationService;
 
 import org.json.JSONObject;
 
@@ -14,7 +16,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.Collator;
-import java.util.List;
+import java.util.Collection;
 import java.util.TreeSet;
 import java.util.UUID;
 
@@ -72,6 +74,7 @@ public class DatabaseManager {
             JSONObject obj = _file.getContent(creds);
             _db = Database.fromJson(obj);
             _creds = creds;
+            _context.startService(new Intent(_context, NotificationService.class));
         } catch (DatabaseFileException | DatabaseException e) {
             throw new DatabaseManagerException(e);
         }
@@ -133,32 +136,32 @@ public class DatabaseManager {
 
     public void addEntry(DatabaseEntry entry) {
         assertState(false, true);
-        _db.addEntry(entry);
+        _db.getEntries().add(entry);
     }
 
-    public void removeEntry(DatabaseEntry entry) {
+    public DatabaseEntry removeEntry(DatabaseEntry entry) {
         assertState(false, true);
-        _db.removeEntry(entry);
+        return _db.getEntries().remove(entry);
     }
 
-    public void replaceEntry(DatabaseEntry entry) {
+    public DatabaseEntry replaceEntry(DatabaseEntry entry) {
         assertState(false, true);
-        _db.replaceEntry(entry);
+        return _db.getEntries().replace(entry);
     }
 
     public void swapEntries(DatabaseEntry entry1, DatabaseEntry entry2) {
         assertState(false, true);
-        _db.swapEntries(entry1, entry2);
+        _db.getEntries().swap(entry1, entry2);
     }
 
-    public List<DatabaseEntry> getEntries() {
+    public boolean isEntryDuplicate(DatabaseEntry entry) {
         assertState(false, true);
-        return _db.getEntries();
+        return _db.getEntries().has(entry);
     }
 
-    public DatabaseEntry getEntryByUUID(UUID uuid) {
+    public Collection<DatabaseEntry> getEntries() {
         assertState(false, true);
-        return _db.getEntryByUUID(uuid);
+        return _db.getEntries().getValues();
     }
 
     public TreeSet<String> getGroups() {

app/src/main/java/com/beemdevelopment/aegis/db/slots/BiometricSlot.java

@@ -4,17 +4,17 @@ import com.beemdevelopment.aegis.crypto.CryptParameters;
 
 import java.util.UUID;
 
-public class FingerprintSlot extends RawSlot {
-    public FingerprintSlot() {
+public class BiometricSlot extends RawSlot {
+    public BiometricSlot() {
         super();
     }
 
-    FingerprintSlot(UUID uuid, byte[] key, CryptParameters keyParams) {
+    BiometricSlot(UUID uuid, byte[] key, CryptParameters keyParams) {
         super(uuid, key, keyParams);
     }
 
     @Override
     public byte getType() {
-        return TYPE_FINGERPRINT;
+        return TYPE_BIOMETRIC;
     }
 }

app/src/main/java/com/beemdevelopment/aegis/db/slots/PasswordSlot.java

@@ -2,6 +2,7 @@ package com.beemdevelopment.aegis.db.slots;
 
 import com.beemdevelopment.aegis.crypto.CryptParameters;
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
+import com.beemdevelopment.aegis.crypto.MasterKey;
 import com.beemdevelopment.aegis.crypto.SCryptParameters;
 import com.beemdevelopment.aegis.encoding.Hex;
 
@@ -10,18 +11,21 @@ import org.json.JSONObject;
 
 import java.util.UUID;
 
+import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
 public class PasswordSlot extends RawSlot {
+    private boolean _repaired;
     private SCryptParameters _params;
 
     public PasswordSlot() {
         super();
     }
 
-    protected PasswordSlot(UUID uuid, byte[] key, CryptParameters keyParams, SCryptParameters scryptParams) {
+    protected PasswordSlot(UUID uuid, byte[] key, CryptParameters keyParams, SCryptParameters scryptParams, boolean repaired) {
         super(uuid, key, keyParams);
         _params = scryptParams;
+        _repaired = repaired;
     }
 
     @Override
@@ -32,6 +36,7 @@ public class PasswordSlot extends RawSlot {
             obj.put("r", _params.getR());
             obj.put("p", _params.getP());
             obj.put("salt", Hex.encode(_params.getSalt()));
+            obj.put("repaired", _repaired);
             return obj;
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -48,6 +53,23 @@ public class PasswordSlot extends RawSlot {
         return CryptoUtils.deriveKey(password, _params);
     }
 
+    public SecretKey deriveKey(byte[] data) {
+        return CryptoUtils.deriveKey(data, _params);
+    }
+
+    @Override
+    public void setKey(MasterKey masterKey, Cipher cipher) throws SlotException {
+        super.setKey(masterKey, cipher);
+        _repaired = true;
+    }
+
+    /**
+     * Reports whether this slot was repaired and is no longer affected by issue #95.
+     */
+    public boolean isRepaired() {
+        return _repaired;
+    }
+
     @Override
     public byte getType() {
         return TYPE_DERIVED;

app/src/main/java/com/beemdevelopment/aegis/db/slots/Slot.java

@@ -7,12 +7,12 @@ import com.beemdevelopment.aegis.crypto.MasterKey;
 import com.beemdevelopment.aegis.crypto.SCryptParameters;
 import com.beemdevelopment.aegis.encoding.Hex;
 import com.beemdevelopment.aegis.encoding.HexException;
+import com.beemdevelopment.aegis.util.UUIDMap;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -25,26 +25,29 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
-public abstract class Slot implements Serializable {
+public abstract class Slot extends UUIDMap.Value {
     public final static byte TYPE_RAW = 0x00;
     public final static byte TYPE_DERIVED = 0x01;
-    public final static byte TYPE_FINGERPRINT = 0x02;
+    public final static byte TYPE_BIOMETRIC = 0x02;
 
-    private UUID _uuid;
     private byte[] _encryptedMasterKey;
     private CryptParameters _encryptedMasterKeyParams;
 
     protected Slot() {
-        _uuid = UUID.randomUUID();
+        super();
     }
 
     protected Slot(UUID uuid, byte[] key, CryptParameters keyParams) {
-        _uuid = uuid;
+        super(uuid);
         _encryptedMasterKey = key;
         _encryptedMasterKeyParams = keyParams;
     }
 
-    // getKey decrypts the encrypted master key in this slot using the given cipher and returns it.
+    /**
+     * Decrypts the encrypted master key in this slot using the given cipher and returns it.
+     * @throws SlotException if a generic crypto operation error occurred.
+     * @throws SlotIntegrityException if an error occurred while verifying the integrity of the slot.
+     */
     public MasterKey getKey(Cipher cipher) throws SlotException, SlotIntegrityException {
         try {
             CryptResult res = CryptoUtils.decrypt(_encryptedMasterKey, cipher, _encryptedMasterKeyParams);
@@ -57,7 +60,10 @@ public abstract class Slot implements Serializable {
         }
     }
 
-    // setKey encrypts the given master key using the given cipher and stores the result in this slot.
+    /**
+     * Encrypts the given master key using the given cipher and stores the result in this slot.
+     * @throws SlotException if a generic crypto operation error occurred.
+     */
     public void setKey(MasterKey masterKey, Cipher cipher) throws SlotException {
         try {
             byte[] masterKeyBytes = masterKey.getBytes();
@@ -95,7 +101,7 @@ public abstract class Slot implements Serializable {
         try {
             JSONObject obj = new JSONObject();
             obj.put("type", getType());
-            obj.put("uuid", _uuid.toString());
+            obj.put("uuid", getUUID().toString());
             obj.put("key", Hex.encode(_encryptedMasterKey));
             obj.put("key_params", _encryptedMasterKeyParams.toJson());
             return obj;
@@ -129,10 +135,11 @@ public abstract class Slot implements Serializable {
                         obj.getInt("p"),
                         Hex.decode(obj.getString("salt"))
                     );
-                    slot = new PasswordSlot(uuid, key, keyParams, scryptParams);
+                    boolean repaired = obj.optBoolean("repaired", false);
+                    slot = new PasswordSlot(uuid, key, keyParams, scryptParams, repaired);
                     break;
-                case Slot.TYPE_FINGERPRINT:
-                    slot = new FingerprintSlot(uuid, key, keyParams);
+                case Slot.TYPE_BIOMETRIC:
+                    slot = new BiometricSlot(uuid, key, keyParams);
                     break;
                 default:
                     throw new SlotException("unrecognized slot type");
@@ -145,8 +152,4 @@ public abstract class Slot implements Serializable {
     }
 
     public abstract byte getType();
-
-    public UUID getUUID() {
-        return _uuid;
-    }
 }

app/src/main/java/com/beemdevelopment/aegis/db/slots/SlotList.java

@@ -1,17 +1,15 @@
 package com.beemdevelopment.aegis.db.slots;
 
+import com.beemdevelopment.aegis.util.UUIDMap;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
-public class SlotList implements Iterable<Slot>, Serializable {
-    private List<Slot> _slots = new ArrayList<>();
-
+public class SlotList extends UUIDMap<Slot> {
     public JSONArray toJson() {
         JSONArray array = new JSONArray();
         for (Slot slot : this) {
@@ -37,23 +35,6 @@ public class SlotList implements Iterable<Slot>, Serializable {
         return slots;
     }
 
-    public void add(Slot slot) {
-        for (Slot s : this) {
-            if (s.getUUID().equals(slot.getUUID())) {
-                throw new AssertionError("slot found with the same uuid");
-            }
-        }
-        _slots.add(slot);
-    }
-
-    public void remove(Slot slot) {
-        _slots.remove(slot);
-    }
-
-    public int size() {
-        return _slots.size();
-    }
-
     public <T extends Slot> T find(Class<T> type) {
         for (Slot slot : this) {
             if (slot.getClass() == type) {
@@ -76,9 +57,4 @@ public class SlotList implements Iterable<Slot>, Serializable {
     public <T extends Slot> boolean has(Class<T> type) {
         return find(type) != null;
     }
-
-    @Override
-    public Iterator<Slot> iterator() {
-        return _slots.iterator();
-    }
 }

app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricSlotInitializer.java

@@ -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.db.slots.BiometricSlot;
+import com.beemdevelopment.aegis.db.slots.Slot;
+import com.beemdevelopment.aegis.db.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);
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricsHelper.java

@@ -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;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/helpers/EditTextHelper.java

@@ -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;
     }
 

app/src/main/java/com/beemdevelopment/aegis/helpers/FabScrollHelper.java

@@ -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();
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/helpers/FingerprintHelper.java

@@ -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;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/helpers/FingerprintUiHelper.java

@@ -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 android.widget.TextView;
-
-import com.beemdevelopment.aegis.R;
-import com.mattprecious.swirl.SwirlView;
-
-import androidx.annotation.RequiresApi;
-
-/**
- * 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();
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/helpers/SimpleItemTouchHelperCallback.java

@@ -3,8 +3,15 @@ package com.beemdevelopment.aegis.helpers;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.ui.views.EntryAdapter;
+
+import java.util.Map;
+
 public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
 
+    private DatabaseEntry _selectedEntry;
+
     private final ItemTouchHelperAdapter _adapter;
     private boolean _positionChanged = false;
     private boolean _isLongPressDragEnabled = true;
@@ -22,6 +29,10 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
         _isLongPressDragEnabled = enabled;
     }
 
+    public void setSelectedEntry(DatabaseEntry entry) {
+        _selectedEntry = entry;
+    }
+
     @Override
     public boolean isItemViewSwipeEnabled() {
         return false;
@@ -30,7 +41,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 +75,6 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
             _positionChanged = false;
         }
     }
+
+
 }

app/src/main/java/com/beemdevelopment/aegis/helpers/ThemeHelper.java

@@ -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;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/helpers/UiRefresher.java

@@ -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;
     }
 

app/src/main/java/com/beemdevelopment/aegis/helpers/UiThreadExecutor.java

@@ -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);
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/AegisFileImporter.java

@@ -1,84 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.db.DatabaseFile;
-import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
-import com.beemdevelopment.aegis.db.DatabaseFileException;
-import com.beemdevelopment.aegis.encoding.Base64Exception;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-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 DatabaseImporterResult convert() throws DatabaseImporterException {
-        DatabaseImporterResult result = new DatabaseImporterResult();
-
-        try {
-            JSONObject obj;
-            if (_file.isEncrypted() && _creds != null) {
-                obj = _file.getContent(_creds);
-            } else {
-                obj = _file.getContent();
-            }
-
-            JSONArray array = obj.getJSONArray("entries");
-            for (int i = 0; i < array.length(); i++) {
-                JSONObject entryObj = array.getJSONObject(i);
-                try {
-                    DatabaseEntry entry = convertEntry(entryObj);
-                    result.addEntry(entry);
-                } catch (DatabaseImporterEntryException e) {
-                    result.addError(e);
-                }
-            }
-        } catch (JSONException | DatabaseFileException e) {
-            throw new DatabaseImporterException(e);
-        }
-
-        return result;
-    }
-
-    private static DatabaseEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
-        try {
-            return DatabaseEntry.fromJson(obj);
-        } catch (JSONException | OtpInfoException | Base64Exception e) {
-            throw new DatabaseImporterEntryException(e, obj.toString());
-        }
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return _file.isEncrypted();
-    }
-
-    public void setCredentials(DatabaseFileCredentials creds) {
-        _creds = creds;
-    }
-
-    public DatabaseFile getFile() {
-        return _file;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/AegisImporter.java

@@ -0,0 +1,110 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.db.DatabaseFile;
+import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
+import com.beemdevelopment.aegis.db.DatabaseFileException;
+import com.beemdevelopment.aegis.db.slots.SlotList;
+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.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();
+            DatabaseFile file = DatabaseFile.fromBytes(bytes);
+            if (file.isEncrypted()) {
+                return new EncryptedState(file);
+            }
+            return new DecryptedState(file.getContent());
+        } catch (DatabaseFileException | IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class EncryptedState extends State {
+        private DatabaseFile _file;
+
+        private EncryptedState(DatabaseFile file) {
+            super(true);
+            _file = file;
+        }
+
+        public SlotList getSlots() {
+            return _file.getHeader().getSlots();
+        }
+
+        public State decrypt(DatabaseFileCredentials creds) throws DatabaseFileException {
+            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 {
+                        DatabaseEntry entry = convertEntry(entryObj);
+                        result.addEntry(entry);
+                    } catch (DatabaseImporterEntryException e) {
+                        result.addError(e);
+                    }
+                }
+            } catch (JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                return DatabaseEntry.fromJson(obj);
+            } catch (JSONException | OtpInfoException | Base64Exception e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpFileImporter.java

@@ -1,99 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-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.SteamInfo;
-import com.beemdevelopment.aegis.otp.TotpInfo;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.nio.charset.StandardCharsets;
-
-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(), StandardCharsets.UTF_8));
-        } catch (JSONException e) {
-            throw new DatabaseImporterException(e);
-        }
-    }
-
-    @Override
-    public DatabaseImporterResult convert() throws DatabaseImporterException {
-        DatabaseImporterResult result = new DatabaseImporterResult();
-
-        for (int i = 0; i < _obj.length(); i++) {
-            try {
-                JSONObject obj = _obj.getJSONObject(i);
-                DatabaseEntry entry = convertEntry(obj);
-                result.addEntry(entry);
-            } catch (JSONException e) {
-                throw new DatabaseImporterException(e);
-            } catch (DatabaseImporterEntryException e) {
-                result.addError(e);
-            }
-        }
-
-        return result;
-    }
-
-    private static DatabaseEntry 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").toCharArray());
-
-            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 = "";
-
-            String[] parts = obj.getString("label").split(" - ");
-            if (parts.length > 1) {
-                issuer = parts[0];
-                name = parts[1];
-            } else {
-                name = parts[0];
-            }
-
-            return new DatabaseEntry(info, name, issuer);
-        } catch (DatabaseImporterException | Base32Exception | OtpInfoException | JSONException e) {
-            throw new DatabaseImporterEntryException(e, obj.toString());
-        }
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java

@@ -0,0 +1,238 @@
+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.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.SteamInfo;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.ui.Dialogs;
+
+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
+
+    private static final int MAX_ITERATIONS = 10000;
+
+    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 decrypt(char[] password, boolean oldFormat) throws DatabaseImporterException {
+            try {
+                SecretKey key;
+                int offset = 0;
+
+                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 = MessageDigest.getInstance("SHA-256");
+                    byte[] keyBytes = hash.digest(CryptoUtils.toBytes(password));
+                    key = new SecretKeySpec(keyBytes, "AES");
+                } else {
+                    offset = INT_SIZE + SALT_SIZE;
+
+                    byte[] iterBytes = Arrays.copyOfRange(_data, 0, INT_SIZE);
+                    int iterations = ByteBuffer.wrap(iterBytes).getInt();
+                    if (iterations < 1 || iterations > MAX_ITERATIONS) {
+                        throw new DatabaseImporterException(String.format("Invalid number of iterations for PBKDF: %d", iterations));
+                    }
+
+                    byte[] salt = Arrays.copyOfRange(_data, INT_SIZE, offset);
+                    SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+                    KeySpec spec = new PBEKeySpec(password, salt, iterations, KEY_SIZE);
+                    key = factory.generateSecret(spec);
+                }
+
+                // extract nonce and tag
+                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);
+
+                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
+                    | InvalidKeySpecException
+                    | NoSuchPaddingException
+                    | IllegalBlockSizeException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @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 {
+                                DecryptedState state = decrypt(password, i != 0);
+                                listener.onStateDecrypted(state);
+                            } 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);
+                    DatabaseEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (JSONException e) {
+                    throw new DatabaseImporterException(e);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry 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").toCharArray());
+
+                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 = "";
+
+                String[] parts = obj.getString("label").split(" - ");
+                if (parts.length > 1) {
+                    issuer = parts[0];
+                    name = parts[1];
+                } else {
+                    name = parts[0];
+                }
+
+                return new DatabaseEntry(info, name, issuer);
+            } catch (DatabaseImporterException | Base32Exception | OtpInfoException | JSONException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java

@@ -0,0 +1,133 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.util.Xml;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.Base32Exception;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+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;
+
+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";
+
+    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);
+                }
+            }
+
+            return new State(array);
+        } catch (XmlPullParserException | JSONException | IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private JSONArray _obj;
+
+        private State(JSONArray obj) {
+            super(false);
+            _obj = obj;
+        }
+
+        @Override
+        public Result convert() throws DatabaseImporterException {
+            Result result = new Result();
+
+            try {
+                for (int i = 0; i < _obj.length(); i++) {
+                    JSONObject entryObj = _obj.getJSONObject(i);
+                    try {
+                        DatabaseEntry entry = convertEntry(entryObj);
+                        result.addEntry(entry);
+                    } catch (DatabaseImporterEntryException e) {
+                        result.addError(e);
+                    }
+                }
+            } catch (JSONException e) {
+                throw new DatabaseImporterException(e);
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry convertEntry(JSONObject entry) throws DatabaseImporterEntryException {
+            try {
+                AuthyEntryInfo authyEntryInfo = new AuthyEntryInfo();
+                authyEntryInfo.OriginalName = entry.getString("originalName");
+                authyEntryInfo.AccountType = entry.getString("accountType");
+                authyEntryInfo.Name = entry.optString("name");
+
+                sanitizeEntryInfo(authyEntryInfo);
+
+                int digits = entry.getInt("digits");
+                byte[] secret = Base32.decode(entry.getString("decryptedSecret").toCharArray());
+
+                OtpInfo info = new TotpInfo(secret, "SHA1", digits, 30);
+
+                return new DatabaseEntry(info, authyEntryInfo.Name, authyEntryInfo.Issuer);
+            } catch (OtpInfoException | JSONException | Base32Exception e) {
+                throw new DatabaseImporterEntryException(e, entry.toString());
+            }
+        }
+
+        private static void sanitizeEntryInfo(AuthyEntryInfo info) {
+            String seperator = "";
+
+            if (info.OriginalName.contains(":")) {
+                info.Issuer = info.OriginalName.substring(0, info.OriginalName.indexOf(":"));
+                seperator = ":";
+            } else if (info.Name.contains(" - ")) {
+                info.Issuer = info.Name.substring(0, info.Name.indexOf(" - "));
+                seperator = " - ";
+            } else {
+                info.Issuer = info.AccountType.substring(0, 1).toUpperCase() + info.AccountType.substring(1);
+            }
+
+            info.Name = info.Name.replace(info.Issuer + seperator, "");
+        }
+    }
+
+    private static class AuthyEntryInfo {
+        String OriginalName;
+        String AccountType;
+        String Issuer;
+        String Name;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseAppImporter.java

@@ -1,48 +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.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.put("Steam", SteamAppImporter.class);
-        _importers = Collections.unmodifiableMap(importers);
-    }
-
-    private Context _context;
-
-    protected DatabaseAppImporter(Context context) {
-        _context = context;
-    }
-
-    public abstract void parse() throws DatabaseImporterException;
-
-    public abstract DatabaseImporterResult 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;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseFileImporter.java

@@ -1,53 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-
-import com.beemdevelopment.aegis.util.ByteInputStream;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-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 DatabaseImporterResult 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;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java

@@ -1,10 +1,176 @@
 package com.beemdevelopment.aegis.importers;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 
-public interface DatabaseImporter {
-    void parse() throws DatabaseImporterException;
-    DatabaseImporterResult convert() throws DatabaseImporterException;
-    boolean isEncrypted();
-    Context getContext();
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.util.ByteInputStream;
+import com.beemdevelopment.aegis.util.UUIDMap;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+
+import java.io.Closeable;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+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 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("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("Steam", SteamImporter.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("Steam", SteamImporter.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<DatabaseEntry> _entries = new UUIDMap<>();
+        private List<DatabaseImporterEntryException> _errors = new ArrayList<>();
+
+        public void addEntry(DatabaseEntry entry) {
+            _entries.add(entry);
+        }
+
+        public void addError(DatabaseImporterEntryException error) {
+            _errors.add(error);
+        }
+
+        public UUIDMap<DatabaseEntry> 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 {
+            try (ByteInputStream stream = ByteInputStream.create(_stream)) {
+                return stream.getBytes();
+            }
+        }
+
+        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);
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporterResult.java

@@ -1,27 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DatabaseImporterResult {
-    private List<DatabaseEntry> _entries = new ArrayList<>();
-    private List<DatabaseImporterEntryException> _errors = new ArrayList<>();
-
-    public void addEntry(DatabaseEntry entry) {
-        _entries.add(entry);
-    }
-
-    public void addError(DatabaseImporterEntryException error) {
-        _errors.add(error);
-    }
-
-    public List<DatabaseEntry> getEntries() {
-        return _entries;
-    }
-
-    public List<DatabaseImporterEntryException> getErrors() {
-        return _errors;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpFileImporter.java

@@ -1,166 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.content.Context;
-import android.util.Xml;
-
-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;
-
-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 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 DatabaseImporterResult convert() {
-        DatabaseImporterResult result = new DatabaseImporterResult();
-
-        for (XmlEntry xmlEntry : _xmlEntries) {
-            // TODO: order
-            if (!xmlEntry.Name.equals("tokenOrder")) {
-                try {
-                    DatabaseEntry entry = convertEntry(xmlEntry);
-                    result.addEntry(entry);
-                } catch (DatabaseImporterEntryException e) {
-                    result.addError(e);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    private static DatabaseEntry convertEntry(XmlEntry xmlEntry) throws DatabaseImporterEntryException {
-        try {
-            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");
-            return new DatabaseEntry(info, name, issuer);
-        } catch (DatabaseImporterException | OtpInfoException | JSONException e) {
-            throw new DatabaseImporterEntryException(e, xmlEntry.Value);
-        }
-    }
-
-    @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;
-            }
-        }
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java

@@ -0,0 +1,193 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.util.Xml;
+
+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.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 {
+                    DatabaseEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry 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 DatabaseEntry(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;
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpPlusImporter.java

@@ -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;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/GoogleAuthImporter.java

@@ -1,6 +1,5 @@
 package com.beemdevelopment.aegis.importers;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -14,8 +13,6 @@ 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;
@@ -25,30 +22,36 @@ import java.util.List;
 
 import static android.database.sqlite.SQLiteDatabase.OPEN_READONLY;
 
-public class GoogleAuthAppImporter extends DatabaseAppImporter {
+public class GoogleAuthImporter extends DatabaseImporter {
     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 static final String _subPath = "databases/databases";
+    private static final String _pkgName = "com.google.android.apps.authenticator2";
 
-    private List<Entry> _entries = new ArrayList<>();
-
-    public GoogleAuthAppImporter(Context context) {
+    public GoogleAuthImporter(Context context) {
         super(context);
     }
 
     @Override
-    public void parse() throws DatabaseImporterException {
+    protected String getAppPkgName() {
+        return _pkgName;
+    }
+
+    @Override
+    protected String getAppSubPath() {
+        return _subPath;
+    }
+
+    @Override
+    public State read(FileReader reader) 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);
-                }
+            try (FileOutputStream out = new FileOutputStream(file)) {
+                ShellUtils.pump(reader.getStream(), out);
             }
         } catch (IOException e) {
             throw new DatabaseImporterException(e);
@@ -56,14 +59,16 @@ public class GoogleAuthAppImporter extends DatabaseAppImporter {
 
         try (SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getAbsolutePath(), null, OPEN_READONLY, null)) {
             try (Cursor cursor = db.rawQuery("SELECT * FROM accounts", null)) {
-                if (!cursor.moveToFirst()) {
-                    return;
+                List<Entry> entries = new ArrayList<>();
+
+                if (cursor.moveToFirst()) {
+                    do {
+                        Entry entry = new Entry(cursor);
+                        entries.add(entry);
+                    } while(cursor.moveToNext());
                 }
 
-                do {
-                    Entry entry = new Entry(cursor);
-                    _entries.add(entry);
-                } while(cursor.moveToNext());
+                return new State(entries);
             }
         } catch (SQLiteException e) {
             throw new DatabaseImporterException(e);
@@ -73,53 +78,57 @@ public class GoogleAuthAppImporter extends DatabaseAppImporter {
         }
     }
 
-    @Override
-    public DatabaseImporterResult convert() {
-        DatabaseImporterResult result = new DatabaseImporterResult();
+    public static class State extends DatabaseImporter.State {
+        private List<Entry> _entries;
 
-        for (Entry sqlEntry : _entries) {
+        private State(List<Entry> entries) {
+            super(false);
+            _entries = entries;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (Entry sqlEntry : _entries) {
+                try {
+                    DatabaseEntry entry = convertEntry(sqlEntry);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry convertEntry(Entry entry) throws DatabaseImporterEntryException {
             try {
-                DatabaseEntry entry = convertEntry(sqlEntry);
-                result.addEntry(entry);
-            } catch (DatabaseImporterEntryException e) {
-                result.addError(e);
+                byte[] secret = Base32.decode(entry.getSecret().toCharArray());
+
+                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 DatabaseEntry(info, name, entry.getIssuer());
+            } catch (Base32Exception | OtpInfoException | DatabaseImporterException e) {
+                throw new DatabaseImporterEntryException(e, entry.toString());
             }
         }
-
-        return result;
-    }
-
-    private static DatabaseEntry convertEntry(Entry entry) throws DatabaseImporterEntryException {
-        try {
-            byte[] secret = Base32.decode(entry.getSecret().toCharArray());
-
-            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 DatabaseEntry(info, name, entry.getIssuer());
-        } catch (Base32Exception | OtpInfoException | DatabaseImporterException e) {
-            throw new DatabaseImporterEntryException(e, entry.toString());
-        }
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
     }
 
     private static String getString(Cursor cursor, String columnName) {

app/src/main/java/com/beemdevelopment/aegis/importers/SteamAppImporter.java

@@ -1,80 +0,0 @@
-package com.beemdevelopment.aegis.importers;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-
-import com.beemdevelopment.aegis.db.DatabaseEntry;
-import com.beemdevelopment.aegis.encoding.Base64;
-import com.beemdevelopment.aegis.encoding.Base64Exception;
-import com.beemdevelopment.aegis.otp.OtpInfoException;
-import com.beemdevelopment.aegis.otp.SteamInfo;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-import com.topjohnwu.superuser.io.SuFile;
-import com.topjohnwu.superuser.io.SuFileInputStream;
-
-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 SteamAppImporter extends DatabaseAppImporter {
-    @SuppressLint("SdCardPath")
-    private static final String _path = "/data/data/com.valvesoftware.android.steam.community/files";
-
-    private List<JSONObject> _objs = new ArrayList<>();
-
-    public SteamAppImporter(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void parse() throws DatabaseImporterException {
-        SuFile dir = new SuFile(_path);
-        for (SuFile file : dir.listFiles((d, name) -> name.startsWith("Steamguard-"))) {
-            try (SuFileInputStream in = new SuFileInputStream(file)) {
-                try (ByteInputStream stream = ByteInputStream.create(in)) {
-                    JSONObject obj = new JSONObject(new String(stream.getBytes(), StandardCharsets.UTF_8));
-                    _objs.add(obj);
-                }
-            } catch (IOException | JSONException e) {
-                throw new DatabaseImporterException(e);
-            }
-        }
-    }
-
-    @Override
-    public DatabaseImporterResult convert() {
-        DatabaseImporterResult result = new DatabaseImporterResult();
-
-        for (JSONObject obj : _objs) {
-            try {
-                DatabaseEntry entry = convertEntry(obj);
-                result.addEntry(entry);
-            } catch (DatabaseImporterEntryException e) {
-                result.addError(e);
-            }
-        }
-
-        return result;
-    }
-
-    public DatabaseEntry 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 DatabaseEntry(info, account, "Steam");
-        } catch (JSONException | Base64Exception | OtpInfoException e) {
-            throw new DatabaseImporterEntryException(e, obj.toString());
-        }
-    }
-
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-}

app/src/main/java/com/beemdevelopment/aegis/importers/SteamImporter.java

@@ -0,0 +1,90 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.encoding.Base64;
+import com.beemdevelopment.aegis.encoding.Base64Exception;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.SteamInfo;
+import com.beemdevelopment.aegis.util.ByteInputStream;
+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 (ByteInputStream stream = ByteInputStream.create(reader.getStream())) {
+            JSONObject obj = new JSONObject(new String(stream.getBytes(), 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 {
+                DatabaseEntry entry = convertEntry(_obj);
+                result.addEntry(entry);
+            } catch (DatabaseImporterEntryException e) {
+                result.addError(e);
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry 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 DatabaseEntry(info, account, "Steam");
+            } catch (JSONException | Base64Exception | OtpInfoException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/importers/WinAuthImporter.java

@@ -0,0 +1,83 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+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 {
+        ArrayList<String> lines = new ArrayList<>();
+
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(reader.getStream()));
+            String line;
+
+            while ((line = bufferedReader.readLine()) != null) {
+                lines.add(line);
+            }
+        } catch (IOException e) {
+            throw new DatabaseImporterException(e);
+        }
+
+        return new State(lines);
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private ArrayList<String> _lines;
+
+        private State(ArrayList<String> lines) {
+            super(false);
+            _lines = lines;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (String line : _lines) {
+                try {
+                    DatabaseEntry entry = convertEntry(line);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static DatabaseEntry convertEntry(String line) throws DatabaseImporterEntryException {
+            try {
+                GoogleAuthInfo info = GoogleAuthInfo.parseUri(line);
+                DatabaseEntry databaseEntry = new DatabaseEntry(info);
+                databaseEntry.setIssuer(databaseEntry.getName());
+                databaseEntry.setName("WinAuth");
+
+                return databaseEntry;
+            } catch (GoogleAuthInfoException e) {
+                throw new DatabaseImporterEntryException(e, line);
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java

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

app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java

@@ -55,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 {

app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java

@@ -0,0 +1,61 @@
+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.AegisApplication;
+import com.beemdevelopment.aegis.R;
+
+public class NotificationService extends Service {
+    public static final int DATABASE_UNLOCKED_ID = 1;
+
+    private static final String CODE_LOCK_STATUS_ID = "lock_status_channel";
+    private static final String CODE_LOCK_DATABASE_ACTION = "lock_database";
+
+    public NotificationService() {
+
+    }
+
+    @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_DATABASE_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(DATABASE_UNLOCKED_ID, builder.build());
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+        notificationManager.cancel(DATABASE_UNLOCKED_ID);
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java

@@ -0,0 +1,128 @@
+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.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+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);
+
+        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 = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(backgroundColorResource, getTheme())));
+        String textColor = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, getTheme())));
+        String licenseColor = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(R.attr.cardBackgroundFocused, getTheme())));
+
+        stylesheet = String.format(stylesheet, backgroundColor, textColor, licenseColor);
+
+        LicenseResolver.registerLicense(new GlideLicense());
+        new LicensesDialog.Builder(this)
+                .setNotices(R.raw.notices)
+                .setTitle(R.string.licenses)
+                .setNoticesCssStyle(stylesheet)
+                .setIncludeOwnLicense(true)
+                .build()
+                .show();
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java

@@ -2,6 +2,7 @@ package com.beemdevelopment.aegis.ui;
 
 import android.animation.ValueAnimator;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -13,22 +14,31 @@ import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
 
+import androidx.annotation.CallSuper;
 import androidx.appcompat.app.AppCompatActivity;
 
-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 (!(this instanceof MainActivity) && !(this instanceof AuthActivity) && _app.getDatabaseManager().isLocked()) {
+        if (savedInstanceState != null && isOrphan()) {
             Intent intent = new Intent(this, MainActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             startActivity(intent);
-            finish();
             return;
         }
 
@@ -37,11 +47,38 @@ public abstract class AegisActivity extends AppCompatActivity {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
-        // set the theme
-        setPreferredTheme(Theme.fromInteger(getPreferences().getCurrentTheme()));
-
         // apply a dirty hack to make progress bars work even if animations are disabled
         setGlobalAnimationDurationScale();
+
+        // 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() {
@@ -53,6 +90,8 @@ public abstract class AegisActivity extends AppCompatActivity {
     }
 
     protected void setPreferredTheme(Theme theme) {
+        _currentTheme = theme;
+
         switch (theme) {
             case LIGHT:
                 setTheme(R.style.AppTheme);
@@ -66,6 +105,30 @@ public abstract class AegisActivity extends AppCompatActivity {
         }
     }
 
+    protected void setLocale(Locale locale) {
+        Locale.setDefault(locale);
+
+        Configuration config = new Configuration();
+        config.locale = locale;
+
+        getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics());
+    }
+
+    /**
+     * 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.getDatabaseManager().isLocked();
+    }
+
     private void setGlobalAnimationDurationScale() {
         float durationScale = Settings.Global.getFloat(getContentResolver(), Settings.Global.ANIMATOR_DURATION_SCALE, 0);
         if (durationScale != 1) {
@@ -76,4 +139,8 @@ public abstract class AegisActivity extends AppCompatActivity {
             }
         }
     }
+
+    protected Theme getCurrentTheme() {
+        return _currentTheme;
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java

@@ -1,56 +1,56 @@
 package com.beemdevelopment.aegis.ui;
 
+import android.content.Context;
 import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
 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.TextView;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.biometric.BiometricPrompt;
+
+import com.beemdevelopment.aegis.CancelAction;
 import com.beemdevelopment.aegis.R;
 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.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
 import com.beemdevelopment.aegis.db.slots.SlotException;
 import com.beemdevelopment.aegis.db.slots.SlotList;
+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.helpers.UiThreadExecutor;
 import com.beemdevelopment.aegis.ui.tasks.SlotListTask;
-import com.mattprecious.swirl.SwirlView;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
-import androidx.appcompat.app.AlertDialog;
-
-public class AuthActivity extends AegisActivity implements FingerprintUiHelper.Callback, SlotListTask.Callback {
+public class AuthActivity extends AegisActivity implements SlotListTask.Callback {
     private EditText _textPassword;
 
+    private CancelAction _cancelAction;
     private SlotList _slots;
-    private FingerprintUiHelper _fingerHelper;
-    private FingerprintManager.CryptoObject _fingerCryptoObj;
+    private BiometricPrompt.CryptoObject _bioCryptoObj;
+    private BiometricPrompt _bioPrompt;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         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);
+        Button biometricsButton = findViewById(R.id.button_biometrics);
 
         _textPassword.setOnEditorActionListener((v, actionId, event) -> {
             if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
@@ -59,23 +59,17 @@ 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();
         _slots = (SlotList) intent.getSerializableExtra("slots");
+        _cancelAction = (CancelAction) intent.getSerializableExtra("cancelAction");
 
-        // 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)) {
@@ -85,10 +79,11 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
                             invalidated = true;
                             continue;
                         }
+
                         Cipher cipher = slot.createDecryptCipher(key);
-                        _fingerCryptoObj = new FingerprintManager.CryptoObject(cipher);
-                        _fingerHelper = new FingerprintUiHelper(manager, imgFingerprint, textFingerprint, this);
-                        boxFingerprint.setVisibility(View.VISIBLE);
+                        _bioCryptoObj = new BiometricPrompt.CryptoObject(cipher);
+                        _bioPrompt = new BiometricPrompt(this, new UiThreadExecutor(), new BiometricPromptListener());
+                        biometricsButton.setVisibility(View.VISIBLE);
                         invalidated = false;
                         break;
                     }
@@ -99,19 +94,26 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
 
             // display a help message if a matching invalidated keystore entry was found
             if (invalidated) {
-                boxFingerprintInfo.setVisibility(View.VISIBLE);
+                boxBiometricInfo.setVisibility(View.VISIBLE);
             }
         }
 
         decryptButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+
                 char[] password = EditTextHelper.getEditTextChars(_textPassword);
                 trySlots(PasswordSlot.class, password);
             }
         });
 
-        if (_fingerHelper == null) {
+        biometricsButton.setOnClickListener(v -> {
+            showBiometricPrompt();
+        });
+
+        if (_bioCryptoObj == null) {
             _textPassword.requestFocus();
             getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         }
@@ -122,7 +124,7 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
                 .setTitle(getString(R.string.unlock_vault_error))
                 .setMessage(getString(R.string.unlock_vault_error_description))
                 .setCancelable(false)
-                .setPositiveButton(android.R.string.ok, null)
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> selectPassword())
                 .create());
     }
 
@@ -131,53 +133,89 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
         new SlotListTask<>(type, this, this).execute(params);
     }
 
-    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();
+    private void selectPassword() {
+        _textPassword.selectAll();
+
+        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:
+                Intent intent = new Intent();
+                setResult(RESULT_CANCELED, intent);
+                finish();
+        }
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        if (_fingerHelper != null) {
-            _fingerHelper.startListening(_fingerCryptoObj);
+        if (_bioPrompt != null) {
+            showBiometricPrompt();
         }
     }
 
+    public void showBiometricPrompt() {
+        BiometricPrompt.PromptInfo info = new BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.authentication))
+                .setNegativeButtonText(getString(android.R.string.cancel))
+                .build();
+        _bioPrompt.authenticate(info, _bioCryptoObj);
+    }
+
     @Override
     public void onPause() {
         super.onPause();
 
-        if (_fingerHelper != null) {
-            _fingerHelper.stopListening();
+        if (_bioPrompt != null) {
+            _bioPrompt.cancelAuthentication();
         }
     }
 
     @Override
-    public void onAuthenticated() {
-        trySlots(FingerprintSlot.class, _fingerCryptoObj.getCipher());
-    }
+    public void onTaskFinished(SlotListTask.Result result) {
+        if (result != null) {
+            // replace the old slot with the repaired one
+            if (result.isSlotRepaired()) {
+                _slots.replace(result.getSlot());
+            }
 
-    @Override
-    public void onError() {
-
-    }
-
-    @Override
-    public void onTaskFinished(MasterKey key) {
-        if (key != null) {
-            setKey(key);
+            // send the master key back to the main activity
+            Intent intent = new Intent();
+            intent.putExtra("creds", new DatabaseFileCredentials(result.getKey(), _slots));
+            intent.putExtra("repairedSlot", result.isSlotRepaired());
+            setResult(RESULT_OK, intent);
+            finish();
         } else {
             showError();
         }
     }
+
+    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);
+            trySlots(BiometricSlot.class, _bioCryptoObj.getCipher());
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            super.onAuthenticationFailed();
+        }
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/ChangelogDialog.java

@@ -0,0 +1,90 @@
+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 = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(backgroundColorResource, getContext().getTheme())));
+        String textColor = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, getContext().getTheme())));
+
+        return String.format(changelog, backgroundColor, textColor);
+    }
+
+    public ChangelogDialog setTheme(Theme theme) {
+        _themeStyle = theme;
+
+        return this;
+    }
+}
+

app/src/main/java/com/beemdevelopment/aegis/ui/Dialogs.java

@@ -4,37 +4,33 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.hardware.fingerprint.FingerprintManager;
 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 androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
-import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
-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 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;
 
 public class Dialogs {
     private Dialogs() {
@@ -52,17 +48,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))
@@ -85,6 +70,18 @@ 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);
+                textPassword.clearFocus();
+                textPasswordConfirm.setEnabled(false);
+            } else {
+                textPassword.setTransformationMethod(new PasswordTransformationMethod());
+                textPasswordConfirm.setEnabled(true);
+            }
+        });
 
         AlertDialog dialog = new AlertDialog.Builder(activity)
                 .setTitle(R.string.set_password)
@@ -101,7 +98,7 @@ public class Dialogs {
 
             // replace the default listener
             button.setOnClickListener(v -> {
-                if (!EditTextHelper.areEditTextsEqual(textPassword, textPasswordConfirm)) {
+                if (!EditTextHelper.areEditTextsEqual(textPassword, textPasswordConfirm) && !switchToggleVisibility.isChecked()) {
                     return;
                 }
 
@@ -126,7 +123,7 @@ public class Dialogs {
         TextWatcher watcher = new TextWatcher() {
             public void onTextChanged(CharSequence c, int start, int before, int count) {
                 boolean equal = EditTextHelper.areEditTextsEqual(textPassword, textPasswordConfirm);
-                buttonOK.get().setEnabled(equal);
+                buttonOK.get().setEnabled(equal || switchToggleVisibility.isChecked());
             }
 
             public void beforeTextChanged(CharSequence c, int start, int count, int after) {
@@ -141,20 +138,34 @@ 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 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 dialog = new AlertDialog.Builder(context)
+                .setTitle(titleId)
                 .setView(view)
-                .setPositiveButton(android.R.string.ok, (dialog1, which) ->
-                        listener.onTextInputResult(groupName.getText().toString()))
+                .setPositiveButton(android.R.string.ok, (dialog1, which) -> {
+                        char[] text = EditTextHelper.getEditTextChars(input);
+                        listener.onTextInputResult(text);
+                })
                 .create();
 
         showSecureDialog(dialog);
     }
 
+    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 showNumberPickerDialog(Activity activity, NumberInputListener listener) {
         View view = activity.getLayoutInflater().inflate(R.layout.dialog_number_picker, null);
         NumberPicker numberPicker = view.findViewById(R.id.numberPicker);
@@ -173,57 +184,12 @@ 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);
-
-        FingerprintManager.CryptoObject obj;
-        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 cipher = Slot.createEncryptCipher(key);
-            obj = new FingerprintManager.CryptoObject(cipher);
-        } catch (KeyStoreHandleException | SlotException e) {
-            throw new RuntimeException(e);
-        }
-
-        AlertDialog dialog = new AlertDialog.Builder(activity)
-                .setTitle(R.string.register_fingerprint)
-                .setView(view)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setOnDismissListener(d -> {
-                    helper.get().stopListening();
-                })
-                .create();
-
-        helper.set(new FingerprintUiHelper(manager, imgFingerprint, textFingerprint, new FingerprintUiHelper.Callback() {
-            @Override
-            public void onAuthenticated() {
-                listener.onSlotResult(slot, obj.getCipher());
-                dialog.dismiss();
-            }
-
-            @Override
-            public void onError() {
-
-            }
-        }));
-
-        helper.get().startListening(obj);
-        showSecureDialog(dialog);
-    }
-
     public interface NumberInputListener {
         void onNumberInputResult(int number);
     }
 
     public interface TextInputListener {
-        void onTextInputResult(String text);
+        void onTextInputResult(char[] text);
     }
 
     public interface SlotListener {

app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java

@@ -4,11 +4,8 @@ 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 android.text.Editable;
 import android.text.TextWatcher;
@@ -39,14 +36,13 @@ 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.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 com.beemdevelopment.aegis.util.Cloner;
 
-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;
@@ -54,6 +50,8 @@ import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicReference;
 
 import androidx.annotation.ArrayRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import de.hdodenhof.circleimageview.CircleImageView;
@@ -109,6 +107,8 @@ public class EditEntryActivity extends AegisActivity {
             setTitle(R.string.add_new_profile);
         }
 
+        String selectedGroup = intent.getStringExtra("selectedGroup");
+
         // set up fields
         _iconView = findViewById(R.id.profile_drawable);
         _kropView = findViewById(R.id.krop_view);
@@ -133,51 +133,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), 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();
+        }
+        _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), 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);
@@ -216,15 +214,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 {
@@ -251,9 +250,19 @@ public class EditEntryActivity extends AegisActivity {
         // automatically open advanced settings since 'Secret' is required.
         if (_isNew) {
             openAdvancedSettings();
+
+            setGroup(selectedGroup);
         }
     }
 
+    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() {
         Animation fadeOut = new AlphaAnimation(1, 0);
         fadeOut.setInterpolator(new AccelerateInterpolator());
@@ -320,7 +329,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;
         }
@@ -390,24 +399,30 @@ public class EditEntryActivity extends AegisActivity {
     @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();
-            }
+            Glide.with(this)
+                .asBitmap()
+                .load(data.getData())
+                .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(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     _iconView.setImageBitmap(_kropView.getCroppedBitmap());
+                    _iconView.setVisibility(View.VISIBLE);
                     _kropView.setVisibility(View.GONE);
                     _hasCustomIcon = true;
                     _hasChangedIcon = true;
@@ -443,12 +458,11 @@ public class EditEntryActivity extends AegisActivity {
 
         byte[] secret;
         try {
-            secret = Base32.decode(EditTextHelper.getEditTextChars(_textSecret));
+            secret = Base32.decode(EditTextHelper.getEditTextChars(_textSecret, true));
         } catch (Base32Exception e) {
             throw new ParseException("Secret is not valid base32.");
         }
 
-        // set otp info
         OtpInfo info;
         try {
             switch (type.toLowerCase()) {
@@ -477,14 +491,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);
-        }
+        DatabaseEntry entry = Cloner.clone(_origEntry);
+        entry.setInfo(info);
         entry.setIssuer(_textIssuer.getText().toString());
         entry.setName(_textName.getText().toString());
 
@@ -498,8 +506,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 {
@@ -559,41 +568,6 @@ public class EditEntryActivity extends AegisActivity {
         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);

app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java

@@ -4,6 +4,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.WindowManager;
 
+import androidx.fragment.app.Fragment;
+
 import com.beemdevelopment.aegis.Preferences;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.db.Database;
@@ -12,11 +14,10 @@ import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
 import com.beemdevelopment.aegis.db.DatabaseFileException;
 import com.beemdevelopment.aegis.db.DatabaseManager;
 import com.beemdevelopment.aegis.db.DatabaseManagerException;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
 import com.beemdevelopment.aegis.db.slots.SlotException;
-import com.beemdevelopment.aegis.db.slots.SlotList;
 import com.beemdevelopment.aegis.ui.slides.CustomAuthenticatedSlide;
 import com.beemdevelopment.aegis.ui.slides.CustomAuthenticationSlide;
 import com.beemdevelopment.aegis.ui.tasks.DerivationTask;
@@ -29,8 +30,6 @@ import org.json.JSONObject;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
-import androidx.fragment.app.Fragment;
-
 public class IntroActivity extends AppIntro2 implements DerivationTask.Callback {
     public static final int RESULT_OK = 0;
     public static final int RESULT_EXCEPTION = 1;
@@ -65,7 +64,7 @@ public class IntroActivity extends AppIntro2 implements DerivationTask.Callback
 
         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));
@@ -83,7 +82,7 @@ public class IntroActivity extends AppIntro2 implements DerivationTask.Callback
         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.setImageDrawable(R.drawable.app_icon);
         endSliderPage.setBgColor(getResources().getColor(R.color.colorSecondary));
         _endSlide = AppIntroFragment.newInstance(endSliderPage);
         addSlide(_endSlide);
@@ -135,7 +134,6 @@ public class IntroActivity extends AppIntro2 implements DerivationTask.Callback
             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
@@ -150,18 +148,14 @@ public class IntroActivity extends AppIntro2 implements DerivationTask.Callback
             }
         }
 
-        if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_FINGER) {
+        if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_BIOMETRIC) {
+            BiometricSlot slot = _authenticatedSlide.getBiometricSlot();
             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);
+                slot.setKey(creds.getKey(), _authenticatedSlide.getBiometriCipher());
             } catch (SlotException e) {
                 setException(e);
-                return;
             }
+            creds.getSlots().add(slot);
         }
 
         // finally, save the database

app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java

@@ -1,43 +1,58 @@
 package com.beemdevelopment.aegis.ui;
 
 import android.Manifest;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SubMenu;
-import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.SearchView;
+
 import com.beemdevelopment.aegis.AegisApplication;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
+import com.beemdevelopment.aegis.CancelAction;
 import com.beemdevelopment.aegis.ViewMode;
 import com.beemdevelopment.aegis.db.DatabaseEntry;
 import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
 import com.beemdevelopment.aegis.db.DatabaseManager;
 import com.beemdevelopment.aegis.db.DatabaseManagerException;
+import com.beemdevelopment.aegis.helpers.FabScrollHelper;
 import com.beemdevelopment.aegis.helpers.PermissionHelper;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfoException;
 import com.beemdevelopment.aegis.ui.views.EntryListView;
 import com.getbase.floatingactionbutton.FloatingActionsMenu;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.ChecksumException;
+import com.google.zxing.FormatException;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.RGBLuminanceSource;
+import com.google.zxing.Reader;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+import com.mikepenz.iconics.context.IconicsContextWrapper;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-
 public class MainActivity extends AegisActivity implements EntryListView.Listener {
     // activity request codes
     private static final int CODE_SCAN = 0;
@@ -47,24 +62,34 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     private static final int CODE_DO_INTRO = 4;
     private static final int CODE_DECRYPT = 5;
     private static final int CODE_PREFERENCES = 6;
+    private static final int CODE_SCAN_IMAGE = 7;
 
     // permission request codes
     private static final int CODE_PERM_CAMERA = 0;
+    private static final int CODE_PERM_READ_STORAGE = 1;
 
     private AegisApplication _app;
     private DatabaseManager _db;
     private boolean _loaded;
-    private String _checkedGroup;
+    private String _selectedGroup;
+    private boolean _searchSubmitted;
+
+    private DatabaseEntry _selectedEntry;
+    private ActionMode _actionMode;
 
     private Menu _menu;
+    private SearchView _searchView;
     private FloatingActionsMenu _fabMenu;
     private EntryListView _entryListView;
 
-    private boolean _isAnimating;
+    private FabScrollHelper _fabScrollHelper;
+
+    private ActionMode.Callback _actionModeCallbacks = new ActionModeCallbacks();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         _app = (AegisApplication) getApplication();
         _db = _app.getDatabaseManager();
         _loaded = false;
@@ -76,9 +101,12 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         _entryListView = (EntryListView) getSupportFragmentManager().findFragmentById(R.id.key_profiles);
         _entryListView.setListener(this);
         _entryListView.setShowAccountName(getPreferences().isAccountNameVisible());
+        _entryListView.setSearchAccountName(getPreferences().isSearchAccountNameEnabled());
+        _entryListView.setHighlightEntry(getPreferences().isEntryHighlightEnabled());
         _entryListView.setTapToReveal(getPreferences().isTapToRevealEnabled());
         _entryListView.setTapToRevealTime(getPreferences().getTapToRevealTime());
-        _entryListView.setViewMode(ViewMode.fromInteger(getPreferences().getCurrentViewMode()));
+        _entryListView.setSortCategory(getPreferences().getCurrentSortCategory(), false);
+        _entryListView.setViewMode(getPreferences().getCurrentViewMode());
 
         // set up the floating action button
         _fabMenu = findViewById(R.id.fab);
@@ -86,10 +114,22 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             _fabMenu.collapse();
             startEditProfileActivity(CODE_ENTER_ENTRY, null, true);
         });
+        findViewById(R.id.fab_scan_image).setOnClickListener(view -> {
+            _fabMenu.collapse();
+            startScanImageActivity();
+        });
         findViewById(R.id.fab_scan).setOnClickListener(view -> {
             _fabMenu.collapse();
             startScanActivity();
         });
+
+        _fabScrollHelper = new FabScrollHelper(_fabMenu);
+    }
+
+    @Override
+    protected void onDestroy() {
+        _entryListView.setListener(null);
+        super.onDestroy();
     }
 
     @Override
@@ -123,6 +163,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             return;
         }
 
+        // don't process any activity results if the vault is locked
+        if (requestCode != CODE_DECRYPT && requestCode != CODE_DO_INTRO && _db.isLocked()) {
+            return;
+        }
+
         switch (requestCode) {
             case CODE_SCAN:
                 onScanResult(resultCode, data);
@@ -145,7 +190,11 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             case CODE_PREFERENCES:
                 onPreferencesResult(resultCode, data);
                 break;
+            case CODE_SCAN_IMAGE:
+                onScanImageResult(resultCode, data);
         }
+
+        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
@@ -159,6 +208,9 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             case CODE_PERM_CAMERA:
                 startScanActivity();
                 break;
+            case CODE_PERM_READ_STORAGE:
+                startScanImageActivity();
+                break;
         }
     }
 
@@ -168,21 +220,26 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             recreate();
         } else if (data.getBooleanExtra("needsRefresh", false)) {
             boolean showAccountName = getPreferences().isAccountNameVisible();
+            boolean searchAccountName = getPreferences().isSearchAccountNameEnabled();
+            boolean highlightEntry = getPreferences().isEntryHighlightEnabled();
             boolean tapToReveal = getPreferences().isTapToRevealEnabled();
             int tapToRevealTime = getPreferences().getTapToRevealTime();
+            ViewMode viewMode = getPreferences().getCurrentViewMode();
             _entryListView.setShowAccountName(showAccountName);
+            _entryListView.setSearchAccountName(searchAccountName);
+            _entryListView.setHighlightEntry(highlightEntry);
             _entryListView.setTapToReveal(tapToReveal);
             _entryListView.setTapToRevealTime(tapToRevealTime);
+            _entryListView.setViewMode(viewMode);
             _entryListView.refresh(true);
         }
     }
 
     private void startEditProfileActivity(int requestCode, DatabaseEntry entry, boolean isNew) {
         Intent intent = new Intent(this, EditEntryActivity.class);
-        if (entry != null) {
-            intent.putExtra("entry", entry);
-        }
+        intent.putExtra("entry", entry != null ? entry : DatabaseEntry.getDefault());
         intent.putExtra("isNew", isNew);
+        intent.putExtra("selectedGroup", _selectedGroup);
         intent.putExtra("groups", new ArrayList<>(_db.getGroups()));
         startActivityForResult(intent, requestCode);
     }
@@ -210,8 +267,8 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             } else {
                 // this profile has been serialized/deserialized and is no longer the same instance it once was
                 // to deal with this, the replaceEntry functions are used
-                _db.replaceEntry(entry);
-                _entryListView.replaceEntry(entry);
+                DatabaseEntry oldEntry = _db.replaceEntry(entry);
+                _entryListView.replaceEntry(oldEntry, entry);
                 saveDatabase();
             }
         }
@@ -225,6 +282,38 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         }
     }
 
+    private void onScanImageResult(int resultCode, Intent intent) {
+        if (resultCode == RESULT_OK) {
+            Uri inputFile = (intent.getData());
+            Bitmap bitmap;
+
+            try {
+                BitmapFactory.Options bmOptions = new BitmapFactory.Options();
+
+                try (InputStream inputStream = getContentResolver().openInputStream(inputFile)) {
+                    bitmap = BitmapFactory.decodeStream(inputStream, null, bmOptions);
+                }
+
+                int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
+                bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
+
+                LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
+                BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+                Reader reader = new MultiFormatReader();
+                Result result = reader.decode(binaryBitmap);
+
+                GoogleAuthInfo info = GoogleAuthInfo.parseUri(result.getText());
+                DatabaseEntry entry = new DatabaseEntry(info);
+
+                startEditProfileActivity(CODE_ADD_ENTRY, entry, true);
+            } catch (NotFoundException | IOException | ChecksumException | FormatException | GoogleAuthInfoException e) {
+                Toast.makeText(this, getString(R.string.unable_to_read_qrcode), Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+            }
+        }
+    }
+
     private void updateGroupFilterMenu() {
         SubMenu menu = _menu.findItem(R.id.action_filter).getSubMenu();
         for (int i = menu.size() - 1; i >= 0; i--) {
@@ -237,38 +326,34 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
         // if the group no longer exists, switch back to 'All'
         TreeSet<String> groups = _db.getGroups();
-        if (_checkedGroup != null && !groups.contains(_checkedGroup)) {
+        if (_selectedGroup != null && !groups.contains(_selectedGroup)) {
             menu.findItem(R.id.menu_filter_all).setChecked(true);
             setGroupFilter(null);
         }
 
         for (String group : groups) {
             MenuItem item = menu.add(R.id.action_filter_group, Menu.NONE, Menu.NONE, group);
-            if (group.equals(_checkedGroup)) {
+            if (group.equals(_selectedGroup)) {
                 item.setChecked(true);
             }
         }
 
+        if (groups.size() > 0) {
+            menu.add(R.id.action_filter_group, Menu.NONE, 10, R.string.filter_ungrouped);
+        }
+
         menu.setGroupCheckable(R.id.action_filter_group, true, true);
     }
 
+    private void updateSortCategoryMenu() {
+        SortCategory category = getPreferences().getCurrentSortCategory();
+        _menu.findItem(category.getMenuItem()).setChecked(true);
+    }
+
     private void setGroupFilter(String group) {
         getSupportActionBar().setSubtitle(group);
-        _checkedGroup = group;
-        _entryListView.setGroupFilter(group);
-    }
-
-    private void setSortCategory(SortCategory sortCategory) {
-        if (sortCategory == SortCategory.CUSTOM) {
-            _entryListView.clearEntries();
-            loadEntries();
-        }
-
-        _entryListView.setSortCategory(sortCategory);
-    }
-
-    private void updateSortCategoryMenu(SortCategory sortCategory) {
-        _menu.findItem(SortCategory.getMenuItem(sortCategory)).setChecked(true);
+        _selectedGroup = group;
+        _entryListView.setGroupFilter(group, true);
     }
 
     private void addEntry(DatabaseEntry entry) {
@@ -289,7 +374,13 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
     private void onDecryptResult(int resultCode, Intent intent) {
         DatabaseFileCredentials creds = (DatabaseFileCredentials) intent.getSerializableExtra("creds");
-        unlockDatabase(creds);
+        boolean unlocked = unlockDatabase(creds);
+
+        // save the database in case a slot was repaired
+        if (unlocked && intent.getBooleanExtra("repairedSlot", false)) {
+            _db.setCredentials(creds);
+            saveDatabase();
+        }
 
         doShortcutActions();
     }
@@ -303,6 +394,18 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         startActivityForResult(scannerActivity, CODE_SCAN);
     }
 
+    private void startScanImageActivity() {
+        if (!PermissionHelper.request(this, CODE_PERM_READ_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+            return;
+        }
+
+        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_picture));
+        startActivityForResult(Intent.createChooser(chooserIntent, getString(R.string.select_picture)), CODE_SCAN_IMAGE);
+    }
+
     private void doShortcutActions() {
         Intent intent = getIntent();
         String action = intent.getStringExtra("action");
@@ -319,8 +422,31 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         intent.removeExtra("action");
     }
 
-    public void startActivityForResult(Intent intent, int requestCode) {
-        super.startActivityForResult(intent, requestCode);
+    private void handleDeeplink() {
+        if (_db.isLocked()) {
+            return;
+        }
+
+        Intent intent = getIntent();
+        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+            Uri uri = intent.getData();
+            getIntent().setData(null);
+            getIntent().setAction(null);
+
+            GoogleAuthInfo info = null;
+            try {
+                info = GoogleAuthInfo.parseUri(uri);
+            } catch (GoogleAuthInfoException e) {
+                Toast.makeText(this, getString(R.string.unable_to_read_qrcode), Toast.LENGTH_SHORT).show();
+                e.printStackTrace();
+            }
+
+            if (info != null) {
+                DatabaseEntry entry = new DatabaseEntry(info);
+                startEditProfileActivity(CODE_ADD_ENTRY, entry, true);
+            }
+        }
+
     }
 
     @Override
@@ -347,66 +473,41 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             }
 
             // refresh all codes to prevent showing old ones
-            _entryListView.refresh(true);
+            _entryListView.refresh(false);
         } else {
             loadEntries();
         }
 
+        handleDeeplink();
         updateLockIcon();
         doShortcutActions();
     }
 
     @Override
     public void onBackPressed() {
+        if (!_searchView.isIconified() || _searchSubmitted) {
+            _searchSubmitted = false;
+            _entryListView.setSearchFilter(null);
+
+            collapseSearchView();
+            setTitle("Aegis");
+            setGroupFilter(_selectedGroup);
+            return;
+        }
+
         if (_app.isAutoLockEnabled()) {
-            lockDatabase();
+            _app.lock();
+            return;
         }
 
         super.onBackPressed();
     }
 
-    private BottomSheetDialog createBottomSheet(final DatabaseEntry entry) {
-        BottomSheetDialog dialog = new BottomSheetDialog(this);
-        dialog.setContentView(R.layout.bottom_sheet_edit_entry);
-        dialog.setCancelable(true);
-        dialog.getWindow().setLayout(LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT);
-        dialog.show();
-
-        dialog.findViewById(R.id.copy_button).setOnClickListener(view -> {
-            dialog.dismiss();
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText("text/plain", entry.getInfo().getOtp());
-            clipboard.setPrimaryClip(clip);
-            Toast.makeText(this, getString(R.string.code_copied), Toast.LENGTH_SHORT).show();
-        });
-
-        dialog.findViewById(R.id.delete_button).setOnClickListener(view -> {
-            dialog.dismiss();
-            Dialogs.showDeleteEntryDialog(this, (d, which) -> {
-                deleteEntry(entry);
-                // update the filter list if the group no longer exists
-                if (entry.getGroup() != null) {
-                    if (!_db.getGroups().contains(entry.getGroup())) {
-                        updateGroupFilterMenu();
-                    }
-                }
-            });
-        });
-
-        dialog.findViewById(R.id.edit_button).setOnClickListener(view -> {
-            dialog.dismiss();
-            startEditProfileActivity(CODE_EDIT_ENTRY, entry, false);
-        });
-
-        return dialog;
-    }
-
     private void deleteEntry(DatabaseEntry entry) {
-        _db.removeEntry(entry);
+        DatabaseEntry oldEntry = _db.removeEntry(entry);
         saveDatabase();
 
-        _entryListView.removeEntry(entry);
+        _entryListView.removeEntry(oldEntry);
     }
 
     @Override
@@ -416,21 +517,57 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         updateLockIcon();
         if (_loaded) {
             updateGroupFilterMenu();
-            updateSortCategoryMenu(SortCategory.fromInteger(getPreferences().getCurrentSortCategory()));
+            updateSortCategoryMenu();
         }
+
+        MenuItem searchViewMenuItem = menu.findItem(R.id.mi_search);
+
+        _searchView = (SearchView) searchViewMenuItem.getActionView();
+        _searchView.setFocusable(false);
+        _searchView.setQueryHint(getString(R.string.search));
+        _searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                setTitle(getString(R.string.search));
+                getSupportActionBar().setSubtitle(s);
+                _searchSubmitted = true;
+                collapseSearchView();
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                if (!_searchSubmitted) {
+                    _entryListView.setSearchFilter(s);
+                }
+                return false;
+            }
+        });
+        _searchView.setOnSearchClickListener(v -> {
+            if (_searchSubmitted) {
+                _searchSubmitted = false;
+                _entryListView.setSearchFilter(null);
+            }
+        });
+
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_settings:
+            case R.id.action_settings: {
                 Intent intent = new Intent(this, PreferencesActivity.class);
                 startActivityForResult(intent, CODE_PREFERENCES);
                 return true;
+            }
+            case R.id.action_about: {
+                Intent intent = new Intent(this, AboutActivity.class);
+                startActivity(intent);
+                return true;
+            }
             case R.id.action_lock:
-                lockDatabase();
-                startAuthActivity();
+                _app.lock();
                 return true;
             default:
                 if (item.getGroupId() == R.id.action_filter_group) {
@@ -452,13 +589,13 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                             sortCategory = SortCategory.ISSUER;
                             break;
                         case R.id.menu_sort_alphabetically_reverse:
-                            sortCategory = SortCategory.ISSUERREVERSED;
+                            sortCategory = SortCategory.ISSUER_REVERSED;
                             break;
                         case R.id.menu_sort_alphabetically_name:
                             sortCategory = SortCategory.ACCOUNT;
                             break;
                         case R.id.menu_sort_alphabetically_name_reverse:
-                            sortCategory = SortCategory.ACCOUNTREVERSED;
+                            sortCategory = SortCategory.ACCOUNT_REVERSED;
                             break;
                         case R.id.menu_sort_custom:
                         default:
@@ -466,26 +603,19 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                             break;
                     }
 
-                    setSortCategory(sortCategory);
+                    _entryListView.setSortCategory(sortCategory, true);
                     getPreferences().setCurrentSortCategory(sortCategory);
                 }
                 return super.onOptionsItemSelected(item);
         }
     }
 
-    private void lockDatabase() {
-        if (_loaded) {
-            _entryListView.clearEntries();
-            _db.lock();
-            _loaded = false;
-        }
+    private void collapseSearchView() {
+        _searchView.setQuery(null, false);
+        _searchView.setIconified(true);
     }
 
-    private void unlockDatabase(DatabaseFileCredentials creds) {
-        if (_loaded) {
-            return;
-        }
-
+    private boolean unlockDatabase(DatabaseFileCredentials creds) {
         try {
             if (!_db.isLoaded()) {
                 _db.load();
@@ -493,7 +623,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
             if (_db.isLocked()) {
                 if (creds == null) {
                     startAuthActivity();
-                    return;
+                    return false;
                 } else {
                     _db.unlock(creds);
                 }
@@ -501,24 +631,26 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         } catch (DatabaseManagerException e) {
             Toast.makeText(this, getString(R.string.decryption_error), Toast.LENGTH_LONG).show();
             startAuthActivity();
-            return;
+            return false;
         }
 
         loadEntries();
-        SortCategory currentSortCategory = SortCategory.fromInteger(getPreferences().getCurrentSortCategory());
-        setSortCategory(currentSortCategory);
+        return true;
     }
 
     private void loadEntries() {
         // load all entries
         List<DatabaseEntry> entries = new ArrayList<DatabaseEntry>(_db.getEntries());
         _entryListView.addEntries(entries);
+        _entryListView.runEntriesAnimation();
         _loaded = true;
     }
 
     private void startAuthActivity() {
         Intent intent = new Intent(this, AuthActivity.class);
         intent.putExtra("slots", _db.getFileHeader().getSlots());
+        intent.putExtra("requiresUnlock", false);
+        intent.putExtra("cancelAction", CancelAction.KILL);
         startActivityForResult(intent, CODE_DECRYPT);
     }
 
@@ -540,7 +672,29 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
     @Override
     public void onEntryClick(DatabaseEntry entry) {
-        createBottomSheet(entry).show();
+        if (_selectedEntry != null) {
+            if (_selectedEntry == entry) {
+                _actionMode.finish();
+            }
+
+            return;
+        }
+
+        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clip = ClipData.newPlainText("text/plain", entry.getInfo().getOtp());
+        clipboard.setPrimaryClip(clip);
+        Toast.makeText(this, getString(R.string.code_copied), Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onLongEntryClick(DatabaseEntry entry) {
+        if (_selectedEntry != null) {
+            return;
+        }
+
+        _selectedEntry = entry;
+        _entryListView.setActionModeState(true, entry);
+        _actionMode = this.startSupportActionMode(_actionModeCallbacks);
     }
 
     @Override
@@ -560,33 +714,68 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
     @Override
     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();
+        _fabScrollHelper.onScroll(dx, dy);
+    }
+
+    @Override
+    public void onLocked() {
+        if (_actionMode != null) {
+            _actionMode.finish();
         }
+
+        _entryListView.clearEntries();
+        _loaded = false;
+
+        if (isOpen()) {
+            startAuthActivity();
+        }
+
+        super.onLocked();
+    }
+
+    private class ActionModeCallbacks implements ActionMode.Callback {
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                MenuInflater inflater = mode.getMenuInflater();
+                inflater.inflate(R.menu.menu_action_mode, menu);
+                return true;
+            }
+
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                return false;
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.action_edit:
+                        startEditProfileActivity(CODE_EDIT_ENTRY, _selectedEntry, false);
+                        mode.finish();
+                        return true;
+
+                    case R.id.action_delete:
+                        Dialogs.showDeleteEntryDialog(MainActivity.this, (d, which) -> {
+                            deleteEntry(_selectedEntry);
+
+                            if (_selectedEntry.getGroup() != null) {
+                                if (!_db.getGroups().contains(_selectedEntry.getGroup())) {
+                                    updateGroupFilterMenu();
+                                }
+                            }
+                            mode.finish();
+                        });
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+                _entryListView.setActionModeState(false, null);
+                _selectedEntry = null;
+                _actionMode = null;
+            }
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java

@@ -2,21 +2,25 @@ package com.beemdevelopment.aegis.ui;
 
 import android.Manifest;
 import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.biometric.BiometricPrompt;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
 import com.beemdevelopment.aegis.AegisApplication;
 import com.beemdevelopment.aegis.BuildConfig;
+import com.beemdevelopment.aegis.CancelAction;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.Theme;
 import com.beemdevelopment.aegis.ViewMode;
@@ -24,27 +28,28 @@ import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
 import com.beemdevelopment.aegis.db.DatabaseEntry;
 import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
+import com.beemdevelopment.aegis.db.DatabaseFileException;
 import com.beemdevelopment.aegis.db.DatabaseManager;
 import com.beemdevelopment.aegis.db.DatabaseManagerException;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
 import com.beemdevelopment.aegis.db.slots.SlotException;
 import com.beemdevelopment.aegis.db.slots.SlotList;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
+import com.beemdevelopment.aegis.helpers.BiometricSlotInitializer;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.beemdevelopment.aegis.helpers.PermissionHelper;
-import com.beemdevelopment.aegis.importers.AegisFileImporter;
-import com.beemdevelopment.aegis.importers.DatabaseAppImporter;
-import com.beemdevelopment.aegis.importers.DatabaseFileImporter;
+import com.beemdevelopment.aegis.importers.AegisImporter;
 import com.beemdevelopment.aegis.importers.DatabaseImporter;
 import com.beemdevelopment.aegis.importers.DatabaseImporterEntryException;
 import com.beemdevelopment.aegis.importers.DatabaseImporterException;
-import com.beemdevelopment.aegis.importers.DatabaseImporterResult;
+import com.beemdevelopment.aegis.services.NotificationService;
+import com.beemdevelopment.aegis.ui.models.ImportEntry;
 import com.beemdevelopment.aegis.ui.preferences.SwitchPreference;
-import com.beemdevelopment.aegis.util.ByteInputStream;
-import com.google.android.material.snackbar.Snackbar;
-import com.takisoft.preferencex.PreferenceFragmentCompat;
+import com.beemdevelopment.aegis.util.UUIDMap;
 import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -52,21 +57,19 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.crypto.Cipher;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-
 public class PreferencesFragment extends PreferenceFragmentCompat {
     // activity request codes
     private static final int CODE_IMPORT = 0;
     private static final int CODE_IMPORT_DECRYPT = 1;
     private static final int CODE_SLOTS = 2;
     private static final int CODE_GROUPS = 3;
+    private static final int CODE_SELECT_ENTRIES = 4;
 
     // permission request codes
     private static final int CODE_PERM_IMPORT = 0;
@@ -75,19 +78,20 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
     private Intent _result;
     private DatabaseManager _db;
 
-    // this is used to keep a reference to a database converter
-    // while the user provides credentials to decrypt it
-    private DatabaseFileImporter _importer;
-    private Class<? extends DatabaseFileImporter> _importerType;
+    // keep a reference to the type of database converter the user selected
+    private Class<? extends DatabaseImporter> _importerType;
+    private AegisImporter.State _importerState;
+    private UUIDMap<DatabaseEntry> _importerEntries;
 
     private SwitchPreference _encryptionPreference;
-    private SwitchPreference _fingerprintPreference;
+    private SwitchPreference _biometricsPreference;
+    private Preference _autoLockPreference;
     private Preference _setPasswordPreference;
     private Preference _slotsPreference;
     private Preference _groupsPreference;
 
     @Override
-    public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.preferences);
 
         AegisApplication app = (AegisApplication) getActivity().getApplication();
@@ -96,18 +100,17 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         // set the result intent in advance
         setResult(new Intent());
 
-        int currentTheme = app.getPreferences().getCurrentTheme();
+        int currentTheme = app.getPreferences().getCurrentTheme().ordinal();
         Preference darkModePreference = findPreference("pref_dark_mode");
-        darkModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getString(Theme.getThemeNameResource(currentTheme))));
+        darkModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.theme_titles)[currentTheme]));
         darkModePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                String[] themeNames = getStringsFromResourceIds(Theme.getThemeNameResources());
-                int checkedTheme = app.getPreferences().getCurrentTheme();
+                int currentTheme = app.getPreferences().getCurrentTheme().ordinal();
 
                 Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.choose_theme))
-                        .setSingleChoiceItems(themeNames, checkedTheme, (dialog, which) -> {
+                        .setTitle(R.string.choose_theme)
+                        .setSingleChoiceItems(R.array.theme_titles, currentTheme, (dialog, which) -> {
                             int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
                             app.getPreferences().setCurrentTheme(Theme.fromInteger(i));
 
@@ -116,43 +119,38 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                             _result.putExtra("needsRecreate", true);
                             getActivity().recreate();
                         })
-                        .setPositiveButton(android.R.string.ok, null)
+                        .setNegativeButton(android.R.string.cancel, null)
                         .create());
 
                 return true;
             }
         });
 
-        darkModePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                _result.putExtra("needsRecreate", true);
-                getActivity().recreate();
-                return true;
-            }
+        Preference langPreference = findPreference("pref_lang");
+        langPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            _result.putExtra("needsRecreate", true);
+            getActivity().recreate();
+            return true;
         });
 
-        int currentViewMode = app.getPreferences().getCurrentViewMode();
+        int currentViewMode = app.getPreferences().getCurrentViewMode().ordinal();
         Preference viewModePreference = findPreference("pref_view_mode");
-        viewModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getString(ViewMode.getViewModeNameResource(currentViewMode))));
+        viewModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.view_mode_titles)[currentViewMode]));
         viewModePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                String[] viewModes = getStringsFromResourceIds(ViewMode.getViewModeNameResources());
-                int checkedMode = app.getPreferences().getCurrentViewMode();
+                int currentViewMode = app.getPreferences().getCurrentViewMode().ordinal();
 
                 Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.choose_view_mode))
-                        .setSingleChoiceItems(viewModes, checkedMode, (dialog, which) -> {
+                        .setTitle(R.string.choose_view_mode)
+                        .setSingleChoiceItems(R.array.view_mode_titles, currentViewMode, (dialog, which) -> {
                             int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
                             app.getPreferences().setCurrentViewMode(ViewMode.fromInteger(i));
-
+                            viewModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getResources().getStringArray(R.array.view_mode_titles)[i]));
+                            _result.putExtra("needsRefresh", true);
                             dialog.dismiss();
-
-                            viewModePreference.setSummary(String.format("%s: %s", getString(R.string.selected), getString(ViewMode.getViewModeNameResource(i))));
-                            _result.putExtra("needsRecreate", true);
                         })
-                        .setPositiveButton(android.R.string.ok, null)
+                        .setNegativeButton(android.R.string.cancel, null)
                         .create());
 
                 return true;
@@ -206,6 +204,18 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             }
         });
 
+        Preference searchAccountNamePreference = findPreference("pref_search_names");
+        searchAccountNamePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            _result.putExtra("needsRefresh", true);
+            return true;
+        });
+
+        Preference entryHighlightPreference = findPreference("pref_highlight_entry");
+        entryHighlightPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            _result.putExtra("needsRefresh", true);
+            return true;
+        });
+
         Preference tapToRevealPreference = findPreference("pref_tap_to_reveal");
         tapToRevealPreference.setOnPreferenceChangeListener((preference, newValue) -> {
             _result.putExtra("needsRefresh", true);
@@ -252,14 +262,14 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                     Dialogs.showSetPasswordDialog(getActivity(), new EnableEncryptionListener());
                 } else {
                     Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                            .setTitle(getString(R.string.disable_encryption))
+                            .setTitle(R.string.disable_encryption)
                             .setMessage(getString(R.string.disable_encryption_description))
                             .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int which) {
                                     try {
                                         _db.disableEncryption();
                                     } catch (DatabaseManagerException e) {
-                                        Toast.makeText(getActivity(), getString(R.string.disable_encryption_error), Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getActivity(), R.string.disable_encryption_error, Toast.LENGTH_SHORT).show();
                                         return;
                                     }
 
@@ -271,6 +281,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                                         e.printStackTrace();
                                     }
 
+                                    getActivity().stopService(new Intent(getActivity(), NotificationService.class));
                                     updateEncryptionPreferences();
                                 }
                             })
@@ -281,18 +292,25 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             }
         });
 
-        _fingerprintPreference = (SwitchPreference) findPreference("pref_fingerprint");
-        _fingerprintPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+        _biometricsPreference = (SwitchPreference) findPreference("pref_biometrics");
+        _biometricsPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 DatabaseFileCredentials creds = _db.getCredentials();
                 SlotList slots = creds.getSlots();
 
-                if (!slots.has(FingerprintSlot.class)) {
-                    Dialogs.showFingerprintDialog(getActivity(), new RegisterFingerprintListener());
+                if (!slots.has(BiometricSlot.class)) {
+                    if (BiometricsHelper.isAvailable(getContext())) {
+                        BiometricSlotInitializer initializer = new BiometricSlotInitializer(PreferencesFragment.this, new RegisterBiometricsListener());
+                        BiometricPrompt.PromptInfo info = new BiometricPrompt.PromptInfo.Builder()
+                                .setTitle(getString(R.string.set_up_biometric))
+                                .setNegativeButtonText(getString(android.R.string.cancel))
+                                .build();
+                        initializer.authenticate(info);
+                    }
                 } else {
-                    // remove the fingerprint slot
-                    FingerprintSlot slot = slots.find(FingerprintSlot.class);
+                    // remove the biometric slot
+                    BiometricSlot slot = slots.find(BiometricSlot.class);
                     slots.remove(slot);
                     _db.setCredentials(creds);
 
@@ -339,10 +357,12 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                 return true;
             }
         });
+
+        _autoLockPreference = findPreference("pref_auto_lock");
     }
 
     @Override
-    public void onActivityCreated (Bundle savedInstanceState) {
+    public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         updateEncryptionPreferences();
     }
@@ -350,7 +370,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if (!PermissionHelper.checkResults(grantResults)) {
-            Toast.makeText(getActivity(), getString(R.string.permission_denied), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), R.string.permission_denied, Toast.LENGTH_SHORT).show();
             return;
         }
 
@@ -383,6 +403,9 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             case CODE_GROUPS:
                 onGroupManagerResult(resultCode, data);
                 break;
+            case CODE_SELECT_ENTRIES:
+                onSelectEntriesResult(resultCode, data);
+                break;
         }
     }
 
@@ -400,11 +423,11 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             return;
         }
 
-        Map<String, Class<? extends DatabaseFileImporter>> importers = DatabaseFileImporter.getImporters();
-        String[] names = importers.keySet().toArray(new String[importers.size()]);
+        Map<String, Class<? extends DatabaseImporter>> importers = DatabaseImporter.getImporters();
+        String[] names = importers.keySet().toArray(new String[0]);
 
         Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                .setTitle(getString(R.string.choose_application))
+                .setTitle(R.string.choose_application)
                 .setSingleChoiceItems(names, 0, null)
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
@@ -420,61 +443,97 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
     }
 
     private void onImportApp() {
-        Map<String, Class<? extends DatabaseAppImporter>> importers = DatabaseAppImporter.getImporters();
-        String[] names = importers.keySet().toArray(new String[importers.size()]);
+        Map<String, Class<? extends DatabaseImporter>> importers = DatabaseImporter.getAppImporters();
+        String[] names = importers.keySet().toArray(new String[0]);
 
         Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                .setTitle(getString(R.string.choose_application))
+                .setTitle(R.string.choose_application)
                 .setSingleChoiceItems(names, 0, null)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
-                        try {
-                            DatabaseAppImporter importer;
-                            // obtain the global root shell and close it immediately after we're done
-                            // TODO: find a way to use SuFileInputStream with Shell.newInstance()
-                            try (Shell shell = Shell.getShell()) {
-                                if (!shell.isRoot()) {
-                                    Toast.makeText(getActivity(), getString(R.string.root_error), Toast.LENGTH_SHORT).show();
-                                    return;
-                                }
-                                importer = DatabaseAppImporter.create(getContext(), importers.get(names[i]));
-                                importer.parse();
-                            } catch (IOException e) {
-                                Toast.makeText(getActivity(), getString(R.string.root_error), Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-                            importDatabase(importer);
-                        } catch (DatabaseImporterException e) {
-                            e.printStackTrace();
-
-                            String msg = String.format("%s: %s", getString(R.string.parsing_file_error), e.getMessage());
-                            Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
-                        }
-                    }
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                    int i = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                    Class<? extends DatabaseImporter> importerType = Objects.requireNonNull(importers.get(names[i]));
+                    DatabaseImporter importer = DatabaseImporter.create(getContext(), importerType);
+                    importApp(importer);
                 })
                 .create());
     }
 
+    private void importApp(DatabaseImporter importer) {
+        // obtain the global root shell and close it immediately after we're done
+        // TODO: find a way to use SuFileInputStream with Shell.newInstance()
+        try (Shell shell = Shell.getShell()) {
+            if (!shell.isRoot()) {
+                Toast.makeText(getActivity(), R.string.root_error, Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            SuFile file = importer.getAppPath();
+            try (SuFileInputStream stream = new SuFileInputStream(file)) {
+                DatabaseImporter.FileReader reader = new DatabaseImporter.FileReader(stream, true);
+                importDatabase(importer, reader);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            Toast.makeText(getActivity(), R.string.app_lookup_error, Toast.LENGTH_SHORT).show();
+        } catch (IOException | DatabaseImporterException e) {
+            e.printStackTrace();
+            Toast.makeText(getActivity(), R.string.reading_file_error, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void importDatabase(DatabaseImporter importer, DatabaseImporter.FileReader reader) {
+        try {
+            DatabaseImporter.State state = importer.read(reader);
+            if (state.isEncrypted()) {
+                // temporary special case for encrypted Aegis databases
+                if (state instanceof AegisImporter.EncryptedState) {
+                    _importerState = state;
+
+                    Intent intent = new Intent(getActivity(), AuthActivity.class);
+                    intent.putExtra("slots", ((AegisImporter.EncryptedState) state).getSlots());
+                    intent.putExtra("cancelAction", CancelAction.CLOSE);
+                    startActivityForResult(intent, CODE_IMPORT_DECRYPT);
+                } else {
+                    state.decrypt(getActivity(), new DatabaseImporter.DecryptListener() {
+                        @Override
+                        public void onStateDecrypted(DatabaseImporter.State state) {
+                            importDatabase(state);
+                        }
+
+                        @Override
+                        public void onError(Exception e) {
+                            Toast.makeText(getActivity(), R.string.decryption_error, Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                }
+            } else {
+                importDatabase(state);
+            }
+        } catch (DatabaseImporterException e) {
+            e.printStackTrace();
+            String msg = String.format("%s: %s", getString(R.string.parsing_file_error), e.getMessage());
+            Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
+        }
+    }
+
     private void onImportDecryptResult(int resultCode, Intent data) {
         if (resultCode != Activity.RESULT_OK) {
-            _importer = null;
+            _importerState = null;
             return;
         }
 
         DatabaseFileCredentials creds = (DatabaseFileCredentials) data.getSerializableExtra("creds");
-        ((AegisFileImporter)_importer).setCredentials(creds);
-
+        DatabaseImporter.State state;
         try {
-            importDatabase(_importer);
-        } catch (DatabaseImporterException e) {
+            state = ((AegisImporter.EncryptedState) _importerState).decrypt(creds);
+        } catch (DatabaseFileException e) {
             e.printStackTrace();
-
-            String msg = String.format("%s: %s", getString(R.string.parsing_file_error), e.getMessage());
-            Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), R.string.decryption_error, Toast.LENGTH_SHORT).show();
+            return;
         }
 
-        _importer = null;
+        importDatabase(state);
+        _importerState = null;
     }
 
     private void onImportResult(int resultCode, Intent data) {
@@ -483,85 +542,39 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
             return;
         }
 
-        ByteInputStream stream;
-
-        try (InputStream fileStream = getActivity().getContentResolver().openInputStream(uri)) {
-            stream = ByteInputStream.create(fileStream);
+        try (InputStream stream = getContext().getContentResolver().openInputStream(uri)) {
+            DatabaseImporter importer = DatabaseImporter.create(getContext(), _importerType);
+            DatabaseImporter.FileReader reader = new DatabaseImporter.FileReader(stream);
+            importDatabase(importer, reader);
         } catch (FileNotFoundException e) {
-            Toast.makeText(getActivity(), getString(R.string.file_not_found), Toast.LENGTH_SHORT).show();
-            return;
+            Toast.makeText(getActivity(), R.string.file_not_found, Toast.LENGTH_SHORT).show();
         } catch (IOException e) {
             e.printStackTrace();
-            Toast.makeText(getActivity(), getString(R.string.reading_file_error), Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        try {
-            DatabaseFileImporter importer = DatabaseFileImporter.create(getContext(), stream, _importerType);
-            importer.parse();
-
-            // special case to decrypt encrypted aegis databases
-            if (importer.isEncrypted() && importer instanceof AegisFileImporter) {
-                _importer = importer;
-
-                Intent intent = new Intent(getActivity(), AuthActivity.class);
-                intent.putExtra("slots", ((AegisFileImporter)_importer).getFile().getHeader().getSlots());
-                startActivityForResult(intent, CODE_IMPORT_DECRYPT);
-                return;
-            }
-
-            importDatabase(importer);
-        } catch (DatabaseImporterException e) {
-            e.printStackTrace();
-
-            String msg = String.format("%s: %s", getString(R.string.parsing_file_error), e.getMessage());
-            Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
+            Toast.makeText(getActivity(), R.string.reading_file_error, Toast.LENGTH_SHORT).show();
         }
     }
 
-    private void importDatabase(DatabaseImporter importer) throws DatabaseImporterException {
-        DatabaseImporterResult result = importer.convert();
-        List<DatabaseEntry> entries = result.getEntries();
-        List<DatabaseImporterEntryException> errors = result.getErrors();
-
-        for (DatabaseEntry entry : entries) {
-            // temporary: randomize the UUID of duplicate entries and add them anyway
-            if (_db.getEntryByUUID(entry.getUUID()) != null) {
-                entry.resetUUID();
-            }
-
-            _db.addEntry(entry);
-        }
-
-        if (!saveDatabase()) {
+    private void importDatabase(DatabaseImporter.State state) {
+        DatabaseImporter.Result result;
+        try {
+            result = state.convert();
+        } catch (DatabaseImporterException e) {
+            e.printStackTrace();
+            String msg = String.format("%s: %s", getString(R.string.parsing_file_error), e.getMessage());
+            Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show();
             return;
         }
 
-        _result.putExtra("needsRecreate", true);
-
-        Snackbar bar = Snackbar.make(getView(), String.format(Locale.getDefault(), getString(R.string.imported_entries_count), entries.size(), errors.size()), Snackbar.LENGTH_LONG);
-        if (errors.size() > 0) {
-            bar.setAction(R.string.details, v -> {
-                List<String> messages = new ArrayList<>();
-                for (DatabaseImporterEntryException e : errors) {
-                    messages.add(e.getMessage());
-                }
-
-                String message = TextUtils.join("\n\n", messages);
-                Dialogs.showSecureDialog(new AlertDialog.Builder(getActivity())
-                        .setTitle(R.string.import_error_title)
-                        .setMessage(message)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .setNeutralButton(android.R.string.copy, (dialog, which) -> {
-                            ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-                            ClipData clip = ClipData.newPlainText("text/plain", message);
-                            clipboard.setPrimaryClip(clip);
-                            Toast.makeText(getActivity(), getString(R.string.errors_copied), Toast.LENGTH_SHORT).show();
-                        })
-                        .create());
-            });
+        _importerEntries = result.getEntries();
+        List<ImportEntry> entries = new ArrayList<>();
+        for (DatabaseEntry entry : _importerEntries) {
+            entries.add(new ImportEntry(entry));
         }
-        bar.show();
+
+        Intent intent = new Intent(getActivity(), SelectEntriesActivity.class);
+        intent.putExtra("entries", (ArrayList<ImportEntry>) entries);
+        intent.putExtra("errors", (ArrayList<DatabaseImporterEntryException>) result.getErrors());
+        startActivityForResult(intent, CODE_SELECT_ENTRIES);
     }
 
     private void onExport() {
@@ -578,7 +591,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                     try {
                         filename = _db.export(checked.get());
                     } catch (DatabaseManagerException e) {
-                        Toast.makeText(getActivity(), getString(R.string.exporting_database_error), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getActivity(), R.string.exporting_database_error, Toast.LENGTH_SHORT).show();
                         return;
                     }
 
@@ -598,7 +611,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                 }
             });
         } else {
-            builder.setMessage(getString(R.string.export_warning));
+            builder.setMessage(R.string.export_warning);
         }
         Dialogs.showSecureDialog(builder.create());
     }
@@ -628,11 +641,39 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         }
     }
 
+    private void onSelectEntriesResult(int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        List<ImportEntry> selectedEntries = (ArrayList<ImportEntry>) data.getSerializableExtra("entries");
+        for (ImportEntry selectedEntry : selectedEntries) {
+            DatabaseEntry savedEntry = _importerEntries.getByUUID(selectedEntry.getUUID());
+
+            // temporary: randomize the UUID of duplicate entries and add them anyway
+            if (_db.isEntryDuplicate(savedEntry)) {
+                savedEntry.resetUUID();
+            }
+
+            _db.addEntry(savedEntry);
+        }
+
+        _importerEntries = null;
+        if (!saveDatabase()) {
+            return;
+        }
+
+        String toastMessage = getResources().getString(R.string.imported_entries_count, selectedEntries.size());
+        Toast.makeText(getContext(), toastMessage, Toast.LENGTH_SHORT).show();
+
+        _result.putExtra("needsRecreate", true);
+    }
+
     private boolean saveDatabase() {
         try {
             _db.save();
         } catch (DatabaseManagerException e) {
-            Toast.makeText(getActivity(), getString(R.string.saving_error), Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), R.string.saving_error, Toast.LENGTH_LONG).show();
             return false;
         }
 
@@ -643,35 +684,28 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         boolean encrypted = _db.isEncryptionEnabled();
         _encryptionPreference.setChecked(encrypted, true);
         _setPasswordPreference.setVisible(encrypted);
-        _fingerprintPreference.setVisible(encrypted);
+        _biometricsPreference.setVisible(encrypted);
         _slotsPreference.setEnabled(encrypted);
+        _autoLockPreference.setVisible(encrypted);
 
         if (encrypted) {
             SlotList slots = _db.getCredentials().getSlots();
             boolean multiPassword = slots.findAll(PasswordSlot.class).size() > 1;
-            boolean multiFinger = slots.findAll(FingerprintSlot.class).size() > 1;
-            boolean showSlots = BuildConfig.DEBUG || multiPassword || multiFinger;
+            boolean multiBio = slots.findAll(BiometricSlot.class).size() > 1;
+            boolean showSlots = BuildConfig.DEBUG || multiPassword || multiBio;
+            boolean canUseBio = BiometricsHelper.isAvailable(getContext());
             _setPasswordPreference.setEnabled(!multiPassword);
-            _fingerprintPreference.setEnabled(FingerprintHelper.getManager(getContext()) != null && !multiFinger);
-            _fingerprintPreference.setChecked(slots.has(FingerprintSlot.class), true);
+            _biometricsPreference.setEnabled(canUseBio && !multiBio);
+            _biometricsPreference.setChecked(slots.has(BiometricSlot.class), true);
             _slotsPreference.setVisible(showSlots);
         } else {
             _setPasswordPreference.setEnabled(false);
-            _fingerprintPreference.setEnabled(false);
-            _fingerprintPreference.setChecked(false, true);
+            _biometricsPreference.setEnabled(false);
+            _biometricsPreference.setChecked(false, true);
             _slotsPreference.setVisible(false);
         }
     }
 
-    private String[] getStringsFromResourceIds(int[] resourceIds) {
-        String[] strings = new String[resourceIds.length];
-        for(int i = 0; i < resourceIds.length; i++) {
-            strings[i] = getString(resourceIds[i]);
-        }
-
-        return strings;
-    }
-
     private class SetPasswordListener implements Dialogs.SlotListener {
         @Override
         public void onSlotResult(Slot slot, Cipher cipher) {
@@ -704,20 +738,17 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         }
     }
 
-    private class RegisterFingerprintListener implements Dialogs.SlotListener {
+    private class RegisterBiometricsListener implements BiometricSlotInitializer.Listener {
         @Override
-        public void onSlotResult(Slot slot, Cipher cipher) {
+        public void onInitializeSlot(BiometricSlot slot, Cipher cipher) {
             DatabaseFileCredentials creds = _db.getCredentials();
-            SlotList slots = creds.getSlots();
-
             try {
                 slot.setKey(creds.getKey(), cipher);
             } catch (SlotException e) {
-                onException(e);
+                onSlotInitializationFailed(0, e.toString());
                 return;
             }
-
-            slots.add(slot);
+            creds.getSlots().add(slot);
             _db.setCredentials(creds);
 
             saveDatabase();
@@ -725,8 +756,10 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         }
 
         @Override
-        public void onException(Exception e) {
-            Toast.makeText(getActivity(), getString(R.string.encryption_enable_fingerprint_error) + e.getMessage(), Toast.LENGTH_SHORT).show();
+        public void onSlotInitializationFailed(int errorCode, @NonNull CharSequence errString) {
+            if (!BiometricsHelper.isCanceled(errorCode)) {
+                Toast.makeText(getActivity(), String.format("%s: %s", getString(R.string.encryption_enable_biometrics_error), errString), Toast.LENGTH_LONG).show();
+            }
         }
     }
 
@@ -744,6 +777,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                 return;
             }
 
+            getActivity().startService(new Intent(getActivity(), NotificationService.class));
             updateEncryptionPreferences();
         }
 

app/src/main/java/com/beemdevelopment/aegis/ui/SelectEntriesActivity.java

@@ -0,0 +1,136 @@
+package com.beemdevelopment.aegis.ui;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.helpers.FabScrollHelper;
+import com.beemdevelopment.aegis.importers.DatabaseImporterEntryException;
+import com.beemdevelopment.aegis.ui.models.ImportEntry;
+import com.beemdevelopment.aegis.ui.views.ImportEntriesAdapter;
+import com.getbase.floatingactionbutton.FloatingActionButton;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SelectEntriesActivity extends AegisActivity {
+    private ImportEntriesAdapter _adapter;
+    private FabScrollHelper _fabScrollHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_entries);
+
+        ActionBar bar = getSupportActionBar();
+        bar.setHomeAsUpIndicator(R.drawable.ic_close);
+        bar.setDisplayHomeAsUpEnabled(true);
+
+        _adapter = new ImportEntriesAdapter();
+        RecyclerView entriesView = findViewById(R.id.list_entries);
+        entriesView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                onScroll(dx, dy);
+            }
+        });
+
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        entriesView.setLayoutManager(layoutManager);
+        entriesView.setAdapter(_adapter);
+        entriesView.setNestedScrollingEnabled(false);
+
+        Intent intent = getIntent();
+        List<ImportEntry> entries = (ArrayList<ImportEntry>) intent.getSerializableExtra("entries");
+        List<DatabaseImporterEntryException> errors = (ArrayList<DatabaseImporterEntryException>) intent.getSerializableExtra("errors");
+
+        for (ImportEntry entry : entries) {
+            _adapter.addEntry(entry);
+        }
+
+        if (errors.size() > 0) {
+            showErrorDialog(errors);
+        }
+
+        FloatingActionButton fabMenu = findViewById(R.id.fab);
+        fabMenu.setOnClickListener(v -> returnSelectedEntries());
+        _fabScrollHelper = new FabScrollHelper(fabMenu);
+    }
+
+    private void showErrorDialog(List<DatabaseImporterEntryException> errors) {
+        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                .setTitle(R.string.import_error_title)
+                .setMessage(getString(R.string.import_error_dialog, errors.size()))
+                .setPositiveButton(android.R.string.ok, null)
+                .setNeutralButton(getString(R.string.details), (dialog, which) -> showDetailedErrorDialog(errors))
+                .create());
+    }
+
+    private void showDetailedErrorDialog(List<DatabaseImporterEntryException> errors) {
+        List<String> messages = new ArrayList<>();
+        for (DatabaseImporterEntryException e : errors) {
+            messages.add(e.getMessage());
+        }
+
+        String message = TextUtils.join("\n\n", messages);
+        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                .setTitle(R.string.import_error_title)
+                .setMessage(message)
+                .setPositiveButton(android.R.string.ok, null)
+                .setNeutralButton(android.R.string.copy, (dialog2, which2) -> {
+                    ClipboardManager clipboard = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE);
+                    ClipData clip = ClipData.newPlainText("text/plain", message);
+                    clipboard.setPrimaryClip(clip);
+                    Toast.makeText(this, R.string.errors_copied, Toast.LENGTH_SHORT).show();
+                })
+                .create());
+    }
+
+    private void returnSelectedEntries() {
+        List<ImportEntry> entries = _adapter.getCheckedEntries();
+        Intent intent = new Intent();
+        intent.putExtra("entries", (ArrayList<ImportEntry>) entries);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+
+    public void onScroll(int dx, int dy) {
+        _fabScrollHelper.onScroll(dx, dy);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_select_entries, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                break;
+            case R.id.toggle_checkboxes:
+                _adapter.toggleCheckboxes();
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+        return true;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/SlotManagerActivity.java

@@ -7,26 +7,29 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.biometric.BiometricPrompt;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
 import com.beemdevelopment.aegis.db.DatabaseFileCredentials;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
 import com.beemdevelopment.aegis.db.slots.SlotException;
 import com.beemdevelopment.aegis.db.slots.SlotList;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
+import com.beemdevelopment.aegis.helpers.BiometricSlotInitializer;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.beemdevelopment.aegis.ui.views.SlotAdapter;
 
 import javax.crypto.Cipher;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Listener, Dialogs.SlotListener {
+public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Listener {
     private DatabaseFileCredentials _creds;
     private SlotAdapter _adapter;
 
@@ -42,12 +45,19 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
         bar.setHomeAsUpIndicator(R.drawable.ic_close);
         bar.setDisplayHomeAsUpEnabled(true);
 
-        findViewById(R.id.button_add_fingerprint).setOnClickListener(view -> {
-            Dialogs.showFingerprintDialog(this ,this);
+        findViewById(R.id.button_add_biometric).setOnClickListener(view -> {
+            if (BiometricsHelper.isAvailable(this)) {
+                BiometricSlotInitializer initializer = new BiometricSlotInitializer(SlotManagerActivity.this, new RegisterBiometricsListener());
+                BiometricPrompt.PromptInfo info = new BiometricPrompt.PromptInfo.Builder()
+                        .setTitle(getString(R.string.add_biometric_slot))
+                        .setNegativeButtonText(getString(android.R.string.cancel))
+                        .build();
+                initializer.authenticate(info);
+            }
         });
 
         findViewById(R.id.button_add_password).setOnClickListener(view -> {
-            Dialogs.showSetPasswordDialog(this, this);
+            Dialogs.showSetPasswordDialog(this, new PasswordListener());
         });
 
         // set up the recycler view
@@ -64,17 +74,17 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
             _adapter.addSlot(slot);
         }
 
-        updateFingerprintButton();
+        updateBiometricsButton();
     }
 
-    private void updateFingerprintButton() {
-        // only show the fingerprint option if we can get an instance of the fingerprint manager
+    private void updateBiometricsButton() {
+        // only show the biometrics option if we can get an instance of the biometrics manager
         // and if none of the slots in the collection has a matching alias in the keystore
         int visibility = View.VISIBLE;
-        if (FingerprintHelper.getManager(this) != null) {
+        if (BiometricsHelper.isAvailable(this)) {
             try {
                 KeyStoreHandle keyStore = new KeyStoreHandle();
-                for (FingerprintSlot slot : _creds.getSlots().findAll(FingerprintSlot.class)) {
+                for (BiometricSlot slot : _creds.getSlots().findAll(BiometricSlot.class)) {
                     if (keyStore.containsKey(slot.getUUID().toString())) {
                         visibility = View.GONE;
                         break;
@@ -86,7 +96,7 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
         } else {
             visibility = View.GONE;
         }
-        findViewById(R.id.button_add_fingerprint).setVisibility(visibility);
+        findViewById(R.id.button_add_biometric).setVisibility(visibility);
     }
 
     private void onSave() {
@@ -162,29 +172,60 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
                     slots.remove(slot);
                     _adapter.removeSlot(slot);
                     _edited = true;
-                    updateFingerprintButton();
+                    updateBiometricsButton();
                 })
                 .setNegativeButton(android.R.string.no, null)
                 .create());
     }
 
-    @Override
-    public void onSlotResult(Slot slot, Cipher cipher) {
-        try {
-            slot.setKey(_creds.getKey(), cipher);
-        } catch (SlotException e) {
-            onException(e);
-            return;
-        }
-
+    private void addSlot(Slot slot) {
         _creds.getSlots().add(slot);
         _adapter.addSlot(slot);
         _edited = true;
-        updateFingerprintButton();
+        updateBiometricsButton();
     }
 
-    @Override
-    public void onException(Exception e) {
-        Toast.makeText(this, getString(R.string.adding_new_slot_error) + e.getMessage(), Toast.LENGTH_SHORT).show();
+    private void showSlotError(String error) {
+        Toast.makeText(SlotManagerActivity.this, getString(R.string.adding_new_slot_error) + error, Toast.LENGTH_SHORT).show();
+    }
+
+    private class RegisterBiometricsListener implements BiometricSlotInitializer.Listener {
+
+        @Override
+        public void onInitializeSlot(BiometricSlot slot, Cipher cipher) {
+            try {
+                slot.setKey(_creds.getKey(), cipher);
+                addSlot(slot);
+            } catch (SlotException e) {
+                onSlotInitializationFailed(0, e.toString());
+            }
+        }
+
+        @Override
+        public void onSlotInitializationFailed(int errorCode, @NonNull CharSequence errString) {
+            if (!BiometricsHelper.isCanceled(errorCode)) {
+                showSlotError(errString.toString());
+            }
+        }
+    }
+
+    private class PasswordListener implements Dialogs.SlotListener {
+
+        @Override
+        public void onSlotResult(Slot slot, Cipher cipher) {
+            try {
+                slot.setKey(_creds.getKey(), cipher);
+            } catch (SlotException e) {
+                onException(e);
+                return;
+            }
+
+            addSlot(slot);
+        }
+
+        @Override
+        public void onException(Exception e) {
+            showSlotError(e.toString());
+        }
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/glide/AegisGlideModule.java

@@ -0,0 +1,21 @@
+package com.beemdevelopment.aegis.ui.glide;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.Registry;
+import com.bumptech.glide.annotation.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
+
+import java.nio.ByteBuffer;
+
+@GlideModule
+public class AegisGlideModule extends AppGlideModule {
+    @Override
+    public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {
+        registry.prepend(DatabaseEntry.class, ByteBuffer.class, new IconLoader.Factory());
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/glide/GlideLicense.java

@@ -0,0 +1,34 @@
+package com.beemdevelopment.aegis.ui.glide;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.R;
+
+import de.psdev.licensesdialog.licenses.License;
+
+public class GlideLicense extends License {
+    @Override
+    public String getName() {
+        return "Glide License";
+    }
+
+    @Override
+    public String readSummaryTextFromResources(Context context) {
+        return getContent(context, R.raw.glide_license);
+    }
+
+    @Override
+    public String readFullTextFromResources(Context context) {
+        return getContent(context, R.raw.glide_license);
+    }
+
+    @Override
+    public String getVersion() {
+        return null;
+    }
+
+    @Override
+    public String getUrl() {
+        return "https://github.com/bumptech/glide/blob/master/LICENSE";
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/glide/IconLoader.java

@@ -0,0 +1,76 @@
+package com.beemdevelopment.aegis.ui.glide;
+
+import androidx.annotation.NonNull;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.Options;
+import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.model.ModelLoader;
+import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.MultiModelLoaderFactory;
+
+import java.nio.ByteBuffer;
+
+public class IconLoader implements ModelLoader<DatabaseEntry, ByteBuffer> {
+    @Override
+    public LoadData<ByteBuffer> buildLoadData(@NonNull DatabaseEntry model, int width, int height, @NonNull Options options) {
+        return new LoadData<>(new UUIDKey(model.getUUID()), new Fetcher(model));
+    }
+
+    @Override
+    public boolean handles(@NonNull DatabaseEntry model) {
+        return true;
+    }
+
+    public static class Fetcher implements DataFetcher<ByteBuffer> {
+        private DatabaseEntry _model;
+
+        private Fetcher(DatabaseEntry model) {
+            _model = model;
+        }
+
+        @Override
+        public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super ByteBuffer> callback) {
+            byte[] bytes = _model.getIcon();
+            ByteBuffer buf = ByteBuffer.wrap(bytes);
+            callback.onDataReady(buf);
+        }
+
+        @Override
+        public void cleanup() {
+
+        }
+
+        @Override
+        public void cancel() {
+
+        }
+
+        @NonNull
+        @Override
+        public Class<ByteBuffer> getDataClass() {
+            return ByteBuffer.class;
+        }
+
+        @NonNull
+        @Override
+        public DataSource getDataSource() {
+            return DataSource.MEMORY_CACHE;
+        }
+    }
+
+    public static class Factory implements ModelLoaderFactory<DatabaseEntry, ByteBuffer> {
+        @NonNull
+        @Override
+        public ModelLoader<DatabaseEntry, ByteBuffer> build(@NonNull MultiModelLoaderFactory unused) {
+            return new IconLoader();
+        }
+
+        @Override
+        public void teardown() {
+
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/glide/UUIDKey.java

@@ -0,0 +1,31 @@
+package com.beemdevelopment.aegis.ui.glide;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.load.Key;
+
+import java.security.MessageDigest;
+import java.util.UUID;
+
+public class UUIDKey implements Key {
+    private UUID _uuid;
+
+    public UUIDKey(UUID uuid) {
+        _uuid = uuid;
+    }
+
+    @Override
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+        messageDigest.update(_uuid.toString().getBytes(CHARSET));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return _uuid.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return _uuid.hashCode();
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/models/ImportEntry.java

@@ -0,0 +1,53 @@
+package com.beemdevelopment.aegis.ui.models;
+
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class ImportEntry implements Serializable {
+    private UUID _uuid;
+    private String _name;
+    private String _issuer;
+
+    private transient Listener _listener;
+    private boolean _isChecked = true;
+
+    public ImportEntry(DatabaseEntry entry) {
+        _uuid = entry.getUUID();
+        _name = entry.getName();
+        _issuer = entry.getIssuer();
+    }
+
+    public UUID getUUID() {
+        return _uuid;
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public String getIssuer() {
+        return _issuer;
+    }
+
+    public void setOnCheckedChangedListener(Listener listener) {
+        _listener = listener;
+    }
+
+    public boolean isChecked() {
+        return _isChecked;
+    }
+
+    public void setIsChecked(boolean isChecked) {
+        _isChecked = isChecked;
+
+        if (_listener != null) {
+            _listener.onCheckedChanged(_isChecked);
+        }
+    }
+
+    public interface Listener {
+        void onCheckedChanged(boolean value);
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticatedSlide.java

@@ -1,63 +1,58 @@
 package com.beemdevelopment.aegis.ui.slides;
 
-import android.content.Context;
 import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
 import android.os.Bundle;
+import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.biometric.BiometricPrompt;
+import androidx.fragment.app.Fragment;
 
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
-import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
-import com.beemdevelopment.aegis.db.slots.Slot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
+import com.beemdevelopment.aegis.helpers.BiometricSlotInitializer;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.beemdevelopment.aegis.helpers.EditTextHelper;
-import com.beemdevelopment.aegis.helpers.FingerprintUiHelper;
 import com.github.paolorotolo.appintro.ISlidePolicy;
 import com.github.paolorotolo.appintro.ISlideSelectionListener;
 import com.google.android.material.snackbar.Snackbar;
-import com.mattprecious.swirl.SwirlView;
 
 import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
 
-import androidx.fragment.app.Fragment;
-
-public class CustomAuthenticatedSlide extends Fragment implements FingerprintUiHelper.Callback, ISlidePolicy, ISlideSelectionListener {
+public class CustomAuthenticatedSlide extends Fragment implements ISlidePolicy, ISlideSelectionListener {
     private int _cryptType;
     private EditText _textPassword;
     private EditText _textPasswordConfirm;
+    private CheckBox _checkPasswordVisibility;
     private int _bgColor;
 
-    private LinearLayout _boxFingerprint;
-    private SwirlView _imgFingerprint;
-    private TextView _textFingerprint;
-    private FingerprintUiHelper _fingerHelper;
-    private KeyStoreHandle _storeHandle;
-    private FingerprintSlot _fingerSlot;
-    private FingerprintManager.CryptoObject _fingerCryptoObj;
-    private boolean _fingerAuthenticated;
+    private BiometricSlot _bioSlot;
+    private Cipher _bioCipher;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.fragment_authenticated_slide, container, false);
         _textPassword = view.findViewById(R.id.text_password);
         _textPasswordConfirm = view.findViewById(R.id.text_password_confirm);
-        _boxFingerprint = view.findViewById(R.id.box_fingerprint);
+        _checkPasswordVisibility = view.findViewById(R.id.check_toggle_visibility);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            ViewGroup insertPoint = view.findViewById(R.id.img_fingerprint_insert);
-            _imgFingerprint = new SwirlView(getContext());
-            insertPoint.addView(_imgFingerprint, 0, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-        }
+        _checkPasswordVisibility.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                _textPassword.setTransformationMethod(null);
+                _textPassword.clearFocus();
+                _textPasswordConfirm.setEnabled(false);
+            } else {
+                _textPassword.setTransformationMethod(new PasswordTransformationMethod());
+                _textPasswordConfirm.setEnabled(true);
+            }
+        });
 
-        _textFingerprint = view.findViewById(R.id.text_fingerprint);
         view.findViewById(R.id.main).setBackgroundColor(_bgColor);
         return view;
     }
@@ -66,114 +61,96 @@ public class CustomAuthenticatedSlide extends Fragment implements FingerprintUiH
         return _cryptType;
     }
 
+    public BiometricSlot getBiometricSlot() {
+        return _bioSlot;
+    }
+
+    public Cipher getBiometriCipher() {
+        return _bioCipher;
+    }
+
     public char[] getPassword() {
         return EditTextHelper.getEditTextChars(_textPassword);
     }
 
-    public Cipher getFingerCipher() {
-        return _fingerCryptoObj.getCipher();
-    }
-
-    public FingerprintSlot getFingerSlot() {
-        return _fingerSlot;
-    }
-
     public void setBgColor(int color) {
         _bgColor = color;
     }
 
+    public void showBiometricPrompt() {
+        BiometricSlotInitializer initializer = new BiometricSlotInitializer(this, new BiometricsListener());
+        BiometricPrompt.PromptInfo info = new BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.set_up_biometric))
+                .setNegativeButtonText(getString(android.R.string.cancel))
+                .build();
+        initializer.authenticate(info);
+    }
+
     @Override
     public void onSlideSelected() {
         Intent intent = getActivity().getIntent();
         _cryptType = intent.getIntExtra("cryptType", CustomAuthenticationSlide.CRYPT_TYPE_INVALID);
 
-        switch(_cryptType) {
-            case CustomAuthenticationSlide.CRYPT_TYPE_NONE:
-            case CustomAuthenticationSlide.CRYPT_TYPE_PASS:
-                break;
-            case CustomAuthenticationSlide.CRYPT_TYPE_FINGER:
-                _boxFingerprint.setVisibility(View.VISIBLE);
-
-                SecretKey key;
-                try {
-                    if (_storeHandle == null) {
-                        _storeHandle = new KeyStoreHandle();
-                        _fingerSlot = new FingerprintSlot();
-                    }
-                    key = _storeHandle.generateKey(_fingerSlot.getUUID().toString());
-                } catch (KeyStoreHandleException e) {
-                    throw new RuntimeException(e);
-                }
-
-                if (_fingerHelper == null) {
-                    FingerprintManager fingerManager = (FingerprintManager) getContext().getSystemService(Context.FINGERPRINT_SERVICE);
-                    _fingerHelper = new FingerprintUiHelper(fingerManager, _imgFingerprint, _textFingerprint, this);
-                }
-
-                try {
-                    Cipher cipher = Slot.createEncryptCipher(key);
-                    _fingerCryptoObj = new FingerprintManager.CryptoObject(cipher);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-                _fingerHelper.startListening(_fingerCryptoObj);
-                break;
-            default:
-                throw new RuntimeException();
+        if (_cryptType == CustomAuthenticationSlide.CRYPT_TYPE_BIOMETRIC) {
+            showBiometricPrompt();
         }
     }
 
     @Override
     public void onSlideDeselected() {
-        if (_fingerHelper != null) {
-            _fingerAuthenticated = false;
-            _boxFingerprint.setVisibility(View.INVISIBLE);
-            _fingerHelper.stopListening();
-        }
+
     }
 
     @Override
     public boolean isPolicyRespected() {
-        switch(_cryptType) {
+        switch (_cryptType) {
             case CustomAuthenticationSlide.CRYPT_TYPE_NONE:
                 return true;
-            case CustomAuthenticationSlide.CRYPT_TYPE_FINGER:
-                if (!_fingerAuthenticated) {
+            case CustomAuthenticationSlide.CRYPT_TYPE_BIOMETRIC:
+                if (_bioSlot == null) {
                     return false;
                 }
                 // intentional fallthrough
             case CustomAuthenticationSlide.CRYPT_TYPE_PASS:
-                return EditTextHelper.areEditTextsEqual(_textPassword, _textPasswordConfirm);
+                if (EditTextHelper.getEditTextChars(_textPassword).length > 0) {
+                    return EditTextHelper.areEditTextsEqual(_textPassword, _textPasswordConfirm) || _checkPasswordVisibility.isChecked();
+                }
+
+                return false;
             default:
-                throw new RuntimeException();
+                return false;
         }
     }
 
     @Override
     public void onUserIllegallyRequestedNextPage() {
         String message;
-        if (!EditTextHelper.areEditTextsEqual(_textPassword, _textPasswordConfirm)) {
+        if (!EditTextHelper.areEditTextsEqual(_textPassword, _textPasswordConfirm) && !_checkPasswordVisibility.isChecked()) {
             message = getString(R.string.password_equality_error);
-        } else if (!_fingerAuthenticated) {
-            message = getString(R.string.register_fingerprint);
-        } else {
-            return;
-        }
 
-        View view = getView();
-        if (view != null) {
-            Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
-            snackbar.show();
+            View view = getView();
+            if (view != null) {
+                Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
+                snackbar.show();
+            }
+        } else if (_bioSlot == null) {
+            showBiometricPrompt();
         }
     }
 
-    @Override
-    public void onAuthenticated() {
-        _fingerAuthenticated = true;
-    }
+    private class BiometricsListener implements BiometricSlotInitializer.Listener {
 
-    @Override
-    public void onError() {
+        @Override
+        public void onInitializeSlot(BiometricSlot slot, Cipher cipher) {
+            _bioSlot = slot;
+            _bioCipher = cipher;
+        }
 
+        @Override
+        public void onSlotInitializationFailed(int errorCode, @NonNull CharSequence errString) {
+            if (!BiometricsHelper.isCanceled(errorCode)) {
+                Toast.makeText(CustomAuthenticatedSlide.this.getContext(), errString, Toast.LENGTH_LONG).show();
+            }
+        }
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticationSlide.java

@@ -1,7 +1,6 @@
 package com.beemdevelopment.aegis.ui.slides;
 
 import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,18 +9,18 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.beemdevelopment.aegis.R;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 import com.github.paolorotolo.appintro.ISlidePolicy;
 import com.google.android.material.snackbar.Snackbar;
 
-import androidx.fragment.app.Fragment;
-
 public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy, RadioGroup.OnCheckedChangeListener {
     public static final int CRYPT_TYPE_INVALID = 0;
     public static final int CRYPT_TYPE_NONE = 1;
     public static final int CRYPT_TYPE_PASS = 2;
-    public static final int CRYPT_TYPE_FINGER = 3;
+    public static final int CRYPT_TYPE_BIOMETRIC = 3;
 
     private RadioGroup _buttonGroup;
     private int _bgColor;
@@ -34,10 +33,9 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy,
         onCheckedChanged(_buttonGroup, _buttonGroup.getCheckedRadioButtonId());
 
         // only enable the fingerprint option if the api version is new enough, permission is granted and a scanner is found
-        FingerprintManager manager = FingerprintHelper.getManager(getContext());
-        if (manager != null) {
-            RadioButton button = view.findViewById(R.id.rb_fingerprint);
-            TextView text = view.findViewById(R.id.text_rb_fingerprint);
+        if (BiometricsHelper.isAvailable(getContext())) {
+            RadioButton button = view.findViewById(R.id.rb_biometrics);
+            TextView text = view.findViewById(R.id.text_rb_biometrics);
             button.setEnabled(true);
             text.setEnabled(true);
         }
@@ -75,8 +73,8 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy,
             case R.id.rb_password:
                 id = CRYPT_TYPE_PASS;
                 break;
-            case R.id.rb_fingerprint:
-                id = CRYPT_TYPE_FINGER;
+            case R.id.rb_biometrics:
+                id = CRYPT_TYPE_BIOMETRIC;
                 break;
             default:
                 throw new RuntimeException();

app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java

@@ -9,7 +9,7 @@ import com.beemdevelopment.aegis.ui.Dialogs;
 
 import androidx.annotation.CallSuper;
 
-public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Params, Void, Result> {
+public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Params, String, Result> {
     private ProgressDialog _dialog;
 
     public ProgressDialogTask(Context context, String message) {
@@ -33,6 +33,13 @@ public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Param
         }
     }
 
+    @Override
+    protected void onProgressUpdate(String... values) {
+        if (values.length == 1) {
+            _dialog.setMessage(values[0]);
+        }
+    }
+
     protected void setPriority() {
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE);
     }

app/src/main/java/com/beemdevelopment/aegis/ui/tasks/SlotListTask.java

@@ -3,8 +3,9 @@ package com.beemdevelopment.aegis.ui.tasks;
 import android.content.Context;
 
 import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.crypto.CryptoUtils;
 import com.beemdevelopment.aegis.crypto.MasterKey;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
 import com.beemdevelopment.aegis.db.slots.SlotException;
@@ -14,7 +15,7 @@ import com.beemdevelopment.aegis.db.slots.SlotList;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
-public class SlotListTask<T extends Slot> extends ProgressDialogTask<SlotListTask.Params, MasterKey> {
+public class SlotListTask<T extends Slot> extends ProgressDialogTask<SlotListTask.Params, SlotListTask.Result> {
     private Callback _cb;
     private Class<T> _type;
 
@@ -25,51 +26,80 @@ public class SlotListTask<T extends Slot> extends ProgressDialogTask<SlotListTas
     }
 
     @Override
-    protected MasterKey doInBackground(SlotListTask.Params... args) {
+    protected Result doInBackground(SlotListTask.Params... args) {
         setPriority();
 
         Params params = args[0];
         SlotList slots = params.getSlots();
-        try {
-            if (!slots.has(_type)) {
-                throw new RuntimeException();
-            }
-
-            MasterKey masterKey = null;
-            for (Slot slot : slots.findAll(_type)) {
-                try {
-                    if (slot instanceof PasswordSlot) {
-                        char[] password = (char[])params.getObj();
-                        SecretKey key = ((PasswordSlot)slot).deriveKey(password);
-                        Cipher cipher = slot.createDecryptCipher(key);
-                        masterKey = slot.getKey(cipher);
-                    } else if (slot instanceof FingerprintSlot) {
-                        masterKey = slot.getKey((Cipher)params.getObj());
-                    } else {
-                        throw new RuntimeException();
-                    }
-                    break;
-                } catch (SlotIntegrityException e) {
 
+        for (Slot slot : slots.findAll(_type)) {
+            try {
+                if (slot instanceof PasswordSlot) {
+                    char[] password = (char[]) params.getObj();
+                    return decryptPasswordSlot((PasswordSlot) slot, password);
+                } else if (slot instanceof BiometricSlot) {
+                    return decryptBiometricSlot((BiometricSlot) slot, (Cipher) params.getObj());
                 }
-            }
+            } catch (SlotException e) {
+                throw new RuntimeException(e);
+            } catch (SlotIntegrityException ignored) {
 
-            if (masterKey == null) {
-                throw new SlotIntegrityException();
             }
-
-            return masterKey;
-        } catch (SlotIntegrityException e) {
-            return null;
-        } catch (SlotException e) {
-            throw new RuntimeException(e);
         }
+
+        return null;
+    }
+
+    private Result decryptBiometricSlot(BiometricSlot slot, Cipher cipher)
+            throws SlotException, SlotIntegrityException {
+        MasterKey key = slot.getKey(cipher);
+        return new Result(key, slot);
+    }
+
+    private Result decryptPasswordSlot(PasswordSlot slot, char[] password)
+            throws SlotIntegrityException, SlotException {
+        MasterKey masterKey;
+        SecretKey key = slot.deriveKey(password);
+        byte[] oldPasswordBytes = CryptoUtils.toBytesOld(password);
+
+        try {
+            masterKey = decryptPasswordSlot(slot, key);
+        } catch (SlotIntegrityException e) {
+            // a bug introduced in afb9e59 caused passwords longer than 64 bytes to produce a different key than before
+            // so, try again with the old password encode function if the password is longer than 64 bytes
+            if (slot.isRepaired() || oldPasswordBytes.length <= 64) {
+                throw e;
+            }
+
+            publishProgress(getDialog().getContext().getString(R.string.unlocking_vault_repair));
+
+            // try to decrypt the password slot with the old key
+            SecretKey oldKey = slot.deriveKey(oldPasswordBytes);
+            masterKey = decryptPasswordSlot(slot, oldKey);
+        }
+
+        // if necessary, repair the slot by re-encrypting the master key with the correct key
+        // slots with passwords smaller than 64 bytes also get this treatment to make sure those also have 'repaired' set to true
+        boolean repaired = false;
+        if (!slot.isRepaired()) {
+            Cipher cipher = Slot.createEncryptCipher(key);
+            slot.setKey(masterKey, cipher);
+            repaired = true;
+        }
+
+        return new Result(masterKey, slot, repaired);
+    }
+
+    private MasterKey decryptPasswordSlot(PasswordSlot slot, SecretKey key)
+            throws SlotException, SlotIntegrityException {
+        Cipher cipher = slot.createDecryptCipher(key);
+        return slot.getKey(cipher);
     }
 
     @Override
-    protected void onPostExecute(MasterKey masterKey) {
-        super.onPostExecute(masterKey);
-        _cb.onTaskFinished(masterKey);
+    protected void onPostExecute(Result result) {
+        super.onPostExecute(result);
+        _cb.onTaskFinished(result);
     }
 
     public static class Params {
@@ -90,7 +120,35 @@ public class SlotListTask<T extends Slot> extends ProgressDialogTask<SlotListTas
         }
     }
 
+    public static class Result {
+        private MasterKey _key;
+        private Slot _slot;
+        private boolean _repaired;
+
+        public Result(MasterKey key, Slot slot, boolean repaired) {
+            _key = key;
+            _slot = slot;
+            _repaired = repaired;
+        }
+
+        public Result(MasterKey key, Slot slot) {
+            this(key, slot, false);
+        }
+
+        public MasterKey getKey() {
+            return _key;
+        }
+
+        public Slot getSlot() {
+            return _slot;
+        }
+
+        public boolean isSlotRepaired() {
+            return _repaired;
+        }
+    }
+
     public interface Callback {
-        void onTaskFinished(MasterKey key);
+        void onTaskFinished(Result result);
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java

@@ -1,9 +1,12 @@
 package com.beemdevelopment.aegis.ui.views;
 
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
 import com.beemdevelopment.aegis.ViewMode;
@@ -16,31 +19,43 @@ import com.beemdevelopment.aegis.otp.TotpInfo;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import java.util.UUID;
-
-import androidx.recyclerview.widget.RecyclerView;
 
 public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements ItemTouchHelperAdapter {
+    private EntryListView _view;
     private List<DatabaseEntry> _entries;
     private List<DatabaseEntry> _shownEntries;
-    private static Listener _listener;
+    private DatabaseEntry _selectedEntry;
+    private DatabaseEntry _focusedEntry;
     private boolean _showAccountName;
+    private boolean _searchAccountName;
+    private boolean _highlightEntry;
     private boolean _tapToReveal;
     private int _tapToRevealTime;
     private String _groupFilter;
     private SortCategory _sortCategory;
-
     private ViewMode _viewMode;
+    private String _searchFilter;
+    private boolean _isPeriodUniform = true;
+    private Handler _dimHandler;
 
     // keeps track of the viewholders that are currently bound
     private List<EntryHolder> _holders;
 
-    public EntryAdapter(Listener listener) {
+    public EntryAdapter(EntryListView view) {
         _entries = new ArrayList<>();
         _shownEntries = new ArrayList<>();
         _holders = new ArrayList<>();
-        _listener = listener;
+        _dimHandler = new Handler();
+        _view = view;
+    }
+
+    public void destroy() {
+        for (EntryHolder holder : _holders) {
+            holder.destroy();
+        }
+        _view = null;
     }
 
     public void setShowAccountName(boolean showAccountName) {
@@ -55,32 +70,60 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         _tapToRevealTime = number;
     }
 
+    public void setSearchAccountName(boolean searchAccountName) {
+        _searchAccountName = searchAccountName;
+    }
+
+    public void setHighlightEntry(boolean highlightEntry) {
+        _highlightEntry = highlightEntry;
+    }
+
+    public DatabaseEntry getEntryAt(int position) {
+        return _shownEntries.get(position);
+    }
+
     public void addEntry(DatabaseEntry entry) {
         _entries.add(entry);
-        if (!isEntryFiltered(entry)) {
-            _shownEntries.add(entry);
+        if (isEntryFiltered(entry)) {
+            return;
         }
 
-        int position = getItemCount() - 1;
-        if (position == 0) {
-            notifyDataSetChanged();
-        } else {
-            notifyItemInserted(position);
+        boolean added = false;
+        Comparator<DatabaseEntry> comparator = _sortCategory.getComparator();
+        if (comparator != null) {
+            // insert the entry in the correct order
+            // note: this assumes that _shownEntries has already been sorted
+            for (int i = 0; i < _shownEntries.size(); i++) {
+                if (comparator.compare(_shownEntries.get(i), entry) > 0) {
+                    _shownEntries.add(i, entry);
+                    notifyItemInserted(i);
+                    added = true;
+                    break;
+                }
+            }
         }
+
+        if (!added){
+            _shownEntries.add(entry);
+
+            int position = getItemCount() - 1;
+            if (position == 0) {
+                notifyDataSetChanged();
+            } else {
+                notifyItemInserted(position);
+            }
+        }
+
+        checkPeriodUniformity();
     }
 
     public void addEntries(List<DatabaseEntry> entries) {
         _entries.addAll(entries);
-        for (DatabaseEntry entry : entries) {
-            if (!isEntryFiltered(entry)) {
-                _shownEntries.add(entry);
-            }
-        }
-        notifyDataSetChanged();
+        updateShownEntries();
+        checkPeriodUniformity(true);
     }
 
     public void removeEntry(DatabaseEntry entry) {
-        entry = getEntryByUUID(entry.getUUID());
         _entries.remove(entry);
 
         if (_shownEntries.contains(entry)) {
@@ -88,16 +131,18 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
             _shownEntries.remove(position);
             notifyItemRemoved(position);
         }
+
+        checkPeriodUniformity();
     }
 
     public void clearEntries() {
         _entries.clear();
         _shownEntries.clear();
         notifyDataSetChanged();
+        checkPeriodUniformity();
     }
 
-    public void replaceEntry(DatabaseEntry newEntry) {
-        DatabaseEntry oldEntry = getEntryByUUID(newEntry.getUUID());
+    public void replaceEntry(DatabaseEntry oldEntry, DatabaseEntry newEntry) {
         _entries.set(_entries.indexOf(oldEntry), newEntry);
 
         if (_shownEntries.contains(oldEntry)) {
@@ -116,23 +161,30 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
             int position = getItemCount() - 1;
             notifyItemInserted(position);
         }
+
+        checkPeriodUniformity();
     }
 
     private boolean isEntryFiltered(DatabaseEntry entry) {
         String group = entry.getGroup();
-        if (_groupFilter == null) {
-            return false;
-        }
-        return group == null || !group.equals(_groupFilter);
-    }
+        String issuer = entry.getIssuer().toLowerCase();
+        String name = entry.getName().toLowerCase();
 
-    private DatabaseEntry getEntryByUUID(UUID uuid) {
-        for (DatabaseEntry entry : _entries) {
-            if (entry.getUUID().equals(uuid)) {
-                return entry;
+        if (_groupFilter != null) {
+            if (group == null && _groupFilter.equals(_view.getContext().getString(R.string.filter_ungrouped))) {
+                return false;
+            }
+
+            if (group == null || !group.equals(_groupFilter)) {
+                return true;
             }
         }
-        throw new AssertionError("no entry found with the same id");
+
+        if (_searchFilter == null) {
+            return false;
+        }
+
+        return !issuer.contains(_searchFilter) && !(_searchAccountName && name.contains(_searchFilter));
     }
 
     public void refresh(boolean hard) {
@@ -145,36 +197,53 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         }
     }
 
-    public void setGroupFilter(String group) {
+    public void setGroupFilter(String group, boolean apply) {
+        if (_groupFilter != null && _groupFilter.equals(group)) {
+            return;
+        }
         _groupFilter = group;
+        if (apply) {
+            updateShownEntries();
+            checkPeriodUniformity();
+        }
+    }
+
+    public void setSortCategory(SortCategory category, boolean apply) {
+        if (_sortCategory == category) {
+            return;
+        }
+
+        _sortCategory = category;
+        if (apply) {
+            updateShownEntries();
+        }
+    }
+
+    public void setSearchFilter(String search) {
+        _searchFilter = search != null ? search.toLowerCase() : null;
+        updateShownEntries();
+    }
+
+    private void updateShownEntries() {
+        // clear the list of shown entries first
         _shownEntries.clear();
+
+        // add entries back that are not filtered out
         for (DatabaseEntry entry : _entries) {
             if (!isEntryFiltered(entry)) {
                 _shownEntries.add(entry);
             }
         }
 
-        sortList(_sortCategory);
+        // sort the remaining list of entries
+        Comparator<DatabaseEntry> comparator = _sortCategory.getComparator();
+        if (comparator != null) {
+            Collections.sort(_shownEntries, comparator);
+        }
+
         notifyDataSetChanged();
     }
 
-    public void setSortCategory(SortCategory sortCategory) {
-        if (_sortCategory != sortCategory && sortCategory != SortCategory.CUSTOM) {
-            sortList(sortCategory);
-            notifyDataSetChanged();
-        }
-
-        _sortCategory = sortCategory;
-    }
-
-    private void sortList(SortCategory sortCategory) {
-        Collections.sort(_shownEntries, SortCategory.getComparator(sortCategory));
-
-        if (SortCategory.isReversed(sortCategory)) {
-            Collections.reverse(_shownEntries);
-        }
-    }
-
     public void setViewMode(ViewMode viewMode) {
         _viewMode = viewMode;
     }
@@ -191,7 +260,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
             return;
         }
 
-        _listener.onEntryDrop(_shownEntries.get(position));
+        _view.onEntryDrop(_shownEntries.get(position));
     }
 
     @Override
@@ -202,7 +271,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         }
 
         // notify the database first
-        _listener.onEntryMove(_entries.get(firstPosition), _entries.get(secondPosition));
+        _view.onEntryMove(_entries.get(firstPosition), _entries.get(secondPosition));
 
         // update our side of things
         Collections.swap(_entries, firstPosition, secondPosition);
@@ -211,17 +280,17 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
     }
 
     @Override
-    public EntryHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry, parent, false);
-        if (_viewMode == ViewMode.NORMAL) {
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry, parent, false);
-        } else if (_viewMode == ViewMode.COMPACT) {
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry_compact, parent, false);
-        } else if (_viewMode == ViewMode.SMALL) {
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_entry_small, parent, false);
-        }
+    public int getItemViewType(int position) {
+        return _viewMode.getLayoutId();
+    }
 
-        return new EntryHolder(view);
+    @Override
+    public EntryHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        View view = inflater.inflate(_viewMode.getLayoutId(), parent, false);
+        EntryHolder holder = new EntryHolder(view);
+        _view.setPreloadView(holder.getIconView());
+        return holder;
     }
 
     @Override
@@ -233,21 +302,32 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
     @Override
     public void onBindViewHolder(final EntryHolder holder, int position) {
         DatabaseEntry entry = _shownEntries.get(position);
+        holder.setFocused(entry == _selectedEntry);
+
+        boolean hidden = _tapToReveal && entry != _focusedEntry;
+        boolean dimmed = _highlightEntry && _focusedEntry != null && _focusedEntry != entry;
         boolean showProgress = !isPeriodUniform() && entry.getInfo() instanceof TotpInfo;
-        holder.setData(entry, _showAccountName, showProgress, _tapToReveal);
-        holder.setTapToRevealTime(_tapToRevealTime);
-        if (showProgress) {
-            holder.startRefreshLoop();
-        }
+        holder.setData(entry, _showAccountName, showProgress, hidden, dimmed);
+        holder.loadIcon(_view);
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int position = holder.getAdapterPosition();
-                if (_tapToReveal && holder.isCodeHidden()) {
-                    holder.revealCode();
-                } else {
-                    _listener.onEntryClick(_shownEntries.get(position));
+                boolean handled = false;
+
+                if (_selectedEntry == null) {
+                    if (_highlightEntry || _tapToReveal) {
+                        if (_focusedEntry == entry) {
+                            resetFocus();
+                            handled = true;
+                        } else {
+                            focusEntry(entry);
+                        }
+                    }
+                }
+
+                if (!handled) {
+                    _view.onEntryClick(entry);
                 }
             }
         });
@@ -255,7 +335,12 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
             @Override
             public boolean onLongClick(View v) {
                 int position = holder.getAdapterPosition();
-                return _listener.onLongEntryClick(_shownEntries.get(position));
+                if (_selectedEntry == null) {
+                    setSelectedEntry(_shownEntries.get(position));
+                    holder.setFocused(true);
+                }
+
+                return _view.onLongEntryClick(_shownEntries.get(position));
             }
         });
         holder.setOnRefreshClickListener(new View.OnClickListener() {
@@ -270,7 +355,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
 
                 // notify the listener that the counter has been incremented
                 // this gives it a chance to save the database
-                _listener.onEntryChange(entry);
+                _view.onEntryChange(entry);
 
                 // finally, refresh the code in the UI
                 holder.refreshCode();
@@ -280,6 +365,24 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         _holders.add(holder);
     }
 
+    private void checkPeriodUniformity() {
+        checkPeriodUniformity(false);
+    }
+
+    private void checkPeriodUniformity(boolean force) {
+        boolean uniform = isPeriodUniform();
+        if (!force && uniform == _isPeriodUniform) {
+            return;
+        }
+        _isPeriodUniform = uniform;
+
+        for (EntryHolder holder : _holders) {
+            holder.setShowProgress(!_isPeriodUniform);
+        }
+
+        _view.onPeriodUniformityChanged(_isPeriodUniform);
+    }
+
     public int getUniformPeriod() {
         List<TotpInfo> infos = new ArrayList<>();
         for (DatabaseEntry entry : _shownEntries) {
@@ -303,6 +406,58 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         return period;
     }
 
+    private void focusEntry(DatabaseEntry entry) {
+        _focusedEntry = entry;
+        _dimHandler.removeCallbacksAndMessages(null);
+
+        for (EntryHolder holder : _holders) {
+            if (holder.getEntry() != _focusedEntry) {
+                if (_highlightEntry) {
+                    holder.dim();
+                }
+                if (_tapToReveal) {
+                    holder.hideCode();
+                }
+            } else {
+                if (_highlightEntry) {
+                    holder.highlight();
+                }
+                if (_tapToReveal) {
+                    holder.revealCode();
+                }
+            }
+        }
+
+        _dimHandler.postDelayed(this::resetFocus, _tapToRevealTime * 1000);
+    }
+
+    private void resetFocus() {
+        for (EntryHolder holder : _holders) {
+            if (_highlightEntry) {
+                holder.highlight();
+            }
+            if (_tapToReveal) {
+                holder.hideCode();
+            }
+        }
+
+        _focusedEntry = null;
+    }
+
+    public void setSelectedEntry(DatabaseEntry entry) {
+        if (entry == null) {
+            notifyItemChanged(_shownEntries.indexOf(_selectedEntry));
+        } else if (_highlightEntry) {
+            resetFocus();
+        }
+
+        _selectedEntry = entry;
+    }
+
+    public boolean isDragAndDropAllowed() {
+        return _sortCategory == SortCategory.CUSTOM && _groupFilter == null && _searchFilter == null;
+    }
+
     public boolean isPeriodUniform() {
         return getUniformPeriod() != -1;
     }
@@ -318,5 +473,6 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         void onEntryMove(DatabaseEntry entry1, DatabaseEntry entry2);
         void onEntryDrop(DatabaseEntry entry);
         void onEntryChange(DatabaseEntry entry);
+        void onPeriodUniformityChanged(boolean uniform);
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java

@@ -1,26 +1,30 @@
 package com.beemdevelopment.aegis.ui.views;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.PorterDuff;
-import android.os.Handler;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.db.DatabaseEntry;
 import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
+import com.beemdevelopment.aegis.helpers.ThemeHelper;
 import com.beemdevelopment.aegis.helpers.UiRefresher;
 import com.beemdevelopment.aegis.otp.HotpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.SteamInfo;
 import com.beemdevelopment.aegis.otp.TotpInfo;
-
-import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 public class EntryHolder extends RecyclerView.ViewHolder {
+    private static final float DEFAULT_ALPHA = 1.0f;
+    private static final float DIMMED_ALPHA = 0.2f;
+
     private TextView _profileName;
     private TextView _profileCode;
     private TextView _profileIssuer;
@@ -28,21 +32,17 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     private DatabaseEntry _entry;
     private ImageView _buttonRefresh;
 
-    private View _entryDivider;
-
-    private View _currentView;
-
     private boolean _hidden;
-    private int _tapToRevealTime;
 
     private PeriodProgressBar _progressBar;
+    private View _view;
 
     private UiRefresher _refresher;
-    private Handler _hiddenHandler;
 
     public EntryHolder(final View view) {
         super(view);
-        _currentView = view;
+
+        _view = view.findViewById(R.id.rlCardEntry);
 
         _profileName = view.findViewById(R.id.profile_account_name);
         _profileCode = view.findViewById(R.id.profile_code);
@@ -50,16 +50,15 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         _profileDrawable = view.findViewById(R.id.ivTextDrawable);
         _buttonRefresh = view.findViewById(R.id.buttonRefresh);
 
-        _entryDivider = view.findViewById(R.id.entryDivider);
-
         _progressBar = view.findViewById(R.id.progressBar);
         int primaryColorId = view.getContext().getResources().getColor(R.color.colorPrimary);
         _progressBar.getProgressDrawable().setColorFilter(primaryColorId, PorterDuff.Mode.SRC_IN);
+        _view.setBackground(_view.getContext().getResources().getDrawable(R.color.card_background));
 
         _refresher = new UiRefresher(new UiRefresher.Listener() {
             @Override
             public void onRefresh() {
-                if (!isCodeHidden()) {
+                if (_hidden) {
                     refreshCode();
                 }
 
@@ -71,23 +70,14 @@ public class EntryHolder extends RecyclerView.ViewHolder {
                 return ((TotpInfo)_entry.getInfo()).getMillisTillNextRotation();
             }
         });
-
-        _hiddenHandler = new Handler();
     }
 
-    public void setData(DatabaseEntry entry, boolean showAccountName, boolean showProgress, boolean hidden) {
+    public void setData(DatabaseEntry entry, boolean showAccountName, boolean showProgress, boolean hidden, boolean dimmed) {
         _entry = entry;
         _hidden = hidden;
 
         // only show the progress bar if there is no uniform period and the entry type is TotpInfo
-        _progressBar.setVisibility(showProgress ? View.VISIBLE : View.GONE);
-        if (showProgress) {
-            _progressBar.setPeriod(((TotpInfo)entry.getInfo()).getPeriod());
-
-            if (_entryDivider != null) {
-                _entryDivider.setVisibility(View.GONE);
-            }
-        }
+        setShowProgress(showProgress);
 
         // only show the button if this entry is of type HotpInfo
         _buttonRefresh.setVisibility(entry.getInfo() instanceof HotpInfo ? View.VISIBLE : View.GONE);
@@ -98,33 +88,68 @@ public class EntryHolder extends RecyclerView.ViewHolder {
             _profileName.setText(" - " + entry.getName());
         }
 
-        if (_entry.hasIcon()) {
-            byte[] imageBytes = entry.getIcon();
-            Bitmap image = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
-            _profileDrawable.setImageBitmap(image);
-        } else {
-            TextDrawable drawable = TextDrawableHelper.generate(entry.getIssuer(), entry.getName(), _profileDrawable);
-            _profileDrawable.setImageDrawable(drawable);
-        }
-
-        // cancel any scheduled hideCode calls
-        _hiddenHandler.removeCallbacksAndMessages(null);
-
         if (_hidden) {
             hideCode();
         } else {
             refreshCode();
         }
+
+        itemView.setAlpha(dimmed ? DIMMED_ALPHA : DEFAULT_ALPHA);
     }
 
-    public void setTapToRevealTime(int number) {
-        _tapToRevealTime = number;
+    public DatabaseEntry getEntry() {
+        return _entry;
+    }
+
+    public void loadIcon(Fragment fragment) {
+        if (_entry.hasIcon()) {
+            Glide.with(fragment)
+                .asDrawable()
+                .load(_entry)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(false)
+                .into(_profileDrawable);
+        } else {
+            TextDrawable drawable = TextDrawableHelper.generate(_entry.getIssuer(), _entry.getName(), _profileDrawable);
+            _profileDrawable.setImageDrawable(drawable);
+        }
+    }
+
+    public ImageView getIconView() {
+        return _profileDrawable;
     }
 
     public void setOnRefreshClickListener(View.OnClickListener listener) {
         _buttonRefresh.setOnClickListener(listener);
     }
 
+    public void setShowProgress(boolean showProgress) {
+        if (_entry.getInfo() instanceof HotpInfo) {
+            showProgress = false;
+        }
+
+        _progressBar.setVisibility(showProgress ? View.VISIBLE : View.GONE);
+        if (showProgress) {
+            _progressBar.setPeriod(((TotpInfo) _entry.getInfo()).getPeriod());
+            startRefreshLoop();
+        } else {
+            stopRefreshLoop();
+        }
+    }
+
+    public void setFocused(boolean focused) {
+        if (focused) {
+            _view.setBackgroundColor(ThemeHelper.getThemeColor(R.attr.cardBackgroundFocused, _view.getContext().getTheme()));
+        } else {
+            _view.setBackgroundColor(ThemeHelper.getThemeColor(R.attr.cardBackground, _view.getContext().getTheme()));
+        }
+        _view.setSelected(focused);
+    }
+
+    public void destroy() {
+        _refresher.destroy();
+    }
+
     public void startRefreshLoop() {
         _refresher.start();
     }
@@ -134,7 +159,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     }
 
     public void refreshCode() {
-        if (!isCodeHidden()) {
+        if (!_hidden) {
             updateCode();
         }
     }
@@ -142,31 +167,40 @@ public class EntryHolder extends RecyclerView.ViewHolder {
     private void updateCode() {
         OtpInfo info = _entry.getInfo();
 
-        String text;
-        if (info instanceof SteamInfo) {
-            text = info.getOtp();
-        } else {
-            String otp = info.getOtp();
-            text = otp.substring(0, (otp.length() / 2)
-                    + (otp.length() % 2)) + " "
-                    + otp.substring(otp.length() / 2);
+        String otp = info.getOtp();
+        if (!(info instanceof SteamInfo)) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < otp.length(); i++) {
+                if (i != 0 && i % 3 == 0) {
+                    sb.append(" ");
+                }
+                sb.append(otp.charAt(i));
+            }
+            otp = sb.toString();
         }
 
-        _profileCode.setText(text);
+        _profileCode.setText(otp);
     }
 
     public void revealCode() {
         updateCode();
-        _hiddenHandler.postDelayed(this::hideCode, _tapToRevealTime * 1000);
         _hidden = false;
     }
 
-    private void hideCode() {
-        _profileCode.setText(_currentView.getContext().getResources().getString(R.string.tap_to_reveal));
+    public void hideCode() {
+        _profileCode.setText(R.string.tap_to_reveal);
         _hidden = true;
     }
 
-    public boolean isCodeHidden() {
-        return _hidden;
+    public void dim() {
+        animateAlphaTo(DIMMED_ALPHA);
+    }
+
+    public void highlight() {
+        animateAlphaTo(DEFAULT_ALPHA);
+    }
+
+    private void animateAlphaTo(float alpha) {
+        itemView.animate().alpha(alpha).setDuration(200).start();
     }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java

@@ -1,12 +1,23 @@
 package com.beemdevelopment.aegis.ui.views;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.view.animation.LayoutAnimationController;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.SortCategory;
@@ -15,22 +26,28 @@ import com.beemdevelopment.aegis.db.DatabaseEntry;
 import com.beemdevelopment.aegis.helpers.SimpleItemTouchHelperCallback;
 import com.beemdevelopment.aegis.helpers.UiRefresher;
 import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.ListPreloader;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.util.ViewPreloadSizeProvider;
 
+import java.util.Collections;
 import java.util.List;
 
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 public class EntryListView extends Fragment implements EntryAdapter.Listener {
     private EntryAdapter _adapter;
     private Listener _listener;
     private SimpleItemTouchHelperCallback _touchCallback;
 
-    private RecyclerView _rvKeyProfiles;
+    private RecyclerView _recyclerView;
+    private RecyclerView.ItemDecoration _dividerDecoration;
+    private ViewPreloadSizeProvider<DatabaseEntry> _preloadSizeProvider;
     private PeriodProgressBar _progressBar;
     private boolean _showProgress;
+    private ViewMode _viewMode;
+    private LinearLayout _emptyStateView;
 
     private UiRefresher _refresher;
 
@@ -41,15 +58,20 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _showProgress = false;
     }
 
+    @Override
+    public void onDestroy() {
+        _adapter.destroy();
+        super.onDestroy();
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_entry_list_view, container, false);
-
         _progressBar = view.findViewById(R.id.progressBar);
 
         // set up the recycler view
-        _rvKeyProfiles = view.findViewById(R.id.rvKeyProfiles);
-        _rvKeyProfiles.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        _recyclerView = view.findViewById(R.id.rvKeyProfiles);
+        _recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
@@ -57,16 +79,22 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             }
         });
 
-        LinearLayoutManager mLayoutManager = new LinearLayoutManager(view.getContext());
-        _rvKeyProfiles.setLayoutManager(mLayoutManager);
+        // set up icon preloading
+        _preloadSizeProvider = new ViewPreloadSizeProvider<>();
+        IconPreloadProvider modelProvider = new IconPreloadProvider();
+        RecyclerViewPreloader<DatabaseEntry> preloader = new RecyclerViewPreloader<>(Glide.with(this), modelProvider, _preloadSizeProvider, 10);
+        _recyclerView.addOnScrollListener(preloader);
+
+        LinearLayoutManager layoutManager = new LinearLayoutManager(view.getContext());
+        _recyclerView.setLayoutManager(layoutManager);
         _touchCallback = new SimpleItemTouchHelperCallback(_adapter);
         ItemTouchHelper touchHelper = new ItemTouchHelper(_touchCallback);
-        touchHelper.attachToRecyclerView(_rvKeyProfiles);
-        _rvKeyProfiles.setAdapter(_adapter);
+        touchHelper.attachToRecyclerView(_recyclerView);
+        _recyclerView.setAdapter(_adapter);
 
         int resId = R.anim.layout_animation_fall_down;
         LayoutAnimationController animation = AnimationUtils.loadLayoutAnimation(getContext(), resId);
-        _rvKeyProfiles.setLayoutAnimation(animation);
+        _recyclerView.setLayoutAnimation(animation);
 
         _refresher = new UiRefresher(new UiRefresher.Listener() {
             @Override
@@ -80,26 +108,54 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
             }
         });
 
+        _emptyStateView = view.findViewById(R.id.vEmptyList);
+
         return view;
     }
 
-    public void setGroupFilter(String group) {
-        _adapter.setGroupFilter(group);
+    public void setPreloadView(View view) {
+        _preloadSizeProvider.setView(view);
+    }
+
+    @Override
+    public void onDestroyView() {
+        _refresher.destroy();
+        super.onDestroyView();
+    }
+
+    public void setGroupFilter(String group, boolean apply) {
         _touchCallback.setIsLongPressDragEnabled(group == null);
-        checkPeriodUniformity();
+        _adapter.setGroupFilter(group, apply);
 
-        runLayoutAnimation(_rvKeyProfiles);
+        if (apply) {
+            runEntriesAnimation();
+        }
     }
 
-    public void setSortCategory(SortCategory sortCategory) {
+    public void setActionModeState(boolean enabled, DatabaseEntry entry) {
+        _touchCallback.setSelectedEntry(entry);
+        _touchCallback.setIsLongPressDragEnabled(enabled && _adapter.isDragAndDropAllowed());
+        _adapter.setSelectedEntry(entry);
+    }
+
+    public void setSortCategory(SortCategory sortCategory, boolean apply) {
         _touchCallback.setIsLongPressDragEnabled(sortCategory == SortCategory.CUSTOM);
+        _adapter.setSortCategory(sortCategory, apply);
 
-        _adapter.setSortCategory(sortCategory);
-        runLayoutAnimation(_rvKeyProfiles);
+        if (apply) {
+            runEntriesAnimation();
+        }
     }
 
-    public void setViewMode(ViewMode viewMode) {
-        _adapter.setViewMode(viewMode);
+    public void setSearchFilter(String search) {
+        _touchCallback.setIsLongPressDragEnabled(search == null);
+        _adapter.setSearchFilter(search);
+    }
+
+    public void setViewMode(ViewMode mode) {
+        _viewMode = mode;
+        updateDividerDecoration();
+        _adapter.setViewMode(_viewMode);
     }
 
     public void refresh(boolean hard) {
@@ -109,33 +165,6 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _adapter.refresh(hard);
     }
 
-    private void checkPeriodUniformity() {
-        boolean uniform = _adapter.isPeriodUniform();
-        if (uniform == _showProgress) {
-            return;
-        }
-        _showProgress = uniform;
-
-        if (_showProgress) {
-            _progressBar.setVisibility(View.VISIBLE);
-            _progressBar.setPeriod(_adapter.getUniformPeriod());
-            startRefreshLoop();
-        } else {
-            _progressBar.setVisibility(View.GONE);
-            stopRefreshLoop();
-        }
-    }
-
-    private void startRefreshLoop() {
-        refresh(true);
-        _refresher.start();
-    }
-
-    private void stopRefreshLoop() {
-        refresh(true);
-        _refresher.stop();
-    }
-
     public void setListener(Listener listener) {
         _listener = listener;
     }
@@ -145,9 +174,9 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _listener.onEntryClick(entry);
     }
 
-    @Override
     public boolean onLongEntryClick(DatabaseEntry entry) {
-        return false;
+        _listener.onLongEntryClick(entry);
+        return true;
     }
 
     @Override
@@ -165,10 +194,31 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         _listener.onEntryChange(entry);
     }
 
+    @Override
+    public void onPeriodUniformityChanged(boolean isUniform) {
+        setShowProgress(isUniform);
+        if (_showProgress) {
+            _progressBar.setVisibility(View.VISIBLE);
+            _progressBar.setPeriod(_adapter.getUniformPeriod());
+            _refresher.start();
+        } else {
+            _progressBar.setVisibility(View.GONE);
+            _refresher.stop();
+        }
+    }
+
     public void setShowAccountName(boolean showAccountName) {
         _adapter.setShowAccountName(showAccountName);
     }
 
+    public void setSearchAccountName(boolean searchAccountName) {
+        _adapter.setSearchAccountName(searchAccountName);
+    }
+
+    public void setHighlightEntry(boolean highlightEntry) {
+        _adapter.setHighlightEntry(highlightEntry);
+    }
+
     public void setTapToReveal(boolean tapToReveal) {
         _adapter.setTapToReveal(tapToReveal);
     }
@@ -179,37 +229,66 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
 
     public void addEntry(DatabaseEntry entry) {
         _adapter.addEntry(entry);
-        checkPeriodUniformity();
+        updateEmptyState();
     }
 
     public void addEntries(List<DatabaseEntry> entries) {
         _adapter.addEntries(entries);
-        checkPeriodUniformity();
+        updateEmptyState();
     }
 
     public void removeEntry(DatabaseEntry entry) {
         _adapter.removeEntry(entry);
-        checkPeriodUniformity();
+        updateEmptyState();
     }
 
     public void clearEntries() {
         _adapter.clearEntries();
-        checkPeriodUniformity();
     }
 
-    public void replaceEntry(DatabaseEntry entry) {
-        _adapter.replaceEntry(entry);
-        checkPeriodUniformity();
+    public void replaceEntry(DatabaseEntry oldEntry, DatabaseEntry newEntry) {
+        _adapter.replaceEntry(oldEntry, newEntry);
     }
 
-    private void runLayoutAnimation(final RecyclerView recyclerView) {
-        final Context context = recyclerView.getContext();
+    public void runEntriesAnimation() {
+        final Context context = _recyclerView.getContext();
         final LayoutAnimationController controller =
                 AnimationUtils.loadLayoutAnimation(context, R.anim.layout_animation_fall_down);
 
-        recyclerView.setLayoutAnimation(controller);
-        recyclerView.getAdapter().notifyDataSetChanged();
-        recyclerView.scheduleLayoutAnimation();
+        _recyclerView.setLayoutAnimation(controller);
+        _recyclerView.scheduleLayoutAnimation();
+    }
+
+    private void setShowProgress(boolean showProgress) {
+        _showProgress = showProgress;
+        updateDividerDecoration();
+    }
+
+    private void updateDividerDecoration() {
+        if (_dividerDecoration != null) {
+            _recyclerView.removeItemDecoration(_dividerDecoration);
+        }
+
+        float height = _viewMode.getDividerHeight();
+        if (_showProgress && height == 0) {
+            DividerItemDecoration divider = new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL);
+            divider.setDrawable(ContextCompat.getDrawable(getContext(), R.drawable.entry_divider));
+            _dividerDecoration = divider;
+        } else {
+            _dividerDecoration = new VerticalSpaceItemDecoration(height);
+        }
+
+        _recyclerView.addItemDecoration(_dividerDecoration);
+    }
+
+    private void updateEmptyState() {
+        if (_adapter.getItemCount() > 0) {
+            _recyclerView.setVisibility(View.VISIBLE);
+            _emptyStateView.setVisibility(View.GONE);
+        } else {
+            _recyclerView.setVisibility(View.GONE);
+            _emptyStateView.setVisibility(View.VISIBLE);
+        }
     }
 
     public interface Listener {
@@ -217,6 +296,47 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         void onEntryMove(DatabaseEntry entry1, DatabaseEntry entry2);
         void onEntryDrop(DatabaseEntry entry);
         void onEntryChange(DatabaseEntry entry);
+        void onLongEntryClick(DatabaseEntry entry);
         void onScroll(int dx, int dy);
     }
+
+    private class VerticalSpaceItemDecoration extends RecyclerView.ItemDecoration {
+        private int _height;
+
+        private VerticalSpaceItemDecoration(float dp) {
+            // convert dp to pixels
+            _height = (int) (dp * (getContext().getResources().getDisplayMetrics().densityDpi / 160f));
+        }
+
+        @Override
+        public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+            if (parent.getChildAdapterPosition(view) == 0) {
+                // the first item should also have a top margin
+                outRect.top = _height;
+            }
+            outRect.bottom = _height;
+        }
+    }
+
+    private class IconPreloadProvider implements ListPreloader.PreloadModelProvider<DatabaseEntry> {
+        @NonNull
+        @Override
+        public List<DatabaseEntry> getPreloadItems(int position) {
+            DatabaseEntry entry = _adapter.getEntryAt(position);
+            if (!entry.hasIcon()) {
+                return Collections.emptyList();
+            }
+            return Collections.singletonList(entry);
+        }
+
+        @Nullable
+        @Override
+        public RequestBuilder getPreloadRequestBuilder(@NonNull DatabaseEntry entry) {
+            return Glide.with(EntryListView.this)
+                        .asDrawable()
+                        .load(entry)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .skipMemoryCache(false);
+        }
+    }
 }

app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntriesAdapter.java

@@ -0,0 +1,87 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.ui.models.ImportEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ImportEntriesAdapter extends RecyclerView.Adapter<ImportEntryHolder> {
+    private List<ImportEntry> _entries;
+
+    public ImportEntriesAdapter() {
+        _entries = new ArrayList<>();
+    }
+
+    public void addEntry(ImportEntry entry) {
+        _entries.add(entry);
+
+        int position = getItemCount() - 1;
+        if (position == 0) {
+            notifyDataSetChanged();
+        } else {
+            notifyItemInserted(position);
+        }
+    }
+
+    @NonNull
+    @Override
+    public ImportEntryHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_import_entry, parent, false);
+        return new ImportEntryHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ImportEntryHolder holder, int position) {
+        ImportEntry entry = _entries.get(position);
+        entry.setOnCheckedChangedListener(holder);
+        holder.setData(entry);
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull ImportEntryHolder holder) {
+        holder.getEntry().setOnCheckedChangedListener(null);
+    }
+
+    @Override
+    public int getItemCount() {
+        return _entries.size();
+    }
+
+    public List<ImportEntry> getCheckedEntries() {
+        List<ImportEntry> entries = new ArrayList<>();
+
+        for (ImportEntry entry : _entries) {
+            if (entry.isChecked()) {
+                entries.add(entry);
+            }
+        }
+
+        return entries;
+    }
+
+    public void toggleCheckboxes() {
+        int checkedEntries = getCheckedEntries().size();
+        if (checkedEntries == 0 || checkedEntries != _entries.size()) {
+            setCheckboxStates(true);
+        } else {
+            setCheckboxStates(false);
+        }
+    }
+
+    private void setCheckboxStates(boolean checked) {
+        for (ImportEntry entry: _entries) {
+            if (entry.isChecked() != checked) {
+                entry.setIsChecked(checked);
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/views/ImportEntryHolder.java

@@ -0,0 +1,47 @@
+package com.beemdevelopment.aegis.ui.views;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.beemdevelopment.aegis.R;
+import com.beemdevelopment.aegis.db.DatabaseEntry;
+import com.beemdevelopment.aegis.ui.models.ImportEntry;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ImportEntryHolder extends RecyclerView.ViewHolder implements ImportEntry.Listener {
+    private TextView _issuer;
+    private TextView _accountName;
+    private CheckBox _checkbox;
+
+    private ImportEntry _entry;
+
+    public ImportEntryHolder(final View view) {
+        super(view);
+
+        _issuer = view.findViewById(R.id.profile_issuer);
+        _accountName = view.findViewById(R.id.profile_account_name);
+        _checkbox = view.findViewById(R.id.checkbox_import_entry);
+        view.setOnClickListener(v -> _entry.setIsChecked(!_entry.isChecked()));
+    }
+
+    public void setData(ImportEntry entry) {
+        _entry = entry;
+
+        Context context = itemView.getContext();
+        _issuer.setText(!entry.getIssuer().isEmpty() ? entry.getIssuer() : context.getString(R.string.unknown_issuer));
+        _accountName.setText(!entry.getName().isEmpty() ? entry.getName() : context.getString(R.string.unknown_account_name));
+        _checkbox.setChecked(entry.isChecked());
+    }
+
+    public ImportEntry getEntry() {
+        return _entry;
+    }
+
+    @Override
+    public void onCheckedChanged(boolean value) {
+        _checkbox.setChecked(value);
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/views/SlotHolder.java

@@ -5,16 +5,16 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandle;
 import com.beemdevelopment.aegis.crypto.KeyStoreHandleException;
-import com.beemdevelopment.aegis.db.slots.FingerprintSlot;
+import com.beemdevelopment.aegis.db.slots.BiometricSlot;
 import com.beemdevelopment.aegis.db.slots.PasswordSlot;
 import com.beemdevelopment.aegis.db.slots.RawSlot;
 import com.beemdevelopment.aegis.db.slots.Slot;
-import com.beemdevelopment.aegis.helpers.FingerprintHelper;
-
-import androidx.recyclerview.widget.RecyclerView;
+import com.beemdevelopment.aegis.helpers.BiometricsHelper;
 
 public class SlotHolder extends RecyclerView.ViewHolder {
     private TextView _slotUsed;
@@ -36,10 +36,10 @@ public class SlotHolder extends RecyclerView.ViewHolder {
         if (slot instanceof PasswordSlot) {
             _slotName.setText(R.string.password);
             _slotImg.setImageResource(R.drawable.ic_create_black_24dp);
-        } else if (slot instanceof FingerprintSlot) {
-            _slotName.setText(R.string.authentication_method_fingerprint);
+        } else if (slot instanceof BiometricSlot) {
+            _slotName.setText(R.string.authentication_method_biometrics);
             _slotImg.setImageResource(R.drawable.ic_fingerprint_black_24dp);
-            if (FingerprintHelper.isSupported()) {
+            if (BiometricsHelper.isAvailable(itemView.getContext())) {
                 try {
                     KeyStoreHandle keyStore = new KeyStoreHandle();
                     if (keyStore.containsKey(slot.getUUID().toString())) {

app/src/main/java/com/beemdevelopment/aegis/util/Cloner.java

@@ -0,0 +1,32 @@
+package com.beemdevelopment.aegis.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+public class Cloner {
+    private Cloner() {
+
+    }
+
+    /**
+     * Returns an exact clone of the given Serializable object.
+     */
+    @SuppressWarnings("unchecked cast")
+    public static <T extends Serializable> T clone(T obj) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(obj);
+
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            ObjectInputStream ois = new ObjectInputStream(bais);
+            return (T) ois.readObject();
+        } catch (ClassNotFoundException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/util/PreferenceParser.java

@@ -0,0 +1,79 @@
+package com.beemdevelopment.aegis.util;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PreferenceParser {
+    private PreferenceParser() {
+        
+    }
+
+    public 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 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;
+            }
+        }
+    }
+
+    public static class XmlEntry {
+        public String Name;
+        public String Value;
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/util/UUIDMap.java

@@ -0,0 +1,162 @@
+package com.beemdevelopment.aegis.util;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * A map data structure abstraction for storing values with a UUID as the key. Keys
+ * must be specified by the value itself, instead of separately. It uses a
+ * LinkedHashMap internally (a hash map with a separate linked list that maintains
+ * the order).
+ * @param <T> The type of values in this map
+ */
+public class UUIDMap <T extends UUIDMap.Value> implements Iterable<T>, Serializable {
+    private LinkedHashMap<UUID, T> _map = new LinkedHashMap<>();
+
+    /**
+     * Adds a value to the internal map.
+     * @throws AssertionError if a map value with the UUID of the given value already exists.
+     */
+    public void add(T value) {
+        UUID uuid = value.getUUID();
+        if (_map.containsKey(uuid)) {
+            throw new AssertionError(String.format("Existing value found with UUID: %s", uuid));
+        }
+        _map.put(uuid, value);
+    }
+
+    /**
+     * Removes a value from the internal map.
+     * @throws AssertionError if no map value exists with the UUID of the given value.
+     * @return The old value that is now no longer present in the internal map.
+     */
+    public T remove(T value) {
+        T oldValue = getByUUID(value.getUUID());
+        _map.remove(oldValue.getUUID());
+        return oldValue;
+    }
+
+    /**
+     * Replaces an old value (with the same UUID as the new given value) in the
+     * internal map with the new given value.
+     * @throws AssertionError if no map value exists with the UUID of the given value.
+     * @return The old value that is now no longer present in the internal map.
+     */
+    public T replace(T newValue) {
+        T oldValue = getByUUID(newValue.getUUID());
+        _map.put(oldValue.getUUID(), newValue);
+        return oldValue;
+    }
+
+    /**
+     * Swaps the position of value1 and value2 in the internal map. This operation is
+     * quite expensive because it has to reallocate the entire underlying LinkedHashMap.
+     * @throws AssertionError if no map value exists with the UUID of the given entries.
+     */
+    public void swap(T value1, T value2) {
+        boolean found1 = false;
+        boolean found2 = false;
+        List<T> values = new ArrayList<>();
+
+        for (T value : _map.values()) {
+            if (value.getUUID().equals(value1.getUUID())) {
+                values.add(value2);
+                found1 = true;
+            } else if (value.getUUID().equals(value2.getUUID())) {
+                values.add(value1);
+                found2 = true;
+            } else {
+                values.add(value);
+            }
+        }
+
+        if (!found1) {
+            throw new AssertionError(String.format("No value found for value1 with UUID: %s", value1.getUUID()));
+        }
+        if (!found2) {
+            throw new AssertionError(String.format("No value found for value2 with UUID: %s", value2.getUUID()));
+        }
+
+        _map.clear();
+        for (T value : values) {
+            _map.put(value.getUUID(), value);
+        }
+    }
+
+    /**
+     * Reports whether the internal map contains a value with the UUID of the given value.
+     */
+    public boolean has(T value) {
+        return _map.containsKey(value.getUUID());
+    }
+
+    /**
+     * Returns a read-only view of the values in the internal map.
+     */
+    public Collection<T> getValues() {
+        return Collections.unmodifiableCollection(_map.values());
+    }
+
+    /**
+     * Retrieves an entry from the internal map that has the given UUID.
+     * @throws AssertionError if no map value exists with the given UUID.
+     */
+    public T getByUUID(UUID uuid) {
+        T value = _map.get(uuid);
+        if (value == null) {
+            throw new AssertionError(String.format("No value found with UUID: %s", uuid));
+        }
+        return value;
+    }
+
+    @NonNull
+    @Override
+    public Iterator<T> iterator() {
+        return _map.values().iterator();
+    }
+
+    public static abstract class Value implements Serializable {
+        private UUID _uuid;
+
+        protected Value(UUID uuid) {
+            _uuid = uuid;
+        }
+
+        protected Value() {
+            this(UUID.randomUUID());
+        }
+
+        public final UUID getUUID() {
+            return _uuid;
+        }
+
+        /**
+         * Resets the UUID of this value by generating a new random one.
+         * The caller must ensure that this Value is not in a UUIDMap yet. Otherwise, bad things will happen.
+         */
+        public final void resetUUID() {
+            _uuid = UUID.randomUUID();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+
+            if (!(o instanceof Value)) {
+                return false;
+            }
+
+            return getUUID().equals(((Value) o).getUUID());
+        }
+    }
+}

app/src/main/res/drawable-v24/ic_launcher_background.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="137.93103"
+    android:viewportHeight="137.93103">
+  <group android:translateX="-11.034483"
+      android:translateY="-11.034483">
+    <path
+        android:pathData="M55.78,0h48.44C120.28,0 128.31,0 137,2.73A34,34 0,0 1,157.27 23C160,31.69 160,39.72 160,55.78v48.44c0,16.06 0,24.09 -2.73,32.74A34,34 0,0 1,137 157.27C128.31,160 120.28,160 104.22,160H55.78c-16.06,0 -24.09,0 -32.74,-2.73A34,34 0,0 1,2.73 137C0,128.31 0,120.28 0,104.22V55.78C0,39.72 0,31.69 2.73,23A34,34 0,0 1,23 2.73C31.69,0 39.72,0 55.78,0h0">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="28.48"
+            android:startX="51.92"
+            android:endY="189.51"
+            android:endX="139.67"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="0.37" android:color="#FFF5FAFC"/>
+          <item android:offset="1" android:color="#FFDBEBF5"/>
+          <item android:offset="1" android:color="#FFDBEBF5"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

app/src/main/res/drawable/entry_divider.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/divider"/>
+    <size android:height="0.1dp"/>
+</shape>

app/src/main/res/drawable/ic_add_photo_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>
+</vector>

app/src/main/res/drawable/ic_check_black_24dp.xml

@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+<vector android:height="24dp" android:tint="#F7F7F7"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
 </vector>

app/src/main/res/drawable/ic_delete_white.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>

app/src/main/res/drawable/ic_done_all_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F7F7F7"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>